diff --git a/.bumpversion.cfg b/.bumpversion.cfg index aea5bb5889..73350d4f64 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.51.0.dev +current_version = 3.52.0.dev commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+))? diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index 0d3737a505..00e48e4285 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -74,7 +74,7 @@ jobs: with: fetch-depth: 0 path: "pulpcore" - ref: "3.50" + ref: "3.51" - name: "Run update" working-directory: "pulpcore" @@ -88,10 +88,10 @@ jobs: path: "pulpcore" committer: "pulpbot " author: "pulpbot " - title: "Update CI files for branch 3.50" + title: "Update CI files for branch 3.51" body: "" - branch: "update-ci/3.50" - base: "3.50" + branch: "update-ci/3.51" + base: "3.51" commit-message: | Update CI files diff --git a/CHANGES/4592.misc b/CHANGES/4592.misc deleted file mode 100644 index 488a760556..0000000000 --- a/CHANGES/4592.misc +++ /dev/null @@ -1 +0,0 @@ -Added domain support for newest fields in django-storages 1.14.2. diff --git a/CHANGES/5010.misc b/CHANGES/5010.misc deleted file mode 100644 index faf948c437..0000000000 --- a/CHANGES/5010.misc +++ /dev/null @@ -1 +0,0 @@ -Improved the `download_content_unit` test fixture. diff --git a/CHANGES/5179.feature b/CHANGES/5179.feature deleted file mode 100644 index 40eefe6874..0000000000 --- a/CHANGES/5179.feature +++ /dev/null @@ -1 +0,0 @@ -Add a new SecurityScheme for external authentication in the OpenAPI schema. diff --git a/CHANGES/5199.bugfix b/CHANGES/5199.bugfix deleted file mode 100644 index de5c6ad080..0000000000 --- a/CHANGES/5199.bugfix +++ /dev/null @@ -1,3 +0,0 @@ -Fix Upload failing to run post create hooks. -On installations using the default access policy, this fixes the automatic owner assignment for -users with the `core.upload_create` role on upload objects. diff --git a/CHANGES/5259.bugfix b/CHANGES/5259.bugfix deleted file mode 100644 index e448817242..0000000000 --- a/CHANGES/5259.bugfix +++ /dev/null @@ -1 +0,0 @@ -Catch any DatabaseError, not only OperationalError to trigger reconnect to the database diff --git a/docs/conf.py b/docs/conf.py index 0cf20026a8..6e845025ce 100755 --- a/docs/conf.py +++ b/docs/conf.py @@ -75,9 +75,9 @@ # built documents. # # The short X.Y version. -version = "3.51.0.dev" +version = "3.52.0.dev" # The full version, including alpha/beta/rc tags. -release = "3.51.0.dev" +release = "3.52.0.dev" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pulp_certguard/app/__init__.py b/pulp_certguard/app/__init__.py index 2acbe22a47..7dd4f03847 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.51.0.dev" + version = "3.52.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulp_file/app/__init__.py b/pulp_file/app/__init__.py index 2ed387bdb9..a07b578ccb 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.51.0.dev" + version = "3.52.0.dev" python_package_name = "pulpcore" domain_compatible = True diff --git a/pulpcore/app/apps.py b/pulpcore/app/apps.py index cc52ab25ce..7c1b99ad12 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.51.0.dev" + version = "3.52.0.dev" # The python package name providing this app python_package_name = "pulpcore" diff --git a/setup.py b/setup.py index fdcafdbeb0..c0eea0800c 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name="pulpcore", - version="3.51.0.dev", + version="3.52.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 5d2fcabb09..67779fd9f8 100644 --- a/template_config.yml +++ b/template_config.yml @@ -31,7 +31,7 @@ flake8_ignore: github_org: pulp issue_tracker: github kanban: true -latest_release_branch: '3.50' +latest_release_branch: '3.51' lint_requirements: true noissue_marker: '[noissue]' parallel_test_workers: 8 @@ -72,18 +72,17 @@ pulp_settings_s3: authentication_backends: '@merge django.contrib.auth.backends.RemoteUserBackend' authentication_json_header: HTTP_X_RH_IDENTITY authentication_json_header_jq_filter: .identity.user.username + authentication_json_header_openapi_security_scheme: + description: External OAuth integration + flows: + clientCredentials: + scopes: + api.console: grant_access_to_pulp + tokenUrl: https://your-identity-provider/token/issuer + type: oauth2 domain_enabled: true hide_guarded_distributions: true rest_framework__default_authentication_classes: '@merge pulpcore.app.authentication.JSONHeaderRemoteAuthentication' - authentication_json_header_openapi_security_scheme: - type: "oauth2" - description: "External OAuth integration" - flows: - clientCredentials: - tokenUrl: "https://your-identity-provider/token/issuer" - scopes: - api.console: "grant_access_to_pulp" - pydocstyle: true release_email: pulp-infra@redhat.com release_user: pulpbot