Merge branch 'master' into 1548_pyreverse_type_annotations

Author: mbyrnepr2

.github/workflows/ci.yaml

@@ -220,7 +220,7 @@ jobs:
           . venv/bin/activate
           pytest --benchmark-disable --cov --cov-report= tests/
       - name: Upload coverage artifact
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name: coverage-${{ matrix.python-version }}
           path: .coverage
@@ -256,7 +256,7 @@ jobs:
           echo "Failed to restore Python venv from cache"
           exit 1
       - name: Download all coverage artifacts
-        uses: actions/[email protected].9
+        uses: actions/[email protected].10
       - name: Combine coverage results
         run: |
           . venv/bin/activate
@@ -313,7 +313,7 @@ jobs:
         run: >-
           echo "::set-output name=datetime::"$(date "+%Y%m%d_%H%M")
       - name: Upload benchmark artifact
-        uses: actions/[email protected].3
+        uses: actions/[email protected].4
         with:
           name:
             benchmark-${{ runner.os }}-${{ matrix.python-version }}_${{

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
         args: [--py36-plus]
         exclude: *fixtures
   - repo: https://github.com/PyCQA/isort
-    rev: 5.8.0
+    rev: 5.9.1
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
@@ -77,7 +77,7 @@ repos:
         types: [python]
         args: []
         require_serial: true
-        additional_dependencies: ["types-pkg_resources==0.1.2", "types-toml==0.1.2"]
+        additional_dependencies: ["types-pkg_resources==0.1.3", "types-toml==0.1.3"]
         exclude: tests/functional/|tests/input|tests/extensions/data|tests/regrtest_data/|tests/data/|doc/|bin/
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.3.1

ChangeLog

@@ -13,6 +13,8 @@ Release date: TBA
 
   Closes #1548
 
+* astroid has been upgraded to 2.6.0
+
 * ``setuptools_scm`` has been removed and replaced by ``tbump`` in order to not
   have hidden runtime dependencies to setuptools
 

requirements_test.txt

@@ -7,7 +7,7 @@ tbump~=6.3.2
 pyenchant~=3.2
 pytest-cov~=2.12
 pytest-profiling~=1.7
-pytest-xdist~=2.2
+pytest-xdist~=2.3
 # Type packages for mypy
-types-pkg_resources==0.1.2
-types-toml==0.1.2
+types-pkg_resources==0.1.3
+types-toml==0.1.3

requirements_test_min.txt

@@ -1,4 +1,4 @@
 -e .
-astroid==2.6.0-dev0  # Pinned to a specific version for tests
+astroid==2.6.0  # Pinned to a specific version for tests
 pytest~=6.2
 pytest-benchmark~=3.4

requirements_test_pre_commit.txt

@@ -2,5 +2,5 @@
 # in .pre-commit-config.yaml
 black==21.6b0;python_full_version>="3.6.2"
 flake8==3.9.2
-isort==5.8.0
+isort==5.9.1
 mypy==0.902

setup.cfg

@@ -41,7 +41,7 @@ project_urls =
 [options]
 packages = find:
 install_requires =
-    astroid>=2.6.0-dev0,<2.7 # (You should also upgrade requirements_test_min.txt)
+    astroid>=2.6.0,<2.7 # (You should also upgrade requirements_test_min.txt)
     isort>=4.2.5,<6
     mccabe>=0.6,<0.7
     toml>=0.7.1