Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/previous' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
@fit-alessandro-berti
fit-alessandro-berti committed Nov 6, 2024
2 parents a035c93 + d018e84 commit 859ecae
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ RUN apt-get -y install gcc g++ flex bison pkg-config automake autoconf cmake
RUN apt-get -y install python3-dev python3-pydot python3-tk
RUN apt-get -y install libopenblas-dev liblapack-dev libboost-all-dev libncurses5-dev libtool libssl-dev libjemalloc-dev libboost-dev libboost-filesystem-dev libboost-system-dev libboost-regex-dev libxml2-dev libxslt-dev libfreetype6-dev libsuitesparse-dev libclang-16-dev llvm-16-dev libthrift-dev libfftw3-dev
RUN python3 -m pip install --upgrade pip
RUN pip3 install deprecation==2.1.0 graphviz==0.20.3 intervaltree==3.1.0 networkx==3.4.2 packaging==24.1 python-dateutil==2.9.0.post0 pytz==2024.2 setuptools==75.2.0 six==1.16.0 sortedcontainers==2.4.0 tzdata==2024.2 wheel==0.44.0
RUN pip3 install colorama==0.4.6 cycler==0.12.1 pydotplus==2.0.2 pyparsing==3.2.0 tqdm==4.66.5
RUN pip3 install lxml==5.3.0 numpy==2.1.2 pandas==2.2.3 scipy==1.14.1
RUN pip3 install deprecation==2.1.0 graphviz==0.20.3 intervaltree==3.1.0 networkx==3.4.2 packaging==24.1 python-dateutil==2.9.0.post0 pytz==2024.2 setuptools==75.3.0 six==1.16.0 sortedcontainers==2.4.0 tzdata==2024.2 wheel==0.44.0
RUN pip3 install colorama==0.4.6 cycler==0.12.1 pydotplus==2.0.2 pyparsing==3.2.0 tqdm==4.66.6
RUN pip3 install lxml==5.3.0 numpy==2.1.3 pandas==2.2.3 scipy==1.14.1
RUN pip3 install contourpy==1.3.0 fonttools==4.54.1 kiwisolver==1.4.7 matplotlib==3.9.2 pillow==11.0.0
RUN pip3 install anyio==4.6.2.post1 asttokens==2.4.1 attrs==24.2.0 certifi==2024.8.30 charset-normalizer==3.4.0 convertdate==2.4.0 decorator==5.1.1 distro==1.9.0 executing==2.1.0 h11==0.14.0 httpcore==1.0.6 httpx==0.27.2 idna==3.10 ipython==8.29.0 jedi==0.19.1 Jinja2==3.1.4 jsonpickle==3.3.0 jsonschema-specifications==2024.10.1 lunardate==0.2.2 MarkupSafe==3.0.2 matplotlib-inline==0.1.7 parso==0.8.4 prompt-toolkit==3.0.48 pure-eval==0.2.3 pydantic==2.9.2 Pygments==2.18.0 pyluach==2.2.0 PyMeeus==0.5.12 referencing==0.35.1 rpds-py==0.20.0 sniffio==1.3.1 stack-data==0.6.3 traitlets==5.14.3 typing_extensions==4.12.2 urllib3==2.2.3 wcwidth==0.2.13
RUN pip3 install jsonschema==4.23.0 openai==1.52.2 pyvis==0.3.2 requests==2.32.3 workalendar==17.0.0
RUN pip3 install anyio==4.6.2.post1 asttokens==2.4.1 attrs==24.2.0 certifi==2024.8.30 charset-normalizer==3.4.0 convertdate==2.4.0 decorator==5.1.1 distro==1.9.0 executing==2.1.0 h11==0.14.0 httpcore==1.0.6 httpx==0.27.2 idna==3.10 ipython==8.29.0 jedi==0.19.1 Jinja2==3.1.4 jsonpickle==3.4.2 jsonschema-specifications==2024.10.1 lunardate==0.2.2 MarkupSafe==3.0.2 matplotlib-inline==0.1.7 parso==0.8.4 prompt-toolkit==3.0.48 pure-eval==0.2.3 pydantic==2.9.2 Pygments==2.18.0 pyluach==2.2.0 PyMeeus==0.5.12 referencing==0.35.1 rpds-py==0.20.1 sniffio==1.3.1 stack-data==0.6.3 traitlets==5.14.3 typing_extensions==4.12.2 urllib3==2.2.3 wcwidth==0.2.13
RUN pip3 install jsonschema==4.23.0 openai==1.54.1 pyvis==0.3.2 requests==2.32.3 workalendar==17.0.0
RUN pip3 install -U meson-python==0.15.0 Cython==3.0.10 ninja==1.11.1.1 spin==0.8 build==1.2.1 setuptools_scm==8.0.4

