Skip to content

Commit

Permalink
Merge branch '948-add-support-to-create-coordinate-systems-from-homog…
Browse files Browse the repository at this point in the history
…eneous-transformation-matrices' of https://github.com/BAMWelDX/weldx into 948-add-support-to-create-coordinate-systems-from-homogeneous-transformation-matrices
  • Loading branch information
mbwinkler committed Nov 5, 2024
2 parents 195378a + 795c79e commit b3f17d5
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,30 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
py: ['3.9', '3.10', '3.11']
py: ['3.9', '3.10', '3.11', '3.12']
steps:
- uses: actions/checkout@v4
with:
fetch-depth: '0' # Fetch all history for all tags and branches

- uses: CagtayFabry/pydeps2env@v1.2.0
- uses: marscher/pydeps2env@v999
with:
files: 'pyproject.toml'
channels: 'conda-forge defaults'
extras: 'test vis media'
build_system: 'include'

- name: Setup Conda Environment
uses: mamba-org/setup-micromamba@v1.9.0
uses: mamba-org/setup-micromamba@v2
with:
micromamba-version: "2.0.2-0"
environment-file: ./environment.yml
environment-name: weldx
init-shell: >-
bash
powershell
cache-environment: true
# persist on the same day.
cache-environment-key: environment-${{ steps.date.outputs.date }}
create-args: >-
python=${{ matrix.py }}
wheel
Expand Down Expand Up @@ -133,28 +135,29 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
py: ['3.9']
py: ['3.10']
steps:
- uses: actions/checkout@v4
with:
fetch-depth: '0' # Fetch all history for all tags and branches

- uses: CagtayFabry/pydeps2env@v1.2.0
- uses: marscher/pydeps2env@v999
with:
files: 'pyproject.toml'
channels: 'conda-forge defaults'
extras: 'test vis media'
build_system: 'include'

- name: Setup Conda Environment
uses: mamba-org/setup-micromamba@v1.9.0
uses: mamba-org/setup-micromamba@v2
with:
environment-file: ./environment.yml
environment-name: weldx
init-shell: >-
bash
powershell
cache-environment: true
# persist on the same day.
cache-environment-key: environment-${{ steps.date.outputs.date }}
create-args: >-
python=${{ matrix.py }}
wheel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
environment-name: weldx
cache-environment: true
create-args: >-
python=3.9
python=3.10
mypy
- name: activate env
run: micromamba activate weldx
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

- pin `weldx-widgets>=0.2.3` for viz \[{pull}`939`\].
- pin `pint>=0.21` \[{pull}`941`\].
- pin `python<3.13` \[{pull}`896`\].

## 0.6.8 (07.06.2024)

Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ authors = [
{ name = "Volker Hirthammer", email = "[email protected]" },
{ name = "Martin K. Scherer", email = "[email protected]" },
]
requires-python = ">=3.9,<3.12"
requires-python = ">=3.9,<3.13"
classifiers = [
"Development Status :: 4 - Beta",
"Intended Audience :: Education",
Expand All @@ -34,6 +34,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering :: Physics", # TODO: add more topics here!
]
dynamic = [
Expand Down

0 comments on commit b3f17d5

Please sign in to comment.