Imported Upstream version 1.4.2

diff --git a/.travis.yml b/.travis.yml
index d1ca8dfbe94bd265f67303e91d38d3111ed48c7b..bf886517955f0cb3980d217ad8031d66497fce72 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,5 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 script: python setup.py test

diff --git a/CHANGES.rst b/CHANGES.rst
index 3906b73952cd5d27ed3642506bb750b2999a455e..59a3f71c215204151568496c569b9f91483a69ce 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,9 +1,14 @@
 appdirs Changelog
 =================
 
-appdirs 1.4.1
+appdirs 1.4.2
 -------------
+- [PR #84] Allow installing without setuptools
+- [PR #86] Fix string delimiters in setup.py description
+- Add Python 3.6 support
 
+appdirs 1.4.1
+-------------
 - [issue #38] Fix _winreg import on Windows Py3
 - [issue #55] Make appname optional
 

diff --git a/appdirs.py b/appdirs.py
index c6fdc24468553f6b91b6604c92ef25a3f3c14727..348c62ea48b590a1fb9b6a46abe2d50d2aec5dfe 100644 (file)
--- a/appdirs.py
+++ b/appdirs.py
@@ -13,7 +13,7 @@ See <http://github.com/ActiveState/appdirs> for details and usage.
 # - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
 # - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 
-__version_info__ = (1, 4, 1)
+__version_info__ = (1, 4, 2)
 __version__ = '.'.join(map(str, __version_info__))
 
 

diff --git a/setup.py b/setup.py
index cae63300605431bfd97e0a5b7eeefc8190d5dd93..69c46bb4fc95517423946ecb322e941184185e5d 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,11 @@
 import sys
 import os
 import os.path
-from setuptools import setup
+# appdirs is a dependency of setuptools, so allow installing without it.
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 import appdirs
 
 tests_require = []
@@ -20,8 +24,8 @@ def read(fname):
 setup(
     name='appdirs',
     version=appdirs.__version__,
-    description='A small Python module for determining appropriate " + \
-        "platform-specific dirs, e.g. a "user data dir".',
+    description='A small Python module for determining appropriate ' + \
+        'platform-specific dirs, e.g. a "user data dir".',
     long_description=read('README.rst') + '\n' + read('CHANGES.rst'),
     classifiers=[c.strip() for c in """
         Development Status :: 4 - Beta
@@ -36,6 +40,7 @@ setup(
         Programming Language :: Python :: 3.3
         Programming Language :: Python :: 3.4
         Programming Language :: Python :: 3.5
+        Programming Language :: Python :: 3.6
         Programming Language :: Python :: Implementation :: PyPy
         Programming Language :: Python :: Implementation :: CPython
         Topic :: Software Development :: Libraries :: Python Modules

diff --git a/tox.ini b/tox.ini
index eb748c41ab368f4d97c02a3c3fa4dd0992213b99..85e3dd324f8785c8365f3da9a643e53970491eda 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py32, py33, py34, py35
+envlist = py26, py27, py32, py33, py34, py35, py36
 
 [testenv]
 commands = python setup.py test