From acac7eac32285b1f00e46405ec833cc7981c65c1 Mon Sep 17 00:00:00 2001 From: Pete Jemian Date: Tue, 2 Jul 2024 10:35:51 -0500 Subject: [PATCH 1/4] MNT #24 update Python version and workflow. --- .github/workflows/code.yml | 8 +++----- CHANGES.rst | 13 +++++++++++++ pyproject.toml | 8 ++++---- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 3cd1733..159d665 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -21,9 +21,7 @@ jobs: steps: - uses: actions/checkout@v4 - - - name: ruff - uses: chartboost/ruff-action@v1 + - uses: chartboost/ruff-action@v1 matrix: name: Python ${{ matrix.python-version }} @@ -32,10 +30,10 @@ jobs: strategy: matrix: python-version: - - "3.9" + # - "3.9" - "3.10" - "3.11" - # - "3.12" # TODO: dm package not ready + - "3.12" max-parallel: 5 steps: diff --git a/CHANGES.rst b/CHANGES.rst index 019ae83..dfa07d0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -18,8 +18,21 @@ The project `milestones `_ describe the future plans. .. + 2.0.0 + ***** + next release expected by -tba- + Notice + ------ + + Complete overhaul for APS-U era. + + Maintenance + ----------- + + Update to install and run with Python versions 3.10, 3.11, 3.12. + pyyaml 1.5.6 diff --git a/pyproject.toml b/pyproject.toml index ef0c4b5..a28dddd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ maintainers = [ ] dynamic = ["version"] readme = "README.md" -requires-python = ">=3.9" +requires-python = ">=3.10" keywords = ["APS", "BSS", "bluesky", "ophyd"] # https://packaging.python.org/en/latest/specifications/declaring-project-metadata/?highlight=license license = {file = "LICENSE.txt"} @@ -29,9 +29,9 @@ classifiers = [ "License :: Public Domain", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.7", - # "Programming Language :: Python :: 3.8", - # "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering :: Astronomy", "Topic :: Scientific/Engineering :: Bio-Informatics", From cc939f6eaf7d251f6e2c3fbef296dd7de86883f6 Mon Sep 17 00:00:00 2001 From: Pete Jemian Date: Tue, 2 Jul 2024 10:49:55 -0500 Subject: [PATCH 2/4] MNT #24 aps-dm-api limited to <=3.10 --- .github/workflows/code.yml | 7 ++++--- pyproject.toml | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 159d665..4d6006a 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -30,10 +30,11 @@ jobs: strategy: matrix: python-version: - # - "3.9" + - "3.9" - "3.10" - - "3.11" - - "3.12" + # https://anaconda.org/aps-anl-tag/aps-dm-api/files + # - "3.11" # dm does not support yet. + # - "3.12" # dm does not support yet. max-parallel: 5 steps: diff --git a/pyproject.toml b/pyproject.toml index a28dddd..50a9a61 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ maintainers = [ ] dynamic = ["version"] readme = "README.md" -requires-python = ">=3.10" +requires-python = ">=3.9" keywords = ["APS", "BSS", "bluesky", "ophyd"] # https://packaging.python.org/en/latest/specifications/declaring-project-metadata/?highlight=license license = {file = "LICENSE.txt"} @@ -29,9 +29,11 @@ classifiers = [ "License :: Public Domain", "Programming Language :: Python", "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", + # https://anaconda.org/aps-anl-tag/aps-dm-api/files + # "Programming Language :: Python :: 3.11", # dm does not support yet. + # "Programming Language :: Python :: 3.12", # dm does not support yet. "Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering :: Astronomy", "Topic :: Scientific/Engineering :: Bio-Informatics", From 92e8be33966a7c59df35738457c6d5979ff66159 Mon Sep 17 00:00:00 2001 From: Pete Jemian Date: Tue, 2 Jul 2024 10:56:55 -0500 Subject: [PATCH 3/4] MNT #24 try py311 --- .github/workflows/code.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 4d6006a..2665c44 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -33,7 +33,7 @@ jobs: - "3.9" - "3.10" # https://anaconda.org/aps-anl-tag/aps-dm-api/files - # - "3.11" # dm does not support yet. + - "3.11" # dm does not support yet. # - "3.12" # dm does not support yet. max-parallel: 5 diff --git a/pyproject.toml b/pyproject.toml index 50a9a61..a2c631e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", # https://anaconda.org/aps-anl-tag/aps-dm-api/files - # "Programming Language :: Python :: 3.11", # dm does not support yet. + "Programming Language :: Python :: 3.11", # dm does not support yet. # "Programming Language :: Python :: 3.12", # dm does not support yet. "Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering :: Astronomy", From 0509094a32f3d339ed0af15e103e53de2a1c30a5 Mon Sep 17 00:00:00 2001 From: Pete Jemian Date: Tue, 2 Jul 2024 11:04:32 -0500 Subject: [PATCH 4/4] MNT #24 accept 3.9-3.11 --- .github/workflows/code.yml | 2 +- CHANGES.rst | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 2665c44..647d78a 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -32,8 +32,8 @@ jobs: python-version: - "3.9" - "3.10" + - "3.11" # https://anaconda.org/aps-anl-tag/aps-dm-api/files - - "3.11" # dm does not support yet. # - "3.12" # dm does not support yet. max-parallel: 5 diff --git a/CHANGES.rst b/CHANGES.rst index dfa07d0..421166a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -31,7 +31,7 @@ describe the future plans. Maintenance ----------- - Update to install and run with Python versions 3.10, 3.11, 3.12. + Update to install and run with Python versions 3.9, 3.10, 3.11. pyyaml diff --git a/pyproject.toml b/pyproject.toml index a2c631e..7843305 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,8 +31,8 @@ classifiers = [ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", # https://anaconda.org/aps-anl-tag/aps-dm-api/files - "Programming Language :: Python :: 3.11", # dm does not support yet. # "Programming Language :: Python :: 3.12", # dm does not support yet. "Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering :: Astronomy",