Skip to content

Commit

Permalink
Bump pulpcore lowerbounds to supported branch
Browse files Browse the repository at this point in the history
  • Loading branch information
pulpbot authored and mdellweg committed Dec 2, 2024
1 parent fea1fb8 commit 001200a
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-405-g3845bbc
2021.08.26-406-g5f397e3
2 changes: 1 addition & 1 deletion .github/workflows/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ cat >> vars/main.yaml << VARSYAML
pulp_env: {}
pulp_settings: {"allowed_content_checksums": ["sha1", "sha224", "sha256", "sha384", "sha512"], "allowed_export_paths": ["/tmp"], "allowed_import_paths": ["/tmp"], "flatpak_index": true}
pulp_scheme: https
pulp_default_container: ghcr.io/pulp/pulp-ci-centos:latest
pulp_default_container: ghcr.io/pulp/pulp-ci-centos9:latest
VARSYAML

if [ "$TEST" = "s3" ]; then
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ include COPYRIGHT
include functest_requirements.txt
include test_requirements.txt
include unittest_requirements.txt
exclude releasing.md
2 changes: 2 additions & 0 deletions functest_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
pulp-smash @ git+https://github.com/pulp/pulp-smash.git
pytest<8
python-gnupg
pytest-xdist
pytest-timeout
24 changes: 19 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,33 @@ ignore = [
current_version = "2.19.4.dev"
commit = false
tag = false
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<alpha>0a)?(?P<patch>\\d+)(\\.(?P<release>[a-z]+))?"
serialize = [
"{major}.{minor}.{patch}.{release}",
"{major}.{minor}.{patch}",
"{major}.{minor}.{patch}.{release}",
"{major}.{minor}.{patch}",
"{major}.{minor}.{alpha}{patch}.{release}",
"{major}.{minor}.{alpha}{patch}",
]

[tool.bumpversion.parts.alpha]
# This section is managed by the plugin template. Do not edit manually.

# This is sort of a hack. In PEP440 prerelease markers work quite differently.
# But this fits best with the way we have been doing release versions.
optional_value = "final"
values = [
"0a",
"final",
]
independent = true

[tool.bumpversion.parts.release]
# This section is managed by the plugin template. Do not edit manually.

optional_value = "prod"
values = [
"dev",
"prod",
"dev",
"prod",
]

[[tool.bumpversion.files]]
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
jsonschema>=4.4,<4.22
pulpcore>=3.43.0,<3.55
pulpcore>=3.49,<3.55
pyjwt[crypto]>=2.4,<2.9
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
author="Pulp Team",
author_email="[email protected]",
url="https://pulpproject.org/",
python_requires=">=3.8",
python_requires=">=3.9",
install_requires=requirements,
include_package_data=True,
packages=find_packages(exclude=["tests", "tests.*"]),
Expand Down
2 changes: 1 addition & 1 deletion template_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ check_commit_message: true
check_gettext: true
check_manifest: true
check_stray_pulpcore_imports: true
ci_base_image: ghcr.io/pulp/pulp-ci-centos
ci_base_image: ghcr.io/pulp/pulp-ci-centos9
ci_env: {}
ci_trigger: '{pull_request: {branches: [''*'']}}'
cli_package: pulp-cli
Expand Down

0 comments on commit 001200a

Please sign in to comment.