Update

.travis.yml

@@ -1,12 +1,24 @@
 language: python
 python:
-  - "3.5"
+- '3.6'
 env:
-  - TOXENV=django111-py27
-  - TOXENV=django111-py35
-  - TOXENV=django20-py35
+- TOXENV=django111-py27
+- TOXENV=django111-py35
+- TOXENV=django20-py35
+- TOXENV=django225-py36
 
 install:
-  - pip install tox
-
+- pip install tox
 script: tox
+
+after_success:
+- coveralls
+deploy:
+  provider: pypi
+  distributions: sdist bdist_wheel
+  user: __token__
+  password:
+    secure: hCFsFXn3x1DO23LB91l80YTvZRXWNUt+HHXukReQ/DFwXp3ar8sX7usCLyRwqjT+hibAbppJobCpINARPkczMWFnyk6sUQbw2BexR41a1pwCR4xR9mA7ap+fVkwAkFOy+FPl1H7xgKdmZpFmO6HvU7Y0DfnOLLAdgDFM6lIHsycnJEnxy5PfaiPaUwbW7pzjo2Z1XCMRI+Q+iBsUsSI2IwjrogrurNhmEClv9clcy+h1iHRwztAdDcSW23y6GiJSVK2+60Fh+FHMKIJZjGQDISKpnkIwdB7fmbTOOtGvPU+r+v7UjDxLFlBBNRt6YYSIVdntBGQX4gWwA40ajWp2cT1AXupi6HQkGzYgRdElnGozoH2orU19uHQFukunwP9+pic3SXBZwwCvtsB+dwNZlEVXxCdoq9vD5XsWfkYquMug9iYlzAO8O+RTCZC75E4Gjtf1z5fyV8vqQUlJUhp81mxqRXwGUI7Srl6nfFz6D6OKeWLfs1l8yMUQZNJr9nmnQTUBnLOW7+shj2X70VTY5m2XdgZx9IATjuWj6FbhqvNKczOaZLmj8NGK08tOnUoqqu97+txyI7Pj77joFDv3Dpag11Adf+hLdFNtM6PMdZfJgjnVyYfF+RlzRk8zLrVfdI6KNaKGAY5oX8wswEQU3LEk/nWQA9kLOpDToM+xu7M=
+  on:
+    tags: true
+    python: 3.6

AUTHORS.rst

@@ -1,10 +1,8 @@
 Authors
 =======
 
-Praekelt Consulting
+Praekelt Foundation
 -------------------
 
-* Hedley Roos
-* Chris Sergienko
-* Jason Paidoussi
+* Aphiwe Moshesh
 

CHANGELOG.rst

@@ -1,39 +1,7 @@
 Changelog
 =========
 
-next
-----
-#. Vastly simplify the templating. This introduces major backward incompatibility.
-#. Implement caching to speed up the Explorer.
-#. Added a cached loader to speed up rendering during development.
-
-0.3.1
+0.1.6
 -----
-#. Django 1.11 compatibility.
-
-0.3
----
-#. Simplify layout and models. This introduces some backward incompatibility with 0.2.1. You may need to update your templates.
-#. Vastly simplify the RESTful API.
-#. PyPy and Python 3.5 compatibility.
-
-0.2.1
------
-#. Consider the entire nested structure when computing a cache key.
-#. Deepmerge now merges through nested lists.
-#. Deepmerge now does automatic type conversion from a dictionary to a dictionary in a list if required.
-
-0.2
----
-#. Make it possible to override `iframe.html` for each project.
-#. New UI theme.
-#. Django template and RESTful API.
-
-0.1.1
------
-#. Inevitable rename to avoid name collision.
-
-0.1
-----
 #. First release.
-
+#. This package is a fork of mote-prk see https://github.com/praekelt/mote

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) Praekelt Consulting
+Copyright (c) Praekelt Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.rst

@@ -1,7 +1,7 @@
 Mote - the pattern library framework
 ====================================
 
-.. figure:: https://travis-ci.org/praekelt/mote.svg?branch=develop
+.. figure:: https://travis-ci.org/praekeltfoundation/mote.svg?branch=develop
    :align: center
    :alt: Travis
 

mote/__init__.py

@@ -1,7 +1,7 @@
 import threading
 
 
-__version__ = "0.3.1"
+__version__ = "0.1.6"
 default_app_config = "mote.apps.MoteConfig"
 PROJECT_PATHS = {}
 _thread_locals = threading.local()

mote/templatetags/mote_tags.py

