From 9d546478e457759b3a81eb7c70d476582254d7d2 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 26 Feb 2024 17:17:37 -0600 Subject: [PATCH 1/3] Add support for Python 3.11. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +- dependencies.yaml | 6 +++++- python/pylibwholegraph/pyproject.toml | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 85e063967..49a4db54d 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -38,7 +38,7 @@ dependencies: - pytest - pytest-forked - pytest-xdist -- python>=3.9,<3.11 +- python>=3.9,<3.12 - pytorch-cuda=11.8 - pytorch=2.0.0 - recommonmark diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index ad012959a..fd484f621 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -38,7 +38,7 @@ dependencies: - pytest - pytest-forked - pytest-xdist -- python>=3.9,<3.11 +- python>=3.9,<3.12 - recommonmark - scikit-build - sphinx-copybutton diff --git a/dependencies.yaml b/dependencies.yaml index af610b98a..273904b14 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -188,8 +188,12 @@ dependencies: packages: - python=3.10 - matrix: + py: "3.11" packages: - - python>=3.9,<3.11 + - python=3.11 + - matrix: + packages: + - python>=3.9,<3.12 run: common: - output_types: [conda, requirements] diff --git a/python/pylibwholegraph/pyproject.toml b/python/pylibwholegraph/pyproject.toml index 910d4ccea..4a0a31ccc 100644 --- a/python/pylibwholegraph/pyproject.toml +++ b/python/pylibwholegraph/pyproject.toml @@ -41,6 +41,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.11", ] [tool.setuptools] From 74027ef4e9cf77da9399a7a257a2f344d190d778 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 27 Feb 2024 10:10:00 -0600 Subject: [PATCH 2/3] remove duplicate trove classifier --- python/pylibwholegraph/pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/python/pylibwholegraph/pyproject.toml b/python/pylibwholegraph/pyproject.toml index 4a0a31ccc..910d4ccea 100644 --- a/python/pylibwholegraph/pyproject.toml +++ b/python/pylibwholegraph/pyproject.toml @@ -41,7 +41,6 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.11", ] [tool.setuptools] From 6807fd4afacf5e1b9380bbb1b6b58f30b54a37e8 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 27 Feb 2024 18:59:58 -0600 Subject: [PATCH 3/3] require numpy 1.23+ --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-122_arch-x86_64.yaml | 2 +- dependencies.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 49a4db54d..126a1ae02 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -30,7 +30,7 @@ dependencies: - nbsphinx - nccl - ninja -- numpy>=1.17 +- numpy>=1.23 - numpydoc - nvcc_linux-64=11.8 - pre-commit diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index fd484f621..5f765c652 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -31,7 +31,7 @@ dependencies: - nbsphinx - nccl - ninja -- numpy>=1.17 +- numpy>=1.23 - numpydoc - pre-commit - pydata-sphinx-theme diff --git a/dependencies.yaml b/dependencies.yaml index 273904b14..2425d2e37 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -213,7 +213,7 @@ dependencies: - output_types: [conda, requirements] packages: - ninja - - numpy>=1.17 + - numpy>=1.23 - pytest - pytest-forked - pytest-xdist