Skip to content

Commit 5c20704

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Remove check-conflicts script"
2 parents da00165 + 63a1790 commit 5c20704

File tree

3 files changed

+4
-80
lines changed

3 files changed

+4
-80
lines changed

openstack_requirements/cmds/check_conflicts.py

Lines changed: 0 additions & 75 deletions
This file was deleted.

setup.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ packages =
2929
console_scripts =
3030
edit-constraints = openstack_requirements.cmds.edit_constraint:main
3131
generate-constraints = openstack_requirements.cmds.generate:main
32-
check-conflicts = openstack_requirements.cmds.check_conflicts:main
3332
validate-constraints = openstack_requirements.cmds.validate:main
3433
validate-projects = openstack_requirements.cmds.validate_projects:main
3534
normalize-requirements = openstack_requirements.cmds.normalize_requirements:main

tox.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ commands =
1414
[testenv:py310-check-uc]
1515
basepython = python3.10
1616
deps = -r{toxinidir}/upper-constraints.txt
17-
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
17+
commands = python -c 'print("done")'
1818

1919
[testenv:py311-check-uc]
2020
basepython = python3.11
2121
deps = -r{toxinidir}/upper-constraints.txt
22-
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
22+
commands = python -c 'print("done")'
2323

2424
[testenv:py312-check-uc]
2525
basepython = python3.12
2626
deps = -r{toxinidir}/upper-constraints.txt
27-
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
27+
commands = python -c 'print("done")'
2828

2929
[testenv:py313-check-uc]
3030
basepython = python3.13
3131
deps = -r{toxinidir}/upper-constraints.txt
32-
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
32+
commands = python -c 'print("done")'
3333

3434
[testenv:venv]
3535
commands = {posargs}

0 commit comments

Comments
 (0)