From cbc416b125c272fddbc602144b93a6796ba23bc1 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 2 Aug 2026 07:24:41 +0000 Subject: [PATCH 1/3] Update from copier (2026-08-02T07:24:41) Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- .copier-answers.yaml | 2 +- .github/workflows/build.yaml | 63 +++++++++++++++++++++++++++++++++++ .github/workflows/copier.yaml | 7 ++-- 3 files changed, 68 insertions(+), 4 deletions(-) diff --git a/.copier-answers.yaml b/.copier-answers.yaml index d85f1fc..8327df8 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: c2ea129 +_commit: b2cdb6d _src_path: https://github.com/python-project-templates/base.git add_docs: false add_extension: python diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 852d912..8b8ef76 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,6 +33,7 @@ jobs: python-version: ["3.11"] steps: +<<<<<<< before updating - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false @@ -94,3 +95,65 @@ jobs: name: dist-${{matrix.os}} path: dist if: ${{ matrix.os == 'ubuntu-latest' }} +======= + - name: Checkout + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + persist-credentials: false + + - name: Setup Python + uses: actions-ext/python/setup@6e1b91a408ea89f49bc8aff8724f83826f7b5446 + with: + version: ${{ matrix.python-version }} + + - name: Install dependencies + run: make develop + + - name: Lint + run: make lint + + - name: Checks + run: make checks + + - name: Build + run: make build + + - name: Test + run: make coverage + + - name: Upload test results (Python) + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: test-results-${{ matrix.os }}-${{ matrix.python-version }} + path: junit.xml + if: ${{ always() }} + + - name: Publish test results + uses: EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3 # v2.24.0 + with: + files: '**/junit.xml' + + - name: Upload coverage + uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 + with: + token: ${{ secrets.CODECOV_TOKEN }} + + - name: Build distributions + run: make dist + + - name: Test wheel + uses: actions-ext/python/test-wheel@6e1b91a408ea89f49bc8aff8724f83826f7b5446 + with: + module: fsspec_python + + - name: Test source distribution + uses: actions-ext/python/test-sdist@6e1b91a408ea89f49bc8aff8724f83826f7b5446 + with: + module: fsspec_python + + - name: Upload distributions + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: dist-${{matrix.os}} + path: dist +>>>>>>> after updating diff --git a/.github/workflows/copier.yaml b/.github/workflows/copier.yaml index a936d5f..7171411 100644 --- a/.github/workflows/copier.yaml +++ b/.github/workflows/copier.yaml @@ -12,6 +12,7 @@ jobs: pull-requests: write runs-on: ubuntu-latest steps: - - uses: actions-ext/copier-update@378500315a83b5985e175139a55f1fa5ea6dde09 - with: - token: ${{ secrets.WORKFLOW_TOKEN }} + - name: Update from Copier + uses: actions-ext/copier/update@2061209faa6b75ffd4fcecc0b0983772767997f4 + with: + token: ${{ secrets.WORKFLOW_TOKEN }} From 33e7de2a114f926e365b7379b2f2acdc7fd2a188 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 2 Aug 2026 17:01:00 -0400 Subject: [PATCH 2/3] Update build.yaml --- .github/workflows/build.yaml | 66 ++---------------------------------- 1 file changed, 2 insertions(+), 64 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8b8ef76..7b24a98 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,69 +33,6 @@ jobs: python-version: ["3.11"] steps: -<<<<<<< before updating - - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - persist-credentials: false - - - uses: actions-ext/python/setup@6e1b91a408ea89f49bc8aff8724f83826f7b5446 - with: - version: ${{ matrix.python-version }} - - - name: Install dependencies - run: make develop - - - name: Lint - run: make lint - - - name: Checks - run: make checks - - - name: Build - run: make build - - - name: Test - run: make coverage - env: - FSSPEC_S3_ENDPOINT_URL: ${{ secrets.FSSPEC_S3_ENDPOINT_URL }} - - - name: Upload test results (Python) - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 - with: - name: test-results-${{ matrix.os }}-${{ matrix.python-version }} - path: junit.xml - if: ${{ always() }} - - - name: Publish Unit Test Results - uses: EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3 # v2.24.0 - with: - files: '**/junit.xml' - if: ${{ matrix.os == 'ubuntu-latest' }} - - - name: Upload coverage - uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 - with: - token: ${{ secrets.CODECOV_TOKEN }} - if: ${{ matrix.os == 'ubuntu-latest' }} - - - name: Make dist - run: make dist - if: ${{ matrix.os == 'ubuntu-latest' }} - - - uses: actions-ext/python/test-wheel@6e1b91a408ea89f49bc8aff8724f83826f7b5446 - with: - module: fsspec_python - - - uses: actions-ext/python/test-sdist@6e1b91a408ea89f49bc8aff8724f83826f7b5446 - with: - module: fsspec_python - - - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 - with: - name: dist-${{matrix.os}} - path: dist - if: ${{ matrix.os == 'ubuntu-latest' }} -======= - name: Checkout uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: @@ -120,6 +57,8 @@ jobs: - name: Test run: make coverage + env: + FSSPEC_S3_ENDPOINT_URL: ${{ secrets.FSSPEC_S3_ENDPOINT_URL }} - name: Upload test results (Python) uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 @@ -156,4 +95,3 @@ jobs: with: name: dist-${{matrix.os}} path: dist ->>>>>>> after updating From 10a27c72ec1e5e1ffaa50236c65048875c8c3a4a Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 2 Aug 2026 19:13:30 -0400 Subject: [PATCH 3/3] Fix Copier workflow merge Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com> --- .github/workflows/build.yaml | 4 ++++ fsspec_python/tests/test_fs.py | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7b24a98..b910d91 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -71,14 +71,17 @@ jobs: uses: EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3 # v2.24.0 with: files: '**/junit.xml' + if: ${{ matrix.os == 'ubuntu-latest' }} - name: Upload coverage uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0 with: token: ${{ secrets.CODECOV_TOKEN }} + if: ${{ matrix.os == 'ubuntu-latest' }} - name: Build distributions run: make dist + if: ${{ matrix.os == 'ubuntu-latest' }} - name: Test wheel uses: actions-ext/python/test-wheel@6e1b91a408ea89f49bc8aff8724f83826f7b5446 @@ -95,3 +98,4 @@ jobs: with: name: dist-${{matrix.os}} path: dist + if: ${{ matrix.os == 'ubuntu-latest' }} diff --git a/fsspec_python/tests/test_fs.py b/fsspec_python/tests/test_fs.py index dbf59fa..97c8d3a 100644 --- a/fsspec_python/tests/test_fs.py +++ b/fsspec_python/tests/test_fs.py @@ -43,7 +43,7 @@ def test_instance_methods(self): assert fs.fs is fs2 assert fs._cached is True assert fs.listdir(".") == fs2.listdir(".") - assert set(fs.__dict__.keys()) == { + expected = { "__doc__", "__init__", "__module__", @@ -81,3 +81,6 @@ def test_instance_methods(self): "touch", "unstrip_protocol", } + if hasattr(type(fs2), "_instantiation_lock"): + expected.add("_instantiation_lock") + assert set(fs.__dict__.keys()) == expected