From 246f57b34caa1b590fc00a8d6ab22c8125b12b9a Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Wed, 18 Sep 2019 11:46:27 +0200 Subject: [PATCH 01/18] add django 2.2 support --- mote/tests/requirements/225.txt | 9 +++++ mote/tests/settings/225.py | 68 +++++++++++++++++++++++++++++++++ tox.ini | 6 +++ 3 files changed, 83 insertions(+) create mode 100644 mote/tests/requirements/225.txt create mode 100644 mote/tests/settings/225.py diff --git a/mote/tests/requirements/225.txt b/mote/tests/requirements/225.txt new file mode 100644 index 0000000..2845acf --- /dev/null +++ b/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 diff --git a/mote/tests/settings/225.py b/mote/tests/settings/225.py new file mode 100644 index 0000000..3e45956 --- /dev/null +++ b/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"} diff --git a/tox.ini b/tox.ini index 865007f..5514b50 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,7 @@ envlist = django111-{py27,py35} django20-py35 + django225-py36 [testenv] basepython = python2.7 @@ -19,3 +20,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 From 44f0b55e74a4df4f74decef1c6bc15633978472c Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Wed, 18 Sep 2019 12:18:01 +0200 Subject: [PATCH 02/18] rename mote, update version and trav conf --- .travis.yml | 13 +++++++++++++ README.rst | 2 +- mote/__init__.py | 2 +- setup.py | 8 ++++---- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8dba3c4..ae78bfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,3 +10,16 @@ install: - pip install tox script: tox + +after_success: + - coveralls + +deploy: + provider: pypi + user: Praekelt + password: + # NOTE: See http://docs.travis-ci.com/user/encryption-keys/ for more info. + secure: "insert encrypted pypi password here" + on: + tags: true + all_branches: true \ No newline at end of file diff --git a/README.rst b/README.rst index d7ad2eb..3a904f4 100644 --- a/README.rst +++ b/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 diff --git a/mote/__init__.py b/mote/__init__.py index 9545351..de2f74b 100644 --- a/mote/__init__.py +++ b/mote/__init__.py @@ -1,7 +1,7 @@ import threading -__version__ = "0.3.1" +__version__ = "0.0.1" default_app_config = "mote.apps.MoteConfig" PROJECT_PATHS = {} _thread_locals = threading.local() diff --git a/setup.py b/setup.py index b214c9e..9edce39 100644 --- a/setup.py +++ b/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(), From 01e20755d72d2f274b36e91940df6dbcf860bb3e Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Wed, 18 Sep 2019 12:46:15 +0200 Subject: [PATCH 03/18] update change log, version, license and authors log files --- AUTHORS.rst | 6 ++---- CHANGELOG.rst | 36 ++---------------------------------- LICENSE | 2 +- mote/__init__.py | 2 +- 4 files changed, 6 insertions(+), 40 deletions(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index 2fa26dd..3aa6ae8 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -1,10 +1,8 @@ Authors ======= -Praekelt Consulting +Praekelt Foundation ------------------- -* Hedley Roos -* Chris Sergienko -* Jason Paidoussi +* Aphiwe Moshesh diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 59d73f0..5c3908f 100644 --- a/CHANGELOG.rst +++ b/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.0 ----- -#. 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 \ No newline at end of file diff --git a/LICENSE b/LICENSE index c8289b1..3798982 100644 --- a/LICENSE +++ b/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 diff --git a/mote/__init__.py b/mote/__init__.py index de2f74b..17aabbc 100644 --- a/mote/__init__.py +++ b/mote/__init__.py @@ -1,7 +1,7 @@ import threading -__version__ = "0.0.1" +__version__ = "0.1.0" default_app_config = "mote.apps.MoteConfig" PROJECT_PATHS = {} _thread_locals = threading.local() From 7f67d042f8afba732e5e8d6a0ea3ca54c2ecba9e Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Wed, 18 Sep 2019 13:46:41 +0200 Subject: [PATCH 04/18] update trav test envs --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ae78bfb..e29dafa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: - TOXENV=django111-py27 - TOXENV=django111-py35 - TOXENV=django20-py35 + - TOXENV=django225-py36 install: - pip install tox From 3712c50b78132cc7950e4bb9f7e6f8941da31cd3 Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Wed, 18 Sep 2019 13:51:54 +0200 Subject: [PATCH 05/18] update travis python version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e29dafa..446733e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: python python: - - "3.5" + - "3.6" env: - TOXENV=django111-py27 - TOXENV=django111-py35 From 3230d83b88134e61aadb0f5f899f575dccdc1c31 Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Wed, 18 Sep 2019 14:02:11 +0200 Subject: [PATCH 06/18] update changes and version files --- CHANGELOG.rst | 2 +- mote/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5c3908f..2164634 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ Changelog ========= -0.1.0 +0.1.1 ----- #. First release. #. This package is a fork of mote-prk see https://github.com/praekelt/mote \ No newline at end of file diff --git a/mote/__init__.py b/mote/__init__.py index 17aabbc..c4258ed 100644 --- a/mote/__init__.py +++ b/mote/__init__.py @@ -1,7 +1,7 @@ import threading -__version__ = "0.1.0" +__version__ = "0.1.1" default_app_config = "mote.apps.MoteConfig" PROJECT_PATHS = {} _thread_locals = threading.local() From 60452e7de636c5dc779b124740a7949d5e8ccfd7 Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Wed, 18 Sep 2019 16:45:08 +0200 Subject: [PATCH 07/18] update change log and version --- CHANGELOG.rst | 2 +- mote/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2164634..b404b25 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ Changelog ========= -0.1.1 +0.1.2 ----- #. First release. #. This package is a fork of mote-prk see https://github.com/praekelt/mote \ No newline at end of file diff --git a/mote/__init__.py b/mote/__init__.py index c4258ed..3039ee7 100644 --- a/mote/__init__.py +++ b/mote/__init__.py @@ -1,7 +1,7 @@ import threading -__version__ = "0.1.1" +__version__ = "0.1.2" default_app_config = "mote.apps.MoteConfig" PROJECT_PATHS = {} _thread_locals = threading.local() From 6519e73a1549bdcf1a45f202c32717f48de90173 Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Wed, 18 Sep 2019 17:01:24 +0200 Subject: [PATCH 08/18] update change log, version and pypi creds --- .travis.yml | 8 ++++---- CHANGELOG.rst | 2 +- mote/__init__.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 446733e..6560366 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,10 +17,10 @@ after_success: deploy: provider: pypi - user: Praekelt + distributions: sdist bdist_wheel + user: praekelt.org password: - # NOTE: See http://docs.travis-ci.com/user/encryption-keys/ for more info. - secure: "insert encrypted pypi password here" + secure: "A8XMvXz0oUa4wXIyW+EvWHbWRSzOpFL/UOqvTTzklXjw/0mOkwe9cmD0IHlB15lmPkvvPF8tUp8f05wex+2vEsZ9rIekIJRyMCeQZPuVSiHJ/jGnonS9n95BBWiezhmJnt5np8MU390EbsPDNfQKVzXPsblhticvIuDvzAOJo/jODz083QpLO4THFTnNcBbcYrUX8s6r17DcVC9BdOxIMfth/3lC2b69Jk+Djwwmhc1xjrI9a1q4LDxfe8g88JuWi6F48o1S1YKohoRX4XZggZRGKsy38x+3+AXHiCQFjmplNOyA5QPljTfue4fKo5h3eFqilAXYmwJdSqCu7L2zgG0xItnSOPFmQyy1yiIgbpxqFSUfonVMzTW9ehtDAVhk0mxpTKyI69si1FbswozfBKp8TMryNoaXsr3mqSR9//nOR8ueLokzrlzNtYVtBAd4+H5678kXoFO7NiWu3APGS6uMEvY45N10JxObW81rsTSqME1KiyRY+LmwQ/1psOMqSUzonkVMNeEnDtEA9mNbR2kSDFXgHDp8YS/ONXkxDChGSrh4vHW5e8NeP9FGFLrAoPL4KZAN+fCY4uTIfq5NCOg4CR4fncGLa0Tp1SQ+7VTdi+3PqieZomVRZbXqpMo8mTcyCtHKnwgThYREISWYgoyjyH8opeqE7uD96LTR0TY=" on: tags: true - all_branches: true \ No newline at end of file + python: 3.6 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b404b25..37c38e1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ Changelog ========= -0.1.2 +0.1.3 ----- #. First release. #. This package is a fork of mote-prk see https://github.com/praekelt/mote \ No newline at end of file diff --git a/mote/__init__.py b/mote/__init__.py index 3039ee7..c74e778 100644 --- a/mote/__init__.py +++ b/mote/__init__.py @@ -1,7 +1,7 @@ import threading -__version__ = "0.1.2" +__version__ = "0.1.3" default_app_config = "mote.apps.MoteConfig" PROJECT_PATHS = {} _thread_locals = threading.local() From 02dd94af06dfb3826ac50c52ffcb9badb8e094a2 Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Thu, 19 Sep 2019 12:24:31 +0200 Subject: [PATCH 09/18] update deploy creds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6560366..acc0c85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ deploy: distributions: sdist bdist_wheel user: praekelt.org password: - secure: "A8XMvXz0oUa4wXIyW+EvWHbWRSzOpFL/UOqvTTzklXjw/0mOkwe9cmD0IHlB15lmPkvvPF8tUp8f05wex+2vEsZ9rIekIJRyMCeQZPuVSiHJ/jGnonS9n95BBWiezhmJnt5np8MU390EbsPDNfQKVzXPsblhticvIuDvzAOJo/jODz083QpLO4THFTnNcBbcYrUX8s6r17DcVC9BdOxIMfth/3lC2b69Jk+Djwwmhc1xjrI9a1q4LDxfe8g88JuWi6F48o1S1YKohoRX4XZggZRGKsy38x+3+AXHiCQFjmplNOyA5QPljTfue4fKo5h3eFqilAXYmwJdSqCu7L2zgG0xItnSOPFmQyy1yiIgbpxqFSUfonVMzTW9ehtDAVhk0mxpTKyI69si1FbswozfBKp8TMryNoaXsr3mqSR9//nOR8ueLokzrlzNtYVtBAd4+H5678kXoFO7NiWu3APGS6uMEvY45N10JxObW81rsTSqME1KiyRY+LmwQ/1psOMqSUzonkVMNeEnDtEA9mNbR2kSDFXgHDp8YS/ONXkxDChGSrh4vHW5e8NeP9FGFLrAoPL4KZAN+fCY4uTIfq5NCOg4CR4fncGLa0Tp1SQ+7VTdi+3PqieZomVRZbXqpMo8mTcyCtHKnwgThYREISWYgoyjyH8opeqE7uD96LTR0TY=" + secure: rnGNl3NRxGIXTDR+ZA0i8IBn5OyyvLsG3u+SJIWSqyAgPHEucbxBCRuhUN/fIhdTQZFFffQukojxaD4kZnTz13oWMbq/NU0LnofzWKLC59eeVIqzIFpYUVqyTw1gr9PjoeVI4m8bmW+DD/aVVHQKS6TOv98XnzGwVqOjf7sW3neu8a919YXIg47GUx+xh2/dkKSr+KgyqjkRJWcGODZPZ2ZyJmYWSKjCHTN/GkVShbAKykcXIvYUn/ebIYoAFb/OfYi/wzZ3Jy4Dg3Br0qhnROvMgumPCGPrVYPhOFKyUUhzIG2H0VgcwWUpQVGX7QwHqAHhOhjjvb7IvajXtWX4sSbtqncRm+71cqceYtoDVxh80GyHKdn1HPGIgAzgrMUu8vuc+35YpbfwW6mzd5sgRJPFTltfPi1ubA3rsFY6g29tguaX53XQNmxx/eotYkoZT4yZlnAY6TXwcvYgg5M8gJ50TIHjCwIyeje6WNLBVn8MMvg7d6f+aEAXvuWXi/WkQPGydHoD9El72vwSHwP4AX+J38mpUBi4ATqLg3UeYSY8yLg/DCT6DXpyPubEl0cDNAwDGeAVEPm5DxfoV10Qgf+wrtP7gx/HS5aWbrneAF/BmLEmzdDpl3BsDWfSzSU4L959budrAcC6mES+W9O1RbvYBfz8YOgWC9MNWsIRR4w= on: tags: true python: 3.6 From 03fddf4738ee658036029077e6d7dd1336454dab Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Thu, 19 Sep 2019 12:26:10 +0200 Subject: [PATCH 10/18] update version and change log --- CHANGELOG.rst | 2 +- mote/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 37c38e1..f47f0f4 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ Changelog ========= -0.1.3 +0.1.4 ----- #. First release. #. This package is a fork of mote-prk see https://github.com/praekelt/mote \ No newline at end of file diff --git a/mote/__init__.py b/mote/__init__.py index c74e778..866db85 100644 --- a/mote/__init__.py +++ b/mote/__init__.py @@ -1,7 +1,7 @@ import threading -__version__ = "0.1.3" +__version__ = "0.1.4" default_app_config = "mote.apps.MoteConfig" PROJECT_PATHS = {} _thread_locals = threading.local() From c59e0a3bd59970433f364557aba47e6d206ca8c3 Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Thu, 19 Sep 2019 13:30:35 +0200 Subject: [PATCH 11/18] update pypi creds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index acc0c85..e7456e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ deploy: distributions: sdist bdist_wheel user: praekelt.org password: - secure: rnGNl3NRxGIXTDR+ZA0i8IBn5OyyvLsG3u+SJIWSqyAgPHEucbxBCRuhUN/fIhdTQZFFffQukojxaD4kZnTz13oWMbq/NU0LnofzWKLC59eeVIqzIFpYUVqyTw1gr9PjoeVI4m8bmW+DD/aVVHQKS6TOv98XnzGwVqOjf7sW3neu8a919YXIg47GUx+xh2/dkKSr+KgyqjkRJWcGODZPZ2ZyJmYWSKjCHTN/GkVShbAKykcXIvYUn/ebIYoAFb/OfYi/wzZ3Jy4Dg3Br0qhnROvMgumPCGPrVYPhOFKyUUhzIG2H0VgcwWUpQVGX7QwHqAHhOhjjvb7IvajXtWX4sSbtqncRm+71cqceYtoDVxh80GyHKdn1HPGIgAzgrMUu8vuc+35YpbfwW6mzd5sgRJPFTltfPi1ubA3rsFY6g29tguaX53XQNmxx/eotYkoZT4yZlnAY6TXwcvYgg5M8gJ50TIHjCwIyeje6WNLBVn8MMvg7d6f+aEAXvuWXi/WkQPGydHoD9El72vwSHwP4AX+J38mpUBi4ATqLg3UeYSY8yLg/DCT6DXpyPubEl0cDNAwDGeAVEPm5DxfoV10Qgf+wrtP7gx/HS5aWbrneAF/BmLEmzdDpl3BsDWfSzSU4L959budrAcC6mES+W9O1RbvYBfz8YOgWC9MNWsIRR4w= + secure: vd7EJcZekx4ws2cwEatVHjP7/GqY7S+f9vjtj34LN9I1TU2579W021BJrHDEeX/+mFuZfjcVDkDfm5l7oVKpUgweb3Zv1iHoRHAayh9qEgnf2wLOpETLqbVx/pNQvLOJaMLJ9BYvYt8xdLN9WD2gegGQ7uBe1dhZ9pWyI5yitFVzvo/uZNZ0TNYIhlu/2OtTgOU/dwWHkaFRDbp8HsAhKmbf5AfZhyrgAtO4UobvvX6KlwvFeK/K7p8JQo5M7o3OZYicmhOPWiC12ucE3N2NkpX3TnMYUt3r5oACd450awBn47Wn0HVZp16nfHe8FA2jrTrGNYsKlWt0J/G3SRTMI939ywNrhVLsifD5bv4dgUsJysFIavgpRNI8bz2oWJnmqfVPsWStY2Aj2/LnwzVZCeF+yPzryn+CQ+iNE1/l7l1g9cH1TDUlP0mugdszV++lP8W4kIIV55m12ECAQFRKki7Um80V7OOGyUAJI75AT1XvhFwBCS+BwSHD3HN6C/JUa7gywZSOHFyw9BToqbF3gSERSoHYfeqXUCDKkvLJLfJPMxO8OkAhb+xdGO/ZLpFuKA61H8v6+d1Gm6BJbWQyyfqGVuu8vNmgbgwCC5Fk5UaIRdmdGZN1PfxszOn1FNfhsMvC8uyXdmRNazHZlKOs6IWRGSqjXu67/ejMGLwFz1o= on: tags: true python: 3.6 From cffd1232b7355830bc418a9fc1a5ecd840c46ec1 Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Thu, 19 Sep 2019 13:33:11 +0200 Subject: [PATCH 12/18] update change log and version --- CHANGELOG.rst | 2 +- mote/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f47f0f4..e757514 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ Changelog ========= -0.1.4 +0.1.5 ----- #. First release. #. This package is a fork of mote-prk see https://github.com/praekelt/mote \ No newline at end of file diff --git a/mote/__init__.py b/mote/__init__.py index 866db85..244c322 100644 --- a/mote/__init__.py +++ b/mote/__init__.py @@ -1,7 +1,7 @@ import threading -__version__ = "0.1.4" +__version__ = "0.1.5" default_app_config = "mote.apps.MoteConfig" PROJECT_PATHS = {} _thread_locals = threading.local() From 19b203a0f6e38eea48b04c730b03e5e6bdeefedc Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Thu, 19 Sep 2019 13:52:32 +0200 Subject: [PATCH 13/18] update pypi creds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e7456e1..23d9143 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ deploy: distributions: sdist bdist_wheel user: praekelt.org password: - secure: vd7EJcZekx4ws2cwEatVHjP7/GqY7S+f9vjtj34LN9I1TU2579W021BJrHDEeX/+mFuZfjcVDkDfm5l7oVKpUgweb3Zv1iHoRHAayh9qEgnf2wLOpETLqbVx/pNQvLOJaMLJ9BYvYt8xdLN9WD2gegGQ7uBe1dhZ9pWyI5yitFVzvo/uZNZ0TNYIhlu/2OtTgOU/dwWHkaFRDbp8HsAhKmbf5AfZhyrgAtO4UobvvX6KlwvFeK/K7p8JQo5M7o3OZYicmhOPWiC12ucE3N2NkpX3TnMYUt3r5oACd450awBn47Wn0HVZp16nfHe8FA2jrTrGNYsKlWt0J/G3SRTMI939ywNrhVLsifD5bv4dgUsJysFIavgpRNI8bz2oWJnmqfVPsWStY2Aj2/LnwzVZCeF+yPzryn+CQ+iNE1/l7l1g9cH1TDUlP0mugdszV++lP8W4kIIV55m12ECAQFRKki7Um80V7OOGyUAJI75AT1XvhFwBCS+BwSHD3HN6C/JUa7gywZSOHFyw9BToqbF3gSERSoHYfeqXUCDKkvLJLfJPMxO8OkAhb+xdGO/ZLpFuKA61H8v6+d1Gm6BJbWQyyfqGVuu8vNmgbgwCC5Fk5UaIRdmdGZN1PfxszOn1FNfhsMvC8uyXdmRNazHZlKOs6IWRGSqjXu67/ejMGLwFz1o= + secure: UMzofXMie684edH4aFppeymRNXN9knyF9lVHe8io6TERXG3Nel0MQBpUTtErT1lRnc2bKJ4Vbdua7Z3y6i3U1pFoVdgIjjr0estcuPg9aepFbzbQoVeEFPG4/02iWI28yrdl8040Sh9pxt0Gz10A9H7EiVJ3j9ttNfFdwGV2as9ZVyN7YAN6CKGBsGA7XHvd+fBpmqWqGVzYPufUImGIiXKX2hjzJvd6+G1mzPtFfVLFwA5phODw9MemDsSzm94vm33HX2ecaHfz5XzRK0EkF3Zm98tEl5kVFk3Y2/eK37QxjP8KdfQD8KvnUbcBNvFPIHh7nG70HOEPWp+i4wqesPTBy/8oNDGleBXLhDLgSYsOQIfNgfBtp81SUnnatcSc4QiAieS1hgEDuVo8//mvBsunpBL7P6sEmuw/3qswUlLWXBvDs0F9edDSuvO2rRTUQ2JYYkN8EZkPS1i62hVUz+C9D9nKkfGr0A6mN3QikDb0F17FLLXJpO2sU4Aj0khWNxChU5N6kmVy0GW3MTBNJAZqkEvjwx/vcQTIozkIl3UNZwUynqRWQFtYIbGlYDFPtr6YJj2D2usVLORC3OfCHmXFsLMwgt873lZvSAn9/G56iRi03vj3V4TprEvCNuha5Ai7t5dZIs+vqqzYm20lKJfidB/xnoh0gQhHJbvgwkc= on: tags: true python: 3.6 From 12ef3908ffc337c9599efff44ed4cdea5e1b2984 Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Thu, 19 Sep 2019 14:02:24 +0200 Subject: [PATCH 14/18] update pypi creds --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23d9143..b213145 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,9 @@ after_success: deploy: provider: pypi distributions: sdist bdist_wheel - user: praekelt.org + user: __token__ password: - secure: UMzofXMie684edH4aFppeymRNXN9knyF9lVHe8io6TERXG3Nel0MQBpUTtErT1lRnc2bKJ4Vbdua7Z3y6i3U1pFoVdgIjjr0estcuPg9aepFbzbQoVeEFPG4/02iWI28yrdl8040Sh9pxt0Gz10A9H7EiVJ3j9ttNfFdwGV2as9ZVyN7YAN6CKGBsGA7XHvd+fBpmqWqGVzYPufUImGIiXKX2hjzJvd6+G1mzPtFfVLFwA5phODw9MemDsSzm94vm33HX2ecaHfz5XzRK0EkF3Zm98tEl5kVFk3Y2/eK37QxjP8KdfQD8KvnUbcBNvFPIHh7nG70HOEPWp+i4wqesPTBy/8oNDGleBXLhDLgSYsOQIfNgfBtp81SUnnatcSc4QiAieS1hgEDuVo8//mvBsunpBL7P6sEmuw/3qswUlLWXBvDs0F9edDSuvO2rRTUQ2JYYkN8EZkPS1i62hVUz+C9D9nKkfGr0A6mN3QikDb0F17FLLXJpO2sU4Aj0khWNxChU5N6kmVy0GW3MTBNJAZqkEvjwx/vcQTIozkIl3UNZwUynqRWQFtYIbGlYDFPtr6YJj2D2usVLORC3OfCHmXFsLMwgt873lZvSAn9/G56iRi03vj3V4TprEvCNuha5Ai7t5dZIs+vqqzYm20lKJfidB/xnoh0gQhHJbvgwkc= + secure: incBNqD1WDloWPGc1+Te6NMr7sD880gBPAe/vugKSg6QMVD7Ai1C3JwN+dO+y8yI0E0TgjwkXl/CCBWDVfGpLskgZ/UcudRsAqr+2IducEwBeJFGiVp7j/UE8/JEjIG7CHkWWuAMr0fd3Dv2b0F1AaIqdpKvN3VLbKO7P8Eau0jxaWWIN9yNIXiS4q7pF7GYrpxiVWE7vWs66iD6SEQUIRmsSyI5VMxeOaWBKo+7MQJtIem6VyJWTxzF+aZ4A0TL2R57xSYd+es9XA7iW4iVsndeLfvC0Wlv4u9U74WHQ86nsSvQTnUEG6sMe9LlRlVva4NkuuA2ImPbhmzpw5v4xBLn1A1wvfS/NfTYhbR0RPUkEGuPS1dU+S7TUIKBNptcMYAsqstAVZQv+zY/cJfhedmqMmT3+22XZVUrjHa70SGpHfQ7/2qX9E9LVS5Brzd18ge6ciPZtF3gsujAjiVq0l7iHU2S+be/RHSniz9MzA0Hps5ai/ADE/lqwboxjtzLthRLfnjUU6zuOjEyGIEEZfXgbaC6uDh8W+EBBeHyOsD3+9+Mrvs33hjsw1TEUMU6y7Bv0wX7J3FXIqUdTyzq2XscpUQA0BzR6hPTuodFOJ3wkTq8+U8FYVxWflipkxXgeQEiYzCyD1GEgnd3GoGaKYvqaE5F4frcmoALohv8HXI= on: tags: true python: 3.6 From d0e631d87e4537ccb05bf2bb613a9bf987afa7ea Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Thu, 19 Sep 2019 14:18:59 +0200 Subject: [PATCH 15/18] update creds --- .travis.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index b213145..28081b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,24 @@ language: python python: - - "3.6" +- '3.6' env: - - TOXENV=django111-py27 - - TOXENV=django111-py35 - - TOXENV=django20-py35 - - TOXENV=django225-py36 +- TOXENV=django111-py27 +- TOXENV=django111-py35 +- TOXENV=django20-py35 +- TOXENV=django225-py36 install: - - pip install tox - +- pip install tox script: tox after_success: - - coveralls - +- coveralls deploy: provider: pypi distributions: sdist bdist_wheel user: __token__ password: - secure: incBNqD1WDloWPGc1+Te6NMr7sD880gBPAe/vugKSg6QMVD7Ai1C3JwN+dO+y8yI0E0TgjwkXl/CCBWDVfGpLskgZ/UcudRsAqr+2IducEwBeJFGiVp7j/UE8/JEjIG7CHkWWuAMr0fd3Dv2b0F1AaIqdpKvN3VLbKO7P8Eau0jxaWWIN9yNIXiS4q7pF7GYrpxiVWE7vWs66iD6SEQUIRmsSyI5VMxeOaWBKo+7MQJtIem6VyJWTxzF+aZ4A0TL2R57xSYd+es9XA7iW4iVsndeLfvC0Wlv4u9U74WHQ86nsSvQTnUEG6sMe9LlRlVva4NkuuA2ImPbhmzpw5v4xBLn1A1wvfS/NfTYhbR0RPUkEGuPS1dU+S7TUIKBNptcMYAsqstAVZQv+zY/cJfhedmqMmT3+22XZVUrjHa70SGpHfQ7/2qX9E9LVS5Brzd18ge6ciPZtF3gsujAjiVq0l7iHU2S+be/RHSniz9MzA0Hps5ai/ADE/lqwboxjtzLthRLfnjUU6zuOjEyGIEEZfXgbaC6uDh8W+EBBeHyOsD3+9+Mrvs33hjsw1TEUMU6y7Bv0wX7J3FXIqUdTyzq2XscpUQA0BzR6hPTuodFOJ3wkTq8+U8FYVxWflipkxXgeQEiYzCyD1GEgnd3GoGaKYvqaE5F4frcmoALohv8HXI= + 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 From 8e63573ffb9c6fc3bcceaaa5b8602b94e5a90fd9 Mon Sep 17 00:00:00 2001 From: Aphiwe Moshesh Date: Thu, 19 Sep 2019 14:26:35 +0200 Subject: [PATCH 16/18] update version and change log --- CHANGELOG.rst | 2 +- mote/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e757514..f8e34b5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,7 +1,7 @@ Changelog ========= -0.1.5 +0.1.6 ----- #. First release. #. This package is a fork of mote-prk see https://github.com/praekelt/mote \ No newline at end of file diff --git a/mote/__init__.py b/mote/__init__.py index 244c322..e3a77b2 100644 --- a/mote/__init__.py +++ b/mote/__init__.py @@ -1,7 +1,7 @@ import threading -__version__ = "0.1.5" +__version__ = "0.1.6" default_app_config = "mote.apps.MoteConfig" PROJECT_PATHS = {} _thread_locals = threading.local() From 843a8f90896da6221c91fe6f9fe7d6e42c4e8211 Mon Sep 17 00:00:00 2001 From: Codie Roelf Date: Wed, 16 Dec 2020 23:37:00 +0200 Subject: [PATCH 17/18] Django 3 compatible --- mote/templatetags/mote_tags.py | 2 +- mote/views.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mote/templatetags/mote_tags.py b/mote/templatetags/mote_tags.py index 06d955c..6a084af 100644 --- a/mote/templatetags/mote_tags.py +++ b/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: diff --git a/mote/views.py b/mote/views.py index d963d87..8c9e494 100644 --- a/mote/views.py +++ b/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 {} - From d879dfa384d2db1993eab0f5724a57dd159af565 Mon Sep 17 00:00:00 2001 From: Codie Roelf Date: Thu, 17 Dec 2020 09:29:33 +0200 Subject: [PATCH 18/18] remove python 2.7 support --- tox.ini | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tox.ini b/tox.ini index 5514b50..e141331 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,9 @@ [tox] envlist = - django111-{py27,py35} + django111-py35 django20-py35 django225-py36 -[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 - [testenv:django111-py35] basepython = python3.5 deps = -rmote/tests/requirements/111.txt