From 2a97c2871747b37ee7ae16dc0937561e2e787685 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Thu, 6 Apr 2023 14:29:41 +0200 Subject: [PATCH 1/6] drop Python 3.8 --- .github/workflows/build_pkg.yml | 2 +- .github/workflows/pytest.yml | 20 ++++++++++---------- devtools/conda.recipe/build_env.yml | 2 +- devtools/environment.yml | 2 +- devtools/scripts/pyupgrad_run.py | 2 +- pyproject.toml | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml index c344497dd..97f7ac1ee 100644 --- a/.github/workflows/build_pkg.yml +++ b/.github/workflows/build_pkg.yml @@ -72,7 +72,7 @@ jobs: fetch-depth: 0 # Fetch all history for all tags and branches - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.10' - name: Cache pip uses: actions/cache@v3 diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 42f7bcddf..d651252ca 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -30,7 +30,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - py: ['3.8', '3.9', '3.10', '3.11'] + py: ['3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v3 with: @@ -61,17 +61,17 @@ jobs: run: micromamba activate weldx - name: install cookiecutter - if: matrix.py == '3.8' + if: matrix.py == '3.10' run: | pip install cookiecutter - name: create installable quality standard from repo - if: matrix.py == '3.8' + if: matrix.py == '3.10' run: | cookiecutter --no-input https://github.com/BAMWeldx/quality-standard-template - name: install quality standard - if: matrix.py == '3.8' + if: matrix.py == '3.10' run: | pip install -e ./quality_standard_demo @@ -87,32 +87,32 @@ jobs: path: pytest.xml - name: run pytest on notebooks (append coverage) - if: matrix.py == '3.8' + if: matrix.py == '3.10' run: | pytest -n 2 --dist loadfile --nbval --current-env --cov-append ./doc/src/tutorials/ - name: test with WeldxFile - if: matrix.py == '3.8' + if: matrix.py == '3.10' run: | pytest -n 2 --weldx-file-rw-buffer --weldx-file-rw-buffer-disp-header --cov-append ./weldx/tests/asdf_tests - name: test quality standard - if: matrix.py == '3.8' + if: matrix.py == '3.10' run: | pytest --cov-append ./weldx/tests/asdf_tests/quality_standards_check.py - name: test installable quality standard from template repository - if: matrix.py == '3.8' + if: matrix.py == '3.10' run: | pytest --cov-append ./weldx/tests/asdf_tests/installable_quality_standard_check.py - name: coverage xml (combination is performed by pytest-cov) - if: matrix.py == '3.8' + if: matrix.py == '3.10' run: coverage xml - name: codecov.io - if: matrix.py == '3.8' + if: matrix.py == '3.10' uses: codecov/codecov-action@v3.1.1 compat: diff --git a/devtools/conda.recipe/build_env.yml b/devtools/conda.recipe/build_env.yml index bb9511c5e..74dc4e326 100644 --- a/devtools/conda.recipe/build_env.yml +++ b/devtools/conda.recipe/build_env.yml @@ -3,7 +3,7 @@ channels: - conda-forge - defaults dependencies: - - python=3.8 + - python=3.10 - setuptools - setuptools_scm - conda-verify diff --git a/devtools/environment.yml b/devtools/environment.yml index 2bfa12966..7cb01e4c7 100644 --- a/devtools/environment.yml +++ b/devtools/environment.yml @@ -3,7 +3,7 @@ channels: - defaults - conda-forge dependencies: - - python=3.8 + - python=3.10 - setuptools_scm - numpy>=1.18 - pandas>=1.0 diff --git a/devtools/scripts/pyupgrad_run.py b/devtools/scripts/pyupgrad_run.py index 20e61778b..ffcbdcfac 100644 --- a/devtools/scripts/pyupgrad_run.py +++ b/devtools/scripts/pyupgrad_run.py @@ -6,6 +6,6 @@ files = Path("./../../weldx/").rglob("*.py") for p in files: subprocess.run( # skipcq: BAN-B607 - ["pyupgrade", str(p.resolve()), "--py38-plus", "--keep-runtime-typing"], + ["pyupgrade", str(p.resolve()), "--py39-plus", "--keep-runtime-typing"], check=True, ) diff --git a/pyproject.toml b/pyproject.toml index 0cf4aca47..02be54ad2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,29 +24,29 @@ classifiers = [ "Natural Language :: English", "Programming Language :: Python", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Topic :: Scientific/Engineering :: Physics", # TODO: add more topics here! "Intended Audience :: Science/Research", "Intended Audience :: Education", ] # Dependencies -requires-python = ">=3.8" +requires-python = ">=3.9" dependencies = [ "numpy >=1.20", "asdf >=2.15.0", "pandas >=1.0", "xarray >=2022.9.0", - "scipy >=1.4,!=1.6.0,!=1.6.1", + "scipy >=1.6.2", "sympy >=1.6", "pint >=0.18", "pint-xarray >=0.3", "bottleneck >=1.3.3", "boltons", "bidict", - "networkx >=2,!=2.7.0,!=2.8.1", + "networkx >=2.8.2", "fs", "meshio", "psutil", From 5ddad72157879d4ff9f5ede41d73066f37b13bff Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Thu, 6 Apr 2023 14:40:19 +0200 Subject: [PATCH 2/6] update CHANGELOG.md --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0749b8c32..fa2314b2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Release Notes -## 0.6.5 (unreleased) +## 0.6.5 (2023.04.06) + +Version `0.6.5` is a compatibility release to support new `asdf` and `xarray` and drops support for Python 3.8. +Please see the new minimal version requirements below. ### Fixes @@ -8,8 +11,10 @@ ### Dependencies +- drop Python 3.8 support \[{pull}`866`\] - require `xarray >= 2022.9.0`, as `LocalCoordinateSystem` now handles merges correctly \[{pull}`861`\]. - require `asdf>=2.15` for new extension style validator interface \[{pull}`863`\]. +- require `scipy >=1.6.2` and `networkx >=2.8.2` \[{pull}`866`\] ### ASDF From 6d783f1edc9d94f7c102175a25de446f83279f23 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Thu, 6 Apr 2023 14:40:43 +0200 Subject: [PATCH 3/6] update pull_request_template.md --- .github/pull_request_template.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e140ca486..f885d8a98 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,15 +1,19 @@ ## Changes -_Describe changes in this PR_ + ## Related Issues -Closes # (add issue numbers) + ## Checks -- [ ] updated CHANGELOG.rst -- [ ] updated tests -- [ ] updated doc/ +- [ ] updated `CHANGELOG.md` +- [ ] updated `tests/` +- [ ] updated `doc/` - [ ] update example/tutorial notebooks - [ ] update manifest file From 78f2cf2d0e7217d6a3611657e4e55e8eb9d891a1 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Thu, 6 Apr 2023 14:41:30 +0200 Subject: [PATCH 4/6] update CITATION.cff --- CITATION.cff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 886ce180e..a17ee9bf5 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,8 +1,8 @@ # YAML 1.2 --- title: weldx -version: 0.6.4 -date-released: 2023-02-09 +version: 0.6.5 +date-released: 2023-04-06 authors: - affiliation: "Bundesanstalt für Materialforschung und -prüfung (BAM)" email: cagtay.fabry@bam.de From cc4eca88d1b72337f23c5cf6531b12c9e69689a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Ftay=20Fabry?= <43667554+CagtayFabry@users.noreply.github.com> Date: Thu, 6 Apr 2023 15:00:39 +0200 Subject: [PATCH 5/6] disable cache for pytest env --- .github/workflows/pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index d651252ca..0f718e377 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -47,7 +47,7 @@ jobs: with: environment-file: ./environment.yml environment-name: weldx - cache-env: true + cache-env: false extra-specs: | python=${{ matrix.py }} wheel From 0d34c82ff83dad42dddc2c667159f8fe455dfffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Ftay=20Fabry?= <43667554+CagtayFabry@users.noreply.github.com> Date: Thu, 6 Apr 2023 16:56:45 +0200 Subject: [PATCH 6/6] enable cache --- .github/workflows/pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 0f718e377..d651252ca 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -47,7 +47,7 @@ jobs: with: environment-file: ./environment.yml environment-name: weldx - cache-env: false + cache-env: true extra-specs: | python=${{ matrix.py }} wheel