Browse Source

pipenv / python3.8: lock importlib-metadata version

https://github.com/WanzenBug/pylint-import-requirements/issues/17
Fabian Peter Hammerle 3 years ago
parent
commit
72132904fc
3 changed files with 4 additions and 8 deletions
  1. 0 6
      .github/workflows/python.yml
  2. 2 0
      Pipfile
  3. 2 2
      Pipfile.lock

+ 0 - 6
.github/workflows/python.yml

@@ -27,12 +27,6 @@ jobs:
     - run: pipenv install --python "$PYTHON_VERSION" --deploy --dev
       env:
         PYTHON_VERSION: ${{ matrix.python-version }}
-    # ModuleNotFoundError: No module named 'importlib_metadata'
-    # https://github.com/WanzenBug/pylint-import-requirements/issues/17
-    - run: if python3 -c 'import sys; sys.exit(sys.version_info < (3, 8))'; then
-           pipenv graph;
-           pipenv install --dev importlib-metadata;
-           fi
     - run: pipenv graph
     - run: pipenv run pytest --cov=ical2vdir --cov-report=term-missing --cov-fail-under=100
     - run: pipenv run pylint --load-plugins=pylint_import_requirements ical2vdir

+ 2 - 0
Pipfile

@@ -8,6 +8,8 @@ ical2vdir = {editable = true,path = "."}
 # black requires python>=3.6
 # https://github.com/psf/black/commit/e74117f172e29e8a980e2c9de929ad50d3769150#diff-2eeaed663bd0d25b7e608891384b7298R51
 black = {version = "==19.10b0", markers="python_version >= '3.6'"}
+# workaround https://github.com/WanzenBug/pylint-import-requirements/issues/17
+importlib-metadata = "*"
 mypy = "*"
 # workaround https://github.com/pytest-dev/pytest/issues/3953
 pathlib2 = {version = "*", markers="python_version < '3.6'"}

+ 2 - 2
Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "fb37af933e93a3dc17d6b12d1262d48e818d660ce2264a71a13b24a5112e7e1e"
+            "sha256": "79b29b2a81ee80dbfa8dfef1e6082558aa77ee9e5c683107ed2fc63c018e480e"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -106,7 +106,7 @@
                 "sha256:0505dd08068cfec00f53a74a0ad927676d7757da81b7436a6eefe4c7cf75c545",
                 "sha256:15ec6c0fd909e893e3a08b3a7c76ecb149122fb14b7efe1199ddd4c7c57ea958"
             ],
-            "markers": "python_version < '3.8'",
+            "index": "pypi",
             "version": "==1.6.1"
         },
         "isort": {