From e3cf90a13af376036336865aad1bf9b1934bfb3c Mon Sep 17 00:00:00 2001 From: Jack Zhang Date: Mon, 31 Jul 2023 14:05:56 +0800 Subject: [PATCH] Remove constraints requirement files --- .config/requirements-lock.txt | 32 ----------- .config/requirements.txt | 105 ---------------------------------- .github/dependabot.yml | 10 ---- .pre-commit-config.yaml | 28 --------- docs/contributing.md | 5 -- pyproject.toml | 1 - tox.ini | 19 ------ 7 files changed, 200 deletions(-) delete mode 100644 .config/requirements-lock.txt delete mode 100644 .config/requirements.txt diff --git a/.config/requirements-lock.txt b/.config/requirements-lock.txt deleted file mode 100644 index 2f753f7f7..000000000 --- a/.config/requirements-lock.txt +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --no-annotate --output-file=.config/requirements-lock.txt --resolver=backtracking --strip-extras --unsafe-package=ruamel-yaml-clib pyproject.toml -# -ansible-compat==4.1.2 -ansible-core==2.15.1 -attrs==23.1.0 -cffi==1.15.1 -click==8.1.4 -click-help-colors==0.9.1 -cryptography==41.0.1 -enrich==1.2.7 -importlib-resources==5.0.7 -jinja2==3.1.2 -jsonschema==4.18.0 -jsonschema-specifications==2023.6.1 -markdown-it-py==3.0.0 -markupsafe==2.1.3 -mdurl==0.1.2 -packaging==23.1 -pluggy==1.2.0 -pycparser==2.21 -pygments==2.15.1 -pyyaml==6.0 -referencing==0.29.1 -resolvelib==1.0.1 -rich==13.4.2 -rpds-py==0.8.10 -subprocess-tee==0.4.1 -typing-extensions==4.7.1 diff --git a/.config/requirements.txt b/.config/requirements.txt deleted file mode 100644 index e7c57e423..000000000 --- a/.config/requirements.txt +++ /dev/null @@ -1,105 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --extra=docs --extra=test --no-annotate --output-file=.config/requirements.txt --resolver=backtracking --strip-extras pyproject.toml -# -ansi2html==1.8.0 -ansible-compat==4.1.2 -ansible-core==2.15.1 -ansible-lint==6.17.2 -attrs==23.1.0 -beautifulsoup4==4.12.2 -black==23.3.0 -bracex==2.3.post1 -cairocffi==1.5.1 -cairosvg==2.7.0 -certifi==2023.5.7 -cffi==1.15.1 -charset-normalizer==3.1.0 -check-jsonschema==0.23.2 -click==8.1.3 -click-help-colors==0.9.1 -colorama==0.4.6 -coverage==7.2.7 -cryptography==41.0.1 -csscompressor==0.9.5 -cssselect2==0.7.0 -defusedxml==0.7.1 -dnspython==2.3.0 -enrich==1.2.7 -exceptiongroup==1.1.2 -execnet==2.0.0 -filelock==3.12.2 -ghp-import==2.1.0 -griffe==0.29.0 -htmlmin2==0.1.13 -idna==3.4 -importlib-metadata==6.6.0 -importlib-resources==5.0.7 -iniconfig==2.0.0 -jinja2==3.1.2 -jsmin==3.0.1 -jsonschema==4.18.0 -jsonschema-specifications==2023.6.1 -linkchecker==10.2.1 -markdown==3.3.7 -markdown-exec==1.6.0 -markdown-include==0.8.1 -markdown-it-py==3.0.0 -markupsafe==2.1.2 -mdurl==0.1.2 -mergedeep==1.3.4 -mkdocs==1.4.3 -mkdocs-ansible==0.1.6 -mkdocs-autorefs==0.4.1 -mkdocs-gen-files==0.5.0 -mkdocs-htmlproofer-plugin==0.13.1 -mkdocs-material==9.1.15 -mkdocs-material-extensions==1.1.1 -mkdocs-minify-plugin==0.6.4 -mkdocs-monorepo-plugin==1.0.5 -mkdocstrings==0.22.0 -mkdocstrings-python==1.1.0 -mypy-extensions==1.0.0 -packaging==23.1 -pathspec==0.11.1 -pexpect==4.8.0 -pillow==9.5.0 -pipdeptree==2.7.1 -platformdirs==3.8.1 -pluggy==1.2.0 -ptyprocess==0.7.0 -pycparser==2.21 -pygments==2.15.1 -pymdown-extensions==10.0.1 -pytest==7.4.0 -pytest-mock==3.11.1 -pytest-plus==0.4.0 -pytest-testinfra==8.1.0 -pytest-xdist==3.3.1 -python-dateutil==2.8.2 -python-slugify==8.0.1 -pyyaml==6.0 -pyyaml-env-tag==0.1 -referencing==0.29.1 -regex==2023.5.5 -requests==2.31.0 -resolvelib==1.0.1 -rich==13.4.2 -rpds-py==0.8.10 -ruamel-yaml==0.17.31 -ruamel-yaml-clib==0.2.7 -six==1.16.0 -soupsieve==2.4.1 -subprocess-tee==0.4.1 -text-unidecode==1.3 -tinycss2==1.2.1 -tomli==2.0.1 -typing-extensions==4.6.2 -urllib3==2.0.2 -watchdog==3.0.0 -wcmatch==8.4.1 -webencodings==0.5.1 -yamllint==1.32.0 -zipp==3.15.0 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bf2a0d0bc..75d48ea72 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -2,16 +2,6 @@ version: 2 enable-beta-ecosystems: true updates: - - package-ecosystem: "pip" - directory: "/" - schedule: - interval: daily - labels: - - dependencies - - skip-changelog - allow: - - dependency-name: "ansible*" - - dependency-name: pyyaml - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ffee93fb3..a972a1e55 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,8 +1,4 @@ --- -ci: - skip: - # https://github.com/pre-commit-ci/issues/issues/55 - - pip-compile default_language_version: python: python3.9 repos: @@ -92,27 +88,3 @@ repos: - pexpect - pytest-mock - pytest-testinfra - - repo: https://github.com/jazzband/pip-tools - rev: 6.14.0 - hooks: - - id: pip-compile - entry: pip-compile -q --resolver=backtracking --strip-extras --no-annotate --output-file=.config/requirements.txt pyproject.toml --extra docs --extra test - files: ^(pyproject\.toml|\.config\/.*)$ - - id: pip-compile - name: pip-compile-upgrade - alias: up - entry: pip-compile -q --resolver=backtracking --strip-extras -q --upgrade --no-annotate --output-file=.config/requirements.txt pyproject.toml --extra docs --extra test - files: ^(pyproject\.toml|\.config\/.*)$ - stages: [manual] - - id: pip-compile - name: lock - alias: lock - always_run: true - entry: pip-compile --upgrade --resolver=backtracking --no-annotate --output-file=.config/requirements-lock.txt pyproject.toml --strip-extras --unsafe-package ruamel-yaml-clib - files: ^.config\/requirements.*$ - language: python - language_version: "3.9" # minimal we support officially - pass_filenames: false - stages: [manual] - additional_dependencies: - - pip>=22.3.1 diff --git a/docs/contributing.md b/docs/contributing.md index 7a8a8f281..543346151 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -121,11 +121,6 @@ Dependencies need to be updated by hand in: - `.config/requirements.in` - `.pre-commit-config.yaml` (2 places) -Afterwards, you will need to generate changes to `requirements.lock.txt` -and `requirement.txt`, by running the commands listed at the top of those files. - -Please note that CI will attempt to regenerate those changes, and if there is any diff, CI will fail. - ## Credits Based on the good work of John Dewey diff --git a/pyproject.toml b/pyproject.toml index 21bbd38d2..9dbb8ee3d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -221,7 +221,6 @@ known-first-party = ["molecule"] [tool.setuptools.dynamic] optional-dependencies.docs = { file = [".config/requirements-docs.txt"] } optional-dependencies.test = { file = [".config/requirements-test.txt"] } -optional-dependencies.lock = { file = [".config/requirements-lock.txt"] } dependencies = { file = [".config/requirements.in"] } [tool.setuptools_scm] diff --git a/tox.ini b/tox.ini index f9187a361..f9057946a 100644 --- a/tox.ini +++ b/tox.ini @@ -39,8 +39,6 @@ setenv = COVERAGE_FILE={env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}} COVERAGE_PROCESS_START={toxinidir}/pyproject.toml MOLECULE_NO_LOG=0 - PIP_CONSTRAINT = {toxinidir}/.config/requirements.txt - devel: PIP_CONSTRAINT=/dev/null PIP_DISABLE_PIP_VERSION_CHECK=1 PYTHONDONTWRITEBYTECODE=1 PYTHONUNBUFFERED=1 @@ -80,26 +78,9 @@ deps = jsonschema>=4.17.3 setenv = {[testenv]setenv} - # without his upgrade would likely not do anything - PIP_CONSTRAINT = /dev/null skip_install = true usedevelop = false -[testenv:deps] -description = Bump all test dependencies -skip_install = true -deps = {[testenv:lint]deps} -setenv = {[testenv:lint]setenv} -commands = - # manual hook calls the optional pip-compile-upgrade hook after pip-compile - {[testenv:lint]commands} --hook-stage manual pip-compile - # Update pre-commit hooks - -pre-commit autoupdate - # We fail if files are modified at the end - git diff --exit-code -allowlist_externals = - git - [testenv:docs] description = Build documentation passenv = *