Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert HMF code to object-oriented. #21

Merged
merged 16 commits into from
Jan 19, 2017
Merged

Convert HMF code to object-oriented. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2c85061
move HMF code into a container object
weaverba137 Dec 7, 2016
f7f72bd
use astropy.utils.data
weaverba137 Dec 7, 2016
4e29f57
use astropy.utils.data
weaverba137 Dec 7, 2016
a82bfd7
fix astropy/1.0 incompatibility
weaverba137 Dec 7, 2016
c5da030
Merge remote-tracking branch 'origin/master' into hmf-object
weaverba137 Dec 19, 2016
6c8f03c
try numpy prerelease version
weaverba137 Jan 9, 2017
089dc93
fix integer division problem
weaverba137 Jan 10, 2017
a25a098
try adding nomkl
weaverba137 Jan 10, 2017
c84d206
workaround 32-bit test problem on python3.5
weaverba137 Jan 10, 2017
5472d05
add rudimentary HMF tests
weaverba137 Jan 10, 2017
4612d1a
working version of hmf object code
weaverba137 Jan 14, 2017
e748a9b
split metadata reading into separate step
weaverba137 Jan 17, 2017
d01de2d
add tests of metadata
weaverba137 Jan 17, 2017
68debce
tweak HMF documentation
weaverba137 Jan 17, 2017
daf8219
move good column selection
weaverba137 Jan 17, 2017
0bcd309
remove references to good_columns
weaverba137 Jan 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion docs/pydl/changes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
------------------
Expand Down
2 changes: 1 addition & 1 deletion pydl/median.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading