Merge pull request #635 from drnlm/feature/drop_django_nose

Feature/drop django nose
CTPUG · Jun 15, 2022 · a64761d · a64761d
2 parents edc1274 + 8b1eae1
commit a64761d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -22,7 +22,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
 
-    name: Postgres - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main'|| matrix.python-version == '3.10' }} )
+    name: Postgres - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' }} )
     strategy:
       max-parallel: 4
       matrix:
@@ -46,7 +46,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Dependencies
-      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
+      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' }}
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt -r requirements-dev.txt
@@ -70,17 +70,18 @@ jobs:
         pip install 'https://github.com/django/django/archive/main.tar.gz'
       if: matrix.django-version == 'main'
     - name: Run Tests
-      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
+      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' }}
       env:
         TESTDB: postgres
       run: |
-        NOSE_WITH_COVERAGE=1 NOSE_COVER_PACKAGE=wafer python manage.py test
+        export PYTHONWARNINGS=always
+        coverage run --source='wafer' manage.py test && coverage report --skip-covered
 
   sqlite:
 
     runs-on: ubuntu-latest
 
-    name: SQLite - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main'|| matrix.python-version == '3.10' }} )
+    name: SQLite - Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (Allowed Failures - ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main'}} )
     strategy:
       max-parallel: 4
       matrix:
@@ -104,7 +105,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Dependencies
-      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
+      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' }}
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt -r requirements-dev.txt
@@ -118,9 +119,10 @@ jobs:
         pip install 'https://github.com/django/django/archive/main.tar.gz'
       if: matrix.django-version == 'main'
     - name: Run Tests
-      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' || matrix.python-version == '3.10' }}
+      continue-on-error: ${{ matrix.django-version == '4.0.0' || matrix.django-version == 'main' }}
       run: |
-        NOSE_WITH_COVERAGE=1 NOSE_COVER_PACKAGE=wafer python manage.py test
+        export PYTHONWARNINGS=always
+        coverage run --source='wafer' manage.py test && coverage report --skip-covered
 
   translations:
     runs-on: ubuntu-latest

diff --git a/setup.py b/setup.py
@@ -11,7 +11,6 @@
     'django-bakery>=0.12.0',
     'django-crispy-forms',
     'django-markitup>=4.0.0',
-    'django-nose',
     'django-registration-redux',
     'django-reversion',
     'django-select2',

diff --git a/wafer/settings.py b/wafer/settings.py
@@ -147,7 +147,6 @@
     'reversion',
     'bakery',
     'crispy_forms',
-    'django_nose',
     'rest_framework',
     'django_select2',
     'wafer',
@@ -166,8 +165,6 @@
     'django.contrib.admin',
 )
 
-TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
-
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.