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
fit-alessandro-berti committed Nov 9, 2024
2 parents 48ec13b + b9b144f commit d42a605
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 18 deletions.
8 changes: 4 additions & 4 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.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 deprecation==2.1.0 graphviz==0.20.3 intervaltree==3.1.0 networkx==3.4.2 packaging==24.2 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.45.0
RUN pip3 install colorama==0.4.6 cycler==0.12.1 pydotplus==2.0.2 pyparsing==3.2.0 tqdm==4.67.0
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.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 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.21.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.54.3 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 pm4py/meta.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
'''

__name__ = 'pm4py'
VERSION = '2.7.12'
VERSION = '2.7.12.1'
__version__ = VERSION
__doc__ = 'Process mining for Python'
__author__ = 'Process Intelligence Solutions (Fraunhofer FIT)'
__author__ = 'Process Intelligence Solutions (PIS)'
__author_email__ = 'info@processintelligence.solutions'
__maintainer__ = 'Process Intelligence Solutions (Fraunhofer FIT)'
__maintainer__ = 'Process Intelligence Solutions (PIS)'
__maintainer_email__ = "info@processintelligence.solutions"
2 changes: 2 additions & 0 deletions pm4py/objects/bpmn/layout/variants/graphviz_new.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ def apply(bpmn_graph: BPMN, parameters: Optional[Dict[Any, Any]] = None) -> BPMN
vis_parameters = copy(parameters)
vis_parameters["format"] = "svg"
vis_parameters["include_name_in_events"] = False
vis_parameters["endpoints_shape"] = "box"

gviz = bpmn_visualizer.apply(bpmn_graph, parameters=vis_parameters)
bpmn_visualizer.save(gviz, filename_svg.name)

Expand Down
12 changes: 7 additions & 5 deletions pm4py/visualization/bpmn/variants/classic.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,19 @@ class Parameters(Enum):
ENABLE_SWIMLANES = "enable_swimlanes"
INCLUDE_NAME_IN_EVENTS = "include_name_in_events"
SWIMLANES_MARGIN = "swimlanes_margin"
ENDPOINTS_SHAPE = "endpoints_shape"


def add_bpmn_node(graph, n, font_size, include_name_in_events):
def add_bpmn_node(graph, n, font_size, include_name_in_events, endpoints_shape):
n_id = str(id(n))
node_label = str(n.name) if include_name_in_events else ""

if isinstance(n, BPMN.Task):
graph.node(n_id, shape="box", label=n.get_name(), fontsize=font_size)
elif isinstance(n, BPMN.StartEvent):
graph.node(n_id, label="", shape="circle", style="filled", fillcolor="green", fontsize=font_size)
graph.node(n_id, label="", shape=endpoints_shape, style="filled", fillcolor="green", fontsize=font_size)
elif isinstance(n, BPMN.EndEvent):
graph.node(n_id, label="", shape="circle", style="filled", fillcolor="orange", fontsize=font_size)
graph.node(n_id, label="", shape=endpoints_shape, style="filled", fillcolor="orange", fontsize=font_size)
elif isinstance(n, BPMN.Event):
graph.node(n_id, label=node_label, shape="underline", fontsize=font_size)
elif isinstance(n, BPMN.TextAnnotation):
Expand Down Expand Up @@ -103,6 +104,7 @@ def apply(bpmn_graph: BPMN, parameters: Optional[Dict[Any, Any]] = None) -> grap
include_name_in_events = exec_utils.get_param_value(Parameters.INCLUDE_NAME_IN_EVENTS, parameters, True)
swimlanes_margin = exec_utils.get_param_value(Parameters.SWIMLANES_MARGIN, parameters, 35)
swimlanes_margin = str(swimlanes_margin)
endpoints_shape = exec_utils.get_param_value(Parameters.ENDPOINTS_SHAPE, parameters, "circle")

filename = tempfile.NamedTemporaryFile(suffix='.gv')
filename.close()
Expand All @@ -125,7 +127,7 @@ def apply(bpmn_graph: BPMN, parameters: Optional[Dict[Any, Any]] = None) -> grap

if len(participant_nodes) < 1 or not enable_swimlanes:
for n in nodes:
if add_bpmn_node(viz, n, font_size, include_name_in_events):
if add_bpmn_node(viz, n, font_size, include_name_in_events, endpoints_shape):
added_nodes.add(str(id(n)))
else:
# style='invis'
Expand All @@ -139,7 +141,7 @@ def apply(bpmn_graph: BPMN, parameters: Optional[Dict[Any, Any]] = None) -> grap
c.attr(label=pref_pname[subp])
c.attr(margin=swimlanes_margin)
for n in process_ids_members[subp]:
if add_bpmn_node(c, n, font_size, include_name_in_events):
if add_bpmn_node(c, n, font_size, include_name_in_events, endpoints_shape):
added_nodes.add(str(id(n)))
this_added_nodes.append(str(id(n)))
#c.attr(rank='same')
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 @@ -10,7 +10,7 @@ lxml==5.3.0
matplotlib==3.9.2
networkx==3.4.2
numpy==2.1.3
packaging==24.1
packaging==24.2
pandas==2.2.3
pillow==11.0.0
pydotplus==2.0.2
Expand All @@ -21,6 +21,6 @@ scipy==1.14.1
setuptools==75.3.0
six==1.16.0
sortedcontainers==2.4.0
tqdm==4.66.6
tqdm==4.67.0
tzdata==2024.2
wheel==0.44.0
wheel==0.45.0
33 changes: 33 additions & 0 deletions safety_checks/20241109
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
+==============================================================================+

/$$$$$$ /$$
/$$__ $$ | $$
/$$$$$$$ /$$$$$$ | $$ \__//$$$$$$ /$$$$$$ /$$ /$$
/$$_____/ |____ $$| $$$$ /$$__ $$|_ $$_/ | $$ | $$
| $$$$$$ /$$$$$$$| $$_/ | $$$$$$$$ | $$ | $$ | $$
\____ $$ /$$__ $$| $$ | $$_____/ | $$ /$$| $$ | $$
/$$$$$$$/| $$$$$$$| $$ | $$$$$$$ | $$$$/| $$$$$$$
|_______/ \_______/|__/ \_______/ \___/ \____ $$
/$$ | $$
| $$$$$$/
by safetycli.com \______/

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

REPORT

Safety v3.1.0 is scanning for Vulnerabilities...
Scanning dependencies in your files:

-> requirements_stable.txt

Using open-source vulnerability database
Found and scanned 26 packages
Timestamp 2024-11-09 10:43:48
0 vulnerabilities reported
0 vulnerabilities ignored
+==============================================================================+

No known security vulnerabilities reported.

+==============================================================================+
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 @@ -18,7 +18,7 @@
| 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.3 |
| packaging | https://pypi.org/project/packaging | Apache Software License, BSD License | 24.1 |
| packaging | https://pypi.org/project/packaging | Apache Software License, BSD License | 24.2 |
| 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 |
| pydotplus | https://pypi.org/project/pydotplus | MIT License (UNKNOWN) | 2.0.2 |
Expand All @@ -29,6 +29,6 @@
| 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.6 |
| tqdm | https://pypi.org/project/tqdm | MIT License, Mozilla Public License 2.0 (MPL 2.0) (MPL-2.0 AND MIT) | 4.67.0 |
| 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 |
| wheel | https://pypi.org/project/wheel | MIT License | 0.45.0 |

0 comments on commit d42a605

Please sign in to comment.