Cherry pick from 15b2437392 (#5962)

.github/workflows/docker.yaml

@@ -20,15 +20,38 @@ on:
   push:
     branches:
       - 'master'
-  # pull_request:
-  #   branches:
-  #     - 'master'
+  pull_request:
+    branches:
+      - 'master'
 
 jobs:
 
+  paths-filter:
+    name: Filter
+    runs-on: ubuntu-latest
+
+    outputs:
+      docker: ${{ steps.filter.outputs.docker }}
+
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # pin@v4.1.1
+      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # pin@v2.11.1
+        id: filter
+        with:
+          filters: |
+            docker:
+              - .github/workflows/docker.yaml
+              - docker/**
+              - docker-compose.yml
+              - docker.dev.env
+              - Dockerfile
+
+
   # Build the docker image
   build:
     runs-on: ubuntu-latest
+    needs: paths-filter
+    if: needs.paths-filter.outputs.docker == 'true' || github.event_name == 'release' || github.event_name == 'push'
     permissions:
       contents: read
       packages: write
@@ -59,7 +82,6 @@ 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 setuptools==68.1.2
           docker-compose run inventree-dev-server invoke wait
       - name: Check Data Directory
         # The following file structure should have been created by the docker image

InvenTree/plugin/test_api.py

@@ -23,8 +23,8 @@ class PluginDetailAPITest(PluginMixin, InvenTreeAPITestCase):
         """Setup for all tests."""
         self.MSG_NO_PKG = 'Either packagename of URL must be provided'
 
-        self.PKG_NAME = 'minimal'
-        self.PKG_URL = 'git+https://github.com/geoffrey-a-reed/minimal'
+        self.PKG_NAME = 'inventree-brother-plugin'
+        self.PKG_URL = 'git+https://github.com/inventree/inventree-brother-plugin'
         super().setUp()
 
     def test_plugin_install(self):
@@ -60,7 +60,7 @@ class PluginDetailAPITest(PluginMixin, InvenTreeAPITestCase):
             {
                 'confirm': True,
                 'url': self.PKG_URL,
-                'packagename': 'minimal',
+                'packagename': self.PKG_NAME,
             },
             expected_code=201,
         ).data

docker/requirements.txt

@@ -1,16 +1,16 @@
 # Base python requirements for docker containers
 
 # Basic package requirements
-invoke>=1.4.0                   # Invoke build tool
+invoke>=2.2.0                   # Invoke build tool
 pyyaml>=6.0.1
-setuptools==65.6.3
-wheel>=0.37.0
+setuptools>=69.0.0
+wheel>=0.41.0
 
 # Database links
-psycopg2>=2.9.1
-mysqlclient>=2.0.3,<=2.1.1
+psycopg2>=2.9.9
+mysqlclient>=2.2.0
 pgcli>=3.1.0
-mariadb>=1.0.7,<1.1.0
+mariadb>=1.1.8
 
 # gunicorn web server
 gunicorn>=20.1.0

tasks.py

@@ -126,6 +126,7 @@ def install(c):
 
     # Install required Python packages with PIP
     c.run('pip3 install --upgrade pip')
+    c.run('pip3 install --upgrade setuptools')
     c.run('pip3 install --no-cache-dir --disable-pip-version-check -U -r requirements.txt')