From ef38195cada45eafe3b2fe4fd6990cc12cca1ae7 Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Thu, 14 Mar 2024 14:11:23 -0400 Subject: [PATCH 1/6] require Python 3.10 --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 773b662c..83d19a59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,6 +25,7 @@ dependencies = [ dynamic = [ "version", ] +requires-python = "3.10" [project.readme] file = "README.md" @@ -40,7 +41,7 @@ repository = "https://github.com/spacetelescope/pysiaf" [project.optional-dependencies] test = [ - 'pytest', + "pytest", ] docs = [ "stsci-rtd-theme", From 9b02633ec45aff8e8d13ab78c134fce5077ccbbd Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Thu, 14 Mar 2024 14:29:37 -0400 Subject: [PATCH 2/6] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 83d19a59..5e45d913 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ dependencies = [ dynamic = [ "version", ] -requires-python = "3.10" +requires-python = ">=3.10" [project.readme] file = "README.md" From 29b9f62b3d8cbe98d2669e64930868151530b578 Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Fri, 15 Mar 2024 15:00:59 -0400 Subject: [PATCH 3/6] update references to Python 3.9 --- .github/workflows/ci.yml | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f0d2e56..f5686dd1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 @@ -21,4 +21,4 @@ jobs: cache: 'pip' cache-dependency-path: 'pyproject.toml' - run: pip install ".[test]" - - run: pytest \ No newline at end of file + - run: pytest diff --git a/README.md b/README.md index 3b6558aa..014010dd 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ The following describes the typical work flow for contributing to the pysiaf pro 11. Delete your local copy of your branch. ### Installation -This package is supported in python 3.8 and 3.9 +This package is supported in python 3.10+ `pip install pysiaf` From 7526e7bd0bf9d8ed6262462204f70134618211e1 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 29 Aug 2024 15:31:15 -0400 Subject: [PATCH 4/6] Move numpydoc to [docs] installation target * numpydoc and its dependencies should not be required at runtime --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 773b662c..4d90904f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,6 @@ dependencies = [ "lxml>=4.6.4", "matplotlib>=3.4.3", "numpy>=1.21.4", - "numpydoc>=1.1.0", "openpyxl>=3.0.9", "requests>=2.26.0", "scipy>=1.7.2", @@ -48,6 +47,7 @@ docs = [ "sphinx-automodapi", "sphinx>=7.2.5", "numpy", + "numpydoc>=1.1.0", "matplotlib", "scipy", "tomli; python_version<\"3.11\"", From 4e8d5fcb77b730a26c2f476ea40d2ba5b231030a Mon Sep 17 00:00:00 2001 From: Mees Fix Date: Fri, 13 Sep 2024 14:25:48 -0700 Subject: [PATCH 5/6] Removing 3.12 support --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75508b0b..b1fed832 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11"] steps: - uses: actions/checkout@v4 From de0dee1e0aa89110e9917cef7d7f5fadc37cbe7b Mon Sep 17 00:00:00 2001 From: Mees Fix Date: Fri, 13 Sep 2024 14:41:42 -0700 Subject: [PATCH 6/6] Remove publish to pypi add build ci --- .github/workflows/build.yml | 15 +++++++++++++++ .github/workflows/publish-to-pypi.yml | 17 ----------------- 2 files changed, 15 insertions(+), 17 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/publish-to-pypi.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..12215c1f --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,15 @@ +name: build + +on: + release: + types: [ released ] + pull_request: + workflow_dispatch: + +jobs: + build: + uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1 + with: + upload_to_pypi: ${{ (github.event_name == 'release') && (github.event.action == 'released') }} + secrets: + pypi_token: ${{ secrets.PYPI_PASSWORD_STSCI_MAINTAINER }} diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml deleted file mode 100644 index b76202e0..00000000 --- a/.github/workflows/publish-to-pypi.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Publish to PyPI - -on: - release: - types: [released] - workflow_dispatch: - -jobs: - publish: - uses: spacetelescope/action-publish_to_pypi/.github/workflows/workflow.yml@master - with: - test: false - build_platform_wheels: false # Set to true if your package contains a C extension - secrets: - user: ${{ secrets.PYPI_USERNAME_STSCI_MAINTAINER }} - password: ${{ secrets.PYPI_PASSWORD_STSCI_MAINTAINER }} # WARNING: Do not hardcode secret values here! If you want to use a different user or password, you can override this secret by creating one with the same name in your Github repository settings. - test_password: ${{ secrets.PYPI_PASSWORD_STSCI_MAINTAINER_TEST }}