Sync with upstream

.github/workflows/check.yml

@@ -0,0 +1,37 @@
+name: Check
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  build:
+    name: ${{ matrix.tox-environment }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        tox-environment:
+          - docs
+          - lint
+
+    env:
+      TOXENV: ${{ matrix.tox-environment }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+
+      - name: Set up system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext
+
+      - name: Install dependencies
+        run: python -m pip install tox
+
+      - name: Run
+        run: tox

.github/workflows/test.yml

@@ -0,0 +1,47 @@
+name: Test
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  build:
+    name: Python ${{ matrix.python-version }} / ${{ matrix.tox-environment }}
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - 3.6
+          - 3.7
+          - 3.8
+          - 3.9
+          - pypy3
+        tox-environment:
+          # Previous LTS
+          - django22
+          # Latest release
+          - django32
+
+    env:
+      TOXENV: ${{ matrix.tox-environment }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Set up system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext
+
+      - name: Install dependencies
+        run: python -m pip install tox
+
+      - name: Run tests
+        run: tox

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2013, Raphaël Barrois
+Copyright (c) 2011-2020, Raphaël Barrois
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

MANIFEST.in

@@ -1,14 +1,15 @@
 include CREDITS ChangeLog LICENSE README.rst
-include requirements*.txt
 # Required for 'setup.py build'
 include Makefile
 
 graft django_xworkflows
 
-prune dev
-prune docs
-prune tests
+graft dev
+graft docs
+graft tests
+
+prune docs/_build
 
 global-exclude *.py[cod] __pycache__
 
-exclude tox.ini .flake8 manage.py
+include tox.ini .flake8 manage.py

Makefile

@@ -5,7 +5,6 @@ DOC_DIR=docs
 # Use current python binary instead of system default.
 COVERAGE = python $(shell which coverage)
 FLAKE8 = flake8
-MANAGE_PY = python manage.py
 DJANGO_ADMIN = django-admin.py
 PO_FILES = $(shell find $(PACKAGE) -name '*.po')
 MO_FILES = $(PO_FILES:.po=.mo)
@@ -36,17 +35,17 @@ build: $(MO_FILES)
 	cd $(abspath $(dir $<)/../../..) && $(DJANGO_ADMIN) compilemessages
 
 # DOC: Install and/or upgrade dependencies
-update:
+setup-dev:
 	pip install --upgrade pip setuptools
-	pip install --upgrade -r requirements_dev.txt
+	pip install --upgrade -e .[dev,doc]
 	pip freeze
 
 
 release:
 	fullrelease
 
 
-.PHONY: all default clean build update release
+.PHONY: all default clean build setup-dev release
 
 
 # Tests and quality
@@ -59,16 +58,16 @@ testall:
 
 # DOC: Run tests for the currently installed version
 test: build
-	PYTHONPATH=. python -Wdefault $(TESTS_DIR)/runner.py
+	python -Werror ./manage.py test tests.djworkflows.tests
 
 
 
 # Note: we run the linter in two runs, because our __init__.py files has specific warnings we want to exclude
 # DOC: Perform code quality tasks
 lint:
-	$(FLAKE8) --config .flake8 --exclude $(PACKAGE)/__init__.py $(PACKAGE)
-	$(FLAKE8) --config .flake8 --ignore F401 $(PACKAGE)/__init__.py
-	$(FLAKE8) --config .flake8 $(TESTS_DIR)
+	$(FLAKE8) --exclude $(PACKAGE)/__init__.py $(PACKAGE)
+	$(FLAKE8) --ignore F401 $(PACKAGE)/__init__.py
+	$(FLAKE8) $(TESTS_DIR)
 	check-manifest
 
 coverage:

dev/settings.py

@@ -12,6 +12,8 @@
     }
 }
 
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
@@ -104,20 +106,22 @@
     },
 ]
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-ROOT_URLCONF = 'migration_helper.urls'
+ROOT_URLCONF = 'dev.urls'
 
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sites',
+    'tests.djworkflows',
+    'django_xworkflows',
     'django_xworkflows.xworkflow_log',
 )
 

dev/urls.py

@@ -1,17 +1,6 @@
-from django.conf.urls.defaults import patterns, include, url
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin
 # admin.autodiscover()
 
