From 0f55cbf7f58ece645457efe46dbd00f510cdd7a2 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 16 Dec 2022 07:42:07 +1100 Subject: [PATCH] Import setuptools in manage.py (#4061) * Import setuptools in manage.py Ref: https://github.com/pypa/setuptools/issues/3706 * Import all the things * Show setuptools version * Update setuptools to latest verseion * Force upgrade of setuptools version * Remove debug * Prevent docker builds on PR * Remove setuptools imports --- .github/workflows/docker.yaml | 2 +- docker/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index f9a6779656..5498d69606 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -54,6 +54,7 @@ jobs: docker-compose run inventree-dev-server invoke update docker-compose run inventree-dev-server invoke setup-dev docker-compose up -d + docker-compose run inventree-dev-server pip install --upgrade setuptools docker-compose run inventree-dev-server invoke wait - name: Check Data Directory # The following file structure should have been created by the docker image @@ -69,7 +70,6 @@ jobs: test -f data/secret_key.txt - name: Run Unit Tests run: | - docker-compose --version docker-compose run inventree-dev-server invoke test --disable-pty docker-compose down - name: Set up QEMU diff --git a/docker/requirements.txt b/docker/requirements.txt index 2371292f9d..97adfeea6d 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -3,7 +3,7 @@ # Basic package requirements invoke>=1.4.0 # Invoke build tool pyyaml>=6.0 -setuptools==60.0.5 +setuptools==65.6.3 wheel>=0.37.0 # Database links