diff --git a/.ci/scripts/calc_constraints.py b/.ci/scripts/calc_constraints.py index 35315153..93ee2cc7 100755 --- a/.ci/scripts/calc_constraints.py +++ b/.ci/scripts/calc_constraints.py @@ -83,13 +83,15 @@ def to_lower_bound(req): else: for spec in requirement.specifier: if spec.operator == ">=": + min_version = spec.version if requirement.name == "pulpcore": # Currently an exception to allow for pulpcore bugfix releases. # TODO Semver libraries should be allowed too. operator = "~=" + if len(Version(min_version).release) != 3: + raise RuntimeError("Pulpcore lower bound must be in the form '>=x.y.z'.") else: operator = "==" - min_version = spec.version return f"{requirement.name}{operator}{min_version}" return f"# NO LOWER BOUND: {req}" diff --git a/.github/template_gitref b/.github/template_gitref index 4630e6c4..d152b091 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-421-g204a709 +2021.08.26-430-gc1faf10 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 692ba626..d5a55a50 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -13,7 +13,7 @@ on: jobs: test: if: "endsWith(github.base_ref, 'main')" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-latest" defaults: run: working-directory: "pulp_python" @@ -48,7 +48,7 @@ jobs: no-test: if: "!endsWith(github.base_ref, 'main')" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-latest" steps: - run: | echo "Skip docs testing on non-main branches." diff --git a/.github/workflows/scripts/before_script.sh b/.github/workflows/scripts/before_script.sh index 5c0072c4..11404f45 100755 --- a/.github/workflows/scripts/before_script.sh +++ b/.github/workflows/scripts/before_script.sh @@ -32,6 +32,10 @@ tail -v -n +1 .ci/ansible/settings/settings.* ~/.config/pulp_smash/settings.json echo "Containerfile:" tail -v -n +1 .ci/ansible/Containerfile +echo "Constraints Files:" +# The need not even exist. +tail -v -n +1 ../*/*constraints.txt || true + # Needed for some functional tests cmd_prefix bash -c "echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/nopasswd" cmd_prefix bash -c "usermod -a -G wheel pulp" diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index 8e60f87d..414d98f9 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -28,6 +28,8 @@ export PULP_URL="https://pulp" REPORTED_STATUS="$(pulp status)" +echo "${REPORTED_STATUS}" + echo "machine pulp login admin password password