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 Aug 25, 2023
2 parents c9026fd + fa56961 commit a1ba3b6
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 6 deletions.
10 changes: 5 additions & 5 deletions pm4py/objects/ocel/util/ocel_to_dict_types_rel.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,27 +84,27 @@ def apply(ocel: OCEL) -> Dict[str, Dict[Union[str, Tuple[str, str]], pd.DataFram

for evt in ev_types_list:
events = ocel.events[ocel.events[ocel.event_activity] == evt]
events.dropna(axis="columns", how="all")
events.dropna(axis="columns", how="all", inplace=True)
dct_types_rel["ev_types"][evt] = events

for objt in obj_types_list:
objects = ocel.objects[ocel.objects[ocel.object_type_column] == objt]
objects.dropna(axis="columns", how="all")
objects.dropna(axis="columns", how="all", inplace=True)
dct_types_rel["obj_types"][objt] = objects

for e2ot in e2o_list:
e2o = ocel.relations[(ocel.relations[ocel.event_activity] == e2ot[0]) & (ocel.relations[ocel.object_type_column] == e2ot[1])]
e2o.dropna(axis="columns", how="all")
e2o.dropna(axis="columns", how="all", inplace=True)
dct_types_rel["e2o"][e2ot] = e2o

for o2ot in o2o_list:
o2o = overall_o2o[(overall_o2o[ocel.object_type_column] == o2ot[0]) & (overall_o2o[ocel.object_type_column+"_2"] == o2ot[1])]
o2o.dropna(axis="columns", how="all")
o2o.dropna(axis="columns", how="all", inplace=True)
dct_types_rel["o2o"][o2ot] = o2o

for objt in changes_list:
objects = ocel.object_changes[ocel.object_changes[ocel.object_type_column] == objt]
objects.dropna(axis="columns", how="all")
objects.dropna(axis="columns", how="all", inplace=True)
dct_types_rel["changes"][objt] = objects

return dct_types_rel
2 changes: 1 addition & 1 deletion requirements_stable.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ deprecation==2.1.0
fonttools==4.42.1
graphviz==0.20.1
intervaltree==3.1.0
kiwisolver==1.4.4
kiwisolver==1.4.5
lxml==4.9.3
matplotlib==3.7.1
networkx==3.1
Expand Down
47 changes: 47 additions & 0 deletions safety_checks/20230825
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 [email protected]

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 2023-08-25 09:09:47
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 [email protected]

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

0 comments on commit a1ba3b6

Please sign in to comment.