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 Jan 29, 2024
2 parents 31603fa + f10ba33 commit 22f74d7
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* removed circular dependency on pm4py.util
* 0da8c5f04f89dab8b9f5a3d31d8f5beb927e71d4
* fixing OCEL 2.0 support
* 7b2c8ffee70c94c1acce7c28a7b366d5ed95bb6b
* fixing TBR diagnostics computation

### Removed

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.2.0 cycler==0.12.1 deprecation==2.1.0 fonttools==4.47.2 graphviz==0.20.1 intervaltree==3.1.0 kiwisolver==1.4.5 lxml==5.1.0 matplotlib==3.8.2 networkx==3.2.1 numpy==1.26.3 packaging==23.2 pandas==2.2.0 pillow==10.2.0 pydotplus==2.0.2 pyparsing==3.1.1 python-dateutil==2.8.2 pytz==2023.3.post1 scipy==1.12.0 six==1.16.0 sortedcontainers==2.4.0 StringDist==1.0.9 tqdm==4.66.1 tzdata==2023.4
RUN pip install colorama==0.4.6 contourpy==1.2.0 cycler==0.12.1 deprecation==2.1.0 fonttools==4.47.2 graphviz==0.20.1 intervaltree==3.1.0 kiwisolver==1.4.5 lxml==5.1.0 matplotlib==3.8.2 networkx==3.2.1 numpy==1.26.3 packaging==23.2 pandas==2.2.0 pillow==10.2.0 pydotplus==2.0.2 pyparsing==3.1.1 python-dateutil==2.8.2 pytz==2023.4 scipy==1.12.0 six==1.16.0 sortedcontainers==2.4.0 StringDist==1.0.9 tqdm==4.66.1 tzdata==2023.4

COPY . /app
RUN cd /app && python setup.py install
2 changes: 1 addition & 1 deletion requirements_stable.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pillow==10.2.0
pydotplus==2.0.2
pyparsing==3.1.1
python-dateutil==2.8.2
pytz==2023.3.post1
pytz==2023.4
scipy==1.12.0
six==1.16.0
sortedcontainers==2.4.0
Expand Down
47 changes: 47 additions & 0 deletions safety_checks/20240129
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
+==============================================================================+

/$$$$$$ /$$
/$$__ $$ | $$
/$$$$$$$ /$$$$$$ | $$ \__//$$$$$$ /$$$$$$ /$$ /$$
/$$_____/ |____ $$| $$$$ /$$__ $$|_ $$_/ | $$ | $$
| $$$$$$ /$$$$$$$| $$_/ | $$$$$$$$ | $$ | $$ | $$
\____ $$ /$$__ $$| $$ | $$_____/ | $$ /$$| $$ | $$
/$$$$$$$/| $$$$$$$| $$ | $$$$$$$ | $$$$/| $$$$$$$
|_______/ \_______/|__/ \_______/ \___/ \____ $$
/$$ | $$
| $$$$$$/
by pyup.io \______/

+==============================================================================+

REPORT

Safety is using PyUp's free open-source vulnerability database. This
data is 30 days old and limited.
For real-time enhanced vulnerability data, fix recommendations, severity
reporting, cybersecurity support, team and project policy management and more
sign up at https://pyup.io or email sales@pyup.io

Safety v2.3.5 is scanning for Vulnerabilities...
Scanning dependencies in your files:

-> requirements_stable.txt

Using non-commercial database
Found and scanned 25 packages
Timestamp 2024-01-29 07:07:08
0 vulnerabilities found
0 vulnerabilities ignored
+==============================================================================+

No known security vulnerabilities found.

+==============================================================================+

Safety is using PyUp's free open-source vulnerability database. This
data is 30 days old and limited.
For real-time enhanced vulnerability data, fix recommendations, severity
reporting, cybersecurity support, team and project policy management and more
sign up at https://pyup.io or email sales@pyup.io

+==============================================================================+
6 changes: 3 additions & 3 deletions third_party/LICENSES_TRANSITIVE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ PM4Py depends upon. This is a best effort attempt to describe the library's depe
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 | 1.2.0 |
| cycler | https://pypi.org/project/cycler | BSD License | 0.12.1 |
| deprecation | https://pypi.org/project/deprecation | Apache Software License (Apache 2) | 2.1.0 |
| fonttools | https://pypi.org/project/fonttools | MIT License (MIT) | 4.47.2 |
| graphviz | https://pypi.org/project/graphviz | MIT License (MIT) | 0.20.1 |
| intervaltree | https://pypi.org/project/intervaltree | Apache Software License | 3.1.0 |
| 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.5 |
| lxml | https://pypi.org/project/lxml | BSD License (BSD-3-Clause) | 5.1.0 |
| matplotlib | https://pypi.org/project/matplotlib | Python Software Foundation License (PSF) | 3.8.2 |
Expand All @@ -24,7 +24,7 @@ libraries are added/removed.
| pydotplus | https://pypi.org/project/pydotplus | MIT License (UNKNOWN) | 2.0.2 |
| pyparsing | https://pypi.org/project/pyparsing | MIT License | 3.1.1 |
| python-dateutil | https://pypi.org/project/python-dateutil | Apache Software License, BSD License (Dual License) | 2.8.2 |
| pytz | https://pypi.org/project/pytz | MIT License (MIT) | 2023.3.post1 |
| pytz | https://pypi.org/project/pytz | MIT License (MIT) | 2023.4 |
| scipy | https://pypi.org/project/scipy | BSD License | 1.12.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 |
Expand Down

0 comments on commit 22f74d7

Please sign in to comment.