Skip to content

Commit

Permalink
Merge pull request #43 from MDAnalysis/fix-install
Browse files Browse the repository at this point in the history
include code in package
  • Loading branch information
kain88-de authored Jun 7, 2018
2 parents 8a69254 + 2faac08 commit 9feb43c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
13 changes: 11 additions & 2 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,22 @@ The rules for this file:
* release numbers follow "Semantic Versioning" http://semver.org

------------------------------------------------------------------------------
06/07/18 orbeckst

* 0.1.1

Fixes
* The 0.1.0 release was not pip-installable and did not ship code (d'oh);
this release is pip-installable (Issue #42)


05/11/18 kain88-de, orbeckst

* 0.1.0

Enhancements
* add base class for parallel analysis
* add parallel rmsd class (with superposition)
* add base class for parallel analysis
* add parallel rmsd class (with superposition)
* add parallel contacts class
* add parallal AnalysisFromFunction class

Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#
# Released under the GNU Public Licence, v2 or any higher version

from setuptools import setup
from setuptools import setup, find_packages
import versioneer

with open('README.rst', 'r') as f:
Expand Down Expand Up @@ -46,6 +46,7 @@
'Issue Tracker': 'https://github.com/MDAnalysis/pmda/issues/',
'Mailing list': 'https://groups.google.com/group/mdnalysis-discussion',
},
packages=find_packages(),
install_requires=[
'MDAnalysis>=0.18',
'dask',
Expand Down

0 comments on commit 9feb43c

Please sign in to comment.