Skip to content

Commit e8855d9

Browse files
naveen521kkbehackl
andauthored
Added support for Python 3.11, dropped support for Python 3.7 (#3030)
* Add support for Python 3.11 as well drop support for Python 3.7 * update lockfile * Fix an import statement for new version of moderngl * CI: use pipx to install poetry should fix macos 3.11 errors * Update poetry.lock try a newer version of poetry, forgot to update in a long time * update lock file * update poetry.lock * try downgrading pycairo * CI: fix poetry picking up wrong python version * CI: change poetry cache key older wrong environments will not be used then * re-introduce caret restriction for pycairo Co-authored-by: Benjamin Hackl <[email protected]>
1 parent 621f829 commit e8855d9

File tree

4 files changed

+873
-768
lines changed

4 files changed

+873
-768
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
python: ['3.7.14', '3.10.7']
24+
# TODO: test on 3.8 and 3.11
25+
python: ['3.10.7']
2526
steps:
2627
- name: Checkout the repository
2728
uses: actions/checkout@v3
@@ -70,7 +71,7 @@ jobs:
7071
fail-fast: false
7172
matrix:
7273
os: [ubuntu-22.04, macos-latest, windows-latest]
73-
python: ['3.7', '3.8', '3.9', '3.10']
74+
python: ['3.8', '3.9', '3.10', '3.11']
7475

7576
steps:
7677
- name: Checkout the repository
@@ -83,7 +84,8 @@ jobs:
8384

8485
- name: Install Poetry
8586
run: |
86-
pip install --user poetry
87+
pipx install poetry
88+
poetry config virtualenvs.prefer-active-python true
8789
8890
- name: Setup macOS PATH
8991
if: runner.os == 'macOS'
@@ -101,7 +103,7 @@ jobs:
101103
uses: actions/cache@v3
102104
with:
103105
path: ${{ steps.cache-vars.outputs.poetry-venv-dir }}
104-
key: ${{ runner.os }}-poetry-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('poetry.lock') }}
106+
key: ${{ runner.os }}-poetry-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('poetry.lock') }}-1
105107

106108
- name: Install and cache ffmpeg (all OS)
107109
uses: FedericoCarboni/setup-ffmpeg@v2

manim/renderer/shader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ def render(self):
312312
else:
313313
self.shader.context.disable(moderngl.DEPTH_TEST)
314314

315-
from moderngl.program_members.attribute import Attribute
315+
from moderngl.program_members import Attribute
316316

317317
shader_attributes = []
318318
for k, v in self.shader.shader_program._members.items():

0 commit comments

Comments
 (0)