@@ -18,7 +18,7 @@
 from django.template.response import TemplateResponse
 from django.utils.translation import ugettext as _
 from django.utils.functional import Promise
-from django.utils.six import string_types, text_type
+from six import string_types, text_type
 try:
     from django.urls import reverse
 except ImportError:

mote/tests/requirements/225.txt

@@ -0,0 +1,9 @@
+django>=2.2.5,<3.0
+beautifulsoup4==4.4.1
+djangorestframework==3.10.3
+six==1.9.0
+djangorestframework-jwt==1.8.0
+xmltodict==0.10.2
+PyYAML==3.12
+yamlordereddictloader==0.4.0
+pypandoc==1.3.3

mote/tests/settings/225.py

@@ -0,0 +1,68 @@
+import os
+import glob
+from os.path import expanduser
+
+if "VIRTUAL_ENV" in os.environ:
+    BASE_DIR = os.path.join(
+        glob.glob(os.environ["VIRTUAL_ENV"] + "/lib/*/site-packages")[0],
+        "mote"
+    )
+else:
+    BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
+SECRET_KEY = "SECRET_KEY_PLACEHOLDER"
+
+DEBUG = True
+
+TEMPLATE_DEBUG = True
+
+INSTALLED_APPS = (
+    "mote",
+    "mote.tests",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.staticfiles",
+    "rest_framework",
+)
+
+TEMPLATE_CONTEXT_PROCESSORS = [
+    "django.contrib.auth.context_processors.auth",
+    "django.template.context_processors.debug",
+    "django.template.context_processors.i18n",
+    "django.template.context_processors.media",
+    "django.template.context_processors.static",
+    "django.template.context_processors.tz",
+    "django.template.context_processors.request",
+    "django.contrib.messages.context_processors.messages",
+]
+
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [],
+        "APP_DIRS": False,
+        "OPTIONS": {
+            "context_processors": TEMPLATE_CONTEXT_PROCESSORS,
+            "loaders": [
+                "django.template.loaders.filesystem.Loader",
+                "mote.loaders.app_directories.Loader",
+                "django.template.loaders.app_directories.Loader",
+            ]
+        },
+    },
+]
+
+ROOT_URLCONF = "mote.tests.urls"
+
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
+    }
+}
+
+USE_TZ = True
+
+STATIC_URL = "/static/"
+
+MOTE = {"project": lambda request: "myproject"}

mote/views.py

@@ -4,7 +4,7 @@
 from django.template.loader import render_to_string
 from django.templatetags.static import PrefixNode
 from django.utils.functional import cached_property
-from django.utils.six.moves.urllib.parse import urljoin
+from urllib.parse import urljoin
 from django.views.generic.base import TemplateView
 
 from mote import PROJECT_PATHS
@@ -195,4 +195,3 @@ def get_context_data(self, **kwargs):
             for prime in PRIMES:
                 result = str(is_prime(prime))
         return {}
-

setup.py

@@ -14,12 +14,12 @@ def get_version(fname):
 
 
 setup(
-    name="mote-prk",
+    name="mote-praekelt",
     version=get_version('mote/__init__.py'),
     description="Mote - the pattern library framework.",
-    long_description = open("README.rst", "r").read() + open("AUTHORS.rst", "r").read() + open("CHANGELOG.rst", "r").read(),
-    author="Praekelt Consulting",
-    author_email="dev@praekelt.com",
+    long_description=open("README.rst", "r").read() + open("AUTHORS.rst", "r").read() + open("CHANGELOG.rst", "r").read(),
+    author="Praekelt Foundation",
+    author_email="dev@praekelt.org",
     url="https://github.com/praekelt/mote",
     license="BSD",
     packages=find_packages(),

tox.ini

@@ -1,14 +1,8 @@
 [tox]
 envlist =
-    django111-{py27,py35}
+    django111-py35
     django20-py35
-
-[testenv]
-basepython = python2.7
-
-[testenv:django111-py27]
-deps = -rmote/tests/requirements/111.txt
-commands = python manage.py test mote{posargs} --settings=mote.tests.settings.111
+    django225-py36
 
 [testenv:django111-py35]
 basepython = python3.5
@@ -19,3 +13,8 @@ commands = python manage.py test mote{posargs} --settings=mote.tests.settings.11
 basepython = python3.5
 deps = -rmote/tests/requirements/20.txt
 commands = python manage.py test mote{posargs} --settings=mote.tests.settings.20
+
+[testenv:django225-py36]
+basepython = python3.6
+deps = -rmote/tests/requirements/225.txt
+commands = python manage.py test mote{posargs} --settings=mote.tests.settings.225