diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e3eab360d818136b66f480d32c2fc6b2aa505a0..cd011830fb6affbc861a87e576fb0d922a6bcc32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,11 +48,6 @@ jobs: curl -L -O https://tiker.net/ci-support-v0 . ./ci-support-v0 - # NOTE: jax>=0.4.31 requires python 3.10 and uses pattern matching - # which conflicts with our mypy.python_version = '3.8' setting - CONDA_ENVIRONMENT=.test-conda-env-py3.yml - sed -i "s/jax/jax<0.4.31/" "$CONDA_ENVIRONMENT" - build_py_project_in_conda_env python -m pip install mypy pytest ./run-mypy.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa09197f5b599753d2b7a25e5d019227d1a0ea6b..f7cf75ffdff71be435cb80c02dc2ee3075c16845 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,9 +107,7 @@ Pylint: Mypy: script: | - # NOTE: jax>=0.4.31 requires python 3.10 and uses pattern matching - # which conflicts with our mypy.python_version = '3.8' setting - EXTRA_INSTALL="mypy pytest jax[cpu]<0.4.31" + EXTRA_INSTALL="mypy pytest" curl -L -O https://tiker.net/ci-support-v0 . ./ci-support-v0 diff --git a/arraycontext/container/__init__.py b/arraycontext/container/__init__.py index bb18e986a3efb7baa9dc9efe33612fcfaf3c1c6b..655a3e64de99ae978ca947211d41462692ada334 100644 --- a/arraycontext/container/__init__.py +++ b/arraycontext/container/__init__.py @@ -88,6 +88,7 @@ from typing import ( Protocol, Sequence, Tuple, + TypeAlias, TypeVar, ) @@ -95,7 +96,6 @@ from typing import ( # what 'np' is. import numpy import numpy as np -from typing_extensions import TypeAlias from arraycontext.context import ArrayContext diff --git a/pyproject.toml b/pyproject.toml index d971ae20b1cbef3139734109c1054cfa3e8221b5..0755deb53679920e7f87fe2d1a6c6c1f83153617 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,14 +6,14 @@ requires = [ [project] name = "arraycontext" -version = "2021.1" +version = "2024.0" description = "Choose your favorite numpy-workalike" readme = "README.rst" license = { text = "MIT" } authors = [ { name = "Andreas Kloeckner", email = "inform@tiker.net" }, ] -requires-python = ">=3.8" +requires-python = ">=3.10" classifiers = [ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -33,9 +33,6 @@ dependencies = [ "immutabledict>=4.1", "numpy", "pytools>=2024.1.3", - - # for TypeAlias - "typing-extensions>=4; python_version<'3.10'", ] [project.optional-dependencies] @@ -122,8 +119,7 @@ known-local-folder = [ lines-after-imports = 2 [tool.mypy] -# TODO: unpin jax version on CI when this gets bumped to 3.10 -python_version = "3.8" +python_version = "3.10" warn_unused_ignores = true # TODO: enable this # check_untyped_defs = true