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 resolvelib from requirements lock #3387

Merged
merged 1 commit into from
May 1, 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
1 change: 1 addition & 0 deletions .config/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ relpath
reportversion
representer
reqs
resolvelib
returncode
rmtree
robertdebock
Expand Down
8 changes: 4 additions & 4 deletions .config/requirements-lock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# 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
# pip-compile --no-annotate --output-file=.config/requirements-lock.txt --resolver=backtracking --strip-extras --unsafe-package=resolvelib --unsafe-package=ruamel-yaml-clib pyproject.toml
#
ansible-core==2.14.5
attrs==23.1.0
Expand All @@ -20,13 +20,12 @@ mdurl==0.1.2
mypy-extensions==1.0.0
packaging==23.1
pathspec==0.11.1
platformdirs==3.3.0
platformdirs==3.5.0
pycparser==2.21
pygments==2.15.1
pyrsistent==0.19.3
pyyaml==6.0
resolvelib==0.8.1
rich==13.3.4
rich==13.3.5
ruamel-yaml==0.17.21
subprocess-tee==0.4.1
tomli==2.0.1
Expand All @@ -35,4 +34,5 @@ wcmatch==8.4.1
yamllint==1.31.0

# The following packages are considered to be unsafe in a requirements file:
# resolvelib
# ruamel-yaml-clib
12 changes: 6 additions & 6 deletions .config/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# 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 --unsafe-package=ruamel-yaml-clib pyproject.toml
# pip-compile --extra=docs --extra=test --no-annotate --output-file=.config/requirements.txt --resolver=backtracking --strip-extras --unsafe-package=resolvelib --unsafe-package=ruamel-yaml-clib pyproject.toml
#
ansible-core==2.14.5
astroid==2.15.4
Expand All @@ -17,7 +17,7 @@ cffi==1.15.1
charset-normalizer==3.1.0
click==8.1.3
colorama==0.4.6
coverage==7.2.3
coverage==7.2.5
coverage-enable-subprocess==1.0
cryptography==40.0.2
csscompressor==0.9.5
Expand Down Expand Up @@ -66,7 +66,7 @@ packaging==23.0
pathspec==0.11.1
pillow==9.5.0
pipdeptree==2.7.0
platformdirs==3.3.0
platformdirs==3.5.0
pluggy==1.0.0
ply==3.11
psutil==5.9.5
Expand All @@ -87,8 +87,7 @@ pyyaml-env-tag==0.1
rdflib==6.3.2
regex==2023.3.23
requests==2.28.2
resolvelib==0.8.1
rich==13.3.4
rich==13.3.5
ruamel-yaml==0.17.21
six==1.16.0
soupsieve==2.4
Expand All @@ -97,7 +96,7 @@ subprocess-tee==0.4.1
text-unidecode==1.3
tinycss2==1.2.1
tomli==2.0.1
tomlkit==0.11.7
tomlkit==0.11.8
types-jsonschema==4.17.0.7
types-pyyaml==6.0.12.9
typing-extensions==4.5.0
Expand All @@ -112,4 +111,5 @@ yamllint==1.31.0
zipp==3.15.0

