Add django>=1.11 to requirements

Update CI config Remove doc build support Add sorting guidance for 3rd-party app imports Improve documentation markup
pinax · Jan 17, 2018 · dcbc382 · dcbc382
1 parent 5f5c2b7
commit dcbc382
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 34 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,6 @@ common: &common
     - restore_cache:
         keys:
           - v2-deps-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
-          - v2-deps-
     - run:
         name: install dependencies
         command: pip install --user tox
@@ -35,7 +34,7 @@ jobs:
   lint:
     <<: *common
     docker:
-      - image: circleci/python:3.6.1
+      - image: circleci/python:3.6
         environment:
           - TOXENV=checkqa
           - UPLOAD_COVERAGE=0

diff --git a/AUTHORS b/AUTHORS
@@ -1,3 +1,4 @@
 Patrick Altman
-Brian Rosner
+Brian Rosner
 Katherine “Kati” Michel
+Graham Ullrich
diff --git a/Makefile b/Makefile
@@ -1,15 +1,10 @@
-all: init docs test
+all: init test
 
 init:
 	python setup.py develop
-	pip install detox coverage mkdocs
+	pip install detox coverage
 
 test:
 	coverage erase
 	detox
 	coverage html
-
-docs:
-	mkdocs build
-
-.PHONY: docs
diff --git a/README.md b/README.md
@@ -54,23 +54,26 @@ Django \ Python | 2.7 | 3.4 | 3.5 | 3.6
 
 To install pinax-events:
 
-    pip install pinax-events
+```commandline
+    $ pip install pinax-events
+```
 
 Add `pinax-events` to your `INSTALLED_APPS` setting:
 
 ```python
-    INSTALLED_APPS = (
-        ...
+    INSTALLED_APPS = [
+        # other apps
         "imagekit",
         "pinax.events",
-        ...
-    )
+    ]
 ```
 
 You will need either `PIL` or `Pillow` installed for `imagekit` to work.  We
 recommend `Pillow`:
 
-    pip install Pillow
+```commandline
+    $ pip install Pillow
+```
 
 ### Settings
 
@@ -93,15 +96,19 @@ In your template where you want to display events:
 
 First, load the template tags:
 
+```djangotemplate
     {% load pinax_events_tags %}
+```
 
 Then:
 
+```djangotemplate
     {% events as event_items %}
+```
 
 And here is an example that how you can show the events:
 
-```html
+```djangotemplate
     <section class="event-list">
         {% for event in event_items %}
             <article class="event" style="{% if event.secondary_image_thumb %}background-image:url({% static event.secondary_image_thumb.url %});{% endif %}">
@@ -136,6 +143,14 @@ Add and manage events via the Django admin.
 
 ## Change Log
 
+### 2.0.3
+
+* Add django>=1.11 to requirements
+* Update CI config
+* Remove doc build support
+* Add sorting guidance for 3rd-party app imports
+* Improve documentation markup
+
 ### 2.0.2
 
 * fix setup.py LONG_DESCRIPTION for PyPi

diff --git a/mkdocs.yml b/mkdocs.yml
diff --git a/runtests.py b/runtests.py
@@ -15,7 +15,6 @@
         "pinax.events",
         "pinax.events.tests"
     ],
-    MIDDLEWARE_CLASSES=[],
     DATABASES={
         "default": {
             "ENGINE": "django.db.backends.sqlite3",

diff --git a/setup.py b/setup.py
@@ -1,5 +1,6 @@
 from setuptools import find_packages, setup
 
+VERSION = "2.0.3"
 LONG_DESCRIPTION = """
 .. image:: http://pinaxproject.com/pinax-design/patches/pinax-events.svg
     :target: https://pypi.python.org/pypi/pinax-events/
@@ -54,7 +55,7 @@
     description="a simple app for publishing events on your site",
     name="pinax-events",
     long_description=LONG_DESCRIPTION,
-    version="2.0.2",
+    version=VERSION,
     url="http://github.com/pinax/pinax-events/",
     license="MIT",
     packages=find_packages(),
@@ -66,8 +67,9 @@
         "Pillow"
     ],
     install_requires=[
+        "django>=1.11",
         "django-imagekit>=3.3",
-        "Markdown>=2.6.6"
+        "Markdown>=2.6.6",
     ],
     classifiers=[
         "Development Status :: 5 - Production/Stable",

diff --git a/tox.ini b/tox.ini
@@ -2,24 +2,24 @@
 ignore = E265,E501
 max-line-length = 100
 max-complexity = 10
-exclude = pinax/events/migrations/*
+exclude = **/*/migrations/*
 inline-quotes = double
 
 [isort]
 multi_line_output=3
 known_django=django
-known_third_party=pinax
+known_third_party=imagekit,markdown,pinax
 sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
-skip_glob=*/pinax/events/migrations/*
+skip_glob=**/*/migrations/*
 
 [coverage:run]
 source = pinax
-omit = pinax/events/conf.py,pinax/events/tests/*,pinax/events/migrations/*
+omit = **/*/conf.py,**/*/tests/*,**/*/migrations/*
 branch = true
 data_file = .coverage
 
 [coverage:report]
-omit = pinax/events/conf.py,pinax/events/tests/*,pinax/events/migrations/*
+omit = **/*/conf.py,**/*/tests/*,**/*/migrations/*
 exclude_lines =
     coverage: omit
 show_missing = True