diff --git a/Makefile b/Makefile index 71fb1bb8..ec8c70d2 100644 --- a/Makefile +++ b/Makefile @@ -234,7 +234,7 @@ dist_dependent_files := \ README.md \ AUTHORS.md \ requirements.txt \ - extra-testutils-requirements.txt \ + requirements-testutils.txt \ $(package_py_files) \ # No built-in rules needed: @@ -459,7 +459,7 @@ bandit: $(done_dir)/bandit_$(pymn)_$(PACKAGE_LEVEL).done install: $(done_dir)/install_$(pymn)_$(PACKAGE_LEVEL).done @echo "Makefile: $@ done." -$(done_dir)/install_$(pymn)_$(PACKAGE_LEVEL).done: Makefile $(done_dir)/base_$(pymn)_$(PACKAGE_LEVEL).done requirements.txt extra-testutils-requirements.txt minimum-constraints-develop.txt minimum-constraints-install.txt $(dist_dependent_files) +$(done_dir)/install_$(pymn)_$(PACKAGE_LEVEL).done: Makefile $(done_dir)/base_$(pymn)_$(PACKAGE_LEVEL).done requirements.txt requirements-testutils.txt minimum-constraints-develop.txt minimum-constraints-install.txt $(dist_dependent_files) rm -f $@ @echo "Installing $(package_name) (non-editable) and runtime reqs with PACKAGE_LEVEL=$(PACKAGE_LEVEL)" $(PYTHON_CMD) -m pip install $(pip_level_opts) $(pip_level_opts_new) . @@ -649,13 +649,13 @@ check_reqs_install: Makefile $(done_dir)/install_$(pymn)_$(PACKAGE_LEVEL).done m @echo "Makefile: $@ done." .PHONY: check_reqs -check_reqs: Makefile $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done minimum-constraints-install.txt minimum-constraints-develop.txt requirements.txt extra-testutils-requirements.txt +check_reqs: Makefile $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done minimum-constraints-install.txt minimum-constraints-develop.txt requirements.txt requirements-testutils.txt @echo "Makefile: Checking missing and extra dependencies of this package" ifeq ($(PLATFORM),Windows_native) # Reason for skipping on Windows is https://github.com/r1chardj0n3s/pip-check-reqs/issues/67 @echo "Makefile: Warning: Skipping the use of pip-missing-reqs on native Windows" >&2 else - cat requirements.txt extra-testutils-requirements.txt >tmp_requirements.txt + cat requirements.txt requirements-testutils.txt >tmp_requirements.txt pip-missing-reqs $(package_name) --ignore-module $(package_name) --ignore-module $(mock_package_name) --requirements-file=tmp_requirements.txt pip-missing-reqs $(package_name) --ignore-module $(package_name) --ignore-module $(mock_package_name) --requirements-file=minimum-constraints-install.txt rm -f tmp_requirements.txt diff --git a/minimum-constraints-install.txt b/minimum-constraints-install.txt index 1ee9ae9b..9da384b9 100644 --- a/minimum-constraints-install.txt +++ b/minimum-constraints-install.txt @@ -41,7 +41,7 @@ urllib3==2.6.3; python_version == '3.9' urllib3==2.7.0; python_version >= '3.10' -# Direct dependencies for install of extra 'testutils' (must be consistent with extra-testutils-requirements) +# Direct dependencies for install of extra 'testutils' (must be consistent with requirements-testutils.txt) # Used by zhmcclient.testutils pytest==8.4.0; python_version == '3.9' diff --git a/pyproject.toml b/pyproject.toml index 32b01501..d083ecd7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,7 +72,7 @@ Changelog = "https://python-zhmcclient.readthedocs.io/en/master/changes.html" dependencies = {file = ["requirements.txt"]} [tool.setuptools.dynamic.optional-dependencies] -testutils = {file = ['extra-testutils-requirements.txt']} +testutils = {file = ['requirements-testutils.txt']} [tool.setuptools_scm] # Get the version from the Git tag, and write a version file: diff --git a/requirements-develop.txt b/requirements-develop.txt index ab4ffe04..bdeeb698 100644 --- a/requirements-develop.txt +++ b/requirements-develop.txt @@ -14,7 +14,7 @@ pyproject-hooks>=1.1.0 towncrier>=22.8.0 # Unit test (imports into testcases): -# pytest is covered in extra-testutils-requirements.txt +# pytest is covered in requirements-testutils.txt testfixtures>=6.9.0 # For versions of importlib-metadata that are in Python, see https://pypi.org/project/importlib-metadata/ importlib-metadata>=8.7.0 diff --git a/extra-testutils-requirements.txt b/requirements-testutils.txt similarity index 100% rename from extra-testutils-requirements.txt rename to requirements-testutils.txt