Merge pull request #134 from ambitioninc/develop

3.1.0

.github/workflows/tests.yml

@@ -18,26 +18,18 @@ jobs:
         # AttributeError: module 'collections' has no attribute 'Callable'
         # https://github.com/nose-devs/nose/issues/1099
         django:
-        - 'Django~=2.2.0'
-        - 'Django~=3.0.0'
-        - 'Django~=3.1.0'
         - 'Django~=3.2.0'
         - 'Django~=4.0.0'
         - 'Django~=4.1.0'
+        - 'Django~=4.2.0'
         experimental: [false]
-        include:
-        - python: '3.9'
-          django: 'https://github.com/django/django/archive/refs/heads/main.zip#egg=Django'
-          experimental: true
-          # NOTE this job will appear to pass even when it fails because of
-          # `continue-on-error: true`. Github Actions apparently does not
-          # have this feature, similar to Travis' allow-failure, yet.
-          # https://github.com/actions/toolkit/issues/399
         exclude:
         - python: '3.7'
           django: 'Django~=4.0.0'
         - python: '3.7'
           django: 'Django~=4.1.0'
+        - python: '3.7'
+          django: 'Django~=4.2.0'
     services:
       postgres:
         image: postgres:latest
@@ -53,8 +45,8 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python }}
     - name: Setup
@@ -69,7 +61,7 @@ jobs:
       env:
         DB_SETTINGS: >-
           {
-            "ENGINE":"django.db.backends.postgresql_psycopg2",
+            "ENGINE":"django.db.backends.postgresql",
             "NAME":"manager_utils",
             "USER":"postgres",
             "PASSWORD":"postgres",

docs/release_notes.rst

@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+v3.1.0
+------
+* Drop django 2.2
+* Unpin time zone field
+
 v3.0.1
 ------
 * Switch to github actions

manage.py

@@ -1,6 +1,13 @@
 #!/usr/bin/env python
 import sys
 
+# Show warnings about django deprecations - uncomment for version upgrade testing
+import warnings
+from django.utils.deprecation import RemovedInNextVersionWarning
+warnings.filterwarnings('always', category=DeprecationWarning)
+warnings.filterwarnings('always', category=PendingDeprecationWarning)
+warnings.filterwarnings('always', category=RemovedInNextVersionWarning)
+
 from settings import configure_settings
 
 

manager_utils/__init__.py

@@ -5,5 +5,3 @@
     upsert, bulk_update, single, get_or_none, bulk_upsert, bulk_upsert2, id_dict, sync,
     sync2
 )
-
-default_app_config = 'manager_utils.apps.ManagerUtilsConfig'

manager_utils/version.py

@@ -1 +1 @@
-__version__ = '3.0.1'
+__version__ = '3.1.0'

requirements/requirements-testing.txt

@@ -1,10 +1,9 @@
 coverage
-mock
 psycopg2
 django-nose>=1.3
 django-dynamic-fixture
 pytz
-django-timezone-field==4.0
+django-timezone-field
 parameterized
 freezegun
 flake8

requirements/requirements.txt

@@ -1,2 +1,2 @@
-Django>=2.2
-django-query-builder>=3.0.1
+Django>=3.2
+django-query-builder>=3.1.0

setup.py

@@ -42,19 +42,16 @@ def get_lines(file_path):
     packages=find_packages(),
     classifiers=[
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
         'Framework :: Django :: 4.0',
         'Framework :: Django :: 4.1',
+        'Framework :: Django :: 4.2',
     ],
     install_requires=install_requires,
     tests_require=tests_require,