Skip to content

Commit acd2a87

Browse files
authored
Merge pull request #335 from ComputationalCryoEM/update_readme
Update readme
2 parents 9be9769 + 8b9e124 commit acd2a87

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ You may optionally install additional packages:
5858

5959
```
6060
# Additional GPU packages (reqires CUDA)
61-
pip install -e .[gpu]
61+
pip install -e ".[gpu]"
6262
# Additional developer tools
63-
pip install -e .[dev]
63+
pip install -e ".[dev]"
6464
```
6565

6666
### Make sure everything works

docs/source/installation.rst

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Installation
22
============
33

4-
ASPIRE runs on Python 3.6, and comes with an ``environment.yml`` to reconstruct a working Conda environment to run the package.
4+
ASPIRE is based on Python 3.6, and comes with an ``environment.yml`` for reconstructing a working Conda environment to run the package.
55
The package is tested on Linux/Windows/Mac OS X. Pre-built binaries are available for all platform-specific components. No manual
66
compilation should be needed.
77

88
Install Conda
99
*************
1010

11-
You will need to install Conda for **Python3**, either
11+
To follow the suggested installation, you will need to install Conda for **Python3**, either
1212
`Anaconda <https://www.anaconda.com/download/#linux>`__ or
1313
`Miniconda <https://conda.io/miniconda.html>`__, click on the right
1414
distribution to view Conda's installation instructions.
@@ -70,16 +70,14 @@ you would probably want to keep that in a seperate environment.
7070

7171
We recommend using ``conda`` or a ``virtualenv`` environment managing solutions because ASPIRE may have conflicts or change installed versions of Python packages on your system.
7272

73-
Again, we recommend the above for consistency and safety.
73+
Again, we recommend the above for consistency.
7474
However, ASPIRE is a ``pip`` package,
75-
so you can attempt to install it using standard ``pip`` or ``setup.py`` commands.
76-
ASPIRE should generally be compatible with newer version of Python,
77-
and newer dependent packages, but this is still being tested.
78-
There are a few known issues.
79-
While we can try to help,
80-
you may be on your own for support of this method of installation.
75+
so you can attempt to install it using standard ``pip`` or ``setup.py`` commands. There are methods such as ``pip --no-deps`` that can leave your other packages undisturbed, but this is left to the developer.
76+
ASPIRE should generally be compatible with newer version of Python, and newer dependent packages. We are currently testing 3.6, 3.7, 3.8 base Python as configured by ASPIRE, and with upgrading packages to the latest for each of those bases.
77+
If you encounter an issue with a custom pip install, we will try to help, but you may be on your own for support of this method of installation.
8178

8279
::
80+
8381
# Standard pip site-packages installation command
8482
cd path/to/aspire-repo
8583
pip install .
@@ -88,7 +86,6 @@ you may be on your own for support of this method of installation.
8886
cd path/to/aspire-repo
8987
pip install -e .
9088

91-
Note that we hope to have a better automated coverage of ``pip`` installations on recent major Python versions for future releases.
9289

9390
Test the package
9491
****************
@@ -98,9 +95,9 @@ Make sure all unit tests run correctly by doing:
9895
::
9996

10097
cd /path/to/git/clone/folder
101-
pytest tests
98+
pytest
10299

103-
Tests currently take around 5 minutes to run.
100+
Tests currently take around 5 minutes to run, but this depends on your specific machine's resources.
104101

105102

106103
Generating Documentation

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def read(fname):
2020
long_description_content_type="text/markdown",
2121
license="GPLv3",
2222
url="https://github.com/ComputationalCryoEM/ASPIRE-Python",
23-
author="Joakim Anden, Yoel Shkolnisky, Itay Sason, Robbie Brook, Vineet Bansal, Junchao Xia",
23+
author="Joakim Anden, Ayelet Heimowitz, Vineet Bansal, Robbie Brook, Itay Sason, Yoel Shkolnisky, Garrett Wright, Junchao Xia",
2424
author_email="[email protected]",
2525
install_requires=[
2626
"click",

0 commit comments

Comments
 (0)