Skip to content

Commit fc11f2e

Browse files
authored
Merge branch 'taichi-dev:master' into master
2 parents 649c58d + 7d64834 commit fc11f2e

File tree

7 files changed

+11
-19
lines changed

7 files changed

+11
-19
lines changed

.github/workflows/perf.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
/home/dev/taichi/.github/workflows/scripts/build.py
4444
4545
env:
46-
PY: '3.8'
46+
PY: '3.11'
4747
PROJECT_NAME: taichi
4848
TAICHI_CMAKE_ARGS: >-
4949
-DTI_WITH_OPENGL:BOOL=ON
@@ -82,7 +82,7 @@ jobs:
8282
/home/dev/taichi/.github/workflows/scripts/unix-perf-mon.sh
8383
8484
env:
85-
PY: '3.8'
85+
PY: '3.11'
8686
BENCHMARK_UPLOAD_TOKEN: ${{ secrets.BENCHMARK_UPLOAD_TOKEN }}
8787
GITHUB_EVENT_ACTION: ${{ github.event.action }}
8888
GITHUB_TOKEN: ${{ secrets.GARDENER_PAT }}

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v2
1313
- uses: actions/setup-python@v4
1414
with:
15-
python-version: 3.8
15+
python-version: 3.11
1616
- name: Install Dependencies
1717
run: pip install semver GitPython PyGithub
1818

.github/workflows/release.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,11 @@ jobs:
5656
- id: set-matrix
5757
run: |
5858
if [ -n "$RELEASE_VERSION" ]; then
59-
# For production release, we run on five python versions.
60-
echo 'matrix={"include":[{"name":"taichi","python":"3.7"},{"name":"taichi","python":"3.8"},{"name":"taichi","python":"3.9"},{"name":"taichi","python":"3.10"},{"name":"taichi","python":"3.11"},{"name":"taichi","python":"3.12"}]}"' >> $GITHUB_OUTPUT
61-
62-
# M1 only supports 3.8, 3.9, and 3.10(conda), so change matrix.
63-
echo 'matrix_osx={"include":[{"name":"taichi","python":"3.8"},{"name":"taichi","python":"3.9"},{"name":"taichi","python":"3.10"},{"name":"taichi","python":"3.11"},{"name":"taichi","python":"3.12"}]}"' >> $GITHUB_OUTPUT
59+
echo 'matrix={"include":[{"name":"taichi","python":"3.9"},{"name":"taichi","python":"3.10"},{"name":"taichi","python":"3.11"},{"name":"taichi","python":"3.12"}]}"' >> $GITHUB_OUTPUT
60+
echo 'matrix_osx={"include":[{"name":"taichi","python":"3.10"},{"name":"taichi","python":"3.11"},{"name":"taichi","python":"3.12"}]}"' >> $GITHUB_OUTPUT
6461
else
65-
# For nightly release, we run on three python versions.
66-
echo 'matrix={"include":[{"name":"taichi-nightly","python":"3.7"},{"name":"taichi-nightly","python":"3.8"},{"name":"taichi-nightly","python":"3.9"},{"name":"taichi-nightly","python":"3.10"},{"name":"taichi-nightly","python":"3.11"},{"name":"taichi","python":"3.12"}]}"' >> $GITHUB_OUTPUT
67-
68-
# M1 only supports 3.8 and 3.10(conda), so change matrix.
69-
echo 'matrix_osx={"include":[{"name":"taichi-nightly","python":"3.8"},{"name":"taichi-nightly","python":"3.9"},{"name":"taichi-nightly","python":"3.10"},{"name":"taichi-nightly","python":"3.11"},{"name":"taichi","python":"3.12"}]}"' >> $GITHUB_OUTPUT
62+
echo 'matrix={"include":[{"name":"taichi-nightly","python":"3.9"},{"name":"taichi-nightly","python":"3.10"},{"name":"taichi-nightly","python":"3.11"},{"name":"taichi","python":"3.12"}]}"' >> $GITHUB_OUTPUT
63+
echo 'matrix_osx={"include":[{"name":"taichi-nightly","python":"3.9"},{"name":"taichi-nightly","python":"3.10"},{"name":"taichi-nightly","python":"3.11"},{"name":"taichi","python":"3.12"}]}"' >> $GITHUB_OUTPUT
7064
fi
7165
7266
build_and_test_linux:

conda/conda_env.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
name: taichi-dev
88
dependencies:
9-
- python=3.8 # Replace this with your favorite Python version
9+
- python=3.11 # Replace this with your favorite Python version

docs/lang/articles/faqs/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ sidebar_position: 2
3535
ERROR: No matching distribution found for taichi
3636
```
3737

38-
- Make sure you're using Python version 3.7/3.8/3.9/3.10:
38+
- Make sure you're using Python version 3.9/3.10:
3939

4040
```bash
4141
python3 -c "import sys;print(sys.version[:sys.version.find('.', 2)])"
42-
# 3.7, 3.8, 3.9, or 3.10
42+
# 3.9, or 3.10
4343
```
4444

4545
- Make sure your Python executable is 64-bit:

docs/lang/articles/get-started/hello_world.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Additionally, Taichi also has an ahead-of-time (AOT) system for exporting code t
1313

1414
## Prerequisites
1515

16-
- Python: 3.7/3.8/3.9/3.10 (64-bit)
16+
- Python: 3.9/3.10 (64-bit)
1717
- OS: Windows, OS X, and Linux (64-bit)
1818

1919
## Installation

setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
"Intended Audience :: Science/Research",
3030
"Intended Audience :: Developers",
3131
"License :: OSI Approved :: Apache Software License",
32-
"Programming Language :: Python :: 3.7",
33-
"Programming Language :: Python :: 3.8",
3432
"Programming Language :: Python :: 3.9",
3533
"Programming Language :: Python :: 3.10",
3634
"Programming Language :: Python :: 3.11",

0 commit comments

Comments
 (0)