Skip to content

Commit a077421

Browse files
committed
Updated the readme in docs/source.
1 parent 356383b commit a077421

1 file changed

Lines changed: 82 additions & 142 deletions

File tree

docs/source/readme.md

Lines changed: 82 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
![alt text](./_static/images/PyBILT_logo_b.png "PyBILT Logo")
2-
## *Py*thon based lipid *BIL*ayer molecular simulation analysis *T*oolkit
1+
![alt text](./_images/PyBILT_logo.png "PyBILT Logo")
2+
# *Py*thon based lipid *BIL*ayer molecular simulation analysis *T*oolkit
33
------
4-
![Python version badge](https://img.shields.io/badge/python-2.7%2C3.6-blue.svg)
4+
![Python version badge](https://img.shields.io/badge/python-2.7%2C3.6%2C3.7-blue.svg)
55
[![license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
6-
[![Code Health](https://landscape.io/github/blakeaw/PyBILT/master/landscape.svg?style=flat)](https://landscape.io/github/blakeaw/PyBILT/master)
6+
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/2d6da71328a24ef6930ad8f554074292)](https://www.codacy.com/manual/blakeaw1102/PyBILT?utm_source=github.com&utm_medium=referral&utm_content=LoLab-VU/PyBILT&utm_campaign=Badge_Grade)
7+
![version](https://img.shields.io/badge/version-0.2.0-orange.svg)
8+
[![release](https://img.shields.io/github/release-pre/LoLab-VU/PyBILT.svg)](https://github.com/LoLab-VU/PyBILT/releases/tag/v0.2.0)
9+
[![Anaconda-Server Badge](https://anaconda.org/blakeaw/pybilt/badges/version.svg)](https://anaconda.org/blakeaw/pybilt)
710
[![Documentation Status](https://readthedocs.org/projects/pybilt/badge/?version=latest)](http://pybilt.readthedocs.io/en/latest/?badge=latest)
8-
[![docstring-coverage badge](https://img.shields.io/badge/docstring--coverage-49.5%25-orange.svg)](.docstring-coverage_report.txt)
11+
912
------
10-
**PyBILT is a Python toolkit developed to analyze molecular simulation trajectories of lipid bilayers systems. The toolkit includes a variety of analyses from various lipid bilayer molecular simulation publications.**
13+
#### PyBILT is a Python toolkit developed to analyze molecular simulation trajectories of lipid bilayers systems. The toolkit includes a variety of analyses from various lipid bilayer molecular simulation publications.
1114

1215
The analyses include:
1316
* Mean Squared Displacement (MSD)
@@ -21,129 +24,74 @@ The analyses include:
2124
* and more!
2225

2326
------
24-
![alt text](./_static/images/bl_side.jpg "Lipid Bilayer")
27+
![alt text](./_images/7percentCL_sideview_b.jpg "Lipid Bilayer")
2528

2629
------
2730

28-
## Install
29-
30-
<div class ="admonition warning">
31-
<p class="admonition-title">Warning</p>
32-
<p>PyBILT is still under heavy development and may rapidly change.</p>
33-
</div>
34-
35-
#### PyBILT run dependencies
36-
PyBILT has the following major dependencies:
37-
* MDAnalysis - https://www.mdanalysis.org/
38-
* NumPy - http://www.numpy.org/
39-
* SciPy - https://www.scipy.org/
40-
* Matplotlib - https://matplotlib.org/
41-
* Seaborn - https://seaborn.pydata.org/
42-
* six - https://pypi.org/project/six/
43-
* future - http://python-future.org/
44-
45-
To run the pybilt test suite:
46-
* pytest - https://docs.pytest.org/en/latest/
47-
48-
To use the PyBILT Jupyter Notebooks:
49-
* Jupyter - http://jupyter.org/
50-
51-
To build the docs locally requires the following additional packages:
52-
* Sphinx - http://www.sphinx-doc.org/en/master/
53-
* recommonmark - https://recommonmark.readthedocs.io/en/latest/
54-
* sphinx_rtd_theme - https://sphinx-rtd-theme.readthedocs.io/en/latest/
31+
# Install
5532

33+
### Core dependencies
34+
PyBILT has the following core dependencies:
35+
* [MDAnalysis](https://www.mdanalysis.org/)
36+
* [NumPy](http://www.numpy.org/)
37+
* [SciPy](https://www.scipy.org/)
38+
* [Matplotlib](https://matplotlib.org/)
39+
* [Seaborn](https://seaborn.pydata.org/)
40+
* [six](https://pypi.org/project/six/)
41+
* [future](http://python-future.org/)
5642

43+
### Python version support
44+
The pybilt package has been tested using [Anaconda Python](https://www.anaconda.com/) 2.7, 3.6, and 3.7.
5745

58-
The pybilt package has been tested using [Anaconda Python](https://www.anaconda.com/) 2.7 and Python 3.6;
46+
#### Sunsetting of Python 2
47+
Please be aware that Python 2 is scheduled to be sunset on January 1 2020. You can read about it here: [https://www.python.org/doc/sunset-python-2/](https://www.python.org/doc/sunset-python-2/)
48+
Parallel to the sunsetting of Python 2 many open source packages are also dropping support for Python 2 ([https://python3statement.org/](https://python3statement.org/)), including some of PyBILT's core dependencies. As such, after January 1, 2020, PyBILT will also likely sunset its support for Python 2.7.
5949

60-
The following section describes the process for setting up the dependencies and
61-
installing the 'pybilt' package using a conda environment and the setup.py
62-
script.
63-
64-
#### Setup and install using Anaconda's conda tool
65-
66-
##### Method 1 (manual package installation)
67-
First, clone or download the GitHub repo
68-
```
69-
git clone https://github.com/blakeaw/PyBILT.git
50+
### pip install
51+
You can install the latest version of the `pybilt` package using `pip` sourced from the GitHub repo:
7052
```
71-
Then create a new conda environment for pybilt and activate it:
53+
pip install -e git+https://github.com/LoLab-VU/PyBILT@v0.2.0#egg=pybilt
7254
```
73-
conda create --name pybilt
74-
source activate pybilt
55+
However, this will not automatically install the core dependencies. You will have to do that separately:
7556
```
76-
The install the preferred python version:
77-
* for Python 2.7
57+
pip install MDAnalysis numpy scipy matplotlib seaborn six future
7858
```
79-
conda install python=2.7
80-
```
81-
* for Python 3.6
82-
```
83-
conda install python=3.6
84-
```
8559

86-
Then install all the pybilt run dependencies:
87-
```
88-
conda install numpy scipy matplotlib seaborn six future
89-
conda install -c conda-forge MDAnalysis
60+
### conda install
61+
First make sure you have the `conda-forge` channel in your channel list; that is the channel from which MDAnalysis is installed. You can use the following command to add it to the bottom of your channel list:
9062
```
91-
Then install pybilt:
92-
```
93-
python PyBILT/setup.py install
63+
conda config --append channels conda-forge
9464
```
9565

96-
If you want to run the pybilt tests you can install pytest:
97-
```
98-
conda install pytest
66+
Then you can install the `pybilt` package from the `blakeaw` Anaconda Cloud channel,
9967
```
100-
101-
If you want to run the pybilt Jupyter notebooks (PyBILT/jupyter_notebooks), then install Jupyter:
68+
conda install -c blakeaw pybilt
10269
```
103-
conda install jupyter
104-
```
105-
Note that the notebooks have not been updated for Python 3 yet.
70+
The core dependencies will be automatically installed.
10671

107-
If you want to build local versions of doc pages install the following packages:
108-
```
109-
conda install sphinx
110-
pip install sphinx_rtd_theme
111-
pip install recommonmark
112-
```
72+
### Recommended additional software
11373

114-
##### Method 2 (From environment yaml)
74+
The following software is not required for the basic operation of **PyBILT**, but provides extra capabilities and features when installed.
11575

116-
The files environment_py27.yml and environment_py36.yml have been provided to allow for easy setup of a new conda
117-
environment with all of the most recently tested versions of dependencies.
118-
Run:
119-
* For Python 2.7:
120-
```
121-
conda env create -f environment_py27.yml
122-
```
123-
* For Python 3.6
124-
```
125-
conda env create -f environment_py36.yml
126-
```
76+
#### pytest
77+
The pybilt test suite is designed to be run with [pytest](https://docs.pytest.org/en/latest/), so if you want to run the tests then you will need to install pytest.
12778

128-
which will create a new conda environment named *pybilt* with the appropriate
129-
dependencies. Then activate the environment
130-
```
131-
source activate pybilt
132-
```
133-
Next, run the setup.py script with install,
134-
```
135-
python PyBILT/setup.py install
136-
```
137-
to install the 'pybilt' package into the *pybilt* environment.
79+
#### Jupyter
80+
PyBILT comes with a set of [Jupyter IPython notebooks](./jupyter_notebooks) which supplement the doc pages. If you want to run these notebooks locally then you will need to intall [Jupyter](https://jupyter.org/) (or at least the IPython kernel).
13881

139-
If you want to run the pybilt Jupyter notebooks (PyBILT/jupyter_notebooks), then install Jupyter:
140-
```
141-
conda install jupyter
142-
```
14382
Note that the notebooks have not been updated for Python 3 yet.
14483

84+
#### sphinx, sphinx_rtd_theme, and recommonmark
85+
If you want to build local versions of doc pages install the following additional packages:
86+
* [sphinx](http://www.sphinx-doc.org/en/master/)
87+
* [sphinx_rtd_theme](https://sphinx-rtd-theme.readthedocs.io/en/stable/)
88+
* [recommonmark](https://recommonmark.readthedocs.io/en/latest/)
89+
90+
14591
------
14692

93+
# Documentation and Usage
94+
14795
## Quick overview of PyBILT
14896
**PyBILT** is composed of 2 primary analysis packages:
14997
* bilayer_analyzer -- The [bilayer_analyzer](http://pybilt.readthedocs.io/en/latest/pybilt.bilayer_analyzer.html#module-pybilt.bilayer_analyzer.bilayer_analyzer) is an analysis package that
@@ -187,40 +135,33 @@ analysis type. See the [documentation](https://pybilt.readthedocs.io/en/latest/b
187135
(using matplotlib and seaborn) for some of the properties
188136
that can be computed from functions in the other modules.
189137
e.g. mean squared displacement and area per lipid.
190-
191-
------
192-
193-
## Documentation
194-
138+
## Docs
195139
Visit the PyBILT docs on [Read the Docs](http://pybilt.readthedocs.io/en/latest/index.html).
196140
Docs can also be viewed offline/locally by opening the [PyBILT/docs/build/html/index.html](docs/build/html/index.html) file from the
197141
repo in a web browser; however, this build of the docs is not updated often.
142+
143+
## Jupyter IPython notebooks
198144
In addition
199-
to the doc pages, there are currently a few Jupyter IPython
145+
to the Docs, there are currently a few Jupyter IPython
200146
[notebooks](jupyter_notebooks) that provide some examples and show some basic
201147
usage (these have not been updated/tested for/with python 3 yet); updates and more of these are in the pipeline.
202148

203149
------
204150

205-
## Contact
151+
# Contact
206152

207153
To report problems or bugs please open a
208-
[GitHub Issue](https://github.com/blakeaw/PyBILT/issues). Additionally, any
154+
[GitHub Issue](https://github.com/LoLab-VU/PyBILT/issues). Additionally, any
209155
comments, suggestions, or feature requests for PyBILT can also be submitted as
210156
a
211-
[GitHub Issue](https://github.com/blakeaw/PyBILT/issues).
212-
213-
For any other inquiries, including questions about PyBILT use or
214-
implementation, you can contact Blake directly via e-mail at either
215-
blake.a.wilson@vanderbilt.edu or blakeaw1102@gmail.com; please include "PyBILT
216-
inquiry" in the e-mail subject line.
157+
[GitHub Issue](https://github.com/LoLab-VU/PyBILT/issues).
217158

218159
------
219160

220-
## Contributing
161+
# Contributing
221162

222163
If you would like to contribute directly to PyBILT's development please
223-
1. Fork the repo (https://github.com/blakeaw/PyBILT/fork)
164+
1. Fork the repo (https://github.com/LoLab-VU/PyBILT/fork)
224165
2. Create a new branch for your feature (git checkout -b feature/foo_bar)
225166
3. Create test code for your feature
226167
4. Once your feature passes its own test, run all the tests using [pytest](https://docs.pytest.org/en/latest/) (python -m pytest)
@@ -230,42 +171,41 @@ If you would like to contribute directly to PyBILT's development please
230171

231172
------
232173

233-
## License
174+
# License
234175

235176
This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details
236177

237178
------
238179

239-
## Acknowledgments
180+
# Acknowledgments
240181

241182
* A special thanks to James Pino (https://github.com/JamesPino) for his inciteful comments and suggestions that have helped improve the quality of this code, and thanks to him for pointing out some very useful coding tools.
242183
* Thanks to my advisors, Carlos F. Lopez and Arvind Ramanathan, for catalyzing this project and for providing me with the space and means to pursue it.
243184

244185
------
245186

246-
## Built With
247-
248-
* [ANACONDA](https://www.continuum.io/) - ANACONDA Python distribution and CONDA package and environment manager
249-
* [PyCharm](https://www.jetbrains.com/pycharm/) - Text Editor/IDE
250-
* [ATOM](https://atom.io/) - Text Editor/IDE
251-
* [Sublime Text](https://www.sublimetext.com/) - Text Editor used in earlier work
252-
* [Landscape](https://landscape.io/) - Code quality analysis and tracking
253-
* [Git](https://git-scm.com/) - Version control
254-
* [GitHub](https://github.com/) - Development Platform and repository storage
255-
* [Sphinx](http://www.sphinx-doc.org/en/stable/index.html) - Python documentation generator
256-
* [recommonmark](https://github.com/rtfd/recommonmark) - A docutils-compatibility bridge to CommonMark
257-
* [Read the Docs](https://readthedocs.org/) - Documentation hosting
258-
* [docstring-coverage](https://bitbucket.org/DataGreed/docstring-coverage/wiki/Home) - A simple audit tool for examining python source files for missing docstrings.
259-
* [Python-Modernize](https://python-modernize.readthedocs.io/en/latest/) - Automatic modernization of Python 2 code for dual Python 2 and 3 support.
187+
# Citing
260188

261-
------
189+
If you use the **PyBILT** software as a part of your research, please cite the GitHub repo.
190+
191+
Also, please cite the following references as appropriate for scientific/research software used with/via **PyBILT**:
192+
193+
#### MDAnalysis
194+
See: https://www.mdanalysis.org/pages/citations/
195+
196+
#### Packages from the SciPy ecosystem
197+
198+
These include NumPy, SciPy, and Matplotlib for which references can be obtained from:
199+
https://www.scipy.org/citing.html
200+
201+
#### seaborn
202+
Reference can be exported from the [seaborn Zeondo DOI entry](https://doi.org/10.5281/zenodo.592845)
203+
204+
#### Jupyter
205+
See: https://github.com/jupyter/jupyter/issues/190
262206

263-
## Core Developers
207+
#### IPython
264208

265-
* **Blake A Wilson** - Currently a Postdoctoral Fellow at Vanderbilt University
266-
* Vandy e-mail: blake.a.wilson@vanderbilt.edu
267-
* Gmail: blakeaw1102@gmail.com
268-
* [Blake's VU Website]( https://my.vanderbilt.edu/blakeaw/)
269-
* Also find me on [LinkedIn](https://www.linkedin.com/in/blakewilson3/) and [Research Gate](https://www.researchgate.net/profile/Blake_Wilson3)
209+
See: https://ipython.org/citing.html
270210

271211
------

0 commit comments

Comments
 (0)