From 470a9960f1df94b55c958ea316f24ef6b3b996df Mon Sep 17 00:00:00 2001 From: Bell Eapen Date: Wed, 20 Nov 2024 13:43:23 -0600 Subject: [PATCH 1/4] build: update Python version from 3.10.13 to 3.11 in workflow files --- .github/workflows/docs.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/pytest.yml | 2 +- .github/workflows/tox.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7af4742..4a3cb33 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5.3.0 with: - python-version: '3.10.13' + python-version: '3.11' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f0b1442..fb32f36 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,7 +14,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5.3.0 with: - python-version: '3.10.13' + python-version: '3.11' - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 194cf31..764978a 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -19,7 +19,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.10.13] + python-version: ['3.11'] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 3cd24d8..da119d7 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.10.13] + python-version: ['3.11'] steps: - uses: actions/checkout@v4 From efab9db173464b83128afd65e34e4d908bc1ad8b Mon Sep 17 00:00:00 2001 From: Bell Eapen Date: Wed, 20 Nov 2024 13:46:01 -0600 Subject: [PATCH 2/4] build(deps): update dependencies for Python 3.11 compatibility and bump versions --- dev-requirements.txt | 8 ++++---- requirements.txt | 14 +++++++------- setup.cfg | 1 + update.sh | 2 ++ 4 files changed, 14 insertions(+), 11 deletions(-) create mode 100755 update.sh diff --git a/dev-requirements.txt b/dev-requirements.txt index 4d49b0c..d5f9802 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile dev-requirements.in @@ -66,9 +66,9 @@ pytest==6.2.5 # pytest-cov pytest-cov==3.0.0 # via -r dev-requirements.in -pytz==2024.1 +pytz==2024.2 # via - # -c requirements.txt + # -c /Users/M267492/Repository/pyomop/requirements.txt # babel recommonmark==0.7.1 # via -r dev-requirements.in @@ -78,7 +78,7 @@ setuptools-scm==6.3.2 # via -r dev-requirements.in six==1.16.0 # via - # -c requirements.txt + # -c /Users/M267492/Repository/pyomop/requirements.txt # tox # virtualenv snowballstemmer==2.1.0 diff --git a/requirements.txt b/requirements.txt index ce32980..26e0875 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile @@ -8,23 +8,23 @@ aiosqlite==0.20.0 # via pyomop (setup.py) click==8.1.7 # via pyomop (setup.py) -greenlet==3.0.3 +greenlet==3.1.1 # via sqlalchemy -numpy==2.0.0 +numpy==2.1.3 # via pandas -pandas==2.2.2 +pandas==2.2.3 # via pyomop (setup.py) python-dateutil==2.9.0.post0 # via pandas -pytz==2024.1 +pytz==2024.2 # via pandas six==1.16.0 # via python-dateutil -sqlalchemy==2.0.31 +sqlalchemy==2.0.36 # via pyomop (setup.py) typing-extensions==4.12.2 # via # aiosqlite # sqlalchemy -tzdata==2024.1 +tzdata==2024.2 # via pandas diff --git a/setup.cfg b/setup.cfg index 35c2681..541302b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,6 +23,7 @@ classifiers = Operating System :: OS Independent Programming Language :: Python Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 Topic :: Scientific/Engineering :: Information Analysis [options] diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..b949fd6 --- /dev/null +++ b/update.sh @@ -0,0 +1,2 @@ +pip-compile --upgrade +pip-compile dev-requirements.in \ No newline at end of file From 22835275c8c38496914755e6992d995c0b848c3c Mon Sep 17 00:00:00 2001 From: Bell Eapen Date: Wed, 20 Nov 2024 13:54:33 -0600 Subject: [PATCH 3/4] build(deps): update development dependencies and scripts for compatibility with Python 3.11 --- dev-requirements.in | 1 + dev-requirements.txt | 33 ++++++++++++++++++++------------- requirements.txt | 20 +++++++++----------- update.sh | 6 ++++-- 4 files changed, 34 insertions(+), 26 deletions(-) diff --git a/dev-requirements.in b/dev-requirements.in index 406876e..301b933 100644 --- a/dev-requirements.in +++ b/dev-requirements.in @@ -2,6 +2,7 @@ -c requirements.txt pytest-cov pytest +py>=1.11.0 #https://github.com/pytest-dev/apipkg/issues/30 Keyerror __spec__ recommonmark sphinx>=3.2.1 setuptools diff --git a/dev-requirements.txt b/dev-requirements.txt index d5f9802..0086133 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,11 +1,9 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile dev-requirements.in -# +# This file was autogenerated by uv via the following command: +# uv pip compile dev-requirements.in -o dev-requirements.txt --universal alabaster==0.7.12 # via sphinx +atomicwrites==1.4.1 ; sys_platform == 'win32' + # via pytest attrs==21.2.0 # via pytest babel==2.9.1 @@ -16,9 +14,15 @@ certifi==2024.7.4 # via requests charset-normalizer==2.0.6 # via requests +colorama==0.4.6 ; sys_platform == 'win32' or platform_system == 'Windows' + # via + # -c requirements.txt + # pytest + # sphinx + # tox commonmark==0.9.1 # via recommonmark -coverage[toml]==5.5 +coverage==5.5 # via pytest-cov distlib==0.3.2 # via virtualenv @@ -52,8 +56,9 @@ pluggy==1.0.0 # via # pytest # tox -py==1.10.0 +py==1.11.0 # via + # -r dev-requirements.in # pytest # tox pygments==2.15.0 @@ -68,17 +73,22 @@ pytest-cov==3.0.0 # via -r dev-requirements.in pytz==2024.2 # via - # -c /Users/M267492/Repository/pyomop/requirements.txt + # -c requirements.txt # babel recommonmark==0.7.1 # via -r dev-requirements.in requests==2.32.2 # via sphinx +setuptools==75.6.0 + # via + # -r dev-requirements.in + # setuptools-scm + # sphinx setuptools-scm==6.3.2 # via -r dev-requirements.in six==1.16.0 # via - # -c /Users/M267492/Repository/pyomop/requirements.txt + # -c requirements.txt # tox # virtualenv snowballstemmer==2.1.0 @@ -114,6 +124,3 @@ virtualenv==20.8.0 # via tox wheel==0.37.1 # via -r dev-requirements.in - -# The following packages are considered to be unsafe in a requirements file: -# setuptools diff --git a/requirements.txt b/requirements.txt index 26e0875..b6d92e3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,17 @@ -# -# This file is autogenerated by pip-compile with Python 3.11 -# by the following command: -# -# pip-compile -# +# This file was autogenerated by uv via the following command: +# uv pip compile setup.cfg -o requirements.txt --universal aiosqlite==0.20.0 - # via pyomop (setup.py) + # via pyomop (setup.cfg) click==8.1.7 - # via pyomop (setup.py) -greenlet==3.1.1 + # via pyomop (setup.cfg) +colorama==0.4.6 ; platform_system == 'Windows' + # via click +greenlet==3.1.1 ; (python_full_version < '3.13' and platform_machine == 'AMD64') or (python_full_version < '3.13' and platform_machine == 'WIN32') or (python_full_version < '3.13' and platform_machine == 'aarch64') or (python_full_version < '3.13' and platform_machine == 'amd64') or (python_full_version < '3.13' and platform_machine == 'ppc64le') or (python_full_version < '3.13' and platform_machine == 'win32') or (python_full_version < '3.13' and platform_machine == 'x86_64') # via sqlalchemy numpy==2.1.3 # via pandas pandas==2.2.3 - # via pyomop (setup.py) + # via pyomop (setup.cfg) python-dateutil==2.9.0.post0 # via pandas pytz==2024.2 @@ -21,7 +19,7 @@ pytz==2024.2 six==1.16.0 # via python-dateutil sqlalchemy==2.0.36 - # via pyomop (setup.py) + # via pyomop (setup.cfg) typing-extensions==4.12.2 # via # aiosqlite diff --git a/update.sh b/update.sh index b949fd6..af47a77 100755 --- a/update.sh +++ b/update.sh @@ -1,2 +1,4 @@ -pip-compile --upgrade -pip-compile dev-requirements.in \ No newline at end of file +#! /bin/bash +pip install uv +uv pip compile setup.cfg -o requirements.txt --universal +uv pip compile dev-requirements.in -o dev-requirements.txt --universal \ No newline at end of file From 27c199ca8bce3beb59eb8a094df515efd25f741d Mon Sep 17 00:00:00 2001 From: Bell Eapen Date: Wed, 20 Nov 2024 13:58:12 -0600 Subject: [PATCH 4/4] build(deps): pin setuptools version to avoid compatibility issues --- dev-requirements.in | 2 +- dev-requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-requirements.in b/dev-requirements.in index 301b933..c38eabd 100644 --- a/dev-requirements.in +++ b/dev-requirements.in @@ -5,7 +5,7 @@ pytest py>=1.11.0 #https://github.com/pytest-dev/apipkg/issues/30 Keyerror __spec__ recommonmark sphinx>=3.2.1 -setuptools +setuptools<71.0.0 #https://github.com/pypa/setuptools/issues/4483 setuptools_scm wheel tox \ No newline at end of file diff --git a/dev-requirements.txt b/dev-requirements.txt index 0086133..f62def7 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -79,7 +79,7 @@ recommonmark==0.7.1 # via -r dev-requirements.in requests==2.32.2 # via sphinx -setuptools==75.6.0 +setuptools==70.3.0 # via # -r dev-requirements.in # setuptools-scm