From 409d5fe04f2ddb50ecce2eb5986834dac4854ff3 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Jul 2025 11:21:00 +0100 Subject: [PATCH 01/10] add conda badge and feedstock link to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 469b1ad1..70ade6d7 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![made-with-python](https://img.shields.io/badge/Made%20with-Python-1f425f.svg)](https://www.python.org/) [![Test](https://github.com/NCAS-CMS/PyActiveStorage/actions/workflows/run-tests.yml/badge.svg)](https://github.com/NCAS-CMS/PyActiveStorage/actions/workflows/run-tests.yml) [![codecov](https://codecov.io/gh/NCAS-CMS/PyActiveStorage/graph/badge.svg?token=1olGjnvAOp)](https://codecov.io/gh/NCAS-CMS/PyActiveStorage) +[![Anaconda-Server Badge](https://anaconda.org/conda-forge/pyactivestorage/badges/version.svg)](https://anaconda.org/conda-forge/pyactivestorage) ![pyactivestoragelogo](https://raw.githubusercontent.com/NCAS-CMS/PyActiveStorage/main/doc/figures/PyActiveStorage-logo-complete.jpg) @@ -11,6 +12,7 @@ - [Latest documentation on ReadTheDocs (RTD)](https://pyactivestorage.readthedocs.io/en/latest/) - [RTD latest builds](https://app.readthedocs.org/projects/pyactivestorage/) - [GHA Tests](https://github.com/NCAS-CMS/PyActiveStorage/actions) +- [conda-forge feedstock](https://github.com/conda-forge/pyactivestorage-feedstock) ### Create virtual environment From b131768a61fcd9932ed67deaa7186010469b039a Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Jul 2025 11:40:09 +0100 Subject: [PATCH 02/10] add GHA that installs package from conda forge --- .github/workflows/run-tests-condaforge.yml | 63 ++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 .github/workflows/run-tests-condaforge.yml diff --git a/.github/workflows/run-tests-condaforge.yml b/.github/workflows/run-tests-condaforge.yml new file mode 100644 index 00000000..038b8bf4 --- /dev/null +++ b/.github/workflows/run-tests-condaforge.yml @@ -0,0 +1,63 @@ +name: Test Conda Package + +on: + push: + branches: + - main + - conda_package_testing + schedule: + - cron: '0 0 * * *' # nightly + +# Required shell entrypoint to have properly configured bash shell +defaults: + run: + shell: bash -l {0} + +jobs: + linux: + runs-on: "ubuntu-latest" + strategy: + matrix: + python-version: ["3.10", "3.11", "3.12", "3.13"] + fail-fast: false + name: Linux Python ${{ matrix.python-version }} + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: ${{ matrix.python-version }} + miniforge-version: "latest" + use-mamba: true + mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 + - run: conda --version + - run: python -V + - run: conda list + - run: conda install pyactivestorage + - run: conda list + - run: pytest -n 2 + + osx: + runs-on: "macos-latest" + strategy: + matrix: + python-version: ["3.10", "3.11", "3.12", "3.13"] + fail-fast: false + name: OSX Python ${{ matrix.python-version }} + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: conda-incubator/setup-miniconda@v3 + with: + python-version: ${{ matrix.python-version }} + miniforge-version: "latest" + use-mamba: true + mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 + - run: conda --version + - run: python -V + - run: conda list + - run: conda install -c conda-forge git + - run: conda install pyactivestorage + - run: pytest -n 2 From 4e597f0259ae8669ec2a50d7ce1f666a53db48e5 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Jul 2025 11:57:10 +0100 Subject: [PATCH 03/10] pop an active env --- .github/workflows/run-tests-condaforge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/run-tests-condaforge.yml b/.github/workflows/run-tests-condaforge.yml index 038b8bf4..2e6ee466 100644 --- a/.github/workflows/run-tests-condaforge.yml +++ b/.github/workflows/run-tests-condaforge.yml @@ -27,6 +27,7 @@ jobs: fetch-depth: 0 - uses: conda-incubator/setup-miniconda@v3 with: + activate-environment: activestorage python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true @@ -51,6 +52,7 @@ jobs: fetch-depth: 0 - uses: conda-incubator/setup-miniconda@v3 with: + activate-environment: activestorage python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true From b7e0d4cddd867ae922bf7348bd124b43e1c72434 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Jul 2025 12:05:38 +0100 Subject: [PATCH 04/10] actually install pytest and gubbins --- .github/workflows/run-tests-condaforge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/run-tests-condaforge.yml b/.github/workflows/run-tests-condaforge.yml index 2e6ee466..49797656 100644 --- a/.github/workflows/run-tests-condaforge.yml +++ b/.github/workflows/run-tests-condaforge.yml @@ -36,6 +36,7 @@ jobs: - run: python -V - run: conda list - run: conda install pyactivestorage + - run: conda install moto, pytest, pytest-xdist - run: conda list - run: pytest -n 2 @@ -62,4 +63,5 @@ jobs: - run: conda list - run: conda install -c conda-forge git - run: conda install pyactivestorage + - run: conda install moto, pytest, pytest-xdist - run: pytest -n 2 From 982173282a235e607434e99f8060a252250e2b92 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Jul 2025 12:11:24 +0100 Subject: [PATCH 05/10] restructure workflow --- .github/workflows/run-tests-condaforge.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests-condaforge.yml b/.github/workflows/run-tests-condaforge.yml index 49797656..1f7e6dfe 100644 --- a/.github/workflows/run-tests-condaforge.yml +++ b/.github/workflows/run-tests-condaforge.yml @@ -32,11 +32,16 @@ jobs: miniforge-version: "latest" use-mamba: true mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - - run: conda --version - - run: python -V + - run: | + conda --version + mamba --version + python -V - run: conda list - run: conda install pyactivestorage - - run: conda install moto, pytest, pytest-xdist + - run: | + conda install moto + conda install pytest + conda install pytest-xdist - run: conda list - run: pytest -n 2 @@ -58,10 +63,15 @@ jobs: miniforge-version: "latest" use-mamba: true mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - - run: conda --version - - run: python -V + - run: | + conda --version + mamba --version + python -V - run: conda list - run: conda install -c conda-forge git - run: conda install pyactivestorage - - run: conda install moto, pytest, pytest-xdist + - run: | + conda install moto + conda install pytest + conda install pytest-xdist - run: pytest -n 2 From d4f4609b0bf60b13e7c30994380409a5fcafdd12 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Jul 2025 12:16:10 +0100 Subject: [PATCH 06/10] install all pytest subpackages --- .github/workflows/run-tests-condaforge.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/run-tests-condaforge.yml b/.github/workflows/run-tests-condaforge.yml index 1f7e6dfe..3c6efefb 100644 --- a/.github/workflows/run-tests-condaforge.yml +++ b/.github/workflows/run-tests-condaforge.yml @@ -41,6 +41,9 @@ jobs: - run: | conda install moto conda install pytest + conda install pytest-cov + conda install pytest-html + conda install pytest-metadata conda install pytest-xdist - run: conda list - run: pytest -n 2 @@ -73,5 +76,8 @@ jobs: - run: | conda install moto conda install pytest + conda install pytest-cov + conda install pytest-html + conda install pytest-metadata conda install pytest-xdist - run: pytest -n 2 From cc5df6b91f351fd8e6e61cee6bb030f5044a2863 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Jul 2025 12:24:36 +0100 Subject: [PATCH 07/10] avoid long tests --- .github/workflows/run-tests-condaforge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests-condaforge.yml b/.github/workflows/run-tests-condaforge.yml index 3c6efefb..112fa791 100644 --- a/.github/workflows/run-tests-condaforge.yml +++ b/.github/workflows/run-tests-condaforge.yml @@ -46,7 +46,7 @@ jobs: conda install pytest-metadata conda install pytest-xdist - run: conda list - - run: pytest -n 2 + - run: pytest -n 2 -m "not slow" --ignore=tests/test_real_https.py --ignore=tests/test_real_s3.py osx: runs-on: "macos-latest" @@ -80,4 +80,4 @@ jobs: conda install pytest-html conda install pytest-metadata conda install pytest-xdist - - run: pytest -n 2 + - run: pytest -n 2 -m "not slow" --ignore=tests/test_real_https.py --ignore=tests/test_real_s3.py From 2fab1fdae8dddd0074a42067c119fa5f5591fac6 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Jul 2025 12:25:08 +0100 Subject: [PATCH 08/10] test see whats the latest mamba --- .github/workflows/run-tests-condaforge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests-condaforge.yml b/.github/workflows/run-tests-condaforge.yml index 112fa791..740db8c2 100644 --- a/.github/workflows/run-tests-condaforge.yml +++ b/.github/workflows/run-tests-condaforge.yml @@ -31,7 +31,7 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true - mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 + # mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - run: | conda --version mamba --version From eef97b20d456943d96281530c9c76d2c177cee08 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Jul 2025 12:33:34 +0100 Subject: [PATCH 09/10] unpin mamba-version from ALL GHA flows --- .github/workflows/run-s3-test-push.yml | 2 -- .github/workflows/run-test-push.yml | 1 - .github/workflows/run-tests-condaforge.yml | 2 -- .github/workflows/run-tests.yml | 2 -- .github/workflows/test_s3_minio.yml | 2 -- 5 files changed, 9 deletions(-) diff --git a/.github/workflows/run-s3-test-push.yml b/.github/workflows/run-s3-test-push.yml index 7bea5e9e..15a68299 100644 --- a/.github/workflows/run-s3-test-push.yml +++ b/.github/workflows/run-s3-test-push.yml @@ -27,7 +27,6 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true - mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - name: Get conda and Python versions run: | conda --version @@ -51,7 +50,6 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true - mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - name: Install PyActiveStorage run: | conda --version diff --git a/.github/workflows/run-test-push.yml b/.github/workflows/run-test-push.yml index 5b2cf25d..24e116dd 100644 --- a/.github/workflows/run-test-push.yml +++ b/.github/workflows/run-test-push.yml @@ -27,7 +27,6 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true - mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - run: conda --version - run: python -V - run: pip install -e . diff --git a/.github/workflows/run-tests-condaforge.yml b/.github/workflows/run-tests-condaforge.yml index 740db8c2..dd996826 100644 --- a/.github/workflows/run-tests-condaforge.yml +++ b/.github/workflows/run-tests-condaforge.yml @@ -31,7 +31,6 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true - # mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - run: | conda --version mamba --version @@ -65,7 +64,6 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true - mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - run: | conda --version mamba --version diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 76d411e9..c6193e7e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -31,7 +31,6 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true - mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - run: conda --version - run: python -V - run: conda list @@ -57,7 +56,6 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true - mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - run: conda --version - run: python -V - run: conda list diff --git a/.github/workflows/test_s3_minio.yml b/.github/workflows/test_s3_minio.yml index 21eeb3a4..a5dfe1c1 100644 --- a/.github/workflows/test_s3_minio.yml +++ b/.github/workflows/test_s3_minio.yml @@ -31,7 +31,6 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true - mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - name: Get conda and Python versions run: | conda --version @@ -55,7 +54,6 @@ jobs: python-version: ${{ matrix.python-version }} miniforge-version: "latest" use-mamba: true - mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392 - name: Install PyActiveStorage run: | conda --version From bf2e5df64b58f9a991a393b193105c5c22a42d6f Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 15 Jul 2025 12:35:24 +0100 Subject: [PATCH 10/10] unrun GHA for new flow --- .github/workflows/run-tests-condaforge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-tests-condaforge.yml b/.github/workflows/run-tests-condaforge.yml index dd996826..e447748d 100644 --- a/.github/workflows/run-tests-condaforge.yml +++ b/.github/workflows/run-tests-condaforge.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - conda_package_testing schedule: - cron: '0 0 * * *' # nightly