diff --git a/.ci/assets/ci_constraints.txt b/.ci/assets/ci_constraints.txt index e3e22649cd9..c9198f19a70 100644 --- a/.ci/assets/ci_constraints.txt +++ b/.ci/assets/ci_constraints.txt @@ -15,3 +15,5 @@ azure-storage-blob!=12.28.* # Apparently does not work with current azurite. +pycares<5 +# older aiodns versions don't pin pycares UB, and are broken by pycares>=5 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49230420900..055d9b07ec3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,8 @@ jobs: - uses: "actions/checkout@v6" with: fetch-depth: 1 - repository: "pulp/pulp-openapi-generator" + repository: "jobselko/pulp-openapi-generator" + ref: "129" path: "pulp-openapi-generator" - uses: "actions/setup-python@v6" with: diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index f5cd920d35e..7dda14dba27 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -17,6 +17,7 @@ source .github/workflows/scripts/utils.sh export POST_SCRIPT=$PWD/.github/workflows/scripts/post_script.sh export FUNC_TEST_SCRIPT=$PWD/.github/workflows/scripts/func_test_script.sh +# export OPENAPI_PYTHON_IMAGE="docker.io/openapitools/openapi-generator-cli:v7.14.0" # Needed for starting the service # Gets set in .github/settings.yml, but doesn't seem to inherited by @@ -53,7 +54,7 @@ pushd ../pulp-openapi-generator # reliable client. if [ "$TEST" = "pulp" ] then - BUILT_CLIENTS=" core file certguard " + BUILT_CLIENTS="" else BUILT_CLIENTS="" fi @@ -175,7 +176,7 @@ then pip install -r test_requirements.txt pytest -v tests -m "pulpcore or pulp_file or pulp_certguard" else - PULP_CA_BUNDLE="/usr/local/share/ca-certificates/pulp_webserver.crt" make livetest + PULP_CA_BUNDLE="/usr/local/share/ca-certificates/pulp_webserver.crt" make livetest PYTEST_MARK="live and (pulpcore or pulp_file or pulp_certguard)" fi popd diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 833c98e4f8c..096b89a679d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,8 @@ jobs: - uses: "actions/checkout@v6" with: fetch-depth: 1 - repository: "pulp/pulp-openapi-generator" + repository: "jobselko/pulp-openapi-generator" + ref: "129" path: "pulp-openapi-generator" - uses: "actions/setup-python@v6" diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 454055afd74..49b42f94fcb 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -107,7 +107,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - ref: "3.113" + ref: "3.114" - name: "Run update" working-directory: "pulpcore" @@ -116,21 +116,21 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v8" - id: "create_pr_3_113" + id: "create_pr_3_114" with: token: "${{ secrets.RELEASE_TOKEN }}" path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.113" - branch: "update-ci/3.113" - base: "3.113" + title: "Update CI files for branch 3.114" + branch: "update-ci/3.114" + base: "3.114" delete-branch: true - name: "Mark PR automerge" working-directory: "pulpcore" run: | - gh pr merge --rebase --auto "${{ steps.create_pr_3_113.outputs.pull-request-number }}" - if: "steps.create_pr_3_113.outputs.pull-request-number" + gh pr merge --rebase --auto "${{ steps.create_pr_3_114.outputs.pull-request-number }}" + if: "steps.create_pr_3_114.outputs.pull-request-number" env: GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}" continue-on-error: true diff --git a/CHANGES/+optimize_resync.feature b/CHANGES/+optimize_resync.feature deleted file mode 100644 index d049f383595..00000000000 --- a/CHANGES/+optimize_resync.feature +++ /dev/null @@ -1 +0,0 @@ -Improved sync performance by caching content during re-syncs. diff --git a/CHANGES/+respect-etc-hosts.bugfix b/CHANGES/+respect-etc-hosts.bugfix deleted file mode 100644 index 1ee3ec65d28..00000000000 --- a/CHANGES/+respect-etc-hosts.bugfix +++ /dev/null @@ -1 +0,0 @@ -Respect the system /etc/hosts and nsswitch.conf configurations for sync configurations. We drop the `aiodns` resolver backend for `aiohttp` and use the default resolver. diff --git a/CHANGES/7746.bugfix b/CHANGES/7746.bugfix deleted file mode 100644 index f6a44861933..00000000000 --- a/CHANGES/7746.bugfix +++ /dev/null @@ -1 +0,0 @@ -Enabled filesystem export of content synced with a streamed policy from a file:// remote, by reading the files from their local path instead of failing because no Artifact was downloaded. diff --git a/CHANGES/plugin_api/+optimize_resync.feature b/CHANGES/plugin_api/+optimize_resync.feature deleted file mode 100644 index 259162942a3..00000000000 --- a/CHANGES/plugin_api/+optimize_resync.feature +++ /dev/null @@ -1 +0,0 @@ -`DeclarativeVersion` now accepts `deferred_fields` to exclude fields not needed during sync, reducing memory usage and producing lighter queries. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index 652547af8da..05dc487f12b 100644 --- a/pulp_certguard/app/__init__.py +++ b/pulp_certguard/app/__init__.py @@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig): name = "pulp_certguard.app" label = "certguard" - version = "3.114.0.dev" + version = "3.115.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index 3c8fba83dcf..78680708df9 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.114.0.dev" + version = "3.115.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index 69cbc13a121..f8e12e2570c 100644 --- a/pulpcore/app/apps.py +++ b/pulpcore/app/apps.py @@ -237,7 +237,7 @@ class PulpAppConfig(PulpPluginAppConfig): label = "core" # The version of this app - version = "3.114.0.dev" + version = "3.115.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/pyproject.toml b/pyproject.toml index f43d179ba46..7eec235e2e3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ build-backend = 'setuptools.build_meta' [project] name = "pulpcore" -version = "3.114.0.dev" +version = "3.115.0.dev" description = "Pulp Django Application and Related Modules" readme = "README.md" authors = [ @@ -206,7 +206,7 @@ ignore = [ [tool.bumpversion] # This section is managed by the plugin template. Do not edit manually. -current_version = "3.114.0.dev" +current_version = "3.115.0.dev" commit = false tag = false parse = "(?P\\d+)\\.(?P\\d+)\\.(?P0a)?(?P\\d+)(\\.(?P[a-z]+))?" diff --git a/template_config.yml b/template_config.yml index 6f8fae1569c..8c44961ba29 100644 --- a/template_config.yml +++ b/template_config.yml @@ -25,7 +25,7 @@ extra_files: - destination: "/etc/nginx/pulp/api_root_rewrite.conf" origin: "pulpcore/pulpcore/tests/functional/assets/api_root_rewrite.conf" github_org: "pulp" -latest_release_branch: "3.113" +latest_release_branch: "3.114" lint_ignore: - "./pulpcore/app/protobuf/*" lint_requirements: true