Merge pull request #38 from toabctl/fixes

Add python 3.4 and 3.5 support
openSUSE · Feb 12, 2016 · 5cf0b0d · 5cf0b0d
2 parents c4b87a8 + 716605f
commit 5cf0b0d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,12 +3,13 @@ sudo: false
 
 language: python
 python:
-  - 2.6
   - 2.7
   - 3.3
+  - 3.4
+  - 3.5
 install:
-  - pip install --use-mirrors -r test-requirements.txt
-  - pip install --use-mirrors coveralls
+  - pip install -r test-requirements.txt
+  - pip install coveralls
 script:
   - flake8 py2pack
   - coverage run --source=py2pack setup.py test

diff --git a/setup.py b/setup.py
@@ -63,9 +63,10 @@
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Operating System :: POSIX',
         'Programming Language :: Python',
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
         'Topic :: Software Development :: Code Generators',
         'Topic :: Software Development :: Pre-processors',
     ],

diff --git a/test/test_py2pack.py b/test/test_py2pack.py
@@ -91,4 +91,5 @@ def test_canonicalize_setup_data(self, data, expected_data):
     @unpack
     def test_canonicalize_setup_data_console_scripts(self, data, expected_data):
         py2pack._canonicalize_setup_data(data)
-        self.assertEqual(list(data['console_scripts']), expected_data)
+        self.assertEqual(sorted(list(data['console_scripts'])),
+                         sorted(expected_data))
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,py33,pep8,cover
+envlist = py27,py33,py34,py35,pep8,cover
 
 [testenv]
 deps = -r{toxinidir}/test-requirements.txt