From 448373c775aec8abc6b4f58f7c3118ce502b1dd5 Mon Sep 17 00:00:00 2001 From: Alexander Piskun Date: Mon, 28 Nov 2022 12:54:57 +0300 Subject: [PATCH] removing not needed `piexif` --- .github/workflows/publish-pypi-pi_heif.yml | 2 +- .github/workflows/publish-pypi.yml | 2 +- .github/workflows/test-wheels-pi_heif.yml | 10 +++++----- .github/workflows/test-wheels.yml | 6 +++--- docker/test_wheels.Dockerfile | 2 +- pi-heif/setup.cfg | 1 - setup.cfg | 3 --- 7 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/publish-pypi-pi_heif.yml b/.github/workflows/publish-pypi-pi_heif.yml index 3f741d54..b9d1da74 100644 --- a/.github/workflows/publish-pypi-pi_heif.yml +++ b/.github/workflows/publish-pypi-pi_heif.yml @@ -274,7 +274,7 @@ jobs: - name: Build sdist run: | - python3 -m pip install pytest piexif pillow numpy pympler defusedxml + python3 -m pip install pytest pillow numpy pympler defusedxml python3 -m build --sdist --outdir wheelhouse - name: Install and check sdist diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index c3075655..92ed2090 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -398,7 +398,7 @@ jobs: - name: Build sdist run: | - python3 -m pip install pytest piexif pillow numpy pympler defusedxml + python3 -m pip install pytest pillow numpy pympler defusedxml python3 -m build --sdist --outdir wheelhouse - name: Install and check sdist diff --git a/.github/workflows/test-wheels-pi_heif.yml b/.github/workflows/test-wheels-pi_heif.yml index 76fb6894..a244feb7 100644 --- a/.github/workflows/test-wheels-pi_heif.yml +++ b/.github/workflows/test-wheels-pi_heif.yml @@ -101,7 +101,7 @@ jobs: - name: Preparations run: | - python3 -m pip install pytest piexif pillow cffi numpy pympler defusedxml opencv-python + python3 -m pip install pytest pillow cffi numpy pympler defusedxml opencv-python python3 -m pip install --only-binary=:all: pi-heif - name: Test wheel @@ -131,7 +131,7 @@ jobs: - name: Preparations run: | brew install libjpeg little-cms2 - python3 -m pip install pytest piexif cffi pillow numpy pympler defusedxml + python3 -m pip install pytest cffi pillow numpy pympler defusedxml python3 -m pip install --only-binary=:all: pi-heif - name: Install OpenCV for CPython @@ -166,7 +166,7 @@ jobs: - name: Preparations run: | sudo apt update && sudo apt install libjpeg-dev liblcms2-dev - python3 -m pip install pytest piexif cffi pillow numpy pympler defusedxml + python3 -m pip install pytest cffi pillow numpy pympler defusedxml python3 -m pip install --only-binary=:all: pi-heif - name: Install OpenCV for CPython @@ -201,7 +201,7 @@ jobs: - name: Preparations run: | brew install libjpeg little-cms2 - python3 -m pip install pytest piexif cffi pillow numpy pympler defusedxml + python3 -m pip install pytest cffi pillow numpy pympler defusedxml python3 -m pip install --only-binary=:all: pillow-heif python3 -m pip install --only-binary=:all: pi-heif @@ -236,7 +236,7 @@ jobs: - name: Preparations run: | sudo apt update && sudo apt install libjpeg-dev liblcms2-dev - python3 -m pip install pytest piexif cffi pillow numpy pympler defusedxml + python3 -m pip install pytest cffi pillow numpy pympler defusedxml python3 -m pip install --only-binary=:all: pillow-heif python3 -m pip install --only-binary=:all: pi-heif diff --git a/.github/workflows/test-wheels.yml b/.github/workflows/test-wheels.yml index 6e81a70f..76425701 100644 --- a/.github/workflows/test-wheels.yml +++ b/.github/workflows/test-wheels.yml @@ -108,7 +108,7 @@ jobs: - name: Preparations run: | - python3 -m pip install pytest piexif pillow cffi numpy pympler defusedxml opencv-python + python3 -m pip install pytest pillow cffi numpy pympler defusedxml opencv-python python3 -m pip install --only-binary=:all: pillow_heif - name: Test wheel @@ -136,7 +136,7 @@ jobs: - name: Preparations run: | brew install libjpeg little-cms2 - python3 -m pip install pytest piexif cffi pillow numpy pympler defusedxml + python3 -m pip install pytest cffi pillow numpy pympler defusedxml python3 -m pip install --only-binary=:all: pillow_heif - name: Install OpenCV for CPython @@ -170,7 +170,7 @@ jobs: - name: Preparations run: | sudo apt update && sudo apt install libjpeg-dev liblcms2-dev - python3 -m pip install pytest piexif cffi pillow numpy pympler defusedxml + python3 -m pip install pytest cffi pillow numpy pympler defusedxml python3 -m pip install --only-binary=:all: pillow_heif - name: Install OpenCV for CPython diff --git a/docker/test_wheels.Dockerfile b/docker/test_wheels.Dockerfile index 35e333e5..61f2a671 100644 --- a/docker/test_wheels.Dockerfile +++ b/docker/test_wheels.Dockerfile @@ -8,7 +8,7 @@ RUN $INSTALL_CMD RUN python3 -m pip install --upgrade pip RUN python3 -m pip install --prefer-binary pillow -RUN python3 -m pip install pytest piexif cffi numpy pympler defusedxml +RUN python3 -m pip install pytest cffi numpy pympler defusedxml ARG EX_ARG RUN python3 -m pip install $EX_ARG --no-deps --only-binary=:all: pillow_heif diff --git a/pi-heif/setup.cfg b/pi-heif/setup.cfg index 2d8736d2..3f9a0881 100644 --- a/pi-heif/setup.cfg +++ b/pi-heif/setup.cfg @@ -44,7 +44,6 @@ install_requires = [options.extras_require] tests = pytest - piexif defusedxml packaging diff --git a/setup.cfg b/setup.cfg index 88c4e6a8..5489a783 100644 --- a/setup.cfg +++ b/setup.cfg @@ -48,19 +48,16 @@ docs = sphinx-rtd-theme>=1.0 tests-min = pytest - piexif defusedxml packaging tests = pytest - piexif defusedxml packaging numpy pympler dev = pytest - piexif defusedxml packaging numpy