Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .ci/scripts/calc_constraints.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
3 changes: 2 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
exclude = ./docs/*,*/migrations/*
per-file-ignores = */__init__.py: F401

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

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

# Flake8-quotes extension codes
# -----------------------------
Expand Down
1 change: 0 additions & 1 deletion .github/template_gitref

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/scripts/before_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/scripts/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ export PULP_URL="https://pulp"

REPORTED_STATUS="$(pulp status)"

echo "${REPORTED_STATUS}"

echo "machine pulp
login admin
password password
Expand Down
4 changes: 2 additions & 2 deletions pulp_python/tests/functional/api/test_pypi_apis.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def test_package_upload_simple(self):

@pytest.mark.parallel
def test_twine_upload(
pulpcore_bindings,
tasks_api_client,
python_content_summary,
python_empty_repo_distro,
python_package_dist_directory,
Expand All @@ -218,7 +218,7 @@ def test_twine_upload(
capture_output=True,
check=True,
)
tasks = pulpcore_bindings.TasksApi.list(reserved_resources=repo.pulp_href).results
tasks = tasks_api_client.list(reserved_resources=repo.pulp_href).results
for task in reversed(tasks):
t = monitor_task(task.pulp_href)
repo_ver_href = t.created_resources[-1]
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ search = "version = \"{current_version}\""
replace = "version = \"{new_version}\""

[[tool.bumpversion.files]]
filename = "./setup.py"
filename = "./setup.py"
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pulpcore>=3.28,<3.55
pulpcore>=3.28.0,<3.55
pkginfo>=1.12.0,<1.13.0
bandersnatch>=6.1,<6.2
pypi-simple>=0.9.0,<1.0.0