Skip to content

Commit

Permalink
Fix CI dependency issues (#812)
Browse files Browse the repository at this point in the history
* Switch doc dependencies to mirror those of OpenMDAO

* workflow edits

* jupyter-book from conda-forge

* added matplotlib dependency to [docs]

* minor cleanup
  • Loading branch information
robfalck authored Aug 23, 2022
1 parent 5b4287a commit 9acc776
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/dymos_docs_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
PYOPTSPARSE: 'v2.8.3'
MBI: 1
OPENMDAO: 'latest'
OPTIONAL: '[all]'
OPTIONAL: '[docs]'
JAX: True
PUBLISH_DOCS: 1

Expand All @@ -45,7 +45,7 @@ jobs:
SNOPT: 7.7
MBI: 1
OPENMDAO: 'dev'
OPTIONAL: '[all]'
OPTIONAL: '[docs]'
JAX: True
PUBLISH_DOCS: 0

Expand Down Expand Up @@ -205,6 +205,16 @@ jobs:
pip install openmdao==${{ matrix.OPENMDAO }}
fi
- name: Install juptyter-book and jupyter
if: (github.event_name != 'workflow_dispatch' || matrix.NAME == 'latest')
shell: bash -l {0}
run: |
echo "============================================================="
echo "Install jupyter-book and jupyter"
echo "============================================================="
mamba install jupyter-book jupyter -q -y
- name: Install optional dependencies
if: (github.event_name != 'workflow_dispatch' || matrix.NAME == 'latest') && matrix.OPTIONAL == '[all]'
shell: bash -l {0}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dymos_tests_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
SNOPT: 7.7
MBI: 1
OPENMDAO: 'latest'
OPTIONAL: '[all]'
OPTIONAL: '[test]'
JAX: True
DOCS: 0

Expand All @@ -46,7 +46,7 @@ jobs:
PETSc: 3.17
MBI: 1
OPENMDAO: 'latest'
OPTIONAL: '[all]'
OPTIONAL: '[test]'
DOCS: 0

# baseline versions except with pyoptsparse but no SNOPT
Expand All @@ -59,7 +59,7 @@ jobs:
PYOPTSPARSE: 'v2.8.3'
MBI: 1
OPENMDAO: 'latest'
OPTIONAL: '[all]'
OPTIONAL: '[test]'
DOCS: 0

# try latest versions
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
SNOPT: 7.2
MBI: 1
OPENMDAO: 3.17.0
OPTIONAL: '[all]'
OPTIONAL: '[test]'
DOCS: 0

steps:
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
# Setup optional dependencies
optional_dependencies = {
'docs': [
'matplotlib',
'jupyter',
'jupyter-book',
'nbconvert',
'notebook',
'ipython',
'numpydoc>=0.9.1',
'numpydoc>=1.1',
'redbaron',
'tabulate',
'jaxlib',
Expand Down

0 comments on commit 9acc776

Please sign in to comment.