Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/hotfixes' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
fit-alessandro-berti committed Jul 27, 2023
2 parents 61308a9 + dacfa0a commit dd65a31
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 9 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,22 @@
* small fixes pre-existing Jupyter notebooks
* 17f1340cc8a1095e6cdd8a8d85b92a3800a1e7f9
* bug fix textual abstraction log skeleton
* 1217473888b97a00f34834b4746bb7f7e4744df3
* bug fix PuLP solver with extremely low weights
* badbff239cf8a703e7d05c1cc2fc6d51af8aa7d7
* bug fix WOFLAN when no basis vectors are identified
* f528509c6b5117aca6285686e78175dbcf4ba057
* fixed path to Graphviz.JS
* ca79aa9b9e51ba3a95665d5d53c8e5ab5028bf12
* minor fix TBR generalization parameters

### Removed

### Other
* 916ea3163119afe7aa0fc9f6c43624147d6c0f9f
* reference to published paper in OCEL feature extraction
* 549aa7c6766f1a51425a7a65673173c55d9731e9
* updated reference to PM4Py website

---

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN apt-get -y install libtool flex bison pkg-config g++ libssl-dev automake
RUN apt-get -y install libjemalloc-dev libboost-dev libboost-filesystem-dev libboost-system-dev libboost-regex-dev python3-dev autoconf flex bison cmake
RUN apt-get -y install libxml2-dev libxslt-dev libfreetype6-dev libsuitesparse-dev
RUN pip install -U wheel six pytest
RUN pip install colorama==0.4.6 contourpy==1.1.0 cycler==0.11.0 deprecation==2.1.0 fonttools==4.40.0 graphviz==0.20.1 intervaltree==3.1.0 kiwisolver==1.4.4 lxml==4.9.2 matplotlib==3.7.1 networkx==3.1 numpy==1.25.0 packaging==23.1 pandas==2.0.3 pillow==9.5.0 pydotplus==2.0.2 pyparsing==3.1.0 python-dateutil==2.8.2 pytz==2023.3 scipy==1.11.1 six==1.16.0 sortedcontainers==2.4.0 stringdist==1.0.9 tqdm==4.65.0 tzdata==2023.3
RUN pip install colorama==0.4.6 contourpy==1.1.0 cycler==0.11.0 deprecation==2.1.0 fonttools==4.41.1 graphviz==0.20.1 intervaltree==3.1.0 kiwisolver==1.4.4 lxml==4.9.3 matplotlib==3.7.2 networkx==3.1 numpy==1.25.1 packaging==23.1 pandas==2.0.3 pillow==10.0.0 pydotplus==2.0.2 pyparsing==3.1.0 python-dateutil==2.8.2 pytz==2023.3 scipy==1.11.1 six==1.16.0 sortedcontainers==2.4.0 stringdist==1.0.9 tqdm==4.65.0 tzdata==2023.3

COPY . /app
RUN cd /app && python setup.py install
25 changes: 25 additions & 0 deletions requirements_complete.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
colorama
contourpy
cycler
deprecation
fonttools
graphviz
intervaltree
kiwisolver
lxml
matplotlib
networkx
numpy
packaging
pandas
pillow
pydotplus
pyparsing
python-dateutil
pytz
scipy
six
sortedcontainers
stringdist
tqdm
tzdata
2 changes: 1 addition & 1 deletion requirements_stable.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ graphviz==0.20.1
intervaltree==3.1.0
kiwisolver==1.4.4
lxml==4.9.3
matplotlib==3.7.1
matplotlib==3.7.2
networkx==3.1
numpy==1.25.1
packaging==23.1
Expand Down
14 changes: 7 additions & 7 deletions third_party/LICENSES_TRANSITIVE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ libraries are added/removed.
| Name | URL | License | Version |
| --------------------------- | ------------------------------------------------------------ | --------------------------- | ------------------- |
| colorama | https://pypi.org/project/colorama | BSD License | 0.4.6 |
| contourpy | https://pypi.org/project/contourpy | BSD License (BSD) | 1.1.0 |
| contourpy | https://pypi.org/project/contourpy | BSD License | 1.1.0 |
| cycler | https://pypi.org/project/cycler | BSD License (BSD) | 0.11.0 |
| deprecation | https://pypi.org/project/deprecation | Apache Software License (Apache 2) | 2.1.0 |
| fonttools | https://pypi.org/project/fonttools | MIT License (MIT) | 4.40.0 |
| fonttools | https://pypi.org/project/fonttools | MIT License (MIT) | 4.41.1 |
| graphviz | https://pypi.org/project/graphviz | MIT License (MIT) | 0.20.1 |
| intervaltree | https://pypi.org/project/intervaltree | Apache Software License (Apache License, Version 2.0) | 3.1.0 |
| kiwisolver | https://pypi.org/project/kiwisolver | BSD License | 1.4.4 |
| lxml | https://pypi.org/project/lxml | BSD License (BSD-3-Clause) | 4.9.2 |
| matplotlib | https://pypi.org/project/matplotlib | Python Software Foundation License (PSF) | 3.7.1 |
| lxml | https://pypi.org/project/lxml | BSD License (BSD-3-Clause) | 4.9.3 |
| matplotlib | https://pypi.org/project/matplotlib | Python Software Foundation License (PSF) | 3.7.2 |
| networkx | https://pypi.org/project/networkx | BSD License | 3.1 |
| numpy | https://pypi.org/project/numpy | BSD License (BSD-3-Clause) | 1.25.0 |
| numpy | https://pypi.org/project/numpy | BSD License (BSD-3-Clause) | 1.25.1 |
| packaging | https://pypi.org/project/packaging | Apache Software License, BSD License | 23.1 |
| pandas | https://pypi.org/project/pandas | BSD License (BSD) | 2.0.3 |
| pillow | https://pypi.org/project/pillow | Historical Permission Notice and Disclaimer (HPND) (HPND) | 9.5.0 |
| pandas | https://pypi.org/project/pandas | BSD License | 2.0.3 |
| pillow | https://pypi.org/project/pillow | Historical Permission Notice and Disclaimer (HPND) (HPND) | 10.0.0 |
| pydotplus | https://pypi.org/project/pydotplus | MIT License (UNKNOWN) | 2.0.2 |
| pyparsing | https://pypi.org/project/pyparsing | MIT License | 3.1.0 |
| python-dateutil | https://pypi.org/project/python-dateutil | Apache Software License, BSD License (Dual License) | 2.8.2 |
Expand Down

0 comments on commit dd65a31

Please sign in to comment.