Merge branch 'release/0.4.2'

wmayner · Jan 12, 2017 · 82ac4f4 · 82ac4f4
2 parents 3de520d + b969c32
commit 82ac4f4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 sudo: false
 language: python
 python:
+- '3.3'
 - '3.4'
 - '3.5'
 - '3.6'
@@ -9,7 +10,7 @@ install:
 - make
 - pip install -e .
 - pip install pytest
-script: py.test
+script: python -m pytest
 notifications:
   email: false
   slack:

diff --git a/pyemd/__about__.py b/pyemd/__about__.py
@@ -5,7 +5,7 @@
 """PyEMD metadata"""
 
 __title__ = 'pyemd'
-__version__ = '0.4.1'
+__version__ = '0.4.2'
 __description__ = ("A Python wrapper for Ofir Pele and Michael Werman's "
                    "implementation of the Earth Mover's Distance.")
 __author__ = 'Will Mayner'

diff --git a/setup.py b/setup.py
@@ -76,7 +76,7 @@ def no_cythonize(extensions, **_ignore):
 with open('./pyemd/__about__.py') as f:
     exec(f.read(), about)
 
-requires = ['numpy >=1.10.0, <2.0.0']
+requires = ['numpy >=1.9.0, <2.0.0']
 
 setup(
     name=about['__title__'],
@@ -100,6 +100,7 @@ def no_cythonize(extensions, **_ignore):
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6'