regenerate lock file and update test deps

tweak test matrix update flake8 install dev deps in tests update test matrix
ericls · Feb 6, 2024 · 7f00d95 · 7f00d95
1 parent 2034522
commit 7f00d95
Show file tree

Hide file tree

Showing 5 changed files with 428 additions and 330 deletions.
diff --git a/.github/workflows/test-mysql.yml b/.github/workflows/test-mysql.yml
@@ -14,11 +14,13 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.9]
-        django-version: [2.2.13, 3.0.7, 3.1.2, 3.2.4]
+        python-version: [3.12]
+        django-version: [4.2.9, 5.0.1]
         include:
-          - python-version: "3.10"
-            django-version: "4.0.4"
+          - python-version: "3.9"
+            django-version: "2.2.13"
+          - python-version: "3.9"
+            django-version: "3.2.4"
 
     env:
       MYSQL_PASSWORD: mysql
@@ -30,7 +32,7 @@ jobs:
     services:
       mysql:
         image: mysql
-        ports: ['3306:3306']
+        ports: ["3306:3306"]
         env:
           MYSQL_PASSWORD: mysql
           MYSQL_ROOT_PASSWORD: mysql
@@ -51,18 +53,12 @@ jobs:
       - name: Install tooling
         run: |
           python -mpip install poetry codecov
-      - name: Install mysqlclient
-        run: |
-          poetry add mysqlclient
       - name: Install dependencies
         run: |
-          poetry install
+          poetry install --with testmysql,dev
       - name: Setup Django ${{ matrix.django-version }}
         run: |
           poetry run pip install django==${{ matrix.django-version }}
-      - name: Lint with flake
-        run: |
-          poetry run flake8 django_hashids
       - name: Test with pytest
         run: |
           poetry run py.test --cov=./django_hashids/ --no-migrations

diff --git a/.github/workflows/test-pg.yml b/.github/workflows/test-pg.yml
@@ -14,11 +14,13 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.9]
-        django-version: [1.11.29, 2.2.13, 3.0.7, 3.1.2, 3.2.4]
+        python-version: [3.12]
+        django-version: [4.2.9, 5.0.1]
         include:
-          - python-version: "3.10"
-            django-version: "4.0.4"
+          - python-version: "3.9"
+            django-version: "2.2.13"
+          - python-version: "3.9"
+            django-version: "3.2.4"
 
     env:
       POSTGRES_PASSWORD: postgres
@@ -50,18 +52,12 @@ jobs:
       - name: Install tooling
         run: |
           python -mpip install poetry codecov
-      - name: Install psycopg2
-        run: |
-          poetry add psycopg2-binary
       - name: Install dependencies
         run: |
-          poetry install
+          poetry install --with testpg,dev
       - name: Setup Django ${{ matrix.django-version }}
         run: |
           poetry run pip install django==${{ matrix.django-version }}
-      - name: Lint with flake
-        run: |
-          poetry run flake8 django_hashids
       - name: Test with pytest
         run: |
           poetry run py.test --cov=./django_hashids/ --no-migrations

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,11 +14,15 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9"]
-        django-version: ["1.11.29", "2.2.13", "3.0.7", "3.1.2", "3.2.4"]
+        python-version: ["3.12"]
+        django-version: ["4.2.9", "5.0.1"]
         include:
-          - python-version: "3.10"
-            django-version: "4.0.4"
+          - python-version: "3.8"
+            django-version: "1.11.28"
+          - python-version: "3.9"
+            django-version: "2.2.13"
+          - python-version: "3.9"
+            django-version: "3.2.4"
     steps:
       - uses: actions/checkout@v1
       - name: Set up Python ${{ matrix.python-version }}
@@ -30,7 +34,7 @@ jobs:
           python -mpip install poetry codecov; python -mpip install six
       - name: Install dependencies
         run: |
-          poetry install
+          poetry install --with dev
       - name: Setup Django ${{ matrix.django-version }}
         run: |
           poetry run pip install django==${{ matrix.django-version }}