From 90b89d3eee4bbdbf19a2ebcc1870be0d828c792b Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 15:25:08 +0100 Subject: [PATCH 01/12] adds github action workflow for pypi deployment --- .github/workflows/stable_push.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/stable_push.yml diff --git a/.github/workflows/stable_push.yml b/.github/workflows/stable_push.yml new file mode 100644 index 0000000..a5b247b --- /dev/null +++ b/.github/workflows/stable_push.yml @@ -0,0 +1,31 @@ +name: stable pypi build push + +on: + push: + tags: + - "v*" + +jobs: + build-push-pypi: + runs-on: ubuntu-latest + environment: stable_pypi + steps: + - uses: actions/checkout@v3 + - name: Setup python 3.10 + uses: actions/setup-python@v4 + with: + python-version: 3.10 + - name: Build source and wheel + run: | + python -m pip install --upgrade build twine + python -m build + twine check --strict dist/* + - name: Publish to PyPI + uses: pypa/gh-action-pypi-publish@v1 + with: + user: __token__ + password: ${{ secrets.PYPI_TEST }} + + + + \ No newline at end of file From aca09d57a67d955dd437875b84e4f4772873a54b Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 15:29:16 +0100 Subject: [PATCH 02/12] temporarily changed the activation trigger in stable_push.yml --- .github/workflows/stable_push.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stable_push.yml b/.github/workflows/stable_push.yml index a5b247b..4e33870 100644 --- a/.github/workflows/stable_push.yml +++ b/.github/workflows/stable_push.yml @@ -2,8 +2,9 @@ name: stable pypi build push on: push: - tags: - - "v*" + branches: [ "development" ] + pull_request: + branches: [ "development" ] jobs: build-push-pypi: From b49fb73dee1c2ae3681ba3a96372d0970e87ae6e Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 15:32:28 +0100 Subject: [PATCH 03/12] fixes pypi deployment action version in stable_push.yml --- .github/workflows/stable_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stable_push.yml b/.github/workflows/stable_push.yml index 4e33870..c510386 100644 --- a/.github/workflows/stable_push.yml +++ b/.github/workflows/stable_push.yml @@ -22,7 +22,7 @@ jobs: python -m build twine check --strict dist/* - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@v1 + uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ password: ${{ secrets.PYPI_TEST }} From e198f1eab812f0380f6c2a36ae33d915d581e24d Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 15:34:46 +0100 Subject: [PATCH 04/12] fixed python version to string form --- .github/workflows/stable_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stable_push.yml b/.github/workflows/stable_push.yml index c510386..4f82a09 100644 --- a/.github/workflows/stable_push.yml +++ b/.github/workflows/stable_push.yml @@ -15,7 +15,7 @@ jobs: - name: Setup python 3.10 uses: actions/setup-python@v4 with: - python-version: 3.10 + python-version: "3.10" - name: Build source and wheel run: | python -m pip install --upgrade build twine From 7bf361e6e2127116d7b995b9465dc5c281a1f8a4 Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 15:41:10 +0100 Subject: [PATCH 05/12] removed API token in stable_push.yml --- .github/workflows/stable_push.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/stable_push.yml b/.github/workflows/stable_push.yml index 4f82a09..f659fc9 100644 --- a/.github/workflows/stable_push.yml +++ b/.github/workflows/stable_push.yml @@ -23,9 +23,8 @@ jobs: twine check --strict dist/* - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - with: - user: __token__ - password: ${{ secrets.PYPI_TEST }} + + From 712ea201891d7f372780abd4b1cf006cab961b6d Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 15:45:21 +0100 Subject: [PATCH 06/12] removed the user_token in stable_push.yml --- .github/workflows/stable_push.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/stable_push.yml b/.github/workflows/stable_push.yml index f659fc9..71621cf 100644 --- a/.github/workflows/stable_push.yml +++ b/.github/workflows/stable_push.yml @@ -23,7 +23,8 @@ jobs: twine check --strict dist/* - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - + with: + password: ${{ secrets.PYPI_API_TOKEN }} From 735f9bb01a8937f276b9cc0fec5903dd7ddd4025 Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 15:52:01 +0100 Subject: [PATCH 07/12] added a repository_url in stable_push.yml --- .github/workflows/stable_push.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/stable_push.yml b/.github/workflows/stable_push.yml index 71621cf..9f20d71 100644 --- a/.github/workflows/stable_push.yml +++ b/.github/workflows/stable_push.yml @@ -24,7 +24,9 @@ jobs: - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - password: ${{ secrets.PYPI_API_TOKEN }} + user: __token__ + password: ${{ secrets.PYPI_TEST}} + repository_url: https://upload.pypi.org/legacy/ From aa0ed28e62ca8b30b974f5ca4a0d317a7612546d Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 16:11:46 +0100 Subject: [PATCH 08/12] tries publishing pypi pipeline in stable_push.yml --- .github/workflows/stable_push.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/stable_push.yml b/.github/workflows/stable_push.yml index 9f20d71..052d282 100644 --- a/.github/workflows/stable_push.yml +++ b/.github/workflows/stable_push.yml @@ -10,6 +10,8 @@ jobs: build-push-pypi: runs-on: ubuntu-latest environment: stable_pypi + permissions: + id-token: write # IMPORTANT: this permission is mandatory for trusted publishing steps: - uses: actions/checkout@v3 - name: Setup python 3.10 @@ -21,12 +23,11 @@ jobs: python -m pip install --upgrade build twine python -m build twine check --strict dist/* + - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - with: - user: __token__ - password: ${{ secrets.PYPI_TEST}} - repository_url: https://upload.pypi.org/legacy/ + + From 8982c499c28588d1eb97deb37dc9ebdb96e35bfa Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 16:16:57 +0100 Subject: [PATCH 09/12] changes default environment in stable_push.yml --- .github/workflows/stable_push.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/stable_push.yml b/.github/workflows/stable_push.yml index 052d282..0fe838b 100644 --- a/.github/workflows/stable_push.yml +++ b/.github/workflows/stable_push.yml @@ -9,7 +9,9 @@ on: jobs: build-push-pypi: runs-on: ubuntu-latest - environment: stable_pypi + environment: + name: stable_pypi + url: https://pypi.org/p/guorbit-utils permissions: id-token: write # IMPORTANT: this permission is mandatory for trusted publishing steps: @@ -26,10 +28,4 @@ jobs: - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 - - - - - - - \ No newline at end of file + \ No newline at end of file From 4c7935e18978c11ce7a180906a1df3dc92643d55 Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 16:23:01 +0100 Subject: [PATCH 10/12] added an option for verbose in stable_push.yml --- .github/workflows/stable_push.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/stable_push.yml b/.github/workflows/stable_push.yml index 0fe838b..e1c32bc 100644 --- a/.github/workflows/stable_push.yml +++ b/.github/workflows/stable_push.yml @@ -28,4 +28,6 @@ jobs: - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 + env: + TWINE_VERBOSE: 1 \ No newline at end of file From 7808a819ec6c1cc9fae6169d77de18d69fd28197 Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 16:29:59 +0100 Subject: [PATCH 11/12] updated project name in pyproject.toml from utilities to guorbit-utils --- pyproject.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d2be2d6..9f19a63 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,8 +3,8 @@ requires = ["setuptools", "wheel", "setuptools_scm"] build-backend = "setuptools.build_meta" [project] -name = "utilities" -version = "0.1.0" +name = "guorbit-utils" +version = "0.2.1" authors = [{ name = "GU Orbit Software Team", email = "uog.orbit@gmail.com" }] requires-python = ">=3.10" description = "A package containing utilities for GU Orbit Software" @@ -16,7 +16,7 @@ classifiers = [ "Operating System :: OS Independent", ] dependencies = [ - "numpy >= 1.24.0", + "numpy >= 1.24.3", "rasterio >= 1.3.6", "Pillow >= 9.4.0", "tensorflow >= 2.10", @@ -38,6 +38,7 @@ markers = [ [project.optional-dependencies] dev = [ + "pytest >= 7.2.2", "pytest-cov >= 4.0.0", "pytest-mock >= 3.10.0", From c973855c1c30f2c6d1f24cce60720f235e27e791 Mon Sep 17 00:00:00 2001 From: Ayleen Sohaib <2684413S@student.gla.ac.uk> Date: Fri, 1 Sep 2023 16:40:07 +0100 Subject: [PATCH 12/12] changed trigger to release stable in stable_push.yml --- .github/workflows/stable_push.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/stable_push.yml b/.github/workflows/stable_push.yml index e1c32bc..d5c27e1 100644 --- a/.github/workflows/stable_push.yml +++ b/.github/workflows/stable_push.yml @@ -1,10 +1,10 @@ name: stable pypi build push on: - push: - branches: [ "development" ] - pull_request: - branches: [ "development" ] + release: + types: + - released + jobs: build-push-pypi: