Skip to content

Commit 9a2711f

Browse files
fit-alessandro-bertifit-alessandro-berti
committed
fix(pm4py): preparing for 2.2.29
2 parents cd3bb32 + f0359e9 commit 9a2711f

File tree

7 files changed

+49
-28
lines changed

7 files changed

+49
-28
lines changed

‎CHANGELOG.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
# Changelog of pm4py
22

3+
## pm4py 2.2.29 (2022.09.16)
4+
5+
### Added
6+
7+
### Changed
8+
9+
### Deprecated
10+
11+
### Fixed
12+
* d066d3f49a996c30d151031d66de90db4f4d9a2e
13+
* Fixed issue with OCEL-CSV importing (Pandas index_col)
14+
* c38348df9cf165fd94a2e69ba29601e1643e80ae
15+
* Fixed issue with OCEL-CSV importing (relations dataframe timestamp)
16+
17+
### Removed
18+
19+
### Other
20+
21+
---
22+
323
## pm4py 2.2.28 (2022.09.02)
424

525
### Added

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN apt-get -y install libjemalloc-dev libboost-dev libboost-filesystem-dev libb
1414
RUN apt-get -y install libxml2-dev libxslt-dev libfreetype6-dev libsuitesparse-dev
1515
RUN pip install -U cvxopt
1616
RUN pip install -U wheel six pytest
17-
RUN pip install asttokens==2.0.5 backcall==0.2.0 colorama==0.4.4 cycler==0.11.0 decorator==5.1.1 deprecation==2.1.0 executing==0.8.3 fonttools==4.33.3 graphviz==0.20 intervaltree==3.1.0 ipython==8.3.0 jedi==0.18.1 jinja2==3.1.2 jsonpickle==2.2.0 kiwisolver==1.4.2 lxml==4.8.0 MarkupSafe==2.1.1 matplotlib==3.5.2 matplotlib-inline==0.1.3 mpmath==1.2.1 networkx==2.8.2 numpy==1.22.4 packaging==21.3 pandas==1.4.2 parso==0.8.3 pickleshare==0.7.5 pillow==9.1.1 prompt-toolkit==3.0.29 pure-eval==0.2.2 pydotplus==2.0.2 pygments==2.12.0 pyparsing==3.0.9 python-dateutil==2.8.2 pytz==2022.1 pyvis==0.2.1 scipy==1.8.1 setuptools==62.3.2 six==1.16.0 sortedcontainers==2.4.0 stack-data==0.2.0 stringdist==1.0.9 sympy==1.10.1 tqdm==4.64.0 traitlets==5.2.1.post0 wcwidth==0.2.5
17+
RUN pip install asttokens==2.0.8 backcall==0.2.0 colorama==0.4.5 cycler==0.11.0 decorator==5.1.1 deprecation==2.1.0 executing==1.0.0 fonttools==4.37.1 graphviz==0.20.1 intervaltree==3.1.0 ipython==8.5.0 jedi==0.18.1 jinja2==3.1.2 jsonpickle==2.2.0 kiwisolver==1.4.4 lxml==4.9.1 MarkupSafe==2.1.1 matplotlib==3.5.3 matplotlib-inline==0.1.6 mpmath==1.2.1 networkx==2.8.6 numpy==1.23.3 packaging==21.3 pandas==1.4.4 parso==0.8.3 pickleshare==0.7.5 pillow==9.2.0 prompt-toolkit==3.0.31 pure-eval==0.2.2 pydotplus==2.0.2 pygments==2.13.0 pyparsing==3.0.9 python-dateutil==2.8.2 pytz==2022.2.1 pyvis==0.2.1 scipy==1.9.1 six==1.16.0 sortedcontainers==2.4.0 stack-data==0.5.0 stringdist==1.0.9 sympy==1.11.1 tqdm==4.64.1 traitlets==5.4.0 wcwidth==0.2.5
1818

1919
COPY . /app
2020
RUN cd /app && python setup.py install

‎docs/source/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# The short X.Y version
2727
version = '2.2'
2828
# The full version, including alpha/beta/rc tags
29-
release = '2.2.28'
29+
release = '2.2.29'
3030

3131
# -- General configuration ---------------------------------------------------
3232

‎pm4py/meta.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
along with PM4Py. If not, see <https://www.gnu.org/licenses/>.
1616
'''
1717
__name__ = 'pm4py'
18-
VERSION = '2.2.28'
18+
VERSION = '2.2.29'
1919
__version__ = VERSION
2020
__doc__ = 'Process Mining for Python (PM4Py)'
2121
__author__ = 'Fraunhofer Institute for Applied Technology'

‎pm4py/objects/ocel/importer/csv/variants/pandas.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ def apply(file_path: str, objects_path: str = None, parameters: Optional[Dict[An
4343
if parameters is None:
4444
parameters = {}
4545

46-
table = pd.read_csv(file_path)
46+
table = pd.read_csv(file_path, index_col=False)
4747

4848
objects = None
4949
if objects_path is not None:
50-
objects = pd.read_csv(objects_path)
50+
objects = pd.read_csv(objects_path, index_col=False)
5151

5252
return extended_table.get_ocel_from_extended_table(table, objects, parameters=parameters)

‎pm4py/objects/ocel/util/extended_table.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ def get_ocel_from_extended_table(df: pd.DataFrame, objects_df: Optional[Dict[Any
9393
df[internal_index] = df.index
9494
relations[internal_index] = relations.index
9595

96+
relations[event_timestamp] = pd.to_datetime(relations[event_timestamp])
97+
9698
df = df.sort_values([event_timestamp, internal_index])
9799
relations = relations.sort_values([event_timestamp, internal_index])
98100

‎third_party/LICENSES_TRANSITIVE‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,47 @@ libraries are added/removed.
66

77
| Name | URL | License | Version |
88
| --------------------------- | ------------------------------------------------------------ | --------------------------- | ------------------- |
9-
| asttokens | https://pypi.org/project/asttokens | Apache 2.0 | 2.0.5 |
9+
| asttokens | https://pypi.org/project/asttokens | Apache 2.0 | 2.0.8 |
1010
| backcall | https://pypi.org/project/backcall | BSD License | 0.2.0 |
11-
| colorama | https://pypi.org/project/colorama | BSD License (BSD) | 0.4.4 |
11+
| colorama | https://pypi.org/project/colorama | BSD License (BSD) | 0.4.5 |
1212
| cycler | https://pypi.org/project/cycler | BSD License (BSD) | 0.11.0 |
1313
| decorator | https://pypi.org/project/decorator | BSD License (new BSD License) | 5.1.1 |
1414
| deprecation | https://pypi.org/project/deprecation | Apache Software License (Apache 2) | 2.1.0 |
15-
| executing | https://pypi.org/project/executing | MIT License (MIT) | 0.8.3 |
16-
| fonttools | https://pypi.org/project/fonttools | MIT License (MIT) | 4.33.3 |
17-
| graphviz | https://pypi.org/project/graphviz | MIT License (MIT) | 0.20 |
15+
| executing | https://pypi.org/project/executing | MIT License (MIT) | 1.0.0 |
16+
| fonttools | https://pypi.org/project/fonttools | MIT License (MIT) | 4.37.1 |
17+
| graphviz | https://pypi.org/project/graphviz | MIT License (MIT) | 0.20.1 |
1818
| intervaltree | https://pypi.org/project/intervaltree | Apache Software License (Apache License, Version 2.0) | 3.1.0 |
19-
| ipython | https://pypi.org/project/ipython | BSD License (BSD) | 8.3.0 |
19+
| ipython | https://pypi.org/project/ipython | BSD License (BSD) | 8.5.0 |
2020
| jedi | https://pypi.org/project/jedi | MIT License (MIT) | 0.18.1 |
2121
| jinja2 | https://pypi.org/project/jinja2 | BSD License (BSD-3-Clause) | 3.1.2 |
2222
| jsonpickle | https://pypi.org/project/jsonpickle | BSD License | 2.2.0 |
23-
| kiwisolver | https://pypi.org/project/kiwisolver | BSD License | 1.4.2 |
24-
| lxml | https://pypi.org/project/lxml | BSD License (BSD) | 4.8.0 |
23+
| kiwisolver | https://pypi.org/project/kiwisolver | BSD License | 1.4.4 |
24+
| lxml | https://pypi.org/project/lxml | BSD License (BSD) | 4.9.1 |
2525
| MarkupSafe | https://pypi.org/project/MarkupSafe | BSD License (BSD-3-Clause) | 2.1.1 |
26-
| matplotlib | https://pypi.org/project/matplotlib | Python Software Foundation License (PSF) | 3.5.2 |
27-
| matplotlib-inline | https://pypi.org/project/matplotlib-inline | BSD 3-Clause | 0.1.3 |
26+
| matplotlib | https://pypi.org/project/matplotlib | Python Software Foundation License (PSF) | 3.5.3 |
27+
| matplotlib-inline | https://pypi.org/project/matplotlib-inline | BSD 3-Clause | 0.1.6 |
2828
| mpmath | https://pypi.org/project/mpmath | BSD License (BSD) | 1.2.1 |
29-
| networkx | https://pypi.org/project/networkx | BSD License | 2.8.2 |
30-
| numpy | https://pypi.org/project/numpy | BSD License (BSD) | 1.22.4 |
29+
| networkx | https://pypi.org/project/networkx | BSD License | 2.8.6 |
30+
| numpy | https://pypi.org/project/numpy | BSD License (BSD) | 1.23.3 |
3131
| packaging | https://pypi.org/project/packaging | Apache Software License, BSD License (BSD-2-Clause or Apache-2.0) | 21.3 |
32-
| pandas | https://pypi.org/project/pandas | BSD License (BSD-3-Clause) | 1.4.2 |
32+
| pandas | https://pypi.org/project/pandas | BSD License (BSD-3-Clause) | 1.4.4 |
3333
| parso | https://pypi.org/project/parso | MIT License (MIT) | 0.8.3 |
3434
| pickleshare | https://pypi.org/project/pickleshare | MIT License (MIT) | 0.7.5 |
35-
| pillow | https://pypi.org/project/pillow | Historical Permission Notice and Disclaimer (HPND) (HPND) | 9.1.1 |
36-
| prompt-toolkit | https://pypi.org/project/prompt-toolkit | BSD License | 3.0.29 |
35+
| pillow | https://pypi.org/project/pillow | Historical Permission Notice and Disclaimer (HPND) (HPND) | 9.2.0 |
36+
| prompt-toolkit | https://pypi.org/project/prompt-toolkit | BSD License | 3.0.31 |
3737
| pure-eval | https://pypi.org/project/pure-eval | MIT License (MIT) | 0.2.2 |
3838
| pydotplus | https://pypi.org/project/pydotplus | MIT License (UNKNOWN) | 2.0.2 |
39-
| pygments | https://pypi.org/project/pygments | BSD License (BSD License) | 2.12.0 |
39+
| pygments | https://pypi.org/project/pygments | BSD License (BSD License) | 2.13.0 |
4040
| pyparsing | https://pypi.org/project/pyparsing | MIT License | 3.0.9 |
4141
| python-dateutil | https://pypi.org/project/python-dateutil | Apache Software License, BSD License (Dual License) | 2.8.2 |
42-
| pytz | https://pypi.org/project/pytz | MIT License (MIT) | 2022.1 |
42+
| pytz | https://pypi.org/project/pytz | MIT License (MIT) | 2022.2.1 |
4343
| pyvis | https://pypi.org/project/pyvis | BSD | 0.2.1 |
44-
| scipy | https://pypi.org/project/scipy | BSD License (BSD) | 1.8.1 |
45-
| setuptools | https://pypi.org/project/setuptools | MIT License | 62.3.2 |
44+
| scipy | https://pypi.org/project/scipy | BSD License (BSD) | 1.9.1 |
4645
| six | https://pypi.org/project/six | MIT License (MIT) | 1.16.0 |
4746
| sortedcontainers | https://pypi.org/project/sortedcontainers | Apache Software License (Apache 2.0) | 2.4.0 |
48-
| stack-data | https://pypi.org/project/stack-data | MIT License (MIT) | 0.2.0 |
47+
| stack-data | https://pypi.org/project/stack-data | MIT License (MIT) | 0.5.0 |
4948
| stringdist | https://pypi.org/project/stringdist | MIT License (MIT) | 1.0.9 |
50-
| sympy | https://pypi.org/project/sympy | BSD License (BSD) | 1.10.1 |
51-
| tqdm | https://pypi.org/project/tqdm | MIT License, Mozilla Public License 2.0 (MPL 2.0) (MPLv2.0, MIT Licences) | 4.64.0 |
52-
| traitlets | https://pypi.org/project/traitlets | BSD License | 5.2.1.post0 |
49+
| sympy | https://pypi.org/project/sympy | BSD License (BSD) | 1.11.1 |
50+
| tqdm | https://pypi.org/project/tqdm | MIT License, Mozilla Public License 2.0 (MPL 2.0) (MPLv2.0, MIT Licences) | 4.64.1 |
51+
| traitlets | https://pypi.org/project/traitlets | BSD License | 5.4.0 |
5352
| wcwidth | https://pypi.org/project/wcwidth | MIT License (MIT) | 0.2.5 |

0 commit comments

Comments
 (0)