summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Abramowitz <msabramo@gmail.com>2014-06-16 11:44:24 -0700
committerMarc Abramowitz <msabramo@gmail.com>2014-06-16 11:44:24 -0700
commit3c572d0bba54d63e1ffab7d265eb693df35fec30 (patch)
treeae6c27bd5dc78ae9212d3e68311d9daa0ce06731
parentafa236807c3002ae92ca75b541767bfc7e877ff7 (diff)
parentfbbb3090ea1ca4ac3042acea7633241b0388f0b3 (diff)
downloadsmmap-3c572d0bba54d63e1ffab7d265eb693df35fec30.tar.gz
Merge pull request #17 from Byron/support_python_3
Support python 3
-rw-r--r--.travis.yml5
-rw-r--r--setup.py6
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index d02eb6f..47cb411 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,3 @@ script:
- nosetests --with-coverage
after_success:
- coveralls
-matrix:
- allow_failures:
- - python: 3.3
- - python: 3.4
- fast_finish: true
diff --git a/setup.py b/setup.py
index 2e97e59..13d2063 100644
--- a/setup.py
+++ b/setup.py
@@ -44,6 +44,12 @@ setup(
"Operating System :: Microsoft :: Windows",
"Operating System :: MacOS :: MacOS X",
"Programming Language :: Python",
+ "Programming Language :: Python :: 2",
+ "Programming Language :: Python :: 2.6",
+ "Programming Language :: Python :: 2.7",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.3",
+ "Programming Language :: Python :: 3.4",
],
long_description=long_description,
)