# The following packages are considered to be unsafe in a requirements file:
# resolvelib
# ruamel-yaml-clib
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ repos:
name: lock
alias: lock
always_run: true
entry: pip-compile --upgrade --resolver=backtracking -q --no-annotate --output-file=.config/requirements-lock.txt pyproject.toml --strip-extras --unsafe-package ruamel-yaml-clib
entry: pip-compile --upgrade --resolver=backtracking -q --no-annotate --output-file=.config/requirements-lock.txt pyproject.toml --strip-extras --unsafe-package ruamel-yaml-clib --unsafe-package resolvelib
files: ^.config\/requirements.*$
language: python
language_version: "3.9" # minimal we support officially
Expand All @@ -201,15 +201,15 @@ repos:
name: deps
alias: deps
always_run: true
entry: pip-compile --resolver=backtracking -q --no-annotate --output-file=.config/requirements.txt pyproject.toml --extra docs --extra test --strip-extras --unsafe-package ruamel-yaml-clib
entry: pip-compile --resolver=backtracking -q --no-annotate --output-file=.config/requirements.txt pyproject.toml --extra docs --extra test --strip-extras --unsafe-package ruamel-yaml-clib --unsafe-package resolvelib
files: ^.config\/requirements.*$
language: python
language_version: "3.9" # minimal we support officially
pass_filenames: false
additional_dependencies:
- pip>=22.3.1
- id: pip-compile
entry: pip-compile --resolver=backtracking -q --no-annotate --output-file=.config/requirements.txt pyproject.toml --extra docs --extra test --strip-extras --unsafe-package ruamel-yaml-clib --upgrade
entry: pip-compile --resolver=backtracking -q --no-annotate --output-file=.config/requirements.txt pyproject.toml --extra docs --extra test --strip-extras --unsafe-package ruamel-yaml-clib --unsafe-package resolvelib --upgrade
language: python
always_run: true
pass_filenames: false
Expand Down
2 changes: 1 addition & 1 deletion src/ansiblelint/schemas/__store__.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible-lint-config.json"
},
"ansible-navigator-config": {
"etag": "40c81a8e173bc86393cf4dbbccef4151d069f05d24e43a95a3b6b17fa3a2150a",
"etag": "22dcf91587ac30f126a20907a9a036e56860bbe36dc6b18fc15a7fbad0312c73",
"url": "https://raw.githubusercontent.com/ansible/ansible-navigator/main/src/ansible_navigator/data/ansible-navigator.json"
},
"changelog": {
Expand Down
4 changes: 2 additions & 2 deletions src/ansiblelint/schemas/ansible-navigator-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@
"required": [
"ansible-navigator"
],
"title": "ansible-navigator settings v3.0",
"title": "ansible-navigator settings v3.1",
"type": "object",
"version": "3.0"
"version": "3.1"
}
42 changes: 21 additions & 21 deletions test/schemas/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions test/schemas/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
"js-yaml": "^4.1.0",
"safe-stable-stringify": "^2.4.3",
"ts-node": "^10.9.1",
"vscode-json-languageservice": "^5.3.3"
"vscode-json-languageservice": "^5.3.4"
},
"scripts": {
"compile": "tsc -p ./src",
"deps": "npx --yes npm-check-updates -u && npm install --ignore-scripts",
"test": "python3 src/rebuild.py && mocha"
},
"devDependencies": {
"@types/chai": "^4.3.4",
"@types/chai": "^4.3.5",
"@types/js-yaml": "^4.0.5",
"@types/minimatch": "^5.1.2",
"@types/mocha": "^10.0.1",
"@types/node": "^18.16.0",
"@types/node": "^18.16.3",
"chai": "^4.3.7",
"minimatch": "^9.0.0",
"mocha": "^10.2.0",
Expand Down
13 changes: 7 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# spell-checker:ignore linkcheck basepython changedir envdir envlist envname envsitepackagesdir passenv setenv testenv toxinidir toxworkdir usedevelop doctrees envpython posargs
[tox]
minversion = 4.0.0
minversion = 4.5.1
envlist =
lint
pkg
Expand All @@ -18,8 +18,9 @@ description =
Run the tests under {basepython} and
devel: ansible devel branch
deps =
--editable .[test]
devel: ansible-core @ git+https://github.com/ansible/ansible.git # GPLv3+
extras =
test
commands_pre =
sh -c "rm -f .tox/.coverage.* 2>/dev/null || true"
commands =
Expand Down Expand Up @@ -70,9 +71,8 @@ allowlist_externals =
sh
tox
./tools/test-hook.sh
# both options needed to workaround https://github.com/tox-dev/tox/issues/2197
usedevelop = false
skip_install = true
# https://tox.wiki/en/latest/upgrading.html#editable-mode
package = editable

[testenv:lint]
description = Run all linters
Expand Down Expand Up @@ -160,9 +160,10 @@ allowlist_externals =

[testenv:eco]
description = Perform ecosystem impact (downstream testing) https://github.com/ansible/ansible-lint/discussions/1403
skip_install = true
deps =
{[testenv]deps}
extras =
test
commands =
python3 -m venv .tox/venv
.tox/venv/bin/pip install -q git+https://github.com/ansible/ansible-lint@main
Expand Down