Merge pull request #64 from jdelic/feature/stdout-not-stderr-althist

add text to fulfill clause 2 and 3 of the PSF License

.travis.yml

@@ -1,16 +1,17 @@
 language: python
-sudo: false
-env:
-    - TOXENV=doc8
-    - TOXENV=flake8
-    - TOXENV=pep257
-    - TOXENV=py27
-    - TOXENV=py33
-    - TOXENV=py34
+python:
+    - "2.7"
+    - "3.4"
+    - "3.5"
+    - "3.6"
+    - "3.7"
+sudo: required
+dist: xenial
 install:
     - pip install tox
 script:
-    - tox -e $TOXENV
+    - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then tox -e coverage,coverage-report,flake8,doc8,pep257; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == 3* ]]; then tox -e coverage,coverage-report,flake8,doc8,pep257,mypy; fi
 matrix:
     fast_finish: true
 notifications:

LICENSE

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2013 Kristian Glass
+Copyright (c) 2013-2018 Kristian Glass
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,3 +18,9 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
 DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+Portions of this software are
+    Copyright © 2001-2017 Python Software Foundation; All Rights Reserved
+
+See READNE.rst for more information.

README.rst

@@ -37,3 +37,20 @@ Documentation
 -------------
 
 https://django12factor.readthedocs.org/en/latest/
+
+Licensing
+---------
+
+django12factor is licensed under the terms of the MIT License (see
+`License <LICENSE>`__).
+
+django12factor includes copies of Python's ``captured_output``,
+``captured_stdout`` and ``captured_stderr`` context managers, which are
+licensed under the terms of the
+`PSF LICENSE AGREEMENT FOR PYTHON <https://docs.python.org/3/license.html>`__.
+
+Credits
+-------
+
+Originally written by Kristian Glass / @doismellburning, now maintained by the
+wonderful Jonas Maurus / @jdelic

django12factor/__init__.pyi

@@ -0,0 +1,6 @@
+# -* encoding: utf-8 *-
+from typing import Dict, Any, Sequence, Optional
+
+
+def getenv_bool(setting_name: str) -> bool: ...
+def factorise(custom_settings: Optional[Sequence[str]] = None) -> Dict[str, Any]: ...

requirements-test.txt

@@ -1,6 +1,6 @@
-coverage==4.3.4
-git+https://github.com/doismellburning/doc8.git@feature/display-line-lengths
-flake8==3.3.0
+doc8==0.7.0
+coverage==4.5.2
+flake8==3.6.0
 nose==1.3.7
 pep257==0.7.0
 pygments==2.2.0

setup.py

@@ -7,9 +7,10 @@
 
 try:
     long_description = open(os.path.join(HERE, 'README.rst')).read()
-except:
+except Exception:
     long_description = None
 
+
 setup(
     name='django12factor',
     version=__version__,
@@ -27,9 +28,9 @@
     keywords='django 12factor configuration',
 
     install_requires=(
-        "dj-database-url==0.4.2",
-        "dj-email-url==0.0.10",
-        "django-cache-url==1.3.1",
+        "dj-database-url==0.5.0",
+        "dj-email-url==0.1.0",
+        "django-cache-url==3.0.0",
         "six",
         "django",
     ),

tox.ini

@@ -1,36 +1,35 @@
 [tox]
 envlist =
-	doc8,
+	coverage,
+	coverage-report,
 	flake8,
-	pep257,
-	py27,
-	py33,
-	py34,
-	sphinx,
+	doc8,
+	pep257
 
 
 [testenv]
+envdir = {toxinidir}/.toxenv
 deps =
 	-rrequirements-test.txt
 commands =
-	coverage run {envdir}/bin/nosetests
-	coverage report
-
-
-[testenv:flake8]
-commands =
-	flake8 django12factor tests setup.py
+	coverage: coverage run {envdir}/bin/nosetests
+	coverage-report: coverage report
+	flake8: flake8 django12factor tests setup.py
+	doc8: doc8 README.rst
+	pep257: pep257 --ignore D200,D202,D203 django12factor
 
 
-[testenv:doc8]
+[testenv:mypy]
+envdir = {toxinidir}/.toxenv
+deps =
+	mypy
+	typing
+setenv=
+    MYPYPATH=.
 commands =
-	doc8 README.rst
+	mypy: mypy --ignore-missing-imports --follow-imports=skip --disallow-untyped-calls --disallow-untyped-defs -p django12factor
 
 
-[testenv:pep257]
-commands =
-	pep257 --ignore D200,D202,D203 django12factor
-
 [testenv:sphinx]
 deps =
 	Sphinx