Remove resolvelib from requirements lock

ansible · May 1, 2023 · 1674d3d · 1674d3d
1 parent 3480fa9
commit 1674d3d
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 45 deletions.
diff --git a/.config/dictionary.txt b/.config/dictionary.txt
@@ -292,6 +292,7 @@ relpath
 reportversion
 representer
 reqs
+resolvelib
 returncode
 rmtree
 robertdebock

diff --git a/.config/requirements-lock.txt b/.config/requirements-lock.txt
@@ -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
@@ -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
@@ -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
diff --git a/.config/requirements.txt b/.config/requirements.txt
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -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
@@ -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

diff --git a/src/ansiblelint/schemas/__store__.json b/src/ansiblelint/schemas/__store__.json
@@ -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": {

diff --git a/src/ansiblelint/schemas/ansible-navigator-config.json b/src/ansiblelint/schemas/ansible-navigator-config.json
@@ -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"
 }
diff --git a/test/schemas/package-lock.json b/test/schemas/package-lock.json
diff --git a/test/schemas/package.json b/test/schemas/package.json
@@ -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",

diff --git a/tox.ini b/tox.ini
@@ -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
@@ -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 =
@@ -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