diff options
| author | Marc Mueller <30130371+cdce8p@users.noreply.github.com> | 2021-02-21 22:14:15 +0100 |
|---|---|---|
| committer | Pierre Sassoulas <pierre.sassoulas@gmail.com> | 2021-02-28 21:52:27 +0100 |
| commit | 7a3f53a437c3445a5fabe0814f5641ebfd9b1baf (patch) | |
| tree | 1d63dd28b570798ea0af28aad23b33f4cc752083 | |
| parent | 02b619d3092620b29b9fdae25da19952b96a4655 (diff) | |
| download | pylint-git-7a3f53a437c3445a5fabe0814f5641ebfd9b1baf.tar.gz | |
Update requirements
* Pin test and doc requirements to current versions
* Rename requirements_test_pypy.txt to requirements_test_min.txt
* Move some dependencies from min to test
* Update coverage and sphinx versions
* Update ci
* Use pytest-cov
| -rw-r--r-- | .github/workflows/ci.yaml | 14 | ||||
| -rw-r--r-- | pylint/__pkginfo__.py | 2 | ||||
| -rw-r--r-- | requirements_docs.txt | 4 | ||||
| -rw-r--r-- | requirements_test.txt | 11 | ||||
| -rw-r--r-- | requirements_test_min.txt | 3 | ||||
| -rw-r--r-- | requirements_test_pypy.txt | 7 |
6 files changed, 21 insertions, 20 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index db84b929e..dc919e03c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,7 +33,7 @@ jobs: run: >- echo "::set-output name=key::base-venv-${{ env.CACHE_VERSION }}-${{ hashFiles('pylint/__pkg_info__.py', 'requirements_test.txt', - 'requirements_test_pypy.txt', 'requirements_docs.txt') }}" + 'requirements_test_min.txt', 'requirements_docs.txt') }}" - name: Restore Python virtual environment id: cache-venv uses: actions/cache@v2.1.4 @@ -195,7 +195,7 @@ jobs: run: >- echo "::set-output name=key::venv-${{ env.CACHE_VERSION }}-${{ hashFiles('pylint/__pkg_info__.py', 'requirements_test.txt', - 'requirements_test_pypy.txt') }}" + 'requirements_test_min.txt') }}" - name: Restore Python virtual environment id: cache-venv uses: actions/cache@v2.1.4 @@ -246,7 +246,7 @@ jobs: - name: Run pytest run: | . venv/bin/activate - coverage run -m pytest --benchmark-disable tests/ + pytest --benchmark-disable --cov --cov-report= tests/ - name: Upload coverage artifact uses: actions/upload-artifact@v2.2.2 with: @@ -366,7 +366,7 @@ jobs: id: generate-python-key run: >- echo "::set-output name=key::venv-${{ env.CACHE_VERSION }}-${{ - hashFiles('pylint/__pkg_info__.py', 'requirements_test_pypy.txt') }}" + hashFiles('pylint/__pkg_info__.py', 'requirements_test_min.txt') }}" - name: Restore Python virtual environment id: cache-venv uses: actions/cache@v2.1.4 @@ -383,7 +383,7 @@ jobs: python -m venv venv . venv\\Scripts\\activate python -m pip install -U pip setuptools wheel - pip install -U -r requirements_test_pypy.txt + pip install -U -r requirements_test_min.txt pip install -e . pytest-windows: @@ -444,7 +444,7 @@ jobs: id: generate-python-key run: >- echo "::set-output name=key::venv-${{ env.CACHE_VERSION }}-${{ - hashFiles('pylint/__pkg_info__.py', 'requirements_test_pypy.txt') }}" + hashFiles('pylint/__pkg_info__.py', 'requirements_test_min.txt') }}" - name: Restore Python virtual environment id: cache-venv uses: actions/cache@v2.1.4 @@ -461,7 +461,7 @@ jobs: python -m venv venv . venv/bin/activate python -m pip install -U pip setuptools wheel - pip install -U -r requirements_test_pypy.txt + pip install -U -r requirements_test_min.txt pip install -e . pytest-pypy: diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py index 5d78adfea..c3e63a1fd 100644 --- a/pylint/__pkginfo__.py +++ b/pylint/__pkginfo__.py @@ -50,7 +50,7 @@ dependency_links = [] # type: ignore extras_require = {} extras_require[':sys_platform=="win32"'] = ["colorama"] -extras_require["docs"] = ["sphinx~=3.2", "python-docs-theme"] +extras_require["docs"] = ["sphinx==3.5.1", "python-docs-theme==2020.12"] license = "GPL" description = "python code static checker" diff --git a/requirements_docs.txt b/requirements_docs.txt index 10783d349..a299f539f 100644 --- a/requirements_docs.txt +++ b/requirements_docs.txt @@ -1,2 +1,2 @@ -sphinx~=3.2 -python-docs-theme +Sphinx==3.5.1 +python-docs-theme==2020.12 diff --git a/requirements_test.txt b/requirements_test.txt index c2bc9ceca..f30968e9b 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,4 +1,9 @@ -r requirements_test_pre_commit.txt --r requirements_test_pypy.txt -pre-commit -pyenchant +-r requirements_test_min.txt +coveralls==3.0.0 +coverage==5.4.0 +pre-commit==2.10.1 +pyenchant==3.2.0 +pytest-cov==2.11.1 +pytest-profiling==1.7.0 +pytest-xdist==2.2.1 diff --git a/requirements_test_min.txt b/requirements_test_min.txt new file mode 100644 index 000000000..3370e8c4c --- /dev/null +++ b/requirements_test_min.txt @@ -0,0 +1,3 @@ +astroid==2.5.0 +pytest==6.2.2 +pytest-benchmark==3.2.3 diff --git a/requirements_test_pypy.txt b/requirements_test_pypy.txt deleted file mode 100644 index 9ef5c75f4..000000000 --- a/requirements_test_pypy.txt +++ /dev/null @@ -1,7 +0,0 @@ -astroid==2.5.0 -coveralls -coverage<5.0 -pytest -pytest-xdist -pytest-benchmark -pytest-profiling |