From 11494209e4d691c5ca3dc78163d2f0d96c817aa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Eertmans?= Date: Wed, 7 Sep 2022 23:40:05 +0200 Subject: [PATCH 1/6] fix: import errors... --- .github/workflows/python-publish.yml | 2 +- manim_slides/slide.py | 6 +----- setup.py | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 60ed275..e501976 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-python@v2 - name: Install cibuildwheel - run: python -m pip install -U setuptools wheel pip + run: python -m pip install -U setuptools wheel pip . - name: Build wheels run: python setup.py sdist diff --git a/manim_slides/slide.py b/manim_slides/slide.py index 9667ec2..73441a0 100644 --- a/manim_slides/slide.py +++ b/manim_slides/slide.py @@ -6,11 +6,7 @@ import subprocess from tqdm import tqdm -try: - from .manim import Scene, ThreeDScene, config, logger -except ImportError: - Scene = ThreeDScene = config = logger = None - # TODO: manage both manim and manimgl +from manim import Scene, ThreeDScene, config, logger try: # For manim=8.0", "click-default-group>=1.2", "numpy>=1.19.3", + "manim", "pydantic>=1.9.1", "opencv-python>=4.6", ], From efa6fe05cf9532f34d90abce76d214e06af5396b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 7 Sep 2022 21:40:31 +0000 Subject: [PATCH 2/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- manim_slides/slide.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manim_slides/slide.py b/manim_slides/slide.py index 73441a0..03dc08d 100644 --- a/manim_slides/slide.py +++ b/manim_slides/slide.py @@ -4,9 +4,8 @@ import platform import shutil import subprocess -from tqdm import tqdm - from manim import Scene, ThreeDScene, config, logger +from tqdm import tqdm try: # For manim Date: Wed, 7 Sep 2022 23:44:08 +0200 Subject: [PATCH 3/6] fix: CI --- .github/workflows/python-publish.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index e501976..3ec67cc 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -21,8 +21,11 @@ jobs: # Used to host cibuildwheel - uses: actions/setup-python@v2 + - name: Install package + run: python -m pip install -U . + - name: Install cibuildwheel - run: python -m pip install -U setuptools wheel pip . + run: python -m pip install -U setuptools wheel pip - name: Build wheels run: python setup.py sdist From 255c86ba25ead086809a4d1de525da3f3bd63250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Eertmans?= Date: Wed, 7 Sep 2022 23:45:20 +0200 Subject: [PATCH 4/6] fix: manual install --- .github/workflows/python-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 3ec67cc..afb7d3d 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-python@v2 - name: Install package - run: python -m pip install -U . + run: python -m pip install -U manim tqdm - name: Install cibuildwheel run: python -m pip install -U setuptools wheel pip From 78941e10fcd1e612333f4aab51faf6f3dc4a63b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Eertmans?= Date: Wed, 7 Sep 2022 23:48:16 +0200 Subject: [PATCH 5/6] remove builds --- .github/workflows/python-publish.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index afb7d3d..2f7abfb 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -8,38 +8,10 @@ on: types: [published] jobs: - build_wheels: - name: Build wheels on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macos-latest] - - steps: - - uses: actions/checkout@v2 - - # Used to host cibuildwheel - - uses: actions/setup-python@v2 - - - name: Install package - run: python -m pip install -U manim tqdm - - - name: Install cibuildwheel - run: python -m pip install -U setuptools wheel pip - - - name: Build wheels - run: python setup.py sdist - - - uses: actions/upload-artifact@v2 - with: - name: dist - path: dist/*.tar.* - release: name: Release if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') runs-on: ubuntu-latest - needs: [ build_wheels ] steps: - uses: actions/download-artifact@v2 with: From dab96c980d1e9f1f2fb6f7d98b975330fa7841f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Eertmans?= Date: Wed, 7 Sep 2022 23:48:49 +0200 Subject: [PATCH 6/6] remove dist --- .github/workflows/python-publish.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index 2f7abfb..ee11e89 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -13,10 +13,6 @@ jobs: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v2 - with: - name: dist - path: dist/ - name: Upload to PyPI uses: pypa/gh-action-pypi-publish@master with: