From 4293ef7372f6f5462e6577b77dce8e6e3c2fdd02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Nowacki?= Date: Fri, 24 Nov 2023 00:32:48 +0100 Subject: [PATCH 1/4] remove old todos --- b2sdk/sync/action.py | 3 --- test/unit/replication/conftest.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/b2sdk/sync/action.py b/b2sdk/sync/action.py index 323a97e2e..718f0fdda 100644 --- a/b2sdk/sync/action.py +++ b/b2sdk/sync/action.py @@ -245,7 +245,6 @@ def do_action(self, bucket: Bucket, reporter: ProgressReport) -> None: """ bucket.hide_file(self.b2_file_name) - # TODO: This function uses SyncReport.update_transfer, while others are enough with ProgressReport interface. def do_report(self, bucket: Bucket, reporter: SyncReport): """ Report the hiding action performed. @@ -464,7 +463,6 @@ def do_action(self, bucket: Bucket, reporter: ProgressReport): """ bucket.api.delete_file_version(self.file_id, self.b2_file_name) - # TODO: This function uses SyncReport.update_transfer, while others are enough with ProgressReport interface. def do_report(self, bucket: Bucket, reporter: SyncReport): """ Report the deleting action performed. @@ -506,7 +504,6 @@ def do_action(self, bucket: Bucket, reporter: ProgressReport): """ os.unlink(self.full_path) - # TODO: This function uses SyncReport.update_transfer, while others are enough with ProgressReport interface. def do_report(self, bucket: Bucket, reporter: SyncReport): """ Report the deleting of a local file action performed. diff --git a/test/unit/replication/conftest.py b/test/unit/replication/conftest.py index 082798394..38a1718d2 100644 --- a/test/unit/replication/conftest.py +++ b/test/unit/replication/conftest.py @@ -52,7 +52,7 @@ def source_bucket(api, destination_bucket) -> Bucket: ReplicationRule( destination_bucket_id=destination_bucket.id_, name='name', - file_name_prefix='folder/', # TODO: is last slash needed? + file_name_prefix='folder/', ), ], source_key_id='hoho|trololo', From 982fd0add4942321f5784581ccb48119222b653b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Nowacki?= Date: Fri, 24 Nov 2023 00:33:20 +0100 Subject: [PATCH 2/4] dont check changelog if `-changelog` label is present and after pushing to master --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71f5299b2..f6e72903d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,7 @@ jobs: - name: Run linters run: nox -vs lint - name: Validate new changelog entries + if: (contains(github.event.pull_request.labels.*.name, '-changelog') == false) && (github.event.pull_request.base.ref != '') run: if [ -z "$(git diff --diff-filter=A --name-only origin/${{ github.event.pull_request.base.ref }} changelog.d)" ]; then echo no changelog item added; exit 1; fi build: From 2986af46d6ec7f7927545e05526d584d16c4042f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Nowacki?= Date: Fri, 24 Nov 2023 00:34:10 +0100 Subject: [PATCH 3/4] python3.12 has been released --- .github/workflows/ci.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6e72903d..d4c9771ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: branches: [master] env: - PYTHON_DEFAULT_VERSION: "3.11" + PYTHON_DEFAULT_VERSION: "3.12" SKIP_COVERAGE_PYTHON_VERSION_PREFIX: "pypy" jobs: @@ -82,7 +82,7 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12-dev", "pypy-3.9", "pypy-3.10"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy-3.9", "pypy-3.10"] exclude: - os: "macos-latest" python-version: "pypy-3.9" @@ -92,11 +92,6 @@ jobs: python-version: "pypy-3.10" - os: "windows-latest" python-version: "pypy-3.10" - # FIXME remove these exclusions after 3.12 release; 3.12-dev setlocale(...) is broken on Windows & Mac - - os: "macos-latest" - python-version: "3.12-dev" - - os: "windows-latest" - python-version: "3.12-dev" steps: - uses: actions/checkout@v3 with: From 167c3fe6b5da5ffed4da6d3dd3c33aecdc6f10b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Nowacki?= Date: Fri, 24 Nov 2023 09:47:37 +0100 Subject: [PATCH 4/4] let's go back to not running test on 3.12 mac and windows --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4c9771ca..22723bdc6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,6 +92,11 @@ jobs: python-version: "pypy-3.10" - os: "windows-latest" python-version: "pypy-3.10" + # TODO: 3.12 setlocale(...) is broken on Windows & Mac + - os: "macos-latest" + python-version: "3.12" + - os: "windows-latest" + python-version: "3.12" steps: - uses: actions/checkout@v3 with: