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
2 changes: 1 addition & 1 deletion .ci/scripts/update_requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def fix_requirements_file(path: Path, check: bool, specs: t.Dict[str, SpecifierS

def main(check: bool) -> None:
pulp_glue_path = Path("plugins/module_utils/pulp_glue.py")
requirements_path = Path("requirements.txt")
requirements_path = Path("requirements-test.txt")
lower_bounds_path = Path("lower_bounds_constraints.lock")

version_spec_regex = {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
python-version: "3.11"
- name: "Install Ansible"
run: |
pip install ansible-core~=2.18.0
pip install ansible-core~=2.19.0
- name: "Install dependencies"
run: |
make test-setup
Expand All @@ -51,7 +51,7 @@ jobs:

ready-to-ship:
# This is a dummy dependent task to have a single entry for the branch protection rules.
runs-on: "ubuntu-latest"
runs-on: "ubuntu-latest"
needs:
- "lint"
- "test"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ jobs:
fail-fast: false
matrix:
include:
- python: "3.9"
ansible: "stable-2.15"
image_tag: "latest"
- python: "3.10"
ansible: "stable-2.16"
image_tag: "latest"
- python: "3.10"
ansible: "stable-2.17"
lower_bounds: true
- python: "3.11"
ansible: "stable-2.17"
- python: "3.12"
ansible: "stable-2.18"
- python: "3.12"
ansible: "stable-2.19"
- python: "3.13"
ansible: "devel"
image_tag: "nightly"
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ record_%: FORCE $(MANIFEST)
clean_%: FORCE $(MANIFEST) | tests/playbooks/vars/server.yaml
ansible-playbook --tags teardown,cleanup -i tests/inventory/hosts 'tests/playbooks/$*.yaml'

test-setup: requirements.txt lower_bounds_constraints.lock | tests/playbooks/vars/server.yaml
test-setup: requirements-test.txt lower_bounds_constraints.lock | tests/playbooks/vars/server.yaml
pip install --upgrade pip
ifeq ($(LOWER_BOUNDS), "true")
pip install -r requirements.txt -c lower_bounds_constraints.lock
pip install -r requirements-test.txt -c lower_bounds_constraints.lock
else
pip install -r requirements.txt
pip install -r requirements-test.txt
endif

tests/playbooks/vars/server.yaml:
Expand Down
2 changes: 1 addition & 1 deletion meta/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ action_groups:
- task
- user
- x509_cert_guard
requires_ansible: '>=2.15.0,<2.19'
requires_ansible: '>=2.16.0,<2.20'
...
3 changes: 0 additions & 3 deletions requirements.txt → requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@ voluptuous
pytest>=4.4.0
pytest-xdist
vcrpy

# Temporary pin for a vcr bug
urllib3<2.0.0