Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc cleanup #449

Merged
merged 4 commits into from
Nov 24, 2023
Merged

Misc cleanup #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4293ef7
remove old todos
mpnowacki-reef Nov 23, 2023
982fd0a
dont check changelog if `-changelog` label is present and after pushi…
mpnowacki-reef Nov 23, 2023
2986af4
python3.12 has been released
mpnowacki-reef Nov 23, 2023
167c3fe
let's go back to not running test on 3.12 mac and windows
mpnowacki-reef Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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"
Expand All @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions b2sdk/sync/action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion test/unit/replication/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading