Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.6.5 #866

Merged
merged 6 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
## Changes

_Describe changes in this PR_
<!--
Describe changes in this PR
-->

## Related Issues

Closes # (add issue numbers)
<!--
List related issues and closing issues here
-->

## Checks

- [ ] updated CHANGELOG.rst
- [ ] updated tests
- [ ] updated doc/
- [ ] updated `CHANGELOG.md`
- [ ] updated `tests/`
- [ ] updated `doc/`
- [ ] update example/tutorial notebooks
- [ ] update manifest file
2 changes: 1 addition & 1 deletion .github/workflows/build_pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand All @@ -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/[email protected]

compat:
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
# 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

- fix non quantified xarray parameter inputs to `MathematicalExpression` \[{pull}`864`\].

### 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

Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -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: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda.recipe/build_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- defaults
dependencies:
- python=3.8
- python=3.10
- setuptools
- setuptools_scm
- conda-verify
Expand Down
2 changes: 1 addition & 1 deletion devtools/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- defaults
- conda-forge
dependencies:
- python=3.8
- python=3.10
- setuptools_scm
- numpy>=1.18
- pandas>=1.0
Expand Down
2 changes: 1 addition & 1 deletion devtools/scripts/pyupgrad_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down