From b67ba2b6b30716571b29e6a1a177c9d90d514c2b Mon Sep 17 00:00:00 2001
From: Alexandru Fikl <alexfikl@gmail.com>
Date: Mon, 4 Nov 2024 21:18:25 +0200
Subject: [PATCH] pyproject: bump min python to 3.10
---
.github/workflows/ci.yml | 5 -----
.gitlab-ci.yml | 4 +---
arraycontext/container/__init__.py | 2 +-
pyproject.toml | 10 +++-------
4 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6e3eab3..cd01183 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 fa09197..f7cf75f 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 bb18e98..655a3e6 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 d971ae2..0755deb 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
--
GitLab