From 76482446306ba54821d1f5d9a2d70969760036fd Mon Sep 17 00:00:00 2001 From: Ben Gyori Date: Wed, 8 May 2024 22:32:49 -0400 Subject: [PATCH 1/6] Add testing on Python 3.12 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8dac11a..b484bdc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.11"] + python-version: ["3.8", "3.12"] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} From b56f6ca7455fed8969e9719c9c4a1082c64c3c6b Mon Sep 17 00:00:00 2001 From: Ben Gyori Date: Wed, 8 May 2024 22:35:48 -0400 Subject: [PATCH 2/6] Add Adeft from git temporarily --- .github/workflows/tests.yml | 1 + gilda/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b484bdc..4c77039 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,6 +18,7 @@ jobs: run: | python -m pip install --upgrade pip pip install .[test,ui] + pip install git+https://github.com/steppi/adeft.git@modernize python -c "import nltk; nltk.download('punkt'); nltk.download('stopwords')" python -m adeft.download - name: Tests diff --git a/gilda/__init__.py b/gilda/__init__.py index 6841dd0..e9c8072 100644 --- a/gilda/__init__.py +++ b/gilda/__init__.py @@ -1,4 +1,4 @@ -__version__ = '1.2.0' +__version__ = '1.2.1' import logging diff --git a/setup.py b/setup.py index 5cf43d9..9ef917e 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ 'Programming Language :: Python :: 3.11', ], packages=find_packages(), - install_requires=['regex', 'adeft>=0.11.0', 'boto3', 'flask>=3.0,<4.0', + install_requires=['regex', 'boto3', 'flask>=3.0,<4.0', 'flask-restx>=1.3.0', 'pystow>=0.1.10', 'unidecode', 'importlib_metadata; python_version < "3.8"', 'werkzeug'], From 60cd9fed627c2864d22ea8f1b53b05ca49220acb Mon Sep 17 00:00:00 2001 From: Ben Gyori Date: Wed, 8 May 2024 23:31:52 -0400 Subject: [PATCH 3/6] Point to merged adeft --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4c77039..3923e5d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: run: | python -m pip install --upgrade pip pip install .[test,ui] - pip install git+https://github.com/steppi/adeft.git@modernize + pip install git+https://github.com/gyorilab/adeft.git python -c "import nltk; nltk.download('punkt'); nltk.download('stopwords')" python -m adeft.download - name: Tests From 78bd561b4f741e5d66b453caea9d8e6037b7faa2 Mon Sep 17 00:00:00 2001 From: Ben Gyori Date: Thu, 9 May 2024 00:11:10 -0400 Subject: [PATCH 4/6] Add back adeft dependency --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9ef917e..9229e92 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ 'Programming Language :: Python :: 3.11', ], packages=find_packages(), - install_requires=['regex', 'boto3', 'flask>=3.0,<4.0', + install_requires=['regex', 'boto3', 'adeft', 'flask>=3.0,<4.0', 'flask-restx>=1.3.0', 'pystow>=0.1.10', 'unidecode', 'importlib_metadata; python_version < "3.8"', 'werkzeug'], From b433d059e6c323852e142c3f83836d92d8e923d1 Mon Sep 17 00:00:00 2001 From: Ben Gyori Date: Wed, 12 Jun 2024 13:34:05 -0400 Subject: [PATCH 5/6] Add scikit-learn constraint --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9229e92..ba3c278 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ install_requires=['regex', 'boto3', 'adeft', 'flask>=3.0,<4.0', 'flask-restx>=1.3.0', 'pystow>=0.1.10', 'unidecode', 'importlib_metadata; python_version < "3.8"', - 'werkzeug'], + 'werkzeug', 'scikit-learn<1.5'], extras_require={'test': ['pytest', 'pytest-cov', 'pandas'], 'terms': ['indra', 'obonet'], 'benchmarks': ['pandas>=1.0', 'requests', From ef9575d7a003956636a56bd316f618de7d92ab65 Mon Sep 17 00:00:00 2001 From: Ben Gyori Date: Wed, 12 Jun 2024 13:42:08 -0400 Subject: [PATCH 6/6] Remove custom adeft install --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3923e5d..b484bdc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,6 @@ jobs: run: | python -m pip install --upgrade pip pip install .[test,ui] - pip install git+https://github.com/gyorilab/adeft.git python -c "import nltk; nltk.download('punkt'); nltk.download('stopwords')" python -m adeft.download - name: Tests