Skip to content

Commit

Permalink
Merge branch 'master' into py312
Browse files Browse the repository at this point in the history
  • Loading branch information
CagtayFabry authored Jan 10, 2024
2 parents a60ca7c + ad4b8dc commit 5bf048b
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Fetch all history for all tags and branches
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand All @@ -99,7 +99,7 @@ jobs:
run: |
python -m build
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: dist
path: ./dist/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/citation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Build docs
run: sphinx-build -W -n -b html -d build/doctrees doc/src build/html --keep-going -j 2 -D nb_execution_mode=${{ env.nb_execution_mode }}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: |
always() && (
startsWith(github.ref, 'refs/tags/') ||
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Event File
path: ${{ github.event_path }}
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Upload Test Results
if: always() && (matrix.py == '3.10')
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Unit Test Results
path: pytest.xml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest_asdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- uses: actions/cache@v3
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 @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Lint
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exclude: '.*.weldx$|.*.wx$|.*.asdf$'
repos:
# ----- general formatting -----
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
args: [--markdown-linebreak-ext=md]
Expand All @@ -29,28 +29,28 @@ repos:
- mdformat-config
# ----- Python formatting -----
- repo: https://github.com/asottile/pyupgrade
rev: v3.14.0
rev: v3.15.0
hooks:
- id: pyupgrade
args: [--py39-plus]
- repo: https://github.com/psf/black
rev: 23.9.1
rev: 23.12.1
hooks:
- id: black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.292
rev: v0.1.9
hooks:
- id: ruff
args:
- --quiet
- --fix
- repo: https://github.com/abravalheri/validate-pyproject
rev: v0.14
rev: v0.15
hooks:
- id: validate-pyproject
# ----- Jupyter Notebooks -----
- repo: https://github.com/nbQA-dev/nbQA
rev: 1.7.0
rev: 1.7.1
hooks:
- id: nbqa-black
- id: nbqa-ruff # ruff handles isort
Expand Down
7 changes: 2 additions & 5 deletions weldx/asdf/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,10 @@ class WeldxFile(_ProtectedViewDict):
%YAML 1.1
%TAG ! tag:stsci.edu:asdf/
--- !core/asdf-1.1.0
asdf_library: !core/software-1.0.0 {...
name: asdf, version: ...}
asdf_library: !core/software-1.0.0 ...
history:
extensions:
- !core/extension_metadata-1.0.0
extension_class: asdf.extension.BuiltinExtension
software: !core/software-1.0.0 {name: asdf, version: ...}
...
name: CXCOMP
value: 42
<BLANKLINE>
Expand Down
3 changes: 2 additions & 1 deletion weldx/tests/asdf_tests/test_weldx_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,8 @@ def get_mem_info():
# pytest increases memory a bit, but not as much as our large array would
# occupy in memory.
assert diff <= large_array.nbytes * 1.1, diff / 1024**2
assert np.all(WeldxFile(fn)["x"] == large_array)
with WeldxFile(fn) as wf:
assert np.all(wf["x"] == large_array)

@staticmethod
@pytest.mark.parametrize("mode", ("r", "rw"))
Expand Down

0 comments on commit 5bf048b

Please sign in to comment.