Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove constraints requirement files #3981

Merged
merged 1 commit into from
Jul 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions .config/requirements-lock.txt

This file was deleted.

105 changes: 0 additions & 105 deletions .config/requirements.txt

This file was deleted.

10 changes: 0 additions & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
28 changes: 0 additions & 28 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
---
ci:
skip:
# https://github.com/pre-commit-ci/issues/issues/55
- pip-compile
default_language_version:
python: python3.9
repos:
Expand Down Expand Up @@ -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
5 changes: 0 additions & 5 deletions docs/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
19 changes: 0 additions & 19 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = *
Expand Down