Skip to content

Commit

Permalink
Removed PyTest 8 workaround (#385)
Browse files Browse the repository at this point in the history
It's no longer needed now we've upgraded Molecule.
  • Loading branch information
freemanjp authored Nov 15, 2024
1 parent 928bfab commit 006cf65
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 24 deletions.
10 changes: 4 additions & 6 deletions requirements/ansible-max.txt
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,10 @@ pygments==2.18.0 \
--hash=sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199 \
--hash=sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a
# via rich
pytest==7.4.4 \
--hash=sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280 \
--hash=sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8
# via
# -r ./molecule.in
# pytest-testinfra
pytest==8.3.3 \
--hash=sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181 \
--hash=sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2
# via pytest-testinfra
pytest-testinfra==10.1.1 \
--hash=sha256:a876f1453a01b58d94d9d936dd50344c2c01ac7880a2b41d15bdf233aed9cf1f \
--hash=sha256:b990dc7d77b49a1bba24818fbff49b6171d8c46d606fb5ca86b937de690d7062
Expand Down
10 changes: 4 additions & 6 deletions requirements/ansible-min.txt
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,10 @@ pygments==2.18.0 \
--hash=sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199 \
--hash=sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a
# via rich
pytest==7.4.4 \
--hash=sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280 \
--hash=sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8
# via
# -r ./molecule.in
# pytest-testinfra
pytest==8.3.3 \
--hash=sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181 \
--hash=sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2
# via pytest-testinfra
pytest-testinfra==10.1.1 \
--hash=sha256:a876f1453a01b58d94d9d936dd50344c2c01ac7880a2b41d15bdf233aed9cf1f \
--hash=sha256:b990dc7d77b49a1bba24818fbff49b6171d8c46d606fb5ca86b937de690d7062
Expand Down
6 changes: 2 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,8 @@ pyproject-hooks==1.2.0
# via
# build
# pip-tools
pytest==7.4.4
# via
# -r molecule.in
# pytest-testinfra
pytest==8.3.3
# via pytest-testinfra
pytest-testinfra==10.1.1
# via -r molecule.in
pyyaml==6.0.2
Expand Down
2 changes: 0 additions & 2 deletions requirements/molecule.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
molecule==24.9.0
molecule-plugins[docker]
# Workarround for: https://github.com/pytest-dev/pytest/issues/12034
pytest<8
pytest-testinfra
10 changes: 4 additions & 6 deletions requirements/molecule.txt
Original file line number Diff line number Diff line change
Expand Up @@ -386,12 +386,10 @@ pygments==2.18.0 \
--hash=sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199 \
--hash=sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a
# via rich
pytest==7.4.4 \
--hash=sha256:2cf0005922c6ace4a3e2ec8b4080eb0d9753fdc93107415332f50ce9e7994280 \
--hash=sha256:b090cdf5ed60bf4c45261be03239c2c1c22df034fbffe691abe93cd80cea01d8
# via
# -r ./molecule.in
# pytest-testinfra
pytest==8.3.3 \
--hash=sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181 \
--hash=sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2
# via pytest-testinfra
pytest-testinfra==10.1.1 \
--hash=sha256:a876f1453a01b58d94d9d936dd50344c2c01ac7880a2b41d15bdf233aed9cf1f \
--hash=sha256:b990dc7d77b49a1bba24818fbff49b6171d8c46d606fb5ca86b937de690d7062
Expand Down

0 comments on commit 006cf65

Please sign in to comment.