Skip to content

Commit c3c6c3d

Browse files
Merge branch 'develop' into enh/parallel_montecarlo
2 parents cb88e69 + 3b61784 commit c3c6c3d

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

.github/workflows/test-pytest-slow.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Scheduled Tests
22

33
on:
44
schedule:
5-
- cron: "0 17 */14 * 5" # every 2 weeks, always on a Friday at 17:00
5+
- cron: "0 17 * * 5" # at 05:00 PM, only on Friday
66
timezone: "America/Sao_Paulo"
77

88
defaults:
@@ -11,7 +11,6 @@ defaults:
1111

1212
jobs:
1313
pytest:
14-
if: github.ref == "refs/heads/master" || github.ref == "refs/heads/develop"
1514
runs-on: ubuntu-latest
1615
strategy:
1716
matrix:

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Attention: The newest changes should be on top -->
3636

3737
### Changed
3838

39-
-
39+
- DOC: Fix documentation dependencies [#651](https://github.com/RocketPy-Team/RocketPy/pull/651)
4040
- DOC: Fix documentation warnings [#645](https://github.com/RocketPy-Team/RocketPy/pull/645)
4141
- DOC: New Environment class docs pages [#644](https://github.com/RocketPy-Team/RocketPy/pull/644)
4242

docs/requirements.txt

+6-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.10
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# pip-compile requirements.in
@@ -28,10 +28,6 @@ certifi==2024.2.2
2828
# via requests
2929
charset-normalizer==3.3.2
3030
# via requests
31-
colorama==0.4.6
32-
# via
33-
# ipython
34-
# sphinx
3531
comm==0.2.2
3632
# via
3733
# ipykernel
@@ -49,8 +45,6 @@ docutils==0.20.1
4945
# sphinx
5046
entrypoints==0.4
5147
# via nbconvert
52-
exceptiongroup==1.2.2
53-
# via ipython
5448
executing==2.0.1
5549
# via stack-data
5650
fastjsonschema==2.19.1
@@ -144,12 +138,16 @@ pandocfilters==1.5.1
144138
# via nbconvert
145139
parso==0.8.4
146140
# via jedi
141+
pexpect==4.9.0
142+
# via ipython
147143
platformdirs==4.2.2
148144
# via jupyter-core
149145
prompt-toolkit==3.0.43
150146
# via ipython
151147
psutil==5.9.8
152148
# via ipykernel
149+
ptyprocess==0.7.0
150+
# via pexpect
153151
pure-eval==0.2.2
154152
# via stack-data
155153
pydata-sphinx-theme==0.15.2
@@ -167,8 +165,6 @@ python-dateutil==2.9.0.post0
167165
# pandas
168166
pytz==2024.1
169167
# via pandas
170-
pywin32==306
171-
# via jupyter-core
172168
pyzmq==26.0.3
173169
# via
174170
# ipykernel
@@ -219,8 +215,6 @@ stack-data==0.6.3
219215
# via ipython
220216
tinycss2==1.3.0
221217
# via nbconvert
222-
tomli==2.0.1
223-
# via sphinx
224218
tornado==6.4
225219
# via
226220
# ipykernel
@@ -239,9 +233,7 @@ traitlets==5.14.3
239233
# nbformat
240234
# nbsphinx
241235
typing-extensions==4.12.0
242-
# via
243-
# ipython
244-
# pydata-sphinx-theme
236+
# via pydata-sphinx-theme
245237
tzdata==2024.1
246238
# via pandas
247239
urllib3==2.2.1

0 commit comments

Comments
 (0)