Skip to content

Commit 09e0f4f

Browse files
committed
Updated development-notes.md
1 parent 3e5c7c4 commit 09e0f4f

File tree

1 file changed

+24
-16
lines changed

1 file changed

+24
-16
lines changed

development-notes.md

+24-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Tests
22
Currently most of the code is not tested. The project has a basic `tox` setup
3-
which performs simple tests using `pytest` and generates documentation using
4-
`sphinx`. The tests are far from complete.
3+
which performs simple tests using `pytest`.
54

65
Use `tox` command to run the tests:
76
```
@@ -11,25 +10,21 @@ tox
1110
## Configuration files explained
1211
- `setup.cfg` is a configuration for setuptools.
1312
- `tox.ini` defines what does the `tox` command do.
14-
- sphinx configuration is inside `sphinx_config/conf.py` file.
15-
- `sphinx_config/index.rst` defines the content of `index.html` file generated
16-
with sphinx. There are other `rst` files that define other pages.
17-
- sphinx documentation is generated into `documentation/` path which is
18-
excluded with `.gitignore`
13+
- sphinx configuration is inside `docs/conf.py` file.
14+
- sphinx documentation can be build using bat script inside `docs` folder.
15+
In order to build the documentation for local preview `cd` into `docs` folder
16+
and run `build.bat html` script. The documentation will be available in
17+
`docs/_build/html` folder.
1918
- All test functions should have name compliant to these patterns: `test_*` or
2019
`*_test` (it's required by `pytest`).
2120

2221
# Publishing documentation
23-
This code uses Github pages for documentation. The github pages code is
24-
a copy of `documentation/` directory moved to `gh-pages` branch.
22+
The projects is set up to publish documentation on readthedocs.org.
23+
This is very basic setup based on the tutorial:
24+
https://docs.readthedocs.io/en/stable/tutorial/
2525

26-
You can use the `mv_documentation.py` script to copy content of the
27-
`documentation/` folder (generated with `tox`) to `gh-pages` branch in order
28-
to publish it.
29-
30-
The script checkouts to the `gh-pages` branch, removes all fiels
31-
and moves the content of `documentation/` directory to root directory. If you
32-
want to stage and commit that changes you have to do that manually.
26+
The documentation is build automatically on every commit to the `master`
27+
branch.
3328

3429
# Submodules
3530
The project uses a git submodule for the source code. I intend to use the same
@@ -44,6 +39,19 @@ git submodule foreach "git add -A"
4439
git submodule foreach "git commit -m 'Some comment.'"
4540
```
4641

42+
Pulling changes for submodules:
43+
```
44+
git submodule update --remote --recursive
45+
```
46+
47+
After pulling, if you want to checkout the latest commit from the submodule
48+
you can use:
49+
```
50+
git submodule foreach "git checkout master"
51+
```
52+
(by default it checks out to specific commit)
53+
54+
4755
# Project configuration
4856
As of the writing of this document `setuptools` uses `setup.cfg` and the
4957
`pyproject.toml` is in beta. I expect that in the future everything will be

0 commit comments

Comments
 (0)