From 426a7da61f550859608d9a0da16606ee5774e3d0 Mon Sep 17 00:00:00 2001 From: Pedro Bressan Date: Fri, 17 May 2024 13:36:09 -0300 Subject: [PATCH 01/10] DOC: remove requirements cap from docs. --- docs/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 7d45029bb..d6ff3605c 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,7 +1,7 @@ nbsphinx>=0.8.0 -pydata-sphinx-theme==0.13.3 +pydata-sphinx-theme>=0.13.3 m2r2>=0.2.1 -jupyter-sphinx==0.4.0 -sphinx_design==0.5.0 +jupyter-sphinx>=0.4.0 +sphinx_design>=0.5.0 ipykernel>=6.25.0 pandas>=1.4.4 \ No newline at end of file From 1d6fe5684ccea8fe19a9aae053c485f40d5edd1c Mon Sep 17 00:00:00 2001 From: Pedro Bressan Date: Fri, 17 May 2024 13:54:29 -0300 Subject: [PATCH 02/10] BUG: add lxml_html_clean as new docs dependency. --- docs/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index d6ff3605c..ac959263f 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -4,4 +4,5 @@ m2r2>=0.2.1 jupyter-sphinx>=0.4.0 sphinx_design>=0.5.0 ipykernel>=6.25.0 -pandas>=1.4.4 \ No newline at end of file +pandas>=1.4.4 +lxml_html_clean \ No newline at end of file From 73556137e66846f8328e90299df902e626632549 Mon Sep 17 00:00:00 2001 From: Pedro Bressan Date: Fri, 17 May 2024 14:06:02 -0300 Subject: [PATCH 03/10] BUG: limit docutils version due to m2r2 incompatibility. --- docs/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index ac959263f..5d136fe7a 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -5,4 +5,5 @@ jupyter-sphinx>=0.4.0 sphinx_design>=0.5.0 ipykernel>=6.25.0 pandas>=1.4.4 -lxml_html_clean \ No newline at end of file +lxml_html_clean +docutils<0.21 \ No newline at end of file From 4f573adf251c546501cc8aae4f2e370ea9956e7f Mon Sep 17 00:00:00 2001 From: Pedro Bressan Date: Fri, 17 May 2024 14:17:24 -0300 Subject: [PATCH 04/10] MNT: update readthedocs.yaml resources. --- .readthedocs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index d2023dd4c..7e2375a2c 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -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: From 4f4f1a86f9ac38bd97ac6dc8c86f1e1093884555 Mon Sep 17 00:00:00 2001 From: Pedro Bressan Date: Thu, 23 May 2024 18:20:45 -0300 Subject: [PATCH 05/10] MNT: update docs copyright year. --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 75f7a18a7..789793a48 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -19,7 +19,7 @@ # -- Project information ----------------------------------------------------- project = "RocketPy" -copyright = "2023, RocketPy Team" +copyright = "2024, RocketPy Team" author = "RocketPy Team" From abd07ba54a0dfb08555180a5006c46ee65372528 Mon Sep 17 00:00:00 2001 From: Pedro Bressan Date: Thu, 23 May 2024 18:22:21 -0300 Subject: [PATCH 06/10] TMP: try forcing rocketpy installation. --- .readthedocs.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 7e2375a2c..357ff98b0 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,6 +10,9 @@ build: os: ubuntu-22.04 tools: python: "3.12" + jobs: + post_install: + - pip install rocketpy[all] # Build documentation in the docs/ directory with Sphinx sphinx: From e859c47bd9dca659401279f5965f925a4912ef07 Mon Sep 17 00:00:00 2001 From: Pedro Bressan Date: Fri, 24 May 2024 07:29:07 -0300 Subject: [PATCH 07/10] BUG: add new PYTHONPATH to conf.py. --- docs/conf.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 789793a48..ac0f1c349 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -13,8 +13,9 @@ 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 ----------------------------------------------------- From 1df59228f430465afc7817b2c4e213047b9ae4bd Mon Sep 17 00:00:00 2001 From: Pedro Bressan Date: Fri, 24 May 2024 07:39:16 -0300 Subject: [PATCH 08/10] MNT: remove unnecessary post install readthedocs job. --- .readthedocs.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 357ff98b0..7e2375a2c 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -10,9 +10,6 @@ build: os: ubuntu-22.04 tools: python: "3.12" - jobs: - post_install: - - pip install rocketpy[all] # Build documentation in the docs/ directory with Sphinx sphinx: From ac4d85c9c691cd69fbce745daea7c16e9961130e Mon Sep 17 00:00:00 2001 From: Pedro Bressan Date: Tue, 28 May 2024 21:24:06 -0300 Subject: [PATCH 09/10] DOC: pin down version and dependencies with pip-tools. --- docs/requirements.in | 9 ++ docs/requirements.txt | 262 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 262 insertions(+), 9 deletions(-) create mode 100644 docs/requirements.in diff --git a/docs/requirements.in b/docs/requirements.in new file mode 100644 index 000000000..e54e386ad --- /dev/null +++ b/docs/requirements.in @@ -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 \ No newline at end of file diff --git a/docs/requirements.txt b/docs/requirements.txt index 5d136fe7a..f45dac5e5 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,9 +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 -lxml_html_clean -docutils<0.21 \ No newline at end of file +# +# 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 From 73ec84427e9ee997b3752a3d8a59decbd99e3717 Mon Sep 17 00:00:00 2001 From: Pedro Bressan Date: Tue, 28 May 2024 21:56:14 -0300 Subject: [PATCH 10/10] MNT: add recent changes to CHANGELOG. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2abd48a1..0e9aa9845 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)