Merge pull request #21 from weaverba137/hmf-object

Convert HMF code to object-oriented.
weaverba137 · Jan 19, 2017 · bd6277a · bd6277a
2 parents e1f45fc + 0bcd309
commit bd6277a
Show file tree

Hide file tree

Showing 20 changed files with 1,050 additions and 499 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -99,8 +99,8 @@ matrix:
           env: NUMPY_VERSION=1.7 SCIPY_VERSION=0.12
 
         # Try numpy pre-release
-        # - python: 3.5
-        #   env: NUMPY_VERSION=prerelease
+        - python: 3.5
+          env: NUMPY_VERSION=prerelease CONDA_DEPENDENCIES='nomkl scipy matplotlib'
 
         # PEP 8 Compliance
         - python: 2.7

diff --git a/docs/pydl/changes.rst b/docs/pydl/changes.rst
@@ -5,7 +5,15 @@ PyDL Changelog
 0.5.4 (unreleased)
 ------------------
 
-* No changes yet.
+* Refactor HMF code into an object to contain the data and methods.
+* Use functions from :mod:`astropy.utils.data` where possible.
+* Fix an integer division error encountered when using Numpy 1.12
+  (`Issue #19`_).
+* Fixed tests that were failing on 32-bit platforms *and* Python 3.5
+  (`Issue #20`_).
+
+.. _`Issue #19`: https://github.com/weaverba137/pydl/issues/19
+.. _`Issue #20`: https://github.com/weaverba137/pydl/issues/20
 
 0.5.3 (2016-12-03)
 ------------------

diff --git a/pydl/median.py b/pydl/median.py
@@ -50,7 +50,7 @@ def median(array, width=None, axis=None, even=False):
                 return np.median(array)
             else:
                 i = f.argsort()
-                return f[i[f.size/2]]
+                return f[i[f.size//2]]
         else:
             return np.median(array, axis=axis)
     else: