Skip to content

Commit abf43aa

Browse files
Various fixes (#604)
* fix C416 unnecessary dict comprehension * bump rtd python version * update migration test * fix .rtd file * ensure jquery installed for [+] in docs * ignore warnings * refactor api docs * fix typo * update to py3.11 * fox * extend migration time * fix dask by global function; fix sqlalchemy update * update migrate test with fixed versions * fix visserver weird wrong rename
1 parent f51826b commit abf43aa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+328
-314
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ on:
88
pull_request:
99
schedule:
1010
# run Monday and Thursday at 03:18 UTC
11-
- cron: '18 3 * * MON,THU'
11+
- cron: '18 15 * * MON,THU'
1212

1313
jobs:
1414

1515
base:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
python-version: ['3.10', '3.8']
19+
python-version: ['3.11', '3.9']
2020

2121
steps:
2222
- name: Check out repository
@@ -54,7 +54,7 @@ jobs:
5454
runs-on: ubuntu-latest
5555
strategy:
5656
matrix:
57-
python-version: ['3.10', '3.8']
57+
python-version: ['3.11', '3.9']
5858

5959
steps:
6060
- name: Check out repository
@@ -93,7 +93,7 @@ jobs:
9393
runs-on: ubuntu-latest
9494
strategy:
9595
matrix:
96-
python-version: ['3.10']
96+
python-version: ['3.11']
9797

9898
steps:
9999
- name: Check out repository
@@ -127,7 +127,7 @@ jobs:
127127
runs-on: macos-latest
128128
strategy:
129129
matrix:
130-
python-version: ['3.10', '3.8']
130+
python-version: ['3.11', '3.9']
131131

132132
steps:
133133
- name: Check out repository
@@ -161,7 +161,7 @@ jobs:
161161
runs-on: ubuntu-latest
162162
strategy:
163163
matrix:
164-
python-version: ['3.10']
164+
python-version: ['3.11']
165165

166166
steps:
167167
- name: Check out repository
@@ -189,7 +189,7 @@ jobs:
189189
runs-on: ubuntu-latest
190190
strategy:
191191
matrix:
192-
python-version: ['3.10']
192+
python-version: ['3.11']
193193

194194
steps:
195195
- name: Check out repository
@@ -217,7 +217,7 @@ jobs:
217217
runs-on: ubuntu-latest
218218
strategy:
219219
matrix:
220-
python-version: ['3.10']
220+
python-version: ['3.11']
221221

222222
steps:
223223
- name: Check out repository
@@ -240,11 +240,15 @@ jobs:
240240
pip install tox
241241
242242
- name: Run quality checks
243-
timeout-minutes: 10
244-
run: tox -e project,flake8,doc
243+
timeout-minutes: 5
244+
run: tox -e project,flake8
245+
246+
- name: Build docs
247+
timeout-minutes: 5
248+
run: tox -e doc
245249

246250
- name: Test migration
247-
timeout-minutes: 3
251+
timeout-minutes: 5
248252
run: tox -e migrate
249253

250254
- name: Coverage

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ coverage.xml
5959

6060
#documentation
6161
doc/_build
62+
doc/api
6263

6364
# notebooks
6465
doc/examples/out

.readthedocs.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ sphinx:
1111

1212
# python requirements
1313
python:
14-
version: 3.8
1514
install:
1615
- method: pip
1716
path: .
1817
extra_requirements:
1918
- doc
2019

21-
# what to build
22-
formats:
23-
- htmlzip
24-
- pdf
20+
build:
21+
os: "ubuntu-22.04"
22+
tools:
23+
python: "3.11"

doc/api.rst

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
11
API reference
22
=============
33

4+
.. autosummary::
5+
:toctree: api
46

5-
.. automodule:: pyabc
6-
7-
.. toctree::
8-
:maxdepth: 3
9-
10-
api_inference
11-
api_distance
12-
api_acceptor
13-
api_model
14-
api_epsilon
15-
api_predictor
16-
api_sumstat
17-
api_datastore
18-
api_transition
19-
api_populationstrategy
20-
api_sampler
21-
api_parameters
22-
api_population
23-
api_random_variables
24-
api_sge
25-
api_external
26-
api_petab
27-
api_copasi
28-
api_visualization
29-
api_weightedstatistics
7+
pyabc.acceptor
8+
pyabc.copasi
9+
pyabc.distance
10+
pyabc.epsilon
11+
pyabc.external
12+
pyabc.external.r
13+
pyabc.external.julia
14+
pyabc.inference
15+
pyabc.inference_util
16+
pyabc.model
17+
pyabc.parameters
18+
pyabc.petab
19+
pyabc.population
20+
pyabc.populationstrategy
21+
pyabc.predictor
22+
pyabc.random_choice
23+
pyabc.random_variables
24+
pyabc.sampler
25+
pyabc.settings
26+
pyabc.sge
27+
pyabc.storage
28+
pyabc.sumstat
29+
pyabc.transition
30+
pyabc.util
31+
pyabc.visserver
32+
pyabc.visualization
33+
pyabc.weighted_statistics

doc/api_acceptor.rst

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

doc/api_copasi.rst

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

doc/api_datastore.rst

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

doc/api_distance.rst

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

doc/api_epsilon.rst

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

doc/api_external.rst

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

0 commit comments

Comments
 (0)