Bump mypy from 0.982 to 0.990 (#621)

dependabot[bot] · mr-c · web-flow · commit e48d14959b7d · 2022-11-08T11:21:08.000+01:00
* Bump mypy from 0.982 to 0.990 Bumps [mypy](https://github.com/python/mypy) from 0.982 to 0.990. - [Release notes](https://github.com/python/mypy/releases) - [Commits](python/mypy@v0.982...v0.990) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * mypy 0.990 inspired fixs + 1 ignore Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Michael R. Crusoe <michael.crusoe@gmail.com>
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,7 +17,6 @@ jobs:
       CIBW_MANYLINUX_AARCH64_IMAGE: "<< parameters.many_image >>"
       CIBW_MUSLLINUX_AARCH64_IMAGE: quay.io/pypa/musllinux_1_1_aarch64
       CIBW_BUILD: "<< parameters.build >>"
-      CIBW_SKIP: "cp36-* pp*"
 
     steps:
       - checkout
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -74,7 +74,7 @@ jobs:
         step: [lintreadme, pydocstyle]
 
     env:
-      py-semver: "3.10"
+      py-semver: "3.11"
       TOXENV: ${{ format('py310-{0}', matrix.step) }}
 
     steps:
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -20,25 +20,25 @@ jobs:
       with:
         pre-build-command: source .github/workflows/wheel-prep.sh
         build-requirements: -rrequirements.txt -rmypy-requirements.txt
-        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
+        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311'
     - name: Build manylinux2014 x86_64 Python wheels
       uses: RalfG/python-wheels-manylinux-build@v0.5.0-manylinux2014_x86_64
       with:
         pre-build-command: source .github/workflows/wheel-prep.sh
         build-requirements: -rrequirements.txt -rmypy-requirements.txt
-        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
+        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311'
     - name: Build manylinux_2_24 x86_64 Python wheels
       uses: RalfG/python-wheels-manylinux-build@v0.5.0-manylinux_2_24_x86_64
       with:
         pre-build-command: source .github/workflows/wheel-prep.sh
         build-requirements: -rrequirements.txt -rmypy-requirements.txt
-        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
+        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311'
     - name: Build manylinux_2_28 x86_64 Python wheels
       uses: RalfG/python-wheels-manylinux-build@v0.5.0-manylinux_2_28_x86_64
       with:
         pre-build-command: source .github/workflows/wheel-prep.sh
         build-requirements: -rrequirements.txt -rmypy-requirements.txt
-        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
+        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311'
     - name: Move audited wheels to new directory
       run: mkdir audited_wheels && cp dist/*-manylinux*.whl dist/*-musllinux*.whl audited_wheels/
     - name: Publish wheels to PyPI
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ EXTRAS=[pycodegen]
 # `[[` conditional expressions.
 PYSOURCES=$(wildcard ${MODULE}/**.py ${MODULE}/avro/*.py ${MODULE}/tests/*.py) setup.py
 DEVPKGS=diff_cover black pylint pep257 pydocstyle flake8 tox tox-pyenv \
-	isort wheel autoflake flake8-bugbear pyupgrade bandit \
+	isort wheel autoflake flake8-bugbear pyupgrade bandit build\
 	-rtest-requirements.txt -rmypy-requirements.txt
 COVBASE=coverage run --append
 
@@ -66,7 +66,7 @@ dev: install-dep
 dist: dist/${MODULE}-$(VERSION).tar.gz
 
 dist/${MODULE}-$(VERSION).tar.gz: $(SOURCES)
-	python setup.py sdist bdist_wheel
+	python -m build
 
 ## docs                   : make the docs
 docs: FORCE
@@ -199,7 +199,8 @@ release:
 	export SETUPTOOLS_SCM_PRETEND_VERSION=${VERSION} && \
 	./release-test.sh && \
 	. testenv2/bin/activate && \
-		python testenv2/src/${PACKAGE}/setup.py sdist bdist_wheel && \
+		pip install build && \
+		python -m build testenv2/src/${PACKAGE} && \
 		pip install twine && \
 		twine upload testenv2/src/${PACKAGE}/dist/* && \
 		git tag ${VERSION} && git push --tags
diff --git a/mypy-requirements.txt b/mypy-requirements.txt
@@ -1,4 +1,4 @@
-mypy==0.982
+mypy==0.990
 black>=19.10b0
 types-pkg_resources
 types-requests
diff --git a/mypy-stubs/rdflib/namespace/__init__.pyi b/mypy-stubs/rdflib/namespace/__init__.pyi
@@ -33,7 +33,7 @@ __all__ = [
 
 class Namespace(str):
     @property
-    def title(self) -> URIRef: ...
+    def title(self) -> URIRef: ...  # type: ignore[override]
     def term(self, name: Any) -> URIRef: ...
     def __getitem__(self, key: Any) -> URIRef: ...
     def __getattr__(self, name: str) -> URIRef: ...
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2", "mypy==0.961", "black>=19.10b0", "types-pkg_resources", "types-requests", "types-dataclasses", "ruamel.yaml>= 0.12.4, != 0.16.6, < 0.18", "types-setuptools"]
+requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2", "mypy==0.990;python_version>'3.6'", "black>=19.10b0", "types-pkg_resources", "types-requests", "types-dataclasses", "ruamel.yaml>= 0.12.4, != 0.16.6, < 0.18", "types-setuptools"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
@@ -10,7 +10,7 @@ before-build = "python -m pip install -r requirements.txt -r mypy-requirements.t
 test-command = "python -m pytest -n 2 --junitxml=/output/test-results/junit_$(python -V | awk '{print $2}')_${AUDITWHEEL_PLAT}.xml --pyargs schema_salad"
 test-requires = "-r test-requirements.txt"
 test-extras = "pycodegen"
-skip = "pp* cp311-*"
-# ^ skip building wheels on PyPy (any version)
-#   and CPython 3.11 (mypyc doesn't support Python 3.11)
+skip = "pp* cp36-*"
+#      ^ skip building wheels on PyPy (any version)
+#           ^ skip building wheels on Python 3.6 (we now need mypy 0.990+ which doesn't support Python 3.6)
 build-verbosity = "1"
diff --git a/release-test.sh b/release-test.sh
@@ -63,7 +63,7 @@ rm -f lib/python-wheels/setuptools* \
 # The following can fail if you haven't pushed your commits to ${repo}
 pip install -e "git+${repo}@${HEAD}#egg=${package}${extras}"
 pushd src/${package}
-pip install -rtest-requirements.txt
+pip install -rtest-requirements.txt build
 make dist
 make test
 cp dist/${package}*tar.gz ../../../testenv3/
@@ -84,7 +84,7 @@ rm -f lib/python-wheels/setuptools* \
 	&& pip install --force-reinstall -U pip==${pipver} \
         && pip install setuptools==${setuptoolsver} wheel
 package_tar=$(find . -name "${package}*tar.gz")
-pip install "-r${DIR}/test-requirements.txt"
+pip install "-r${DIR}/test-requirements.txt" build
 pip install "${package_tar}${extras}"
 mkdir out
 tar --extract --directory=out -z -f ${package}*.tar.gz
diff --git a/schema_salad/makedoc.py b/schema_salad/makedoc.py
@@ -782,9 +782,7 @@ def makedoc(
         redirect[r.split("=")[0]] = r.split("=")[1]
     renderlist = only or []
     if hasattr(stdout, "buffer") and getattr(stdout, "encoding", None) != "UTF-8":
-        wrapped_stdout: IO[Any] = TextIOWrapper(
-            stdout.buffer, encoding="utf-8"  # type: ignore[attr-defined]
-        )
+        wrapped_stdout: IO[Any] = TextIOWrapper(stdout.buffer, encoding="utf-8")
     else:
         wrapped_stdout = stdout
     avrold_doc(
diff --git a/schema_salad/tests/test_dotnet_codegen.py b/schema_salad/tests/test_dotnet_codegen.py
@@ -22,7 +22,7 @@ def test_cwl_gen(tmp_path: Path) -> None:
 
     dotnet_codegen(cwl_file_uri, target_dir, examples=examples_dir)
     solution_path = target_dir / "Solution.sln"
-    assert solution_path.exists
+    assert solution_path.exists()
     tests_dir = target_dir / "Test" / "src"
     assert tests_dir.exists()
     with open(tests_dir / "ExampleTests.cs") as f:
@@ -54,7 +54,7 @@ def test_class_field(tmp_path: Path) -> None:
     dotnet_codegen(schema_path, target_dir)
 
     solution_path = target_dir / "Solution.sln"
-    assert solution_path.exists
+    assert solution_path.exists()
 
     tests_dir = target_dir / "Test"
     assert tests_dir.exists()
diff --git a/schema_salad/tests/test_java_codegen.py b/schema_salad/tests/test_java_codegen.py
@@ -22,7 +22,7 @@ def test_cwl_gen(tmp_path: Path) -> None:
 
     java_codegen(cwl_file_uri, target_dir, examples=examples_dir)
     pom_xml_path = target_dir / "pom.xml"
-    assert pom_xml_path.exists
+    assert pom_xml_path.exists()
     tests_dir = (
         target_dir / "src" / "test" / "java" / "org" / "w3id" / "cwl" / "cwl" / "utils"
     )
diff --git a/schema_salad/tests/test_typescript_codegen.py b/schema_salad/tests/test_typescript_codegen.py
@@ -22,7 +22,7 @@ def test_cwl_gen(tmp_path: Path) -> None:
 
     typescript_codegen(cwl_file_uri, target_dir, examples=examples_dir)
     package_json_path = target_dir / "package.json"
-    assert package_json_path.exists
+    assert package_json_path.exists()
     tests_dir = target_dir / "src" / "test"
     assert tests_dir.exists()
     with open(tests_dir / "ExampleTest.ts") as f:
@@ -55,7 +55,7 @@ def test_class_field(tmp_path: Path) -> None:
     typescript_codegen(schema_path, target_dir)
 
     package_json_path = target_dir / "package.json"
-    assert package_json_path.exists
+    assert package_json_path.exists()
 
     tests_dir = target_dir / "src" / "test"
     assert tests_dir.exists()
diff --git a/tox.ini b/tox.ini
@@ -58,7 +58,7 @@ commands =
 whitelist_externals =
   py{36,37,38,39,310,311}-lint: flake8
   py{36,37,38,39,310,311}-lint: black
-  py{36,37,38,39,310,311}-{mypy,shellcheck,lint,unit}: make
+  py{36,37,38,39,310,311}-{mypy,shellcheck,lint,lintreadme,unit}: make
 
 skip_install =
   py{36,37,38,39,310,311}-lint: true
@@ -78,8 +78,7 @@ skip_install = true
 [testenv:py310-lintreadme]
 description = Lint the README.rst->.md conversion
 commands =
-  python setup.py sdist
-  python setup.py bdist_wheel
+  make dist
   twine check dist/*
 deps =
     twine

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-mypy==0.982`
	`1`	`+mypy==0.990`
`2`	`2`	`black>=19.10b0`
`3`	`3`	`types-pkg_resources`
`4`	`4`	`types-requests`