-urlpatterns = patterns('',
-    # Examples:
-    # url(r'^$', 'migration_helper.views.home', name='home'),
-    # url(r'^migration_helper/', include('migration_helper.foo.urls')),
-
-    # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    # url(r'^admin/', include(admin.site.urls)),
-)
+urlpatterns = []

django_xworkflows/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2011-2013 Raphaël Barrois
+# Copyright (c) 2011-2020 Raphaël Barrois
 # This code is distributed under the two-clause BSD license.
 
-__version__ = '0.12.4.dev0'
+__version__ = '1.0.1.dev0'
 __author__ = 'Raphaël Barrois <[email protected]>'

django_xworkflows/locale/fr_FR/LC_MESSAGES/django.po

@@ -1,5 +1,5 @@
 # Locale for django-xworkflows.
-# Copyright (C) 2011 Raphaël Barrois
+# Copyright (C) 2011-2020 Raphaël Barrois
 # This file is distributed under the same license as the django-xworkflows package.
 # Raphaël Barrois <[email protected]> 2011.
 #

django_xworkflows/management/commands/rebuild_transitionlog_states.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2011-2013 Raphaël Barrois
+# Copyright (c) 2011-2020 Raphaël Barrois
 # This code is distributed under the two-clause BSD license.
 
-from __future__ import unicode_literals
-
 
 """Rebuild missing from_state/to_state fields on TransitionLog objects."""
 

django_xworkflows/models.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2011-2013 Raphaël Barrois
+# Copyright (c) 2011-2020 Raphaël Barrois
 # This code is distributed under the two-clause BSD license.
 
-from __future__ import unicode_literals
-
 """Specific versions of XWorkflows to use with Django."""
 
 from django.apps import apps
@@ -16,9 +14,8 @@
 from django.forms import fields
 from django.forms import widgets
 from django.utils.deconstruct import deconstructible
-from django.utils.encoding import force_text, python_2_unicode_compatible
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from xworkflows import base
 
@@ -249,7 +246,7 @@ class BaseWorkflowEnabled(base.BaseWorkflowEnabled):
     def _get_FIELD_display(self, field):
         if isinstance(field, StateField):
             value = getattr(self, field.attname)
-            return force_text(value.title)
+            return str(value.title)
         else:
             return super(BaseWorkflowEnabled, self)._get_FIELD_display(field)
 
@@ -292,9 +289,7 @@ def get_default_log_model():
 
 class DjangoImplementationWrapper(base.ImplementationWrapper):
     """Restrict execution of transitions within templates"""
-    # django < 1.4
     alters_data = True
-    # django >= 1.4
     do_not_call_in_templates = True
 
 
@@ -423,7 +418,6 @@ def log_transition(self, transition, from_state, instance, *args, **kwargs):
             self.db_log(transition, from_state, instance, *args, **kwargs)
 
 
-@python_2_unicode_compatible
 class BaseTransitionLog(models.Model):
     """Abstract model for a minimal database logging setup.
 

django_xworkflows/xworkflow_log/admin.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2011-2013 Raphaël Barrois
+# Copyright (c) 2011-2020 Raphaël Barrois
 # This code is distributed under the two-clause BSD license.
 
-from __future__ import unicode_literals
-
 from . import models
 
 from django.contrib import admin

django_xworkflows/xworkflow_log/locale/fr_FR/LC_MESSAGES/django.po

@@ -1,5 +1,5 @@
 # Locale for django-xworkflows.
-# Copyright (C) 2011 Raphaël Barrois
+# Copyright (C) 2011-2020 Raphaël Barrois
 # This file is distributed under the same license as the django-xworkflows package.
 # Raphaël Barrois <[email protected]> 2011.
 #

django_xworkflows/xworkflow_log/migrations/0001_initial.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
-from __future__ import unicode_literals
 
 from django.db import models, migrations
 import django.utils.timezone
@@ -12,7 +11,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('contenttypes', '0001_initial'),
+        ('contenttypes', '0002_remove_content_type_name'),
         migrations.swappable_dependency(XWORKFLOWS_USER_MODEL),
     ]
 

django_xworkflows/xworkflow_log/models.py

@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2011-2013 Raphaël Barrois
+# Copyright (c) 2011-2020 Raphaël Barrois
 # This code is distributed under the two-clause BSD license.
 
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import models as django_models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .. import models