diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d997c5c3..36a5b2099 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,48 +11,7 @@ env: SKIP_COVERAGE_PYTHON_VERSION_PREFIX: "pypy" jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - uses: codespell-project/actions-codespell@2391250ab05295bddd51e36a8c6295edb6343b0e - with: - ignore_words_list: datas - - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }} - uses: actions/setup-python@v4 - with: - python-version: ${{ env.PYTHON_DEFAULT_VERSION }} - cache: "pip" - - name: Install dependencies - run: python -m pip install --upgrade nox pip setuptools - - name: Run linters - run: nox -vs lint - - name: Validate changelog - # Library was designed to be used with pull requests only. - if: ${{ github.event_name == 'pull_request' && ! startsWith(github.ref, 'refs/heads/dependabot/') }} - uses: zattoo/changelog@v1 - with: - token: ${{ github.token }} - build: - needs: lint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }} - uses: actions/setup-python@v4 - with: - python-version: ${{ env.PYTHON_DEFAULT_VERSION }} - cache: "pip" - - name: Install dependencies - run: python -m pip install --upgrade nox pip setuptools - - name: Build the distribution - run: nox -vs build cleanup_buckets: - needs: lint env: B2_TEST_APPLICATION_KEY: ${{ secrets.B2_TEST_APPLICATION_KEY }} B2_TEST_APPLICATION_KEY_ID: ${{ secrets.B2_TEST_APPLICATION_KEY_ID }} @@ -74,62 +33,3 @@ jobs: - name: Find and remove old buckets if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }} # TODO: skip this whole job instead run: nox -vs cleanup_old_buckets - test: - needs: cleanup_buckets - env: - B2_TEST_APPLICATION_KEY: ${{ secrets.B2_TEST_APPLICATION_KEY }} - B2_TEST_APPLICATION_KEY_ID: ${{ secrets.B2_TEST_APPLICATION_KEY_ID }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: ["ubuntu-latest", "macos-latest", "windows-latest"] - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11.0", "pypy-3.7", "pypy-3.8"] - exclude: - - os: "macos-latest" - python-version: "pypy-3.7" - - os: "ubuntu-latest" - python-version: "pypy-3.7" - - os: "macos-latest" - python-version: "pypy-3.8" - - os: "windows-latest" - python-version: "pypy-3.8" - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - cache: "pip" - - name: Install dependencies - run: python -m pip install --upgrade nox pip setuptools - - name: Run unit tests - run: nox -vs unit - env: - SKIP_COVERAGE: ${{ startsWith(matrix.python-version, env.SKIP_COVERAGE_PYTHON_VERSION_PREFIX) }} - - name: Run integration tests - if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }} - run: nox -vs integration -- --dont-cleanup-old-buckets - doc: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }} - uses: actions/setup-python@v4 - with: - python-version: ${{ env.PYTHON_DEFAULT_VERSION }} - cache: "pip" - - name: Install dependencies - env: - DEBIAN_FRONTEND: noninteractive - run: | - sudo apt-get update -y - sudo apt-get install -y graphviz plantuml - python -m pip install --upgrade nox pip setuptools - - name: Build the docs - run: nox --non-interactive -vs doc diff --git a/CHANGELOG.md b/CHANGELOG.md index 2020b8db2..6cafa3dc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added +* Nothing + ### Changed * Connection timeout is now being set explicitly diff --git a/test/integration/test_raw_api.py b/test/integration/test_raw_api.py index ac609a7b3..57fcee357 100644 --- a/test/integration/test_raw_api.py +++ b/test/integration/test_raw_api.py @@ -603,6 +603,9 @@ def _clean_and_delete_bucket(raw_api, api_url, account_auth_token, account_id, b def _should_delete_bucket(bucket_name): # Bucket names for this test look like: c7b22d0b0ad7-1460060364-5670 # Other buckets should not be deleted. + if bucket_name.startswith('clitst'): + return True + match = re.match(r'^test-raw-api-[a-f0-9]+-([0-9]+)-([0-9]+)', bucket_name) if match is None: return False