#RUN cd / && git clone https://github.com/numpy/numpy.git && cd /numpy && git submodule update --init && pip3 install .
Expand Down
6 changes: 3 additions & 3 deletions requirements_stable.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ kiwisolver==1.4.7
lxml==5.3.0
matplotlib==3.9.2
networkx==3.4.2
numpy==2.1.2
numpy==2.1.3
packaging==24.1
pandas==2.2.3
pillow==11.0.0
Expand All @@ -18,9 +18,9 @@ pyparsing==3.2.0
python-dateutil==2.9.0.post0
pytz==2024.2
scipy==1.14.1
setuptools==75.2.0
setuptools==75.3.0
six==1.16.0
sortedcontainers==2.4.0
tqdm==4.66.5
tqdm==4.66.6
tzdata==2024.2
wheel==0.44.0
6 changes: 3 additions & 3 deletions third_party/LICENSES_TRANSITIVE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
| lxml | https://pypi.org/project/lxml | BSD License (BSD-3-Clause) | 5.3.0 |
| matplotlib | https://pypi.org/project/matplotlib | Python Software Foundation License | 3.9.2 |
| networkx | https://pypi.org/project/networkx | BSD License | 3.4.2 |
| numpy | https://pypi.org/project/numpy | BSD License | 2.1.2 |
| numpy | https://pypi.org/project/numpy | BSD License | 2.1.3 |
| packaging | https://pypi.org/project/packaging | Apache Software License, BSD License | 24.1 |
| pandas | https://pypi.org/project/pandas | BSD License | 2.2.3 |
| pillow | https://pypi.org/project/pillow | CMU License (MIT-CMU) (MIT-CMU) | 11.0.0 |
Expand All @@ -26,9 +26,9 @@
| python-dateutil | https://pypi.org/project/python-dateutil | Apache Software License, BSD License (Dual License) | 2.9.0.post0 |
| pytz | https://pypi.org/project/pytz | MIT License (MIT) | 2024.2 |
| scipy | https://pypi.org/project/scipy | BSD License | 1.14.1 |
| setuptools | https://pypi.org/project/setuptools | MIT License | 75.2.0 |
| setuptools | https://pypi.org/project/setuptools | MIT License | 75.3.0 |
| six | https://pypi.org/project/six | MIT License (MIT) | 1.16.0 |
| sortedcontainers | https://pypi.org/project/sortedcontainers | Apache Software License (Apache 2.0) | 2.4.0 |
| tqdm | https://pypi.org/project/tqdm | MIT License, Mozilla Public License 2.0 (MPL 2.0) (MPL-2.0 AND MIT) | 4.66.5 |
| tqdm | https://pypi.org/project/tqdm | MIT License, Mozilla Public License 2.0 (MPL 2.0) (MPL-2.0 AND MIT) | 4.66.6 |
| tzdata | https://pypi.org/project/tzdata | Apache Software License (Apache-2.0) | 2024.2 |
| wheel | https://pypi.org/project/wheel | MIT License | 0.44.0 |

0 comments on commit 859ecae

Please sign in to comment.