From 4c559145729ad9938e72e26452ea79f8842c59ec Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Thu, 19 Dec 2024 09:58:02 -0800 Subject: [PATCH 1/6] Fix CI skip steps file --- .github/workflows/build_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index 198a9b4c5..20d36f173 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -48,7 +48,7 @@ jobs: path: ~/conda_pkgs_dir key: ${{ runner.os }}-${{ matrix.python-version }}-conda-${{ env.CACHE_NUMBER }}-${{ - hashFiles('dev-spec.txt,setup.py') }} + hashFiles('dev-spec.txt,pyproject.toml') }} - if: ${{ steps.skip_check.outputs.should_skip != 'true' }} name: Set up Conda Environment From 19fd61eac844191efad0e59fdc541176cdadfcf4 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Thu, 19 Dec 2024 10:11:26 -0800 Subject: [PATCH 2/6] Remove unused linter settings --- pyproject.toml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1d8d4ac04..56bd7ef34 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,21 +66,6 @@ dependencies = [ "xarray>=0.14.1" ] -[tool.isort] -multi_line_output = "3" -include_trailing_comma = true -force_grid_wrap = "0" -use_parentheses = true -line_length = "79" - -[tool.mypy] -python_version = "3.10" -check_untyped_defs = true -ignore_missing_imports = true -warn_unused_ignores = true -warn_redundant_casts = true -warn_unused_configs = true - [build-system] requires = ["setuptools>=60"] build-backend = "setuptools.build_meta" From 91381735518ee54f6bd2bea51f392cc61ca7f9d5 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Thu, 19 Dec 2024 10:43:40 -0800 Subject: [PATCH 3/6] Add fail-fast attribute to build workflow --- .github/workflows/build_workflow.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index 20d36f173..743f0273d 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -28,6 +28,7 @@ jobs: strategy: matrix: python-version: ["3.10", "3.11", "3.12", "3.13"] + fail-fast: false steps: - id: skip_check uses: fkirc/skip-duplicate-actions@master From ffc9ee4099d70a5b74ba5eff29fed0d01a600bac Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Thu, 19 Dec 2024 10:44:02 -0800 Subject: [PATCH 4/6] Fix python version in docs workflow --- .github/workflows/docs_workflow.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs_workflow.yml b/.github/workflows/docs_workflow.yml index d11d3f4b1..e0b5aee6f 100644 --- a/.github/workflows/docs_workflow.yml +++ b/.github/workflows/docs_workflow.yml @@ -9,6 +9,9 @@ on: release: types: [published] +env: + PYTHON_VERSION: "3.10" + jobs: publish-docs: runs-on: ubuntu-latest @@ -41,14 +44,14 @@ jobs: channels: conda-forge channel-priority: strict auto-update-conda: true - python-version: ${{ matrix.python-version }} + python-version: ${{ env.PYTHON_VERSION }} - if: ${{ steps.skip_check.outputs.should_skip != 'true' }} name: Install mpas_analysis run: | git config --global url."https://github.com/".insteadOf "git@github.com:" conda create -n mpas_analysis_dev --file dev-spec.txt \ - python=${{ matrix.python-version }} + python=${{ env.PYTHON_VERSION }} conda activate mpas_analysis_dev python -m pip install -vv --no-deps --no-build-isolation -e . From ad6160367167658fc82fe3088547dd6979ee46b8 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Thu, 19 Dec 2024 12:15:48 -0800 Subject: [PATCH 5/6] Add python 3.9 to build workflow testing --- .github/workflows/build_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index 743f0273d..c5ffdad71 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -27,7 +27,7 @@ jobs: shell: bash -l {0} strategy: matrix: - python-version: ["3.10", "3.11", "3.12", "3.13"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] fail-fast: false steps: - id: skip_check From 778516921a6f8151a06ad3063c68f9feecfbd178 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Thu, 19 Dec 2024 12:16:08 -0800 Subject: [PATCH 6/6] Replace python 3.9 CI testing file --- ci/python3.9.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 ci/python3.9.yaml diff --git a/ci/python3.9.yaml b/ci/python3.9.yaml new file mode 100644 index 000000000..7929b1920 --- /dev/null +++ b/ci/python3.9.yaml @@ -0,0 +1,8 @@ +channel_sources: +- conda-forge,defaults +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython