Merge pull request #98 from dimagi/pytest

Run tests with pytest instead of nose

.github/workflows/tests.yml

@@ -4,18 +4,22 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
+  workflow_dispatch:
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
         django:
-        - 'Django>=3.2,<3.3'
-        - 'Django>=4.1,<4.2'
         - 'Django>=4.2,<4.3'
+        - 'Django>=5.0,<5.1'
+        - 'Django>=5.1,<5.2'
+        exclude:
+        - {python: '3.9', django: 'Django>=5.0,<5.1'}
+        - {python: '3.9', django: 'Django>=5.1,<5.2'}
     services:
       postgres:
         image: postgres:latest
@@ -39,7 +43,7 @@ jobs:
       run: |
         python --version
         pip install --upgrade pip wheel
-        pip install "${{ matrix.django }}" psycopg2-binary pynose flake8
+        pip install "${{ matrix.django }}" psycopg2-binary pytest-unmagic flake8
     - name: Run tests
       env:
         DB_SETTINGS: >-
@@ -51,6 +55,6 @@ jobs:
             "HOST":"localhost",
             "PORT":"5432"
           }
-      run: nosetests -v --capture_output
+      run: pytest -v
     - name: Check style
       run: flake8 django_cte/ tests/

README.md

@@ -19,11 +19,26 @@ to use Common Table Expressions with the Django ORM.
 
 ```
 cd django-cte
-mkvirtualenv cte  # or however you choose to setup your environment
-pip install django pynose flake8
+python -m venv .venv
+source .venv/bin/activate
+pip install django pytest-unmagic flake8
 
-nosetests
+pytest
 flake8 --config=setup.cfg
+
+# To run tests against postgres
+pip install psycopg2-binary
+psql -U username -h localhost -p 5432 -c 'create database django_cte;'
+export PG_DB_SETTINGS='{
+    "ENGINE":"django.db.backends.postgresql_psycopg2",
+    "NAME":"django_cte",
+    "USER":"username",
+    "PASSWORD":"password",
+    "HOST":"localhost",
+    "PORT":"5432"}'
+
+# WARNING pytest will delete the test_django_cte database if it exists!
+DB_SETTINGS="$PG_DB_SETTINGS" pytest
 ```
 
 All feature and bug contributions are expected to be covered by tests.

django_cte/__init__.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from .cte import CTEManager, CTEQuerySet, With  # noqa
 
 __version__ = "1.3.3"

django_cte/cte.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from django.db.models import Manager
 from django.db.models.query import Q, QuerySet, ValuesIterable
 from django.db.models.sql.datastructures import BaseTable

django_cte/join.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
 from django.db.models.sql.constants import INNER
 
 

django_cte/meta.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import weakref
 
 from django.db.models.expressions import Col, Expression

django_cte/query.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import django
 from django.core.exceptions import EmptyResultSet
 from django.db import connections

django_cte/raw.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-
 def raw_cte_sql(sql, params, refs):
     """Raw CTE SQL
 

setup.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os
 import re
 from io import open

tests/__init__.py

@@ -1,9 +1,7 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os
 
 import django
+from unmagic import fixture
 
 # django setup must occur before importing models
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "tests.settings")
@@ -12,10 +10,8 @@
 from .django_setup import init_db, destroy_db  # noqa
 
 
-def setup():
-    """Initialize database for nosetests"""
+@fixture(autouse=__name__, scope="package")
+def test_db():
     init_db()
-
-
-def teardown():
+    yield
     destroy_db()

tests/django_setup.py

@@ -1,8 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-import sys
-
 from django.db import connection
 
 from .models import KeyPair, Region, Order
@@ -16,13 +11,7 @@ def init_db():
         return
     is_initialized = True
 
-    # replace sys.stdout for prompt to delete database
-    old_stdout = sys.stdout
-    sys.stdout = sys.__stdout__
-    try:
-        connection.creation.create_test_db(verbosity=0)
-    finally:
-        sys.stdout = old_stdout
+    connection.creation.create_test_db(verbosity=0, autoclobber=True)
 
     setup_data()
 

tests/models.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from django.db.models import (
     CASCADE,
     Model,

tests/settings.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os
 import json
 
@@ -20,3 +17,4 @@
 INSTALLED_APPS = ["tests"]
 
 SECRET_KEY = "test"
+USE_TZ = False

tests/test_cte.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-from __future__ import print_function
 from unittest import SkipTest
 
 from django.db.models import IntegerField, TextField

tests/test_manager.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-from __future__ import print_function
 from django.db.models.expressions import F
 from django.db.models.query import QuerySet
 from django.test import TestCase

tests/test_raw.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from django.db.models import IntegerField, TextField
 from django.test import TestCase
 

tests/test_recursive.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import pickle
 from unittest import SkipTest