From c474733d6cf5fc0b10bd40d65d480e4924f37444 Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Fri, 21 Jun 2024 12:00:26 +0100 Subject: [PATCH 1/7] Remove older python versions support --- .azure-pipelines/azure-pipelines.yml | 8 ++------ setup.cfg | 6 ++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index c9708934..27f11c80 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -15,11 +15,11 @@ stages: pool: vmImage: ubuntu-20.04 steps: - # Use Python >=3.8 for syntax validation + # Use Python >=3.10 for syntax validation - task: UsePythonVersion@0 displayName: Set up python inputs: - versionSpec: 3.8 + versionSpec: 3.10 # Run syntax validation on a shallow clone - bash: | @@ -81,10 +81,6 @@ stages: vmImage: ubuntu-20.04 strategy: matrix: - python38: - PYTHON_VERSION: 3.8 - python39: - PYTHON_VERSION: 3.9 python310: PYTHON_VERSION: 3.10 python311: diff --git a/setup.cfg b/setup.cfg index 64c982ef..333c8072 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,8 +14,6 @@ classifiers = License :: OSI Approved :: BSD License Natural Language :: English Programming Language :: Python :: 3 - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 keywords = @@ -41,11 +39,11 @@ install_requires = packages = find: package_dir = =src -python_requires = >=3.8 +python_requires = >=3.10 zip_safe = False [options.extras_require] -dev = +dev = black pytest-cov pytest-random-order From 97c8bb7f32b1769e5800a04de4ca2f235b3349f0 Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Fri, 21 Jun 2024 12:13:13 +0100 Subject: [PATCH 2/7] Updae requirements files --- requirements.txt | 12 ++++++------ requirements_dev.txt | 10 +++++----- requirements_doc.txt | 12 ++++++------ setup.cfg | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index a9d423f9..b496f59c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ -dask==2022.11.1 -distributed==2022.11.1 +dask==2023.3.2 +distributed==2023.3.2 h5py==3.8.0 hdf5plugin==4.0.1 -nexgen==0.7.2 -numpy==1.23.5 -pandas==1.5.2 -Pint==0.20.1 +nexgen==0.9.1 +numpy==1.26.4 +pandas==2.1.4 +Pint==0.23 zarr==2.13.3 diff --git a/requirements_dev.txt b/requirements_dev.txt index 21094915..a515335a 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,11 +1,11 @@ -dask==2022.11.1 -distributed==2022.11.1 +dask==2023.3.2 +distributed==2023.3.2 h5py==3.8.0 hdf5plugin==4.0.1 -nexgen==0.7.2 -numpy==1.23.5 +nexgen==0.9.1 +numpy==1.26.4 pandas==1.5.2 -Pint==0.20.1 +Pint==0.23 pytest==7.2.0 pytest-cov==4.0.0 zarr==2.13.3 diff --git a/requirements_doc.txt b/requirements_doc.txt index 47f6ad87..b12a4dbe 100644 --- a/requirements_doc.txt +++ b/requirements_doc.txt @@ -1,11 +1,11 @@ -dask==2022.11.1 -distributed==2022.11.1 +dask==2023.3.2 +distributed==2023.3.2 h5py==3.8.0 hdf5plugin==4.0.1 -nexgen==0.7.2 -numpy==1.23.5 -pandas==1.5.2 -Pint==0.20.1 +nexgen==0.9.1 +numpy==1.26.4 +pandas==2.1.4 +Pint==0.23 pytest==7.1.2 pytest-cov==3.0.0 Sphinx==6.2.0 diff --git a/setup.cfg b/setup.cfg index 333c8072..fa993d1e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,7 +31,7 @@ install_requires = dask[array,diagnostics,distributed]!=2021.3.*,<2023.4 h5py>=3.8 hdf5plugin>=4.0.1 - nexgen>=0.7.2 + nexgen>=0.9.1 numpy pandas pint From b5897f119b7bd0366079928661e19a9a5ad52e0b Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Fri, 21 Jun 2024 12:13:40 +0100 Subject: [PATCH 3/7] And save it all --- requirements_dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_dev.txt b/requirements_dev.txt index a515335a..dec9dbfb 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -4,7 +4,7 @@ h5py==3.8.0 hdf5plugin==4.0.1 nexgen==0.9.1 numpy==1.26.4 -pandas==1.5.2 +pandas==2.1.4 Pint==0.23 pytest==7.2.0 pytest-cov==4.0.0 From d50f1e88ceab97294bb6032760b261a0d96f3bf0 Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Fri, 21 Jun 2024 13:27:24 +0100 Subject: [PATCH 4/7] Temporarily pin numpy --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index fa993d1e..4fdf6e11 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,7 +32,7 @@ install_requires = h5py>=3.8 hdf5plugin>=4.0.1 nexgen>=0.9.1 - numpy + numpy<2.0 pandas pint zarr From 07b4b3a8743005a41a90b37af9e02d3b50250a4f Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Fri, 21 Jun 2024 13:34:55 +0100 Subject: [PATCH 5/7] Add support for python 3.12 --- .azure-pipelines/azure-pipelines.yml | 2 ++ setup.cfg | 1 + 2 files changed, 3 insertions(+) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 27f11c80..7d1bae3d 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -85,6 +85,8 @@ stages: PYTHON_VERSION: 3.10 python311: PYTHON_VERSION: 3.11 + python312: + PYTHON_VERSION: 3.12 steps: - template: ci.yml diff --git a/setup.cfg b/setup.cfg index 4fdf6e11..4c48c6e5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,6 +16,7 @@ classifiers = Programming Language :: Python :: 3 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 keywords = x-ray tristan From bf3db60d9c4f1114ec91e788a3695119e1c1a3c5 Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Fri, 21 Jun 2024 13:38:58 +0100 Subject: [PATCH 6/7] Revert previous change --- .azure-pipelines/azure-pipelines.yml | 2 -- setup.cfg | 1 - 2 files changed, 3 deletions(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 7d1bae3d..27f11c80 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -85,8 +85,6 @@ stages: PYTHON_VERSION: 3.10 python311: PYTHON_VERSION: 3.11 - python312: - PYTHON_VERSION: 3.12 steps: - template: ci.yml diff --git a/setup.cfg b/setup.cfg index 4c48c6e5..4fdf6e11 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,7 +16,6 @@ classifiers = Programming Language :: Python :: 3 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 - Programming Language :: Python :: 3.12 keywords = x-ray tristan From a4d2d101f13359553683daf57c599cbf358418ae Mon Sep 17 00:00:00 2001 From: Noemi Frisina Date: Fri, 21 Jun 2024 13:44:02 +0100 Subject: [PATCH 7/7] Try pinning python 3.11 version --- .azure-pipelines/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 27f11c80..8d2ee254 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -84,7 +84,7 @@ stages: python310: PYTHON_VERSION: 3.10 python311: - PYTHON_VERSION: 3.11 + PYTHON_VERSION: 3.11.7 steps: - template: ci.yml