Skip to content

Commit

Permalink
No need to include the linux dependencies in lint dependencies now.
Browse files Browse the repository at this point in the history
Given we now properly constraint requirements files

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
  • Loading branch information
s0undt3ch committed Jun 7, 2023
1 parent c67dba3 commit a413f06
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 2,956 deletions.
20 changes: 0 additions & 20 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -903,11 +903,6 @@ repos:
# - --resolver=backtracking
- --py-version=3.8
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/static/pkg/linux.in
- --include=requirements/static/ci/linux.in
- --include=requirements/static/ci/common.in
- requirements/static/ci/lint.in

- id: pip-tools-compile
Expand All @@ -921,11 +916,6 @@ repos:
# - --resolver=backtracking
- --py-version=3.9
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/static/pkg/linux.in
- --include=requirements/static/ci/linux.in
- --include=requirements/static/ci/common.in
- requirements/static/ci/lint.in

- id: pip-tools-compile
Expand All @@ -939,11 +929,6 @@ repos:
# - --resolver=backtracking
- --py-version=3.10
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/static/pkg/linux.in
- --include=requirements/static/ci/linux.in
- --include=requirements/static/ci/common.in
- requirements/static/ci/lint.in

- id: pip-tools-compile
Expand All @@ -957,11 +942,6 @@ repos:
# - --resolver=backtracking
- --py-version=3.11
- --platform=linux
- --include=requirements/base.txt
- --include=requirements/zeromq.txt
- --include=requirements/static/pkg/linux.in
- --include=requirements/static/ci/linux.in
- --include=requirements/static/ci/common.in
- requirements/static/ci/lint.in

# <---- Lint CI Requirements ---------------------------------------------------------------------------------------
Expand Down
13 changes: 11 additions & 2 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -1355,10 +1355,19 @@ def _lint(
session, rcfile, flags, paths, tee_output=True, upgrade_setuptools_and_pip=True
):
if _upgrade_pip_setuptools_and_wheel(session, upgrade=upgrade_setuptools_and_pip):
requirements_file = os.path.join(
linux_requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "linux.txt"
)
lint_requirements_file = os.path.join(
"requirements", "static", "ci", _get_pydir(session), "lint.txt"
)
install_command = ["--progress-bar=off", "-r", requirements_file]
install_command = [
"--progress-bar=off",
"-r",
linux_requirements_file,
"-r",
lint_requirements_file,
]
session.install(*install_command, silent=PIP_INSTALL_SILENT)

if tee_output:
Expand Down

0 comments on commit a413f06

Please sign in to comment.