Skip to content

Commit

Permalink
Merge pull request #613 from RocketPy-Team/bug/docs-requirement-build
Browse files Browse the repository at this point in the history
DOC: Solve Dependencies Conflicts and pyproject build
  • Loading branch information
phmbressan authored May 29, 2024
2 parents 92fb685 + 73ec844 commit 71810ab
Show file tree
Hide file tree
Showing 5 changed files with 269 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ version: 2

# Set the version of Python and other tools
build:
os: ubuntu-20.04
os: ubuntu-22.04
tools:
python: "3.9"
python: "3.12"

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Fixed

- DOC: Solve Dependencies Conflicts and pyproject build [#613](https://github.com/RocketPy-Team/RocketPy/pull/613)
- BUG: Fixes nose cone bluffness issue #610 [#611](https://github.com/RocketPy-Team/RocketPy/pull/611)
- BUG: plot drag curves when function source is callable [#599](https://github.com/RocketPy-Team/RocketPy/pull/599)
- BUG: Fix minor type hinting problems [#598](https://github.com/RocketPy-Team/RocketPy/pull/598)
Expand Down
7 changes: 4 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
import os
import sys

sys.path.insert(0, os.path.abspath("../"))

package_path = os.path.abspath("../")
sys.path.insert(0, package_path)
os.environ["PYTHONPATH"] = ":".join((package_path, os.environ.get("PYTHONPATH", "")))

# -- Project information -----------------------------------------------------

project = "RocketPy"
copyright = "2023, RocketPy Team"
copyright = "2024, RocketPy Team"

author = "RocketPy Team"

Expand Down
9 changes: 9 additions & 0 deletions docs/requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
nbsphinx==0.9.4
pydata-sphinx-theme==0.15.2
m2r2==0.3.3.post2
jupyter-sphinx==0.5.3
sphinx_design==0.5.0
ipykernel==6.29.4
pandas==2.2.2
lxml_html_clean==0.1.1
docutils==0.20.1
260 changes: 253 additions & 7 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,253 @@
nbsphinx>=0.8.0
pydata-sphinx-theme==0.13.3
m2r2>=0.2.1
jupyter-sphinx==0.4.0
sphinx_design==0.5.0
ipykernel>=6.25.0
pandas>=1.4.4
#
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile docs/requirements.in
#
accessible-pygments==0.0.5
# via pydata-sphinx-theme
alabaster==0.7.16
# via sphinx
asttokens==2.4.1
# via stack-data
attrs==23.2.0
# via
# jsonschema
# referencing
babel==2.15.0
# via
# pydata-sphinx-theme
# sphinx
beautifulsoup4==4.12.3
# via
# nbconvert
# pydata-sphinx-theme
bleach==6.1.0
# via nbconvert
certifi==2024.2.2
# via requests
charset-normalizer==3.3.2
# via requests
comm==0.2.2
# via
# ipykernel
# ipywidgets
debugpy==1.8.1
# via ipykernel
decorator==5.1.1
# via ipython
defusedxml==0.7.1
# via nbconvert
docutils==0.20.1
# via
# -r docs/requirements.in
# m2r2
# nbsphinx
# pydata-sphinx-theme
# sphinx
entrypoints==0.4
# via nbconvert
executing==2.0.1
# via stack-data
fastjsonschema==2.19.1
# via nbformat
idna==3.7
# via requests
imagesize==1.4.1
# via sphinx
ipykernel==6.29.4
# via
# -r docs/requirements.in
# jupyter-sphinx
ipython==8.24.0
# via
# ipykernel
# ipywidgets
# jupyter-sphinx
ipywidgets==8.1.2
# via jupyter-sphinx
jedi==0.19.1
# via ipython
jinja2==3.1.4
# via
# nbconvert
# nbsphinx
# sphinx
jsonschema==4.22.0
# via nbformat
jsonschema-specifications==2023.12.1
# via jsonschema
jupyter-client==8.6.2
# via
# ipykernel
# nbclient
jupyter-core==5.7.2
# via
# ipykernel
# jupyter-client
# nbclient
# nbconvert
# nbformat
jupyter-sphinx==0.5.3
# via -r docs/requirements.in
jupyterlab-pygments==0.3.0
# via nbconvert
jupyterlab-widgets==3.0.10
# via ipywidgets
lxml==5.2.2
# via
# lxml-html-clean
# nbconvert
lxml-html-clean==0.1.1
# via -r docs/requirements.in
m2r2==0.3.3.post2
# via -r docs/requirements.in
markupsafe==2.1.5
# via
# jinja2
# nbconvert
matplotlib-inline==0.1.7
# via
# ipykernel
# ipython
mistune==0.8.4
# via
# m2r2
# nbconvert
nbclient==0.10.0
# via nbconvert
nbconvert==6.5.4
# via
# jupyter-sphinx
# nbsphinx
nbformat==5.10.4
# via
# jupyter-sphinx
# nbclient
# nbconvert
# nbsphinx
nbsphinx==0.9.4
# via -r docs/requirements.in
nest-asyncio==1.6.0
# via ipykernel
numpy==1.26.4
# via pandas
packaging==24.0
# via
# ipykernel
# nbconvert
# pydata-sphinx-theme
# sphinx
pandas==2.2.2
# via -r docs/requirements.in
pandocfilters==1.5.1
# via nbconvert
parso==0.8.4
# via jedi
pexpect==4.9.0
# via ipython
platformdirs==4.2.2
# via jupyter-core
prompt-toolkit==3.0.43
# via ipython
psutil==5.9.8
# via ipykernel
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.2
# via stack-data
pydata-sphinx-theme==0.15.2
# via -r docs/requirements.in
pygments==2.18.0
# via
# accessible-pygments
# ipython
# nbconvert
# pydata-sphinx-theme
# sphinx
python-dateutil==2.9.0.post0
# via
# jupyter-client
# pandas
pytz==2024.1
# via pandas
pyzmq==26.0.3
# via
# ipykernel
# jupyter-client
referencing==0.35.1
# via
# jsonschema
# jsonschema-specifications
requests==2.32.2
# via sphinx
rpds-py==0.18.1
# via
# jsonschema
# referencing
six==1.16.0
# via
# asttokens
# bleach
# python-dateutil
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.5
# via beautifulsoup4
sphinx==7.3.7
# via
# jupyter-sphinx
# nbsphinx
# pydata-sphinx-theme
# sphinx-design
sphinx-design==0.5.0
# via -r docs/requirements.in
sphinxcontrib-applehelp==1.0.8
# via sphinx
sphinxcontrib-devhelp==1.0.6
# via sphinx
sphinxcontrib-htmlhelp==2.0.5
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.7
# via sphinx
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
stack-data==0.6.3
# via ipython
tinycss2==1.3.0
# via nbconvert
tornado==6.4
# via
# ipykernel
# jupyter-client
traitlets==5.14.3
# via
# comm
# ipykernel
# ipython
# ipywidgets
# jupyter-client
# jupyter-core
# matplotlib-inline
# nbclient
# nbconvert
# nbformat
# nbsphinx
typing-extensions==4.12.0
# via
# ipython
# pydata-sphinx-theme
tzdata==2024.1
# via pandas
urllib3==2.2.1
# via requests
wcwidth==0.2.13
# via prompt-toolkit
webencodings==0.5.1
# via
# bleach
# tinycss2
widgetsnbextension==4.0.10
# via ipywidgets

0 comments on commit 71810ab

Please sign in to comment.