From aae2b4b6be3430915a6e8cef133e128ef21d31b5 Mon Sep 17 00:00:00 2001 From: pulpbot Date: Tue, 14 Nov 2023 17:35:49 +0000 Subject: [PATCH] Bump minor version [noissue] --- .bumpversion.cfg | 2 +- .github/template_gitref | 2 +- .github/workflows/build.yml | 37 +++++ .github/workflows/ci.yml | 165 +---------------------- .github/workflows/lint.yml | 48 +++++++ .github/workflows/pr_checks.yml | 55 ++++++++ .github/workflows/scripts/install.sh | 8 +- .github/workflows/test.yml | 129 ++++++++++++++++++ .github/workflows/update_ci.yml | 8 +- CHANGES/+pulpcore-worker-restart.feature | 1 - CHANGES/2079.feature | 1 - CHANGES/4648.bugfix | 1 - CHANGES/4679.bugfix | 1 - CHANGES/4681.bugfix | 1 - CHANGES/plugin_api/4607.feature | 1 - CHANGES/plugin_api/4634.bugfix | 5 - CHANGES/plugin_api/4635.feature | 2 - CHANGES/plugin_api/4644.bugfix | 1 - CHANGES/plugin_api/4651.removal | 1 - CHANGES/plugin_api/4654.bugfix | 1 - CHANGES/pulp_file/4633.bugfix | 1 - docs/conf.py | 4 +- pulp_file/app/__init__.py | 2 +- pulpcore/app/apps.py | 2 +- setup.py | 2 +- template_config.yml | 14 +- 26 files changed, 296 insertions(+), 199 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/lint.yml create mode 100644 .github/workflows/pr_checks.yml create mode 100644 .github/workflows/test.yml delete mode 100644 CHANGES/+pulpcore-worker-restart.feature delete mode 100644 CHANGES/2079.feature delete mode 100644 CHANGES/4648.bugfix delete mode 100644 CHANGES/4679.bugfix delete mode 100644 CHANGES/4681.bugfix delete mode 100644 CHANGES/plugin_api/4607.feature delete mode 100644 CHANGES/plugin_api/4634.bugfix delete mode 100644 CHANGES/plugin_api/4635.feature delete mode 100644 CHANGES/plugin_api/4644.bugfix delete mode 100644 CHANGES/plugin_api/4651.removal delete mode 100644 CHANGES/plugin_api/4654.bugfix delete mode 100644 CHANGES/pulp_file/4633.bugfix diff --git a/.bumpversion.cfg b/.bumpversion.cfg index aba3e10392..9fa613b966 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.41.0.dev +current_version = 3.42.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.github/template_gitref b/.github/template_gitref index 256a0012e0..c0d974555c 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-251-g45d399d +2021.08.26-255-g20bf8c0 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000000..49ce88fccc --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,37 @@ +# WARNING: DO NOT EDIT! +# +# This file was generated by plugin_template, and is managed by it. Please use +# './plugin-template --github pulpcore' to update this file. +# +# For more info visit https://github.com/pulp/plugin_template + +--- +name: Build +on: + workflow_call: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 1 + - uses: actions/setup-python@v4 + with: + python-version: "3.8" + - name: Install python dependencies + run: | + echo ::group::PYDEPS + pip install packaging wheel + echo ::endgroup:: + - name: Build package + run: python3 setup.py sdist bdist_wheel --python-tag py3 + - name: 'Upload Package whl' + uses: actions/upload-artifact@v3 + with: + name: plugin_package + path: dist/ + if-no-files-found: error + retention-days: 5 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc6fb85190..c7a9113340 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,170 +40,17 @@ jobs: run: sh .github/workflows/scripts/check_commit.sh - name: Verify requirements files run: python .ci/scripts/check_requirements.py - single_commit: - runs-on: ubuntu-latest - name: Assert single commit - if: github.base_ref == 'main' - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Checkout main - run: git fetch origin main - - name: create local main branch - run: git branch main origin/main - - name: Commit Count Check - run: test `git log --oneline --no-merges HEAD ^main | wc -l ` = 1 lint: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 1 - - uses: actions/setup-python@v4 - with: - python-version: "3.8" - # lint_requirements contains tools needed for flake8, etc. - - name: Install requirements - run: pip3 install -r lint_requirements.txt - - # run black separately from flake8 to get a diff - - name: Run black - run: | - black --version - black --check --diff . - - # Lint code. - - name: Run flake8 - run: flake8 - - - name: Run extra lint checks - run: "[ ! -x .ci/scripts/extra_linting.sh ] || .ci/scripts/extra_linting.sh" - - # check for any files unintentionally left out of MANIFEST.in - - name: Check manifest - run: check-manifest - - + uses: "./.github/workflows/lint.yml" - - name: Check for gettext problems - run: sh .ci/scripts/check_gettext.sh - - test: - runs-on: ubuntu-latest - # run only after lint finishes + build: needs: lint - strategy: - fail-fast: false - matrix: - env: - - TEST: pulp - - TEST: docs - - TEST: azure - - TEST: s3 - - TEST: lowerbounds - outputs: - deprecations-pulp: ${{ steps.deprecations.outputs.deprecations-pulp }} - deprecations-azure: ${{ steps.deprecations.outputs.deprecations-azure }} - deprecations-s3: ${{ steps.deprecations.outputs.deprecations-s3 }} - deprecations-lowerbounds: ${{ steps.deprecations.outputs.deprecations-lowerbounds }} - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 1 - - - uses: actions/setup-python@v4 - with: - python-version: "3.8" - - - name: Install httpie - run: | - echo ::group::HTTPIE - pip install httpie - echo ::endgroup:: - echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV - - - name: Set environment variables - run: | - echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV - - - name: Before Install - run: .github/workflows/scripts/before_install.sh - shell: bash - env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - GITHUB_PULL_REQUEST: ${{ github.event.number }} - GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }} - GITHUB_BRANCH: ${{ github.head_ref }} - GITHUB_REPO_SLUG: ${{ github.repository }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} + uses: "./.github/workflows/build.yml" - - name: Install - run: .github/workflows/scripts/install.sh - shell: bash - env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - GITHUB_PULL_REQUEST: ${{ github.event.number }} - GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }} - GITHUB_BRANCH: ${{ github.head_ref }} - GITHUB_REPO_SLUG: ${{ github.repository }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} - - - name: Before Script - run: .github/workflows/scripts/before_script.sh - shell: bash - env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - GITHUB_PULL_REQUEST: ${{ github.event.number }} - GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }} - GITHUB_BRANCH: ${{ github.head_ref }} - GITHUB_REPO_SLUG: ${{ github.repository }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} - REDIS_DISABLED: ${{ contains('s3', matrix.env.TEST) }} - - - name: Setting secrets - if: github.event_name != 'pull_request' - run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" - env: - SECRETS_CONTEXT: ${{ toJson(secrets) }} - - - name: Script - run: .github/workflows/scripts/script.sh - shell: bash - env: - PY_COLORS: '1' - ANSIBLE_FORCE_COLOR: '1' - GITHUB_PULL_REQUEST: ${{ github.event.number }} - GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }} - GITHUB_BRANCH: ${{ github.head_ref }} - GITHUB_REPO_SLUG: ${{ github.repository }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} - - - name: Extract Deprecations from Logs - id: deprecations - run: echo deprecations-${{ matrix.env.TEST }}=$(docker logs pulp 2>&1 | grep -i pulpcore.deprecation | base64 -w 0) >> $GITHUB_OUTPUT - - - name: Logs - if: always() - run: | - echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" - http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true - docker images || true - docker ps -a || true - docker logs pulp || true - docker exec pulp ls -latr /etc/yum.repos.d/ || true - docker exec pulp cat /etc/yum.repos.d/* || true - docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree" + test: + needs: build + uses: "./.github/workflows/test.yml" deprecations: runs-on: ubuntu-latest if: github.base_ref == 'main' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000000..7f036e515e --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,48 @@ +# WARNING: DO NOT EDIT! +# +# This file was generated by plugin_template, and is managed by it. Please use +# './plugin-template --github pulpcore' to update this file. +# +# For more info visit https://github.com/pulp/plugin_template + +--- +name: Lint +on: + workflow_call: + +jobs: + lint: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 1 + - uses: actions/setup-python@v4 + with: + python-version: "3.8" + # lint_requirements contains tools needed for flake8, etc. + - name: Install requirements + run: pip3 install -r lint_requirements.txt + + # run black separately from flake8 to get a diff + - name: Run black + run: | + black --version + black --check --diff . + + # Lint code. + - name: Run flake8 + run: flake8 + + - name: Run extra lint checks + run: "[ ! -x .ci/scripts/extra_linting.sh ] || .ci/scripts/extra_linting.sh" + + # check for any files unintentionally left out of MANIFEST.in + - name: Check manifest + run: check-manifest + + + + - name: Check for gettext problems + run: sh .ci/scripts/check_gettext.sh diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml new file mode 100644 index 0000000000..26fda041fc --- /dev/null +++ b/.github/workflows/pr_checks.yml @@ -0,0 +1,55 @@ +# WARNING: DO NOT EDIT! +# +# This file was generated by plugin_template, and is managed by it. Please use +# './plugin-template --github pulpcore' to update this file. +# +# For more info visit https://github.com/pulp/plugin_template + +--- +name: Pulpcore PR static checks +on: + pull_request_target: + types: [opened, synchronize, reopened] + +# This workflow runs with elevated permissions. +# Do not even think about running a single bit of code from the PR. +# Static analysis should be fine however. + +concurrency: + group: ${{ github.ref_name }}-${{ github.workflow }} + cancel-in-progress: true + +jobs: + single_commit: + runs-on: ubuntu-latest + name: Label multiple commit PR + permissions: + pull-requests: write + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Commit Count Check + run: echo "COMMIT_COUNT=$(git log --oneline --no-merges origin/${{ github.base_ref }}..${{ github.event.pull_request.head.sha }} | wc -l)" >> "$GITHUB_ENV" + - uses: actions/github-script@v7 + with: + script: | + const { COMMIT_COUNT } = process.env + if (COMMIT_COUNT == 1) + { + github.rest.issues.removeLabel({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + name: ["multi-commit"] + }) + } + else + { + github.rest.issues.addLabels({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + labels: ["multi-commit"] + }) + } diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index 384787c274..46316932b5 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -15,6 +15,9 @@ set -euv source .github/workflows/scripts/utils.sh +PLUGIN_VERSION="$(sed -n -e 's/^\s*current_version\s*=\s*//p' .bumpversion.cfg | python -c 'from packaging.version import Version; print(Version(input()))')" +PLUGIN_NAME="./pulpcore/dist/pulpcore-${PLUGIN_VERSION}-py3-none-any.whl" + export PULP_API_ROOT="/pulp/" PIP_REQUIREMENTS=("pulp-cli") @@ -34,11 +37,6 @@ fi cd .ci/ansible/ -if [[ "${RELEASE_WORKFLOW:-false}" == "true" ]]; then - PLUGIN_NAME=./pulpcore/dist/pulpcore-$PLUGIN_VERSION-py3-none-any.whl -else - PLUGIN_NAME=./pulpcore -fi cat >> vars/main.yaml << VARSYAML image: name: pulp diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000000..106b415121 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,129 @@ +# WARNING: DO NOT EDIT! +# +# This file was generated by plugin_template, and is managed by it. Please use +# './plugin-template --github pulpcore' to update this file. +# +# For more info visit https://github.com/pulp/plugin_template + +--- +name: Test +on: + workflow_call: + +jobs: + test: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + env: + - TEST: pulp + - TEST: docs + - TEST: azure + - TEST: s3 + - TEST: lowerbounds + outputs: + deprecations-pulp: ${{ steps.deprecations.outputs.deprecations-pulp }} + deprecations-azure: ${{ steps.deprecations.outputs.deprecations-azure }} + deprecations-s3: ${{ steps.deprecations.outputs.deprecations-s3 }} + deprecations-lowerbounds: ${{ steps.deprecations.outputs.deprecations-lowerbounds }} + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 1 + + - uses: actions/setup-python@v4 + with: + python-version: "3.8" + + - uses: actions/download-artifact@v3 + with: + name: plugin_package + path: dist/ + + - name: Install httpie + run: | + echo ::group::HTTPIE + pip install httpie + echo ::endgroup:: + echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV + + - name: Set environment variables + run: | + echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV + + - name: Before Install + run: .github/workflows/scripts/before_install.sh + shell: bash + env: + PY_COLORS: '1' + ANSIBLE_FORCE_COLOR: '1' + GITHUB_PULL_REQUEST: ${{ github.event.number }} + GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }} + GITHUB_BRANCH: ${{ github.head_ref }} + GITHUB_REPO_SLUG: ${{ github.repository }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} + + - name: Install + run: .github/workflows/scripts/install.sh + shell: bash + env: + PY_COLORS: '1' + ANSIBLE_FORCE_COLOR: '1' + GITHUB_PULL_REQUEST: ${{ github.event.number }} + GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }} + GITHUB_BRANCH: ${{ github.head_ref }} + GITHUB_REPO_SLUG: ${{ github.repository }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} + + - name: Before Script + run: .github/workflows/scripts/before_script.sh + shell: bash + env: + PY_COLORS: '1' + ANSIBLE_FORCE_COLOR: '1' + GITHUB_PULL_REQUEST: ${{ github.event.number }} + GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }} + GITHUB_BRANCH: ${{ github.head_ref }} + GITHUB_REPO_SLUG: ${{ github.repository }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} + REDIS_DISABLED: ${{ contains('s3', matrix.env.TEST) }} + + - name: Setting secrets + if: github.event_name != 'pull_request' + run: python3 .github/workflows/scripts/secrets.py "$SECRETS_CONTEXT" + env: + SECRETS_CONTEXT: ${{ toJson(secrets) }} + + - name: Script + run: .github/workflows/scripts/script.sh + shell: bash + env: + PY_COLORS: '1' + ANSIBLE_FORCE_COLOR: '1' + GITHUB_PULL_REQUEST: ${{ github.event.number }} + GITHUB_PULL_REQUEST_BODY: ${{ github.event.pull_request.body }} + GITHUB_BRANCH: ${{ github.head_ref }} + GITHUB_REPO_SLUG: ${{ github.repository }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_CONTEXT: ${{ github.event.pull_request.commits_url }} + + - name: Extract Deprecations from Logs + id: deprecations + run: echo deprecations-${{ matrix.env.TEST }}=$(docker logs pulp 2>&1 | grep -i pulpcore.deprecation | base64 -w 0) >> $GITHUB_OUTPUT + + - name: Logs + if: always() + run: | + echo "Need to debug? Please check: https://github.com/marketplace/actions/debugging-with-tmate" + http --timeout 30 --check-status --pretty format --print hb "https://pulp${PULP_API_ROOT}api/v3/status/" || true + docker images || true + docker ps -a || true + docker logs pulp || true + docker exec pulp ls -latr /etc/yum.repos.d/ || true + docker exec pulp cat /etc/yum.repos.d/* || true + docker exec pulp bash -c "pip3 list && pip3 install pipdeptree && pipdeptree" diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 81a9a8774f..e753c35261 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -209,7 +209,7 @@ jobs: - uses: actions/checkout@v3 with: path: pulpcore - ref: '3.40' + ref: '3.41' fetch-depth: 0 - name: Run update @@ -224,10 +224,10 @@ jobs: path: pulpcore committer: pulpbot author: pulpbot - title: 'Update CI files for branch 3.40' + title: 'Update CI files for branch 3.41' body: '[noissue]' - branch: 'update-ci/3.40' - base: '3.40' + branch: 'update-ci/3.41' + base: '3.41' commit-message: | Update CI files diff --git a/CHANGES/+pulpcore-worker-restart.feature b/CHANGES/+pulpcore-worker-restart.feature deleted file mode 100644 index 4ec3f43753..0000000000 --- a/CHANGES/+pulpcore-worker-restart.feature +++ /dev/null @@ -1 +0,0 @@ -Added a ``--restart`` option to pulpcore worker. This requires "hupper" to be installed. diff --git a/CHANGES/2079.feature b/CHANGES/2079.feature deleted file mode 100644 index 9f92f67b96..0000000000 --- a/CHANGES/2079.feature +++ /dev/null @@ -1 +0,0 @@ -Added new management command ``repository-size`` that calculates the total size in bytes of files stored in repositories. diff --git a/CHANGES/4648.bugfix b/CHANGES/4648.bugfix deleted file mode 100644 index 9eb1777eca..0000000000 --- a/CHANGES/4648.bugfix +++ /dev/null @@ -1 +0,0 @@ -Closed the window when serializer.get_or_create could raise ObjectDoesnotExist. diff --git a/CHANGES/4679.bugfix b/CHANGES/4679.bugfix deleted file mode 100644 index 3b2db4a403..0000000000 --- a/CHANGES/4679.bugfix +++ /dev/null @@ -1 +0,0 @@ -Restored the ability to set ``--max-requests-jitter`` on service entrypoints. \ No newline at end of file diff --git a/CHANGES/4681.bugfix b/CHANGES/4681.bugfix deleted file mode 100644 index 2388ea2f6a..0000000000 --- a/CHANGES/4681.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix file:// syncs deleting the original files. diff --git a/CHANGES/plugin_api/4607.feature b/CHANGES/plugin_api/4607.feature deleted file mode 100644 index 0e6bb58a5c..0000000000 --- a/CHANGES/plugin_api/4607.feature +++ /dev/null @@ -1 +0,0 @@ -Exposed a function to return a batch from a given queryset at ``pulpcore.plugin.util.batch_qs``. diff --git a/CHANGES/plugin_api/4634.bugfix b/CHANGES/plugin_api/4634.bugfix deleted file mode 100644 index a057e1cc19..0000000000 --- a/CHANGES/plugin_api/4634.bugfix +++ /dev/null @@ -1,5 +0,0 @@ -Added ADD_TRAILING_SLASH property to AsyncContentCache. The default value is True. By default, -AsyncContentCache will call into Handler._match_distribution(path, add_trailing_slash=True). If the -meaning of the Distribution's base_path changes when a trailing slash is added, this method will not -match such a Distribution. In this case, AsyncContentCache.ADD_TRAILING_SLASH should be set to -False. diff --git a/CHANGES/plugin_api/4635.feature b/CHANGES/plugin_api/4635.feature deleted file mode 100644 index 160741c7d2..0000000000 --- a/CHANGES/plugin_api/4635.feature +++ /dev/null @@ -1,2 +0,0 @@ -Added content app feature to accept a ``ContentArtifact`` from ``content_handler`` so that the -plugin writer no longer has to generate a response when dealing with ``ContentArtifacts``. diff --git a/CHANGES/plugin_api/4644.bugfix b/CHANGES/plugin_api/4644.bugfix deleted file mode 100644 index 2d8e19548d..0000000000 --- a/CHANGES/plugin_api/4644.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed how Distribution.content_handler() is called in the content app. diff --git a/CHANGES/plugin_api/4651.removal b/CHANGES/plugin_api/4651.removal deleted file mode 100644 index 62a1300da3..0000000000 --- a/CHANGES/plugin_api/4651.removal +++ /dev/null @@ -1 +0,0 @@ -Removed the ability to call functions defined outside of pulp components as the target of a task. diff --git a/CHANGES/plugin_api/4654.bugfix b/CHANGES/plugin_api/4654.bugfix deleted file mode 100644 index ecab585ea6..0000000000 --- a/CHANGES/plugin_api/4654.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed content app returning 404s on directory index pages for some published plugins. diff --git a/CHANGES/pulp_file/4633.bugfix b/CHANGES/pulp_file/4633.bugfix deleted file mode 100644 index 36a8711407..0000000000 --- a/CHANGES/pulp_file/4633.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix pulp_file advertised version. diff --git a/docs/conf.py b/docs/conf.py index 0fa978eea9..6c130c18d1 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -75,9 +75,9 @@ # built documents. # # The short X.Y version. -version = "3.41.0.dev" +version = "3.42.0.dev" # The full version, including alpha/beta/rc tags. -release = "3.41.0.dev" +release = "3.42.0.dev" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index d92d113268..410bd56d3a 100644 --- a/pulp_file/app/__init__.py +++ b/pulp_file/app/__init__.py @@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig): name = "pulp_file.app" label = "file" - version = "3.41.0.dev" + version = "3.42.0.dev" python_package_name = "pulp_file" # TODO Add python_module_name domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 3c2b9e089e..7dca8a19dd 100644 --- a/pulpcore/app/apps.py +++ b/pulpcore/app/apps.py @@ -239,7 +239,7 @@ class PulpAppConfig(PulpPluginAppConfig): label = "core" # The version of this app - version = "3.41.0.dev" + version = "3.42.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/setup.py b/setup.py index dd38d9c983..9bdefbbb0b 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.41.0.dev", + version="3.42.0.dev", description="Pulp Django Application and Related Modules", long_description=long_description, long_description_content_type="text/markdown", diff --git a/template_config.yml b/template_config.yml index e80cff2f36..b29b3a67f2 100644 --- a/template_config.yml +++ b/template_config.yml @@ -1,7 +1,7 @@ # This config represents the latest values used when running the plugin-template. Any settings that # were not present before running plugin-template have been added with their default values. -# generated with plugin_template@2021.08.26-249-gca8f021 +# generated with plugin_template@2021.08.26-255-g20bf8c0 additional_repos: [] api_root: /pulp/ @@ -13,12 +13,12 @@ check_stray_pulpcore_imports: false ci_env: {} ci_trigger: '{pull_request: {branches: [''*'']}}' ci_update_branches: -- '3.18' # May, 2024 -- '3.21' # Nov, 2024 -- '3.22' # May, 2025 -- '3.23' # Dec, 2025 -- '3.39' # Nov, 2025 -- '3.40' +- '3.18' +- '3.21' +- '3.22' +- '3.23' +- '3.39' +- '3.41' ci_update_docs: true ci_update_release_behavior: replace-previous-version cli_package: pulp-cli