From e8866a5f4b61c17817d148e93fdaa6cd221fd41e Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Wed, 15 Feb 2023 11:05:51 -0700 Subject: [PATCH 1/2] update python version to 3.10.4, ci-run-all-diff --- .github/workflows/documentation.yml | 2 +- .github/workflows/testing.yml | 2 +- .readthedocs.yaml | 2 +- environment.yml | 2 +- internal/tests/pytests/util/metplus_check/test_metplus_check.py | 1 + metplus/PYTHON_VERSION | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 0b2fad9184..762752c7e5 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' - name: Install dependencies run: | python -m pip install --upgrade sphinx sphinx-gallery sphinx_rtd_theme diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7a0cbab6e8..944c81335f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -78,7 +78,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' - name: Get METplus Image run: .github/jobs/docker_setup.sh env: diff --git a/.readthedocs.yaml b/.readthedocs.yaml index de9f518158..e8acca7c75 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -12,7 +12,7 @@ formats: [pdf] # Optionally set the version of Python and requirements required to build your # docs python: - version: 3.8 + version: 3.10 install: - requirements: docs/requirements.txt - requirements: requirements.txt diff --git a/environment.yml b/environment.yml index e660f9d5d1..721909cca6 100644 --- a/environment.yml +++ b/environment.yml @@ -2,6 +2,6 @@ name: metplus_base channels: - conda-forge dependencies: - - python=3.8.6 + - python=3.10.4 - python-dateutil prefix: /home/met_test/.conda/envs/metplus_base diff --git a/internal/tests/pytests/util/metplus_check/test_metplus_check.py b/internal/tests/pytests/util/metplus_check/test_metplus_check.py index 832512dfb5..01a7e36a9d 100644 --- a/internal/tests/pytests/util/metplus_check/test_metplus_check.py +++ b/internal/tests/pytests/util/metplus_check/test_metplus_check.py @@ -22,6 +22,7 @@ ) @pytest.mark.util def test_metplus_check_python(user, torf): + # check that version is above minimum python requirement assert metplus_check.metplus_check_python_version(user) == torf diff --git a/metplus/PYTHON_VERSION b/metplus/PYTHON_VERSION index b916322161..e90bfef7ab 100644 --- a/metplus/PYTHON_VERSION +++ b/metplus/PYTHON_VERSION @@ -1 +1 @@ -3.8.6 \ No newline at end of file +3.10.4 \ No newline at end of file From 327b4264bf641a2580d6ad4dd53b8c82fa7405f1 Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Wed, 15 Feb 2023 11:08:15 -0700 Subject: [PATCH 2/2] ReadTheDocs does not support Python 3.10, so reverting back to 3.8 --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index e8acca7c75..de9f518158 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -12,7 +12,7 @@ formats: [pdf] # Optionally set the version of Python and requirements required to build your # docs python: - version: 3.10 + version: 3.8 install: - requirements: docs/requirements.txt - requirements: requirements.txt