Skip to content

Commit 12e432e

Browse files
committed
Fixing docs and other cleanups
1 parent 247c63c commit 12e432e

File tree

6 files changed

+35
-58
lines changed

6 files changed

+35
-58
lines changed

.gitlab-ci.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,27 @@
33
stages:
44
- build
55
- deploy
6-
6+
77
job:
88
stage: build
9-
image: python:3.9
9+
image: python:3.11
1010
script:
11-
- sudo yum update -q -y
12-
- sudo yum install -y python3-pip
13-
- pip uninstall pandas numpy scipy -y -y -y
14-
- pip install pandas numpy scipy
15-
- pip install setuptools cython
11+
- pip install poetry
1612
- cd python
17-
- python3 setup.py install
13+
- poetry install --with docs
1814
- cd ../
1915
artifacts:
2016
untracked: true
2117

22-
pages:
18+
pages:
2319
stage: deploy
2420
script:
21+
- pip install poetry
22+
- cd python
23+
- poetry run sphinx-build -b html ../docs ../docs/_build/html
24+
- cd ../
2525
- mkdir .public
26-
- cd python/docs
27-
- make html
28-
- cd ../../
29-
- cp -r python/docs/_build/html/* .public
26+
- cp -r docs/_build/html/* .public
3027
- mv .public public
3128
artifacts:
3229
paths:

.readthedocs.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
# Required
66
version: 2
77

8+
build:
9+
os: ubuntu-22.04
10+
tools:
11+
python: "3.11"
12+
jobs:
13+
post_install:
14+
- pip install poetry
15+
- cd python && poetry install --with docs
16+
817
# Build documentation in the docs/ directory with Sphinx
918
sphinx:
1019
configuration: docs/conf.py
11-
12-
# Optionally set the version of Python and requirements required to build your docs
13-
python:
14-
version: 3.7
15-
install:
16-
- requirements: docs/requirements.txt
17-
- requirements: python/requirements.txt

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
3333

3434

35-
html_theme = 'classic'
35+
html_theme = 'sphinx_rtd_theme'
3636
html_static_path = ['_static']
3737

3838
extensions = ['sphinx.ext.autodoc',

docs/notes/installation.rst

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,16 @@ Installation via Pip
1616
Installation from Source
1717
-------------------------
1818

19-
Download the git repository and navigate to the python folder where you see setup.py. Run the following command `python setup.py install` and that should install the library in your python environment.
19+
Download the git repository and navigate to the ``python`` folder. Install using Poetry:
2020

21+
.. code-block:: none
22+
23+
cd python
24+
poetry install
25+
26+
To also install documentation dependencies:
27+
28+
.. code-block:: none
29+
30+
cd python
31+
poetry install --with docs

python/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
cython
2-
bz2file
31
tqdm
42
scipy
53
pandas
64
numpy
7-
matplotlib
5+
matplotlib
6+
networkx
7+
pymetis

python/setup.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)