From 9e1e6ecac06c9604cc17d1e29194eab1b849a826 Mon Sep 17 00:00:00 2001 From: ChrisRBe Date: Thu, 7 Apr 2022 20:47:56 +0200 Subject: [PATCH 1/6] requirements.txt: solve dependency issues with flake8 dependabot update at some point updated parts of the requirements.txt file but did not update flake8 accordingly. This change should fix this oversight. Hopefully. This is only a temporary solution until such a time where the requirements.txt is removed completely in favor of the pipfile. --- requirements.txt | Bin 712 -> 1531 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index cc00e3684c75bf4940bfc3e09793f7da4bc3c45f..511e8fa01d4b1366a7424e2bf37aeac0708deccf 100644 GIT binary patch literal 1531 zcmZuxO;f^949wXXe+rB(ejYq{*BP%K%cEiyXvKo!k5_lI4UbWW=?Es-Y&M&Ie^vHo zy{)aa#%6YnPibQ-@EPOVu^m~3cxy|o^$b??DTc@s@Y%fv&d63^y$0_JeH;69 z{Fsk;#V}v;c<{RPNX(vqF>}^CAoADNaVl`AodfxaL$GLp$Ig}aW=D3TN~Z(QzbNMe ziWHxL?*gBwCBAAI;l4Q0^q)AjTYwoE#6+wnzIOD8ScM(b(3AMuUT8=U)KE@)*m(x` z#H`SZIV)hWn%EPcs=@#0kQRT*V(xKmFQdP?GQG#n98;U1&&cc3sB??ip1~ve9y@5+ z+6N-+NW=@TWX%#e33XFshgzIfyI7*8bHp0;bnOc2HO^5Ujm>BVI)?KzPYz?ZtX+pr zRF&K3yqZxS6#_GQdqS5EC~42>3OLfg^ErEHBzJP7`C`T zVxeT+bk$M613%46NA1u}8WMr^IWK!AE?bVs8T2Dv!ySl0_AEC*T{vY{ zjd4zM;qGCM-YUY-hGUP1(YV5JUsmKE7!P)1cXsPM^4_S_E41WWtH%>8%L6Bo+lNQw z*<7u+U%p1YjdZCIi#L{LlKZG>H%vT2@BbaB%Zf=iP>Gk%>z?e{lH_+4S0_0U*?;@2(B494G2?}Im*l1^7e1guHA#~&= zlS?G-}lDACZ+6P%5f0X;41h Date: Thu, 7 Apr 2022 20:53:33 +0200 Subject: [PATCH 2/6] requirements.txt: fix encoding somehow file ended up with the wrong encoding. --- requirements.txt | Bin 1531 -> 720 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index 511e8fa01d4b1366a7424e2bf37aeac0708deccf..108cbb7baab135ab8b8baa87b2e4ade06aede468 100644 GIT binary patch literal 720 zcmY*XF>)Ls5X||@QVV-JodN>qc9m0w9Lui8VgUnpI`n$?piYI>OI>BiPp60OE) zsg%^hwsesDDAas4M#+<$an}lf{zBJa-8+z$3pnRXqm6)P@M@M9;kNy5%mP{o_hw7= zZHlQJHqfUpJZY9n3m1s{TqKWmX|=9TF5P{xyXVPxj`t~~Vh?M~3@Inz?}9T5v{)$w z<`!@()fVXb4L1rtBp$KIGn8(@zWa+Y*a*UC^%255%Q>+eS|g@FwV+5Y#f^4Wfg`A< z(u{fH^^^$qvrp;z$GbM=k{)QGjwr%ikrICPy2Hf5DeN3IXqIlSL90Y~P5O#_@NW=-Y z!&zTj4-ls1Wn2v>IM9)9?t$XhV|Fq3jL3!}KYsl* zhCMF+?+x_mt=W@GkKrPd_*o+>xTpuo^$b??DTc@s@Y%fv&d63^y$0_JeH;69 z{Fsk;#V}v;c<{RPNX(vqF>}^CAoADNaVl`AodfxaL$GLp$Ig}aW=D3TN~Z(QzbNMe ziWHxL?*gBwCBAAI;l4Q0^q)AjTYwoE#6+wnzIOD8ScM(b(3AMuUT8=U)KE@)*m(x` z#H`SZIV)hWn%EPcs=@#0kQRT*V(xKmFQdP?GQG#n98;U1&&cc3sB??ip1~ve9y@5+ z+6N-+NW=@TWX%#e33XFshgzIfyI7*8bHp0;bnOc2HO^5Ujm>BVI)?KzPYz?ZtX+pr zRF&K3yqZxS6#_GQdqS5EC~42>3OLfg^ErEHBzJP7`C`T zVxeT+bk$M613%46NA1u}8WMr^IWK!AE?bVs8T2Dv!ySl0_AEC*T{vY{ zjd4zM;qGCM-YUY-hGUP1(YV5JUsmKE7!P)1cXsPM^4_S_E41WWtH%>8%L6Bo+lNQw z*<7u+U%p1YjdZCIi#L{LlKZG>H%vT2@BbaB%Zf=iP>Gk%>z?e{l Date: Thu, 7 Apr 2022 21:10:29 +0200 Subject: [PATCH 3/6] README.md: update readme wrt installation Add preference to using pipenv over plain pip. --- README.md | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 868f121..251ea00 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# PP-P2P-Parser +

PP-P2P-Parser

## Code Status -![](https://github.com/ChrisRBe/PP-P2P-Parser/workflows/Integration/badge.svg?branch=master) -[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) -[![Maintainability](https://api.codeclimate.com/v1/badges/f3bad303efd4200ebee2/maintainability)](https://codeclimate.com/github/ChrisRBe/PP-P2P-Parser/maintainability) -[![Test Coverage](https://api.codeclimate.com/v1/badges/f3bad303efd4200ebee2/test_coverage)](https://codeclimate.com/github/ChrisRBe/PP-P2P-Parser/test_coverage) -[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) +![](https://github.com/ChrisRBe/PP-P2P-Parser/workflows/Integration/badge.svg?branch=master)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Maintainability](https://api.codeclimate.com/v1/badges/f3bad303efd4200ebee2/maintainability)](https://codeclimate.com/github/ChrisRBe/PP-P2P-Parser/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/f3bad303efd4200ebee2/test_coverage)](https://codeclimate.com/github/ChrisRBe/PP-P2P-Parser/test_coverage)
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/37041) ## Introduction @@ -18,7 +18,7 @@ Input format needs to be a csv file as well! ## Usage -``` +```text parse-account-statements.py --help usage: An application to read account statement files from different peer to peer lending sites, e.g. Mintos.com and creates @@ -57,7 +57,7 @@ optional arguments: --debug enables debug level logging if set ``` -``` +```shell parse-account-statements.py --type mintos src/test/testdata/mintos.csv ``` @@ -95,7 +95,7 @@ The content directly reflects the format of the source account statement files. Example: -``` +```yaml --- type_regex: !!map deposit: "(Deposits)|(^Incoming client.*)|(^Incoming currency exchange.*)|(^Affiliate partner bonus$)" @@ -123,16 +123,19 @@ CSV file format compatible with Performance Portfolio (German language setting). To use this application the following dependencies need to be installed: -* Python 3.6+ (unit test are run against Python 3.6, 3.7, 3.8, 3.9) -* PyYaml +* Python 3.7+ (unit test are run against Python 3.7, 3.8, 3.9, 3.10) +* virtualenv +* pipenv Installation of Python dependencies can be handled in two ways: * Install dependencies via `pip install -r requirements.txt` -* Create a virtual environment using pipenv +* Create a virtual environment using pipenv (**preferred way**) - pipenv install - pipenv shell + ```shell + pipenv install + pipenv shell + ``` ## Legal From 5c5ff9e01f9624d13ff60121d190842b089f724e Mon Sep 17 00:00:00 2001 From: ChrisRBe Date: Thu, 7 Apr 2022 21:13:42 +0200 Subject: [PATCH 4/6] README: fix header alignment use align="center" instead of style --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 251ea00..3379196 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

PP-P2P-Parser

+

PP-P2P-Parser

## Code Status From 89bfff9e6a8966a1306851b087d7e8339942ce9f Mon Sep 17 00:00:00 2001 From: ChrisRBe Date: Thu, 7 Apr 2022 21:35:02 +0200 Subject: [PATCH 5/6] README: beautify readme files center heading and badges. Add example heading from #541 --- README.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3379196..4bae590 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@

PP-P2P-Parser

-## Code Status - -![](https://github.com/ChrisRBe/PP-P2P-Parser/workflows/Integration/badge.svg?branch=master)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![Maintainability](https://api.codeclimate.com/v1/badges/f3bad303efd4200ebee2/maintainability)](https://codeclimate.com/github/ChrisRBe/PP-P2P-Parser/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/f3bad303efd4200ebee2/test_coverage)](https://codeclimate.com/github/ChrisRBe/PP-P2P-Parser/test_coverage)
-[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
-[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/37041) +

+Action Status +Test Coverage +Maintainability +pre-commit: enabled +Code style: black +Bors enabled +

## Introduction @@ -57,8 +57,10 @@ optional arguments: --debug enables debug level logging if set ``` +### Example + ```shell -parse-account-statements.py --type mintos src/test/testdata/mintos.csv +./parse-account-statements.py --type mintos src/test/testdata/mintos.csv ``` > ⚠ If you are using the --aggregate=monthly option, please note that this application aggregates always on the From 5809d7664d04bdf77bda9270ad6d0117adc8bfa2 Mon Sep 17 00:00:00 2001 From: ChrisRBe Date: Thu, 7 Apr 2022 21:49:05 +0200 Subject: [PATCH 6/6] README: change format on section Add information section to make it better visible --- README.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 4bae590..2c496a1 100644 --- a/README.md +++ b/README.md @@ -63,16 +63,18 @@ optional arguments: ./parse-account-statements.py --type mintos src/test/testdata/mintos.csv ``` -> ⚠ If you are using the --aggregate=monthly option, please note that this application aggregates always on the -> last day of the month. This can lead to import issues in Portfolio Performance when importing data for -> the current month. -> -> E.g. import date is the 15th of a July, the account statement contains data with a date of 31st of July. -> -> Account activity for a "future date" will be ignored/ not imported by Portfolio Performance. -> -> Please note, that this behaviour on this application side is intentional to avoid importing account activity multiple -> times in Portfolio Performance. +## ⚠ Information + +⚠ If you are using the --aggregate=monthly option, please note that this aggregates account activities +always on then last day of the month. This can lead to import issues in Portfolio Performance when importing +data for the current month. + +E.g. import date is the 15th of a July, the account statement contains data with a date of 31st of July. + +Account activity for a "future date" will be ignored/ not imported by Portfolio Performance. + +Please note, that this behaviour on application side is intentional to avoid importing account activity +multiple times in Portfolio Performance. ## Currently supported formats