Resolved merge conflict

zbw · Oct 9, 2024 · 679d18e · 679d18e
2 parents 59969b9 + 6cdd3cb
commit 679d18e
Show file tree

Hide file tree

Showing 58 changed files with 109 additions and 105 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,13 +14,13 @@ jobs:
         python-version: ["3.9", "3.10", "3.11", "3.12"]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install poetry
         run: pipx install poetry
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'poetry'
@@ -35,7 +35,9 @@ jobs:
         run: poetry run pytest --cov=./ --cov-config=.coveragerc --cov-report=xml
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
         if: matrix.python-version == '3.9'
 
       - name: Look for security vulnerabilities in dependencies

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,13 +13,13 @@ jobs:
         python-version: ["3.9", "3.10", "3.11"]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install poetry
         run: pipx install poetry
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
           cache: 'poetry'
@@ -35,13 +35,13 @@ jobs:
     needs: [test]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install poetry
         run: pipx install poetry
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 

diff --git a/CITATION.cff b/CITATION.cff
@@ -17,7 +17,7 @@ title: "stwfsapy (a library for matching labels of thesaurus concepts via finite
 abstract: "This library provides functionality to find the labels of SKOS thesaurus concepts in text. A deterministic finite automaton is constructed from the labels of the thesaurus concepts to perform the matching. In addition, a classifier is trained to score the matched concept occurrences."
 version: 0.5.0
 license: Apache-2.0
-date-released: 2024-08-28S
+date-released: 2024-08-29
 repository-code: "https://github.com/zbw/stwfsapy"
 contact:
   - name: "Automatization of subject indexing using methods from artificial intelligence (AutoSE)"

diff --git a/poetry.lock b/poetry.lock
diff --git a/stwfsapy/automata/construction.py b/stwfsapy/automata/construction.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/automata/conversion.py b/stwfsapy/automata/conversion.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/automata/dfa.py b/stwfsapy/automata/dfa.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/automata/heap.py b/stwfsapy/automata/heap.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/automata/nfa.py b/stwfsapy/automata/nfa.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/case_handlers.py b/stwfsapy/case_handlers.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/expansion.py b/stwfsapy/expansion.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/frequency_features.py b/stwfsapy/frequency_features.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/position_features.py b/stwfsapy/position_features.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/predictor.py b/stwfsapy/predictor.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/tests/automata/conftest.py b/stwfsapy/tests/automata/conftest.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/tests/automata/construction_test.py b/stwfsapy/tests/automata/construction_test.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/stwfsapy/tests/automata/conversion_test.py b/stwfsapy/tests/automata/conversion_test.py
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Leibniz Information Centre for Economics
+# Copyright 2020-2024 Leibniz Information Centre for Economics
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.