From 864baa731cf492d7f6b645ae29886ebf20f5b3d5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 20:10:53 +0000 Subject: [PATCH 01/11] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/PyCQA/flake8: 7.0.0 → 7.1.0](https://github.com/PyCQA/flake8/compare/7.0.0...7.1.0) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6dee2da..a805142 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/PyCQA/flake8 - rev: 7.0.0 + rev: 7.1.0 hooks: - id: flake8 - repo: https://github.com/PyCQA/autoflake From 5d9c2b3c5a7a9462e69b1acd57df4757adeccb4a Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Mon, 24 Apr 2023 08:33:11 -0400 Subject: [PATCH 02/11] use `provision-with-micromamba` and `conda-forge` channel --- .github/workflows/tox.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index b0861e2..8825467 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -185,10 +185,15 @@ jobs: - name: Setup conda if: ${{ matrix.conda == 'true' }} - uses: s-weigand/setup-conda@v1 + uses: mamba-org/provision-with-micromamba@v15 with: - update-conda: true - python-version: ${{ matrix.python_version }} + environment-file: false + environment-name: 'test' + extra-specs: | + python=${{ matrix.python_version }} + channels: conda-forge + cache-env: true + cache-downloads: true - id: set-env if: ${{ matrix.setenv != '' }} From dc8b99c6ddd9a10051ba49c469c2bd81531391d5 Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Thu, 27 Apr 2023 12:00:37 -0400 Subject: [PATCH 03/11] use rewrite `setup-micromamba` --- .github/workflows/tox.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 8825467..8171a9a 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -185,14 +185,12 @@ jobs: - name: Setup conda if: ${{ matrix.conda == 'true' }} - uses: mamba-org/provision-with-micromamba@v15 + uses: mamba-org/setup-micromamba@v1 with: - environment-file: false - environment-name: 'test' - extra-specs: | + environment-name: test + create-args: >- python=${{ matrix.python_version }} - channels: conda-forge - cache-env: true + cache-environment: true cache-downloads: true - id: set-env From 6cf24c61fd46905c12342651d4d3af49f167db46 Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Tue, 13 Jun 2023 09:01:17 -0400 Subject: [PATCH 04/11] add tox and conda to the micromamba environment --- .github/workflows/tox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 8171a9a..bb2b813 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -189,7 +189,9 @@ jobs: with: environment-name: test create-args: >- + conda python=${{ matrix.python_version }} + tox cache-environment: true cache-downloads: true From 62e6196b3596d3a2a848ea1fc7414c5582cfe81a Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Tue, 13 Jun 2023 09:09:36 -0400 Subject: [PATCH 05/11] use login shell for conda --- .github/workflows/tox.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index bb2b813..14d2654 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -151,6 +151,9 @@ jobs: strategy: fail-fast: ${{ inputs.fail-fast }} matrix: ${{fromJSON(needs.envs.outputs.matrix)}} + defaults: + run: + shell: bash -l {0} steps: - uses: actions/checkout@v4 @@ -192,6 +195,7 @@ jobs: conda python=${{ matrix.python_version }} tox + init-shell: bash cache-environment: true cache-downloads: true From 371fc6f01250e868af7cd276a5432d7977e880c8 Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Sun, 9 Jun 2024 13:19:31 -0400 Subject: [PATCH 06/11] explicitly set channel --- .github/workflows/tox.yml | 3 +++ tox.ini | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 14d2654..ba9f106 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -191,6 +191,9 @@ jobs: uses: mamba-org/setup-micromamba@v1 with: environment-name: test + condarc: | + channels: + - conda-forge create-args: >- conda python=${{ matrix.python_version }} diff --git a/tox.ini b/tox.ini index 6366a77..1233c7b 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ envlist = [testenv] allowlist_externals = python - conda + micromamba bcal dot bash @@ -59,5 +59,5 @@ extras = test conda_deps = pytest commands = conda: python -c "import os, sys; assert os.path.exists(os.path.join(sys.prefix, 'conda-meta', 'history'))" - conda: conda list + conda: micromamba list pytest --pyargs test_package {posargs} From d5584de1175814cb756c9039e7d1e9f04b5f1a5e Mon Sep 17 00:00:00 2001 From: Zach Burnett Date: Sun, 9 Jun 2024 13:22:55 -0400 Subject: [PATCH 07/11] use bash --- .github/workflows/tox.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index ba9f106..dc94a3b 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -209,7 +209,6 @@ jobs: echo $SET_ENV_SCRIPT | base64 --decode > set_env.py python set_env.py "${{ matrix.setenv }}" rm set_env.py - shell: sh env: SET_ENV_SCRIPT: aW1wb3J0IGpzb24KaW1wb3J0IG9zCmltcG9ydCBzeXMKCmltcG9ydCB5YW1sCgpHSVRIVUJfRU5WID0gb3MuZ2V0ZW52KCJHSVRIVUJfRU5WIikKaWYgR0lUSFVCX0VOViBpcyBOb25lOgogICAgcmFpc2UgVmFsdWVFcnJvcigiR0lUSFVCX0VOViBub3Qgc2V0LiBNdXN0IGJlIHJ1biBpbnNpZGUgR2l0SHViIEFjdGlvbnMuIikKCkRFTElNSVRFUiA9ICJFT0YiCgoKZGVmIHNldF9lbnYoZW52KToKCiAgICBlbnYgPSB5YW1sLmxvYWQoZW52LCBMb2FkZXI9eWFtbC5CYXNlTG9hZGVyKQogICAgcHJpbnQoanNvbi5kdW1wcyhlbnYsIGluZGVudD0yKSkKCiAgICBpZiBub3QgaXNpbnN0YW5jZShlbnYsIGRpY3QpOgogICAgICAgIHRpdGxlID0gImBlbnZgIG11c3QgYmUgbWFwcGluZyIKICAgICAgICBtZXNzYWdlID0gZiJgZW52YCBtdXN0IGJlIG1hcHBpbmcgb2YgZW52IHZhcmlhYmxlcyB0byB2YWx1ZXMsIGdvdCB0eXBlIHt0eXBlKGVudil9IgogICAgICAgIHByaW50KGYiOjplcnJvciB0aXRsZT17dGl0bGV9Ojp7bWVzc2FnZX0iKQogICAgICAgIGV4aXQoMSkKCiAgICBmb3IgaywgdiBpbiBlbnYuaXRlbXMoKToKCiAgICAgICAgaWYgbm90IGlzaW5zdGFuY2Uodiwgc3RyKToKICAgICAgICAgICAgdGl0bGUgPSAiYGVudmAgdmFsdWVzIG11c3QgYmUgc3RyaW5ncyIKICAgICAgICAgICAgbWVzc2FnZSA9IGYiYGVudmAgdmFsdWVzIG11c3QgYmUgc3RyaW5ncywgYnV0IHZhbHVlIG9mIHtrfSBoYXMgdHlwZSB7dHlwZSh2KX0iCiAgICAgICAgICAgIHByaW50KGYiOjplcnJvciB0aXRsZT17dGl0bGV9Ojp7bWVzc2FnZX0iKQogICAgICAgICAgICBleGl0KDEpCgogICAgICAgIHYgPSB2LnNwbGl0KCJcbiIpCgogICAgICAgIHdpdGggb3BlbihHSVRIVUJfRU5WLCAiYSIpIGFzIGY6CiAgICAgICAgICAgIGlmIGxlbih2KSA9PSAxOgogICAgICAgICAgICAgICAgZi53cml0ZShmIntrfT17dlswXX1cbiIpCiAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICBmb3IgbGluZSBpbiB2OgogICAgICAgICAgICAgICAgICAgIGFzc2VydCBsaW5lLnN0cmlwKCkgIT0gREVMSU1JVEVSCiAgICAgICAgICAgICAgICBmLndyaXRlKGYie2t9PDx7REVMSU1JVEVSfVxuIikKICAgICAgICAgICAgICAgIGZvciBsaW5lIGluIHY6CiAgICAgICAgICAgICAgICAgICAgZi53cml0ZShmIntsaW5lfVxuIikKICAgICAgICAgICAgICAgIGYud3JpdGUoZiJ7REVMSU1JVEVSfVxuIikKCiAgICAgICAgcHJpbnQoZiJ7a30gd3JpdHRlbiB0byBHSVRIVUJfRU5WIikKCgppZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogICAgc2V0X2VudihzeXMuYXJndlsxXSkK @@ -219,10 +218,8 @@ jobs: - name: Install tox run: python -m pip install --upgrade tox ${{ matrix.toxdeps }} - shell: sh - run: python -m tox -e ${{ matrix.toxenv }} ${{ matrix.toxargs }} -- ${{ matrix.pytest_flag }} ${{ matrix.posargs }} - shell: sh - if: ${{ (success() || failure()) && matrix.artifact-path != '' }} uses: actions/upload-artifact@v4 From f10713ac6a0c3defd1d7971101e55d88aca3c43d Mon Sep 17 00:00:00 2001 From: zacharyburnett Date: Mon, 10 Jun 2024 13:50:14 -0400 Subject: [PATCH 08/11] replace flake8 with ruff --- .pre-commit-config.yaml | 8 +++++--- pyproject.toml | 3 +++ tox.ini | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6dee2da..a4467cb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,8 +1,10 @@ repos: - - repo: https://github.com/PyCQA/flake8 - rev: 7.0.0 + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.4.8 hooks: - - id: flake8 + - id: ruff + args: [ --fix ] + - id: ruff-format - repo: https://github.com/PyCQA/autoflake rev: v2.3.1 hooks: diff --git a/pyproject.toml b/pyproject.toml index 849f3eb..4789051 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,3 +5,6 @@ build-backend = 'setuptools.build_meta' [tool.cibuildwheel.linux] environment-pass = ["GITHUB_WORKFLOW"] + +[tool.ruff.lint] +line-length = 100 diff --git a/tox.ini b/tox.ini index 6366a77..d08afcf 100644 --- a/tox.ini +++ b/tox.ini @@ -49,8 +49,8 @@ commands = [testenv:pep8] description = verify pep8 -deps = flake8 -commands = flake8 . --count +deps = ruff +commands = ruff check . [testenv:py3{10,11,12}{,-conda}] description = run pytest From 32058112316789411b073e1418bd4f6a5bcb3acc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 04:35:53 +0000 Subject: [PATCH 09/11] Bump pypa/cibuildwheel from 2.19.1 to 2.19.2 Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.19.1 to 2.19.2. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.19.1...v2.19.2) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 96629b5..f5cf187 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -183,7 +183,7 @@ jobs: env: SET_ENV_SCRIPT: aW1wb3J0IGpzb24KaW1wb3J0IG9zCmltcG9ydCBzeXMKCmltcG9ydCB5YW1sCgpHSVRIVUJfRU5WID0gb3MuZ2V0ZW52KCJHSVRIVUJfRU5WIikKaWYgR0lUSFVCX0VOViBpcyBOb25lOgogICAgcmFpc2UgVmFsdWVFcnJvcigiR0lUSFVCX0VOViBub3Qgc2V0LiBNdXN0IGJlIHJ1biBpbnNpZGUgR2l0SHViIEFjdGlvbnMuIikKCkRFTElNSVRFUiA9ICJFT0YiCgoKZGVmIHNldF9lbnYoZW52KToKCiAgICBlbnYgPSB5YW1sLmxvYWQoZW52LCBMb2FkZXI9eWFtbC5CYXNlTG9hZGVyKQogICAgcHJpbnQoanNvbi5kdW1wcyhlbnYsIGluZGVudD0yKSkKCiAgICBpZiBub3QgaXNpbnN0YW5jZShlbnYsIGRpY3QpOgogICAgICAgIHRpdGxlID0gImBlbnZgIG11c3QgYmUgbWFwcGluZyIKICAgICAgICBtZXNzYWdlID0gZiJgZW52YCBtdXN0IGJlIG1hcHBpbmcgb2YgZW52IHZhcmlhYmxlcyB0byB2YWx1ZXMsIGdvdCB0eXBlIHt0eXBlKGVudil9IgogICAgICAgIHByaW50KGYiOjplcnJvciB0aXRsZT17dGl0bGV9Ojp7bWVzc2FnZX0iKQogICAgICAgIGV4aXQoMSkKCiAgICBmb3IgaywgdiBpbiBlbnYuaXRlbXMoKToKCiAgICAgICAgaWYgbm90IGlzaW5zdGFuY2Uodiwgc3RyKToKICAgICAgICAgICAgdGl0bGUgPSAiYGVudmAgdmFsdWVzIG11c3QgYmUgc3RyaW5ncyIKICAgICAgICAgICAgbWVzc2FnZSA9IGYiYGVudmAgdmFsdWVzIG11c3QgYmUgc3RyaW5ncywgYnV0IHZhbHVlIG9mIHtrfSBoYXMgdHlwZSB7dHlwZSh2KX0iCiAgICAgICAgICAgIHByaW50KGYiOjplcnJvciB0aXRsZT17dGl0bGV9Ojp7bWVzc2FnZX0iKQogICAgICAgICAgICBleGl0KDEpCgogICAgICAgIHYgPSB2LnNwbGl0KCJcbiIpCgogICAgICAgIHdpdGggb3BlbihHSVRIVUJfRU5WLCAiYSIpIGFzIGY6CiAgICAgICAgICAgIGlmIGxlbih2KSA9PSAxOgogICAgICAgICAgICAgICAgZi53cml0ZShmIntrfT17dlswXX1cbiIpCiAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICBmb3IgbGluZSBpbiB2OgogICAgICAgICAgICAgICAgICAgIGFzc2VydCBsaW5lLnN0cmlwKCkgIT0gREVMSU1JVEVSCiAgICAgICAgICAgICAgICBmLndyaXRlKGYie2t9PDx7REVMSU1JVEVSfVxuIikKICAgICAgICAgICAgICAgIGZvciBsaW5lIGluIHY6CiAgICAgICAgICAgICAgICAgICAgZi53cml0ZShmIntsaW5lfVxuIikKICAgICAgICAgICAgICAgIGYud3JpdGUoZiJ7REVMSU1JVEVSfVxuIikKCiAgICAgICAgcHJpbnQoZiJ7a30gd3JpdHRlbiB0byBHSVRIVUJfRU5WIikKCgppZiBfX25hbWVfXyA9PSAiX19tYWluX18iOgogICAgc2V0X2VudihzeXMuYXJndlsxXSkK - name: Run cibuildwheel - uses: pypa/cibuildwheel@v2.19.1 + uses: pypa/cibuildwheel@v2.19.2 with: output-dir: dist env: From 7e03784e5df913c4217ce1c27fee51644231bd9e Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 8 Jul 2024 11:30:12 +0100 Subject: [PATCH 10/11] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4789051..f934414 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,5 +6,5 @@ build-backend = 'setuptools.build_meta' [tool.cibuildwheel.linux] environment-pass = ["GITHUB_WORKFLOW"] -[tool.ruff.lint] +[tool.ruff] line-length = 100 From 2cc029f4be60b59c4359dc40c2ce36c72fcbf3e5 Mon Sep 17 00:00:00 2001 From: Stuart Mumford Date: Mon, 8 Jul 2024 11:30:51 +0100 Subject: [PATCH 11/11] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ab2de2a..7201f72 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,6 @@ repos: hooks: - id: ruff args: [ --fix ] - - id: ruff-format - repo: https://github.com/PyCQA/autoflake rev: v2.3.1 hooks: