Merge pull request #169 from ambitioninc/develop

6.0.0

Author: somewes

.github/workflows/tests.yml

@@ -0,0 +1,84 @@
+# copied from django-cte
+name: entity tests
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master,develop]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ['3.7', '3.8', '3.9']
+        # Time to switch to pytest or nose2??
+        # nosetests is broken on 3.10
+        # 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'
+        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'
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_DB: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_USER: postgres
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Setup
+      run: |
+        python --version
+        pip install --upgrade pip wheel
+        pip install -r requirements/requirements.txt
+        pip install -r requirements/requirements-testing.txt
+        pip install "${{ matrix.django }}"
+        pip freeze
+    - name: Run tests
+      env:
+        DB_SETTINGS: >-
+          {
+            "ENGINE":"django.db.backends.postgresql_psycopg2",
+            "NAME":"entity",
+            "USER":"postgres",
+            "PASSWORD":"postgres",
+            "HOST":"localhost",
+            "PORT":"5432"
+          }
+      run: |
+        coverage run manage.py test entity
+        coverage report --fail-under=99
+      continue-on-error: ${{ matrix.experimental }}
+    - name: Check style
+      run: flake8 entity

.travis.yml

@@ -7,4 +7,4 @@ class EntityConfig(AppConfig):
 
     def ready(self):
         import entity.signal_handlers
-        assert(entity)
+        assert entity

entity/apps.py

@@ -1 +1 @@
-__version__ = '5.1.1'
+__version__ = '6.0.0'

entity/version.py

@@ -1,5 +1,8 @@
 ## Release Notes
 
+- 6.0.0:
+    - django support for 2.2-4.1
+    - python support for 3.7-3.9
 - 5.1.1:
     - Fix logic holes related to the active flag when generating entity group cache
 - 5.1.0:

release_notes.md

@@ -1,5 +1,6 @@
-coverage==4.5.1
-django-nose==1.4.5
+coverage
+django-nose
 django-dynamic-fixture
-mock==2.0.0
-psycopg2>=2.7.7
+mock
+psycopg2
+flake8

requirements/requirements-testing.txt

@@ -1,4 +1,5 @@
 import os
+import json
 
 from django.conf import settings
 
@@ -14,24 +15,27 @@ def configure_settings():
         test_db = os.environ.get('DB', None)
         if test_db is None:
             db_config = {
-                'ENGINE': 'django.db.backends.postgresql_psycopg2',
-                'NAME': 'ambition',
-                'USER': 'ambition',
-                'PASSWORD': 'ambition',
+                'ENGINE': 'django.db.backends.postgresql',
+                'NAME': 'entity',
+                'USER': 'postgres',
+                'PASSWORD': '',
                 'HOST': 'db',
-                'TEST': {
-                    'CHARSET': 'UTF8',
-                }
             }
         elif test_db == 'postgres':
             db_config = {
-                'ENGINE': 'django.db.backends.postgresql_psycopg2',
-                'USER': 'postgres',
+                'ENGINE': 'django.db.backends.postgresql',
                 'NAME': 'entity',
+                'USER': 'postgres',
+                'PASSWORD': '',
+                'HOST': 'db',
             }
         else:
             raise RuntimeError('Unsupported test DB {0}'.format(test_db))
 
+        # Check env for db override (used for github actions)
+        if os.environ.get('DB_SETTINGS'):
+            db_config = json.loads(os.environ.get('DB_SETTINGS'))
+
         installed_apps = [
             'django.contrib.auth',
             'django.contrib.contenttypes',
@@ -43,6 +47,7 @@ def configure_settings():
 
         settings.configure(
             TEST_RUNNER='django_nose.NoseTestSuiteRunner',
+            SECRET_KEY='*',
             NOSE_ARGS=['--nocapture', '--nologcapture', '--verbosity=1'],
             DATABASES={
                 'default': db_config,

settings.py

@@ -38,13 +38,19 @@ def get_lines(file_path):
     packages=find_packages(),
     classifiers=[
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.6',
         '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',
+        'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
+        'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.1',
     ],
     install_requires=install_requires,
     tests_require=tests_require,