Merge pull request #449 from Backblaze/misc_cleanup

Misc cleanup
Backblaze · Nov 24, 2023 · 15db41e · 15db41e
2 parents 9ca9d0a + 167c3fe
commit 15db41e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git 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:
@@ -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:
@@ -81,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"
@@ -91,11 +92,11 @@ 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
+          # TODO: 3.12 setlocale(...) is broken on Windows & Mac
           - os: "macos-latest"
-            python-version: "3.12-dev"
+            python-version: "3.12"
           - os: "windows-latest"
-            python-version: "3.12-dev"
+            python-version: "3.12"
     steps:
       - uses: actions/checkout@v3
         with:

diff --git 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
@@ -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',