Skip to content

Commit 13917ed

Browse files
committed
Update CI files
1 parent 83387b5 commit 13917ed

File tree

6 files changed

+12
-4
lines changed

6 files changed

+12
-4
lines changed

.ci/scripts/calc_constraints.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,15 @@ def to_lower_bound(req):
8383
else:
8484
for spec in requirement.specifier:
8585
if spec.operator == ">=":
86+
min_version = spec.version
8687
if requirement.name == "pulpcore":
8788
# Currently an exception to allow for pulpcore bugfix releases.
8889
# TODO Semver libraries should be allowed too.
8990
operator = "~="
91+
if len(Version(min_version).release) != 3:
92+
raise RuntimeError("Pulpcore lower bound must be in the form '>=x.y.z'.")
9093
else:
9194
operator = "=="
92-
min_version = spec.version
9395
return f"{requirement.name}{operator}{min_version}"
9496
return f"# NO LOWER BOUND: {req}"
9597

.flake8

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
exclude = ./docs/*,*/migrations/*
99
per-file-ignores = */__init__.py: F401
1010

11-
ignore = E203,W503,Q000,Q003,D100,D104,D106,D200,D205,D400,D401,D402
11+
ignore = E203,W503,Q000,Q003,D100,D104,D106,D200,D205,D400,D401,D402,F824
1212
max-line-length = 100
1313

1414
# Flake8 builtin codes
1515
# --------------------
1616
# E203: no whitespace around ':'. disabled until https://github.com/PyCQA/pycodestyle/issues/373 is fixed
1717
# W503: This enforces operators before line breaks which is not pep8 or black compatible.
18+
# F824: 'nonlocal' is unused: name is never assigned in scope
1819

1920
# Flake8-quotes extension codes
2021
# -----------------------------

.github/template_gitref

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/scripts/before_script.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ tail -v -n +1 .ci/ansible/settings/settings.* ~/.config/pulp_smash/settings.json
3232
echo "Containerfile:"
3333
tail -v -n +1 .ci/ansible/Containerfile
3434

35+
echo "Constraints Files:"
36+
# The need not even exist.
37+
tail -v -n +1 ../*/*constraints.txt || true
38+
3539
# Needed for some functional tests
3640
cmd_prefix bash -c "echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/nopasswd"
3741
cmd_prefix bash -c "usermod -a -G wheel pulp"

.github/workflows/scripts/script.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ export PULP_URL="https://pulp"
2828

2929
REPORTED_STATUS="$(pulp status)"
3030

31+
echo "${REPORTED_STATUS}"
32+
3133
echo "machine pulp
3234
login admin
3335
password password

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ search = "version = \"{current_version}\""
7171
replace = "version = \"{new_version}\""
7272

7373
[[tool.bumpversion.files]]
74-
filename = "./setup.py"
74+
filename = "./setup.py"

0 commit comments

Comments
 (0)