Skip to content

Commit 8989311

Browse files
committed
Merge branch 'master'
2 parents 8f5a130 + 80c1b95 commit 8989311

File tree

160 files changed

+27657
-12705
lines changed

Some content is hidden

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

160 files changed

+27657
-12705
lines changed

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ docs/_build/
1919
config/config.toml
2020
/.idea/
2121
.pyp_history
22-
external/postprocessing/
23-
external/spr_pick/
24-
external/cet_pick/
22+
external/
23+
dist/
24+
nextPYP.egg-info

.gitlab-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: python:3.8.8
1+
image: python:3.11
22

33
# container:
44
# tags:
@@ -16,12 +16,11 @@ image: python:3.8.8
1616

1717
docs:
1818
script:
19-
- pip install -r docs/requirements_docs.txt
20-
- sphinx-apidoc src/ -f -o docs/
19+
- python3 -m pip install --upgrade build
20+
- pip install -r docs/requirements_docs_minimal.txt
21+
# - sphinx-apidoc src/ -f -o docs/
2122
- cd docs/
2223
- sphinx-build -d _build/doctrees . _build/html
23-
- rm _build/html/index.html
24-
- cp _build/html/introduction.html _build/html/index.html
2524
- cd ..
2625
- mv docs/_build/html public
2726
artifacts:
@@ -31,5 +30,6 @@ docs:
3130
# only run this CI pipeline on master
3231
refs:
3332
- master
33+
- immaterial-docs
3434
#changes:
3535
# - docs/**/*

MANIFEST.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
graft bin
2+
graft config
3+
graft singularity
4+
include pyp.sif
5+
prune external
File renamed without changes.

0 commit comments

Comments
 (0)