Merge pull request #62 from somewes/develop

github actions

Author: somewes

.github/workflows/tests.yml

@@ -0,0 +1,84 @@
+# copied from django-cte
+name: db_mutex 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":"db_mutex",
+            "USER":"postgres",
+            "PASSWORD":"postgres",
+            "HOST":"localhost",
+            "PORT":"5432"
+          }
+      run: |
+        coverage run manage.py test db_mutex
+        coverage report --fail-under=99
+      continue-on-error: ${{ matrix.experimental }}
+    - name: Check style
+      run: flake8 db_mutex

.travis.yml

@@ -1,2 +1,3 @@
 include README.rst
 include LICENSE
+recursive-include requirements *

MANIFEST.in

@@ -1 +1 @@
-__version__ = '2.0.0'
+__version__ = '3.0.0'

db_mutex/version.py

@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+v3.0.0
+------
+* Django 3.2. 4.0, 4.1
+* python 3.9
+* drop python 3.6
+
 v2.0.0
 ------
 * Django 3.0, 3.1

docs/release_notes.rst

@@ -1,7 +1,8 @@
 coverage
-coveralls
+#coveralls
 django-dynamic-fixture
 django-nose
 freezegun
 mock
 psycopg2
+flake8

requirements/requirements-testing.txt

@@ -0,0 +1 @@
+Django>=2.2

requirements/requirements.txt

@@ -1,4 +1,5 @@
 import os
+import json
 
 from django.conf import settings
 
@@ -12,28 +13,30 @@ 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_dev',
-                'USER': 'ambition_dev',
-                'PASSWORD': 'ambition_dev',
-                'HOST': 'localhost'
-            }
-        elif test_db == 'postgres':
-            db_config = {
-                'ENGINE': 'django.db.backends.postgresql_psycopg2',
-                'USER': 'postgres',
+                'ENGINE': 'django.db.backends.postgresql',
                 'NAME': 'db_mutex',
+                'USER': 'postgres',
+                'PASSWORD': '',
+                'HOST': 'db',
             }
-        elif test_db == 'sqlite':
+        elif test_db == 'postgres':
             db_config = {
-                'ENGINE': 'django.db.backends.sqlite3',
+                'ENGINE': 'django.db.backends.postgresql',
                 'NAME': 'db_mutex',
+                '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'))
+
         settings.configure(
             TEST_RUNNER='django_nose.NoseTestSuiteRunner',
+            SECRET_KEY='*',
             NOSE_ARGS=['--nocapture', '--nologcapture', '--verbosity=1'],
             MIDDLEWARE_CLASSES=(),
             DATABASES={

settings.py

@@ -19,6 +19,14 @@ def get_version():
         raise RuntimeError('Unable to find version string in {0}.'.format(VERSION_FILE))
 
 
+def get_lines(file_path):
+    return open(file_path, 'r').read().split('\n')
+
+
+install_requires = get_lines('requirements/requirements.txt')
+tests_require = get_lines('requirements/requirements-testing.txt')
+
+
 setup(
     name='django-db-mutex',
     version=get_version(),
@@ -30,28 +38,23 @@ def get_version():
     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',
     ],
     license='MIT',
-    install_requires=[
-        'Django>=2.2',
-    ],
-    tests_require=[
-        'psycopg2',
-        'django-nose>=1.4',
-        'mock',
-        'coverage>=3.7.1',
-        'freezegun>=0.3.2',
-        'django-dynamic-fixture'
-    ],
+    install_requires=install_requires,
+    tests_require=tests_require,
     test_suite='run_tests.run_tests',
     include_package_data=True,
     zip_safe=False,