Skip to content

Commit 0108c50

Browse files
authored
Merge pull request #10 from sandialabs/main
Pull recent main changes into develop
2 parents d1f1137 + 40bd6eb commit 0108c50

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

.github/workflows/deploy_documentation.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,20 @@ jobs:
3333
uses: actions/setup-python@v6
3434
with:
3535
python-version: "3.11"
36-
cache: pip # Implicitly uses requirements.txt for cache key
3736

3837
- name: Install dependencies
3938
run: |
4039
python -m pip install --upgrade pip
4140
pip install -e .[dev]
42-
41+
42+
- name: Debug jupyter-book installation
43+
run: |
44+
which jupyter-book || echo "no jupyter-book script on PATH"
45+
python -m pip show jupyter-book || echo "jupyter-book not installed?"
46+
4347
# Build the book
4448
- name: Build the book
45-
run: |
46-
jupyter-book build .
49+
run: jupyter-book build docs/theory_api_documentation
4750

4851
- name: Configure GitHub Pages
4952
uses: actions/configure-pages@v5
@@ -52,7 +55,7 @@ jobs:
5255
- name: Upload artifact
5356
uses: actions/upload-pages-artifact@v4
5457
with:
55-
path: _build/html
58+
path: docs/theory_api_documentation/_build/html
5659

5760
# Deploy the book's HTML to GitHub Pages
5861
- name: Deploy to GitHub Pages

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ The main features of ForceFinder are:
1616

1717
The SourcePathReceiver object has also been built into a Rattlesnake control law for random vibration control, meaning that the same exact code can be used in offline predictions and online control during a multiple-input/multiple-output (MIMO) vibration test. Note that the control law is included with this package for completeness, but are not imported to the Python environment when ForceFinder is used.
1818

19+
## Documentation
20+
The [theory and API documentation](https://sandialabs.github.io/forcefinder) provides useful information for theory and programming interface that is used in ForceFinder. Examples will be added to this documentation over time.
21+
1922
## Goals
2023
The ForceFinder project has two main goals:
2124

@@ -58,3 +61,4 @@ import forcefinder as ff
5861

5962

6063

64+

setup.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
long_description=open("README.md").read(),
1010
long_description_content_type="text/markdown",
1111
url="https://github.com/sandialabs/forcefinder",
12+
project_urls={"documentation":"https://sandialabs.github.io/forcefinder"},
1213
packages=find_packages(where='src'), # Tell setuptools to look in the src/ folder
1314
package_dir={"": "src"}, # Set the base folder for the packages to src/
1415
classifiers=["Programming Language :: Python :: 3.11",
@@ -33,11 +34,15 @@
3334
"sdynpy>=0.18.6",
3435
"pytest",
3536
"pytest-cov",
36-
"jupyter-book",
37+
"jupyter-book==1.0.4",
3738
"sphinx-autoapi"
3839
]
3940
}
4041
)
4142

4243

4344

45+
46+
47+
48+

0 commit comments

Comments
 (0)