From d871aabf63e6f7f75641b39874fd985c372ad5e2 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 9 Jul 2024 16:33:44 +0100 Subject: [PATCH 1/7] add gitignore file --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2143a6f --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +s3v.egg-info +s3v/__pycache__ From b0a4cf5cfdd4c5737d07213cd81394581248ac4b Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 9 Jul 2024 16:47:32 +0100 Subject: [PATCH 2/7] add conda nev file --- environment.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 environment.yml diff --git a/environment.yml b/environment.yml new file mode 100644 index 0000000..ad63ada --- /dev/null +++ b/environment.yml @@ -0,0 +1,11 @@ +--- +name: s3view +channels: + - conda-forge + - nodefaults + +dependencies: + - cmd2 >1 + - cf-python >=3.16.2 # 3.17.0 n/a yet on conda-forge + - minio + - python >=3.10 From 30fd6eb30cc60283e42a4c86ef8a87173f8b5fba Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 9 Jul 2024 16:47:44 +0100 Subject: [PATCH 3/7] update setup file --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3c335ad..45c9254 100644 --- a/setup.py +++ b/setup.py @@ -9,6 +9,8 @@ scripts=['s3v/s3view'], install_requires = [ 'cmd2>2', + 'cf-python>=3.16.2', # 3.17 n/a yet on PyPI + 'minio', 'pyreadline3;platform_system=="Windows"' ] - ) \ No newline at end of file + ) From 6bcad42e24bebed76807694d8bbc47e3e250af71 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Tue, 9 Jul 2024 16:47:57 +0100 Subject: [PATCH 4/7] add barebones GA test --- .github/workflows/run-tests.yml | 48 +++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/run-tests.yml diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml new file mode 100644 index 0000000..29c12ba --- /dev/null +++ b/.github/workflows/run-tests.yml @@ -0,0 +1,48 @@ + +name: Test + +on: + push: + branches: + - main + pull_request: + branches: + - main + 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"] + 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: + activate-environment: s3view + environment-file: environment.yml + python-version: ${{ matrix.python-version }} + miniforge-version: "latest" + miniforge-variant: Mambaforge + use-mamba: true + - run: conda --version + - run: python -V + - run: conda list + - run: pip install -e . + - run: conda list + - run: which s3view + - run: s3view --help + # turn these on when they will be needed + # - run: flake8 + # - run: pytest -n 2 From 3d11bf4bba7d40d1ffef7ed526049ff3dd35d33c Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 12 Jul 2024 15:59:33 +0100 Subject: [PATCH 5/7] use development package of cf-python --- environment.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index ad63ada..b9781b8 100644 --- a/environment.yml +++ b/environment.yml @@ -6,6 +6,13 @@ channels: dependencies: - cmd2 >1 - - cf-python >=3.16.2 # 3.17.0 n/a yet on conda-forge + # use for conda-forge package, when available + # - cf-python >=3.17.0 - minio + - pip - python >=3.10 + # needed by cf-python; not in cf-python PyPI/git recipe + # remove when using conda-forge cf-python + - udunits2 + - pip: + - git+https://github.com/NCAS-CMS/cf-python@main # edit branch here From a8f161193bc688bf1e381bb3bcd5844909519f2d Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 12 Jul 2024 16:09:00 +0100 Subject: [PATCH 6/7] correct pointer to development branch of cfdm --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index b9781b8..30042e5 100644 --- a/environment.yml +++ b/environment.yml @@ -15,4 +15,4 @@ dependencies: # remove when using conda-forge cf-python - udunits2 - pip: - - git+https://github.com/NCAS-CMS/cf-python@main # edit branch here + - git+https://github.com/davidhassell/cfdm.git@h5-read-hdf5-chunks-hack From e8ba2509ac73fc7211a2ef00929bec39805d43ae Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Mon, 21 Oct 2024 15:01:18 +0100 Subject: [PATCH 7/7] retire mambaforge --- .github/workflows/run-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 29c12ba..5bb6564 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -34,7 +34,6 @@ jobs: environment-file: environment.yml python-version: ${{ matrix.python-version }} miniforge-version: "latest" - miniforge-variant: Mambaforge use-mamba: true - run: conda --version - run: python -V