Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/QSD-Group/QSDsan into trial
Browse files Browse the repository at this point in the history
  • Loading branch information
yalinli2 committed Oct 22, 2023
2 parents dc6e1b1 + 9dc1a1a commit a40b3e6
Show file tree
Hide file tree
Showing 6 changed files with 974 additions and 2,696 deletions.
Binary file added .github/workflows/binder.yaml
Binary file not shown.
14 changes: 7 additions & 7 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# built documents.
#
# The short X.Y version.
version = '1.3.0'
version = '1.3.1'
# The full version, including alpha/beta/rc tags.
release = version

Expand Down Expand Up @@ -127,10 +127,10 @@

# -- External mapping -------------------------------------------------------
intersphinx_mapping = {
'biosteam': ('https://biosteam.readthedocs.io/en/latest', None),
'thermosteam': ('https://biosteam.readthedocs.io/en/latest', None),
'BioSTEAM': ('https://biosteam.readthedocs.io/en/latest', None),
'Thermosteam': ('https://biosteam.readthedocs.io/en/latest', None),
'scipy': ('https://docs.scipy.org/doc/scipy/', None),
'SALib': ('https://salib.readthedocs.io/en/latest', None),
'biosteam': ('https://biosteam.readthedocs.io', None),
'thermosteam': ('https://biosteam.readthedocs.io', None),
'BioSTEAM': ('https://biosteam.readthedocs.io', None),
'Thermosteam': ('https://biosteam.readthedocs.io', None),
'scipy': ('https://docs.scipy.org/doc/scipy', None),
'SALib': ('https://salib.readthedocs.io', None),
}
2 changes: 1 addition & 1 deletion docs/source/tutorials/10_Process.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
" \n",
"- **Video demo:**\n",
"\n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/authors/Joy_Zhang.html)\n",
" - [Joy Zhang](https://qsdsan.readthedocs.io/en/latest/CONTRIBUTING.html)\n",
" \n",
"To run tutorials in your browser, go to this [Binder page](https://mybinder.org/v2/gh/QSD-Group/QSDsan/main?filepath=%2Fdocs%2Fsource%2Ftutorials).\n",
" \n",
Expand Down
Loading

0 comments on commit a40b3e6

Please sign in to comment.