diff --git a/requirements.txt b/.config/requirements.txt similarity index 100% rename from requirements.txt rename to .config/requirements.txt diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index 73d3153..7fdeb62 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -47,7 +47,7 @@ jobs: python-version: ${{ matrix.python_version }} - name: Install tox - run: python3 -m pip install --upgrade "tox>=4.0.2" + run: python3 -m pip install --upgrade "tox>=4.11.3" - name: Log Python info (${{ matrix.python_version }}) run: | diff --git a/.gitignore b/.gitignore index 96de3c7..d997871 100644 --- a/.gitignore +++ b/.gitignore @@ -167,3 +167,5 @@ cython_debug/ # Version created and populated by setuptools_scm /src/ansible_development_environment/_version.py + +.DS_Store diff --git a/pyproject.toml b/pyproject.toml index 32caad2..9dd2ec9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,9 @@ [build-system] build-backend = "setuptools.build_meta" -requires = ["setuptools >= 45", "setuptools_scm[toml]>=6.2"] +requires = [ + "setuptools >= 63.0.0", # required by pyproject+setuptools_scm integration + "setuptools_scm[toml] >= 7.0.5" # required for "no-local-version" scheme +] [project] authors = [{"email" = "bthornto@redhat.com", "name" = "Bradley A. Thornton"}] @@ -254,8 +257,6 @@ convention = "pep257" [tool.setuptools.dynamic] dependencies = {file = [".config/requirements.in"]} optional-dependencies.dev = {file = [".config/requirements-dev.txt"]} -optional-dependencies.docs = {file = [".config/requirements-docs.txt"]} -optional-dependencies.lock = {file = [".config/requirements-lock.txt"]} optional-dependencies.test = {file = [".config/requirements-test.txt"]} [tool.setuptools_scm] diff --git a/src/ansible_development_environment/arg_parser.py b/src/ansible_development_environment/arg_parser.py index 289bbd2..70919c4 100644 --- a/src/ansible_development_environment/arg_parser.py +++ b/src/ansible_development_environment/arg_parser.py @@ -9,7 +9,7 @@ try: - from ._version import version as __version__ # type: ignore[import-not-found] + from ._version import version as __version__ # type: ignore[unused-ignore,import-not-found] except ImportError: # pragma: no cover try: import pkg_resources diff --git a/tox.ini b/tox.ini index 42a05de..e2379ae 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] requires = - tox>=4.2 + tox>=4.11.3 env_list = py lint @@ -27,7 +27,7 @@ set_env = COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}} COVERAGE_PROCESS_START = {toxinidir}/pyproject.toml FORCE_COLOR = 1 - PIP_CONSTRAINT = {toxinidir}/requirements.txt + PIP_CONSTRAINT = {toxinidir}/.config/requirements.txt PRE_COMMIT_COLOR = always TERM = xterm-256color commands =