From e9f0b4359826d5b4830f8c28b72263b315e28982 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 08:14:52 +0100 Subject: [PATCH 1/6] [pre-commit.ci] pre-commit autoupdate (#898) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.4.0...v4.5.0) - [github.com/asottile/pyupgrade: v3.14.0 → v3.15.0](https://github.com/asottile/pyupgrade/compare/v3.14.0...v3.15.0) - [github.com/psf/black: 23.9.1 → 23.11.0](https://github.com/psf/black/compare/23.9.1...23.11.0) - [github.com/astral-sh/ruff-pre-commit: v0.0.292 → v0.1.6](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.292...v0.1.6) - [github.com/abravalheri/validate-pyproject: v0.14 → v0.15](https://github.com/abravalheri/validate-pyproject/compare/v0.14...v0.15) - [github.com/nbQA-dev/nbQA: 1.7.0 → 1.7.1](https://github.com/nbQA-dev/nbQA/compare/1.7.0...1.7.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3b8035fd1..460ccec8d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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] @@ -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.11.0 hooks: - id: black - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.292 + rev: v0.1.6 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 From f65d39868c9601ef2c6d2208219976ca9102a079 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 12:38:26 +0100 Subject: [PATCH 2/6] Bump actions/setup-python from 4 to 5 (#899) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build_pkg.yml | 2 +- .github/workflows/citation.yml | 2 +- .github/workflows/pytest_asdf.yml | 2 +- .github/workflows/static_analysis.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml index 655d8b3fd..12452df5a 100644 --- a/.github/workflows/build_pkg.yml +++ b/.github/workflows/build_pkg.yml @@ -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' diff --git a/.github/workflows/citation.yml b/.github/workflows/citation.yml index 1cc572420..b2ebdfd56 100644 --- a/.github/workflows/citation.yml +++ b/.github/workflows/citation.yml @@ -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 diff --git a/.github/workflows/pytest_asdf.yml b/.github/workflows/pytest_asdf.yml index 78f01978c..5b0c62bfc 100644 --- a/.github/workflows/pytest_asdf.yml +++ b/.github/workflows/pytest_asdf.yml @@ -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 diff --git a/.github/workflows/static_analysis.yml b/.github/workflows/static_analysis.yml index eadaa91c6..507ce0254 100644 --- a/.github/workflows/static_analysis.yml +++ b/.github/workflows/static_analysis.yml @@ -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 From f2d55bb837de0549355c2dfead0f423c7e1c992b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Dec 2023 10:32:05 +0100 Subject: [PATCH 3/6] Bump actions/upload-artifact from 3 to 4 (#901) --- .github/workflows/build_pkg.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/pytest.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_pkg.yml b/.github/workflows/build_pkg.yml index 12452df5a..7038b00ec 100644 --- a/.github/workflows/build_pkg.yml +++ b/.github/workflows/build_pkg.yml @@ -99,7 +99,7 @@ jobs: run: | python -m build - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: dist path: ./dist/ diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 103b7b4ca..ebc6c39e0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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/') || diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index c407f419a..24e092251 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -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 }} @@ -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 From bb213a77ee79e8c982adfec0d56b9d5a3efee7b1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 08:10:23 +0100 Subject: [PATCH 4/6] [pre-commit.ci] pre-commit autoupdate (#902) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 23.11.0 → 23.12.1](https://github.com/psf/black/compare/23.11.0...23.12.1) - [github.com/astral-sh/ruff-pre-commit: v0.1.6 → v0.1.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.6...v0.1.9) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 460ccec8d..d42f1d30d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,11 +34,11 @@ repos: - id: pyupgrade args: [--py39-plus] - repo: https://github.com/psf/black - rev: 23.11.0 + rev: 23.12.1 hooks: - id: black - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.6 + rev: v0.1.9 hooks: - id: ruff args: From 66a9ce4215c2fafeab0906286b4b8036dba880a7 Mon Sep 17 00:00:00 2001 From: Brett Graham Date: Fri, 5 Jan 2024 06:00:35 -0500 Subject: [PATCH 5/6] fix WeldxFile doctest for asdf 3.0 (#904) --- weldx/asdf/file.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/weldx/asdf/file.py b/weldx/asdf/file.py index 93e1b1efc..e0317c06c 100644 --- a/weldx/asdf/file.py +++ b/weldx/asdf/file.py @@ -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 From ad4b8dc8d976c1306cbdfd409c84e73f288c5686 Mon Sep 17 00:00:00 2001 From: Brett Graham Date: Fri, 5 Jan 2024 10:42:56 -0500 Subject: [PATCH 6/6] fix test that relied on slow garbage collection (#903) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Çağtay Fabry --- weldx/tests/asdf_tests/test_weldx_file.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/weldx/tests/asdf_tests/test_weldx_file.py b/weldx/tests/asdf_tests/test_weldx_file.py index b6bc588c5..863159abf 100644 --- a/weldx/tests/asdf_tests/test_weldx_file.py +++ b/weldx/tests/asdf_tests/test_weldx_file.py @@ -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"))