Skip to content

Commit 28ef744

Browse files
bors[bot]ChrisRBe
andauthored
Merge #543
543: requirements.txt: solve dependency issues with flake8 r=ChrisRBe a=ChrisRBe 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. Should solve issues reported in #540 and #490 Co-authored-by: ChrisRBe <[email protected]> Co-authored-by: ChrisRBe <[email protected]>
2 parents ef3da3b + 5809d76 commit 28ef744

File tree

2 files changed

+46
-41
lines changed

2 files changed

+46
-41
lines changed

README.md

+33-28
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# PP-P2P-Parser
1+
<h1 align="center">PP-P2P-Parser</h1>
22

3-
## Code Status
4-
5-
![](https://github.com/ChrisRBe/PP-P2P-Parser/workflows/Integration/badge.svg?branch=master)
6-
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
7-
[![Maintainability](https://api.codeclimate.com/v1/badges/f3bad303efd4200ebee2/maintainability)](https://codeclimate.com/github/ChrisRBe/PP-P2P-Parser/maintainability)
8-
[![Test Coverage](https://api.codeclimate.com/v1/badges/f3bad303efd4200ebee2/test_coverage)](https://codeclimate.com/github/ChrisRBe/PP-P2P-Parser/test_coverage)
9-
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
10-
[![Bors enabled](https://bors.tech/images/badge_small.svg)](https://app.bors.tech/repositories/37041)
3+
<p align="center">
4+
<a href="https://github.com/ChrisRBe/PP-P2P-Parser/actions"><img alt="Action Status" src="https://github.com/ChrisRBe/PP-P2P-Parser/workflows/Integration/badge.svg?branch=master"></a>
5+
<a href="https://codeclimate.com/github/ChrisRBe/PP-P2P-Parser/test_coverage"><img alt="Test Coverage" src="https://api.codeclimate.com/v1/badges/f3bad303efd4200ebee2/test_coverage"/></a>
6+
<a href="https://codeclimate.com/github/ChrisRBe/PP-P2P-Parser/maintainability"><img alt="Maintainability" src="https://api.codeclimate.com/v1/badges/f3bad303efd4200ebee2/maintainability"/></a>
7+
<a href="https://github.com/pre-commit/pre-commit"><img alt="pre-commit: enabled" src="https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white" style="max-width:100%;"></a>
8+
<a href="https://github.com/psf/black"><img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
9+
<a href="https://app.bors.tech/repositories/37041"><img alt="Bors enabled" src="https://bors.tech/images/badge_small.svg"></a>
10+
</p>
1111

1212
## Introduction
1313

@@ -18,7 +18,7 @@ Input format needs to be a csv file as well!
1818

1919
## Usage
2020

21-
```
21+
```text
2222
parse-account-statements.py --help
2323
usage:
2424
An application to read account statement files from different peer to peer lending sites, e.g. Mintos.com and creates
@@ -57,22 +57,24 @@ optional arguments:
5757
--debug enables debug level logging if set
5858
```
5959

60-
Example
60+
### Example
6161

62-
```
62+
```shell
6363
./parse-account-statements.py --type mintos src/test/testdata/mintos.csv
6464
```
6565

66-
> &#x26a0; If you are using the --aggregate=monthly option, please note that this application aggregates always on the
67-
> last day of the month. This can lead to import issues in Portfolio Performance when importing data for
68-
> the current month.
69-
>
70-
> E.g. import date is the 15th of a July, the account statement contains data with a date of 31st of July.
71-
>
72-
> Account activity for a "future date" will be ignored/ not imported by Portfolio Performance.
73-
>
74-
> Please note, that this behaviour on this application side is intentional to avoid importing account activity multiple
75-
> times in Portfolio Performance.
66+
## &#x26a0; Information
67+
68+
&#x26a0; If you are using the --aggregate=monthly option, please note that this aggregates account activities
69+
always on then last day of the month. This can lead to import issues in Portfolio Performance when importing
70+
data for the current month.
71+
72+
E.g. import date is the 15th of a July, the account statement contains data with a date of 31st of July.
73+
74+
Account activity for a "future date" will be ignored/ not imported by Portfolio Performance.
75+
76+
Please note, that this behaviour on application side is intentional to avoid importing account activity
77+
multiple times in Portfolio Performance.
7678

7779
## Currently supported formats
7880

@@ -97,7 +99,7 @@ The content directly reflects the format of the source account statement files.
9799

98100
Example:
99101

100-
```
102+
```yaml
101103
---
102104
type_regex: !!map
103105
deposit: "(Deposits)|(^Incoming client.*)|(^Incoming currency exchange.*)|(^Affiliate partner bonus$)"
@@ -125,16 +127,19 @@ CSV file format compatible with Performance Portfolio (German language setting).
125127

126128
To use this application the following dependencies need to be installed:
127129

128-
* Python 3.6+ (unit test are run against Python 3.6, 3.7, 3.8, 3.9)
129-
* PyYaml
130+
* Python 3.7+ (unit test are run against Python 3.7, 3.8, 3.9, 3.10)
131+
* virtualenv
132+
* pipenv
130133

131134
Installation of Python dependencies can be handled in two ways:
132135

133136
* Install dependencies via `pip install -r requirements.txt`
134-
* Create a virtual environment using pipenv
137+
* Create a virtual environment using pipenv (**preferred way**)
135138

136-
pipenv install
137-
pipenv shell
139+
```shell
140+
pipenv install
141+
pipenv shell
142+
```
138143

139144
## Legal
140145

requirements.txt

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
appdirs==1.4.4
21
astroid==2.11.2
32
atomicwrites==1.4.0
43
attrs==21.4.0
5-
black==21.4b2
4+
black==22.3.0
65
certifi==2021.10.8
76
cfgv==3.3.1
8-
chardet==4.0.0
7+
charset-normalizer==2.0.12
98
click==8.1.2
109
codacy-coverage==1.3.11
1110
colorama==0.4.4
12-
coverage==5.5
11+
coverage==6.3.2
12+
dill==0.3.4
1313
distlib==0.3.4
1414
filelock==3.6.0
15-
flake8==3.9.1
15+
flake8==4.0.1
1616
identify==2.4.12
1717
idna==3.3
1818
iniconfig==1.1.1
1919
isort==5.10.1
2020
lazy-object-proxy==1.7.1
21-
mccabe==0.7.0
21+
mccabe==0.6.1
2222
mypy-extensions==0.4.3
2323
nodeenv==1.6.0
2424
packaging==21.3
2525
pathspec==0.9.0
26+
platformdirs==2.5.1
2627
pluggy==1.0.0
27-
pre-commit==2.12.1
28+
pre-commit==2.18.1
2829
py==1.11.0
2930
pycodestyle==2.8.0
3031
pyflakes==2.4.0
31-
pylint==2.8.2
32+
pylint==2.13.4
3233
pyparsing==3.0.7
33-
pytest==6.2.3
34-
pytest-cov==2.11.1
35-
PyYAML==5.4.1
36-
regex==2022.3.15
34+
pytest==7.1.1
35+
pytest-cov==3.0.0
36+
PyYAML==6.0
3737
requests==2.27.1
3838
six==1.16.0
3939
toml==0.10.2
40-
typed-ast==1.5.2
40+
tomli==2.0.1
4141
typing-extensions==4.1.1
4242
urllib3==1.26.9
4343
virtualenv==20.14.0

0 commit comments

Comments
 (0)