Skip to content

Commit 1be45a5

Browse files
committed
Update readme and installation guidelines
1 parent 32e1669 commit 1be45a5

File tree

4 files changed

+41
-57
lines changed

4 files changed

+41
-57
lines changed

CONTRIBUTING.md

+27
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,30 @@ Ready to contribute? Follow [GitHub best practices](https://www.asmeurer.com/git
5858
6. Make your changes and commit them (testing locally).
5959
7. Push changes to the topic branch on *your* remote once local tests pass and you are happy with the changes you've made.
6060
8. Create a pull request against the base `main` branch through the Github website.
61+
62+
## Making the Docs
63+
64+
Make an HTML version of the documentation.
65+
66+
> **Note**: This might require installing [Pandoc](https://pandoc.org/installing.html).
67+
68+
```
69+
pip install sphinx sphinx_rtd_theme nbsphinx
70+
cd docs
71+
make html
72+
```
73+
74+
## Unit Tests
75+
76+
Run all of the unit tests from a Python session using
77+
78+
``` python
79+
>>> import sequencing.testing as st
80+
>>> st.run()
81+
```
82+
83+
Or run them from the command line, using
84+
85+
```
86+
pytest --cov
87+
```

README.md

+8-50
Original file line numberDiff line numberDiff line change
@@ -6,61 +6,19 @@
66
composed of many modes and generating complex time-dependent control Hamiltonians
77
for [master equation simulations](http://qutip.org/docs/latest/guide/dynamics/dynamics-master.html).
88

9-
### Requirements:
9+
## Documentation
1010

11-
- `python>=3.7` (``sequencing`` is tested on 3.7, 3.8, and 3.9)
12-
- [`qutip>=4.5`](http://qutip.org/docs/latest/installation.html)
13-
- [`attrs>=20`](https://www.attrs.org/en/stable/index.html)
14-
- [`tqdm`](https://tqdm.github.io/)
15-
- [`lmfit`](https://lmfit.github.io/lmfit-py/)
11+
The documentation for `sequencing` is available at:
12+
[https://sequencing.readthedocs.io/](https://sequencing.readthedocs.io/)
1613

17-
### Installing from source:
18-
19-
- Clone the `sequencing` repo
20-
- Create a conda environment
21-
- `conda create -n <env-name> python=<3.7, 3.8, or 3.9>`
22-
- Activate the conda environment
23-
- `conda activate <env-name>`
24-
- Install `sequencing`
25-
- `pip install -e .`, or
26-
- `python setup.py develop` (or `install`)
27-
28-
29-
**Important note for Windows users:**
30-
31-
>[QuTip: Installation on MS Windows:](http://qutip.org/docs/latest/installation.html#installation-on-ms-windows) As of QuTiP 4.1, recommended installation on Windows requires Python 3.5+, as well as Visual Studio 2015... When installing Visual Studio 2015 be sure to select options for the C++ compiler... The ‘Community’ edition of Visual Studio 2015 is free...
32-
33-
### Getting started:
34-
35-
Check out the tutorial notebooks [here](docs/source/notebooks)
36-
37-
### Unit tests:
38-
39-
Run all of the unit tests from a Python session using
40-
41-
``` python
42-
>>> import sequencing.testing as st
43-
>>> st.run()
44-
```
45-
46-
Or run them from the command line, using
14+
## Installation
4715

4816
```
49-
pytest --cov
17+
pip install sequencing
5018
```
5119

52-
### Contributing:
53-
Want to contribute to `sequencing`? Check out our [contribution guidelines](CONTRIBUTING.md).
54-
55-
56-
### Making the docs:
20+
For more details, see the [documentation](https://sequencing.readthedocs.io/en/latest/installation.html).
5721

58-
Make an HTML version of the documentation.
22+
## Contributing:
5923

60-
> **Note**: This might require installing [Pandoc](https://pandoc.org/installing.html).
61-
62-
```
63-
pip install sphinx sphinx_rtd_theme nbsphinx
64-
cd docs
65-
make html
66-
```
24+
Want to contribute to `sequencing`? Check out our [contribution guidelines](CONTRIBUTING.md).

docs/source/installation.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Installation
99

1010
This section of the documentation describes the recommended method for installing and verifying ``sequencing``.
1111

12-
We strongly recommend creating a new
12+
We recommend creating a new
1313
`conda environment <https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html>`_
1414
for ``sequencing``. Here we call the environment ``sequencing-env``, but you may
1515
call it whatever you like. ``sequencing`` is compatible with Python 3.7, 3.8, and 3.9.
@@ -26,18 +26,18 @@ call it whatever you like. ``sequencing`` is compatible with Python 3.7, 3.8, an
2626
`QuTip: Installation on MS Windows <http://qutip.org/docs/latest/installation.html#installation-on-ms-windows>`_:
2727
The only supported installation configuration is using the Conda environment with Python 3.5+ and Visual Studio 2015.
2828

29-
.. Installing with pip
30-
.. ===================
29+
Installing with pip
30+
===================
3131

32-
.. .. code-block:: bash
32+
.. code-block:: bash
3333
34-
.. (sequencing-env) pip install sequencing
34+
(sequencing-env) pip install sequencing
3535
3636
3737
Installing from source
3838
======================
3939

40-
You can install ``sequencing`` from
40+
Alternatively, you can install ``sequencing`` from
4141
`GitHub <https://github.com/sequencing-dev/sequencing>`_ using the following commands:
4242

4343
.. code-block:: bash

setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
for [master equation simulations](http://qutip.org/docs/latest/guide/dynamics/dynamics-master.html).
88
"""
99

10-
import os
1110
from setuptools import setup, find_packages
1211

1312
DESCRIPTION = "seQuencing: simulate realistic quantum control sequences using QuTiP"

0 commit comments

Comments
 (0)