Skip to content

Commit

Permalink
Merge branch 'release/4.27.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@wolph
wolph committed Nov 28, 2022
2 parents 3c35aa2 + 7cfef49 commit 302379b
Show file tree
Hide file tree
Showing 55 changed files with 569 additions and 492 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
54 changes: 0 additions & 54 deletions .travis.yml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion mt940/__about__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
statistics and manipulation.
'''.strip().split())
__email__ = 'wolph@wol.ph'
__version__ = '4.26.0'
__version__ = '4.27.0'
__license__ = 'BSD'
__copyright__ = 'Copyright 2015 Rick van Hattem (wolph)'
__url__ = 'https://github.com/WoLpH/mt940'
7 changes: 2 additions & 5 deletions mt940/tags.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,13 @@ class Statement(Tag):
(?P<day>\d{2})
(?P<entry_month>\d{2})? # [4!n] Entry Date (MMDD)
(?P<entry_day>\d{2})?
(?P<status>[A-Z]?[DC]) # 2a Debit/Credit Mark
(?P<status>R?[DC]) # 2a Debit/Credit Mark
(?P<funds_code>[A-Z])? # [1!a] Funds Code (3rd character of the currency
# code, if needed)
\n? # apparently some banks (sparkassen) incorporate newlines here
(?P<amount>[\d,]{1,15}) # 15d Amount
(?P<id>[A-Z][A-Z0-9 ]{3})? # 1!a3!c Transaction Type Identification Code
(?P<customer_reference>.{0,16}) # 16x Customer Reference
(?P<customer_reference>[^/\n]{0,16}) # 16x Customer Reference
(//(?P<bank_reference>.{0,23}))? # [//23x] Bank Reference
(\n?(?P<extra_details>.{0,34}))? # [34x] Supplementary Details
$'''
Expand Down Expand Up @@ -462,6 +462,3 @@ class Tags(enum.Enum):


TAG_BY_ID = {t.value.id: t.value for t in Tags}



8 changes: 4 additions & 4 deletions mt940_tests/betterplace/amount_formats.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ tags:
re: !!python/object/apply:re._compile
- "^\n (?P<year>\\d{2}) # 6!n Value Date (YYMMDD)\n (?P<month>\\d{2})\n\
\ (?P<day>\\d{2})\n (?P<entry_month>\\d{2})? # [4!n] Entry Date (MMDD)\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>[A-Z]?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>R?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<funds_code>[A-Z])? # [1!a] Funds Code (3rd character of the currency\n\
\ # code, if needed)\n \\n? # apparently some\
\ banks (sparkassen) incorporate newlines here\n (?P<amount>[\\d,]{1,15})\
\ # 15d Amount\n (?P<id>[A-Z][A-Z0-9 ]{3})? # 1!a3!c Transaction Type Identification\
\ Code\n (?P<customer_reference>.{0,16}) # 16x Customer Reference\n (//(?P<bank_reference>.{0,23}))?\
\ # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))? # [34x]\
\ Supplementary Details\n $"
\ Code\n (?P<customer_reference>[^/\\n]{0,16}) # 16x Customer Reference\n\
\ (//(?P<bank_reference>.{0,23}))? # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))?\
\ # [34x] Supplementary Details\n $"
- 98
62: !!python/object:mt940.tags.ClosingBalance
re: *id001
Expand Down
8 changes: 4 additions & 4 deletions mt940_tests/betterplace/currency_in_25.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ tags:
re: !!python/object/apply:re._compile
- "^\n (?P<year>\\d{2}) # 6!n Value Date (YYMMDD)\n (?P<month>\\d{2})\n\
\ (?P<day>\\d{2})\n (?P<entry_month>\\d{2})? # [4!n] Entry Date (MMDD)\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>[A-Z]?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>R?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<funds_code>[A-Z])? # [1!a] Funds Code (3rd character of the currency\n\
\ # code, if needed)\n \\n? # apparently some\
\ banks (sparkassen) incorporate newlines here\n (?P<amount>[\\d,]{1,15})\
\ # 15d Amount\n (?P<id>[A-Z][A-Z0-9 ]{3})? # 1!a3!c Transaction Type Identification\
\ Code\n (?P<customer_reference>.{0,16}) # 16x Customer Reference\n (//(?P<bank_reference>.{0,23}))?\
\ # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))? # [34x]\
\ Supplementary Details\n $"
\ Code\n (?P<customer_reference>[^/\\n]{0,16}) # 16x Customer Reference\n\
\ (//(?P<bank_reference>.{0,23}))? # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))?\
\ # [34x] Supplementary Details\n $"
- 98
62: !!python/object:mt940.tags.ClosingBalance
re: *id001
Expand Down
8 changes: 4 additions & 4 deletions mt940_tests/betterplace/empty_86.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ tags:
re: !!python/object/apply:re._compile
- "^\n (?P<year>\\d{2}) # 6!n Value Date (YYMMDD)\n (?P<month>\\d{2})\n\
\ (?P<day>\\d{2})\n (?P<entry_month>\\d{2})? # [4!n] Entry Date (MMDD)\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>[A-Z]?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>R?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<funds_code>[A-Z])? # [1!a] Funds Code (3rd character of the currency\n\
\ # code, if needed)\n \\n? # apparently some\
\ banks (sparkassen) incorporate newlines here\n (?P<amount>[\\d,]{1,15})\
\ # 15d Amount\n (?P<id>[A-Z][A-Z0-9 ]{3})? # 1!a3!c Transaction Type Identification\
\ Code\n (?P<customer_reference>.{0,16}) # 16x Customer Reference\n (//(?P<bank_reference>.{0,23}))?\
\ # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))? # [34x]\
\ Supplementary Details\n $"
\ Code\n (?P<customer_reference>[^/\\n]{0,16}) # 16x Customer Reference\n\
\ (//(?P<bank_reference>.{0,23}))? # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))?\
\ # [34x] Supplementary Details\n $"
- 98
62: !!python/object:mt940.tags.ClosingBalance
re: *id001
Expand Down
8 changes: 4 additions & 4 deletions mt940_tests/betterplace/empty_entry_date.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ tags:
re: !!python/object/apply:re._compile
- "^\n (?P<year>\\d{2}) # 6!n Value Date (YYMMDD)\n (?P<month>\\d{2})\n\
\ (?P<day>\\d{2})\n (?P<entry_month>\\d{2})? # [4!n] Entry Date (MMDD)\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>[A-Z]?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>R?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<funds_code>[A-Z])? # [1!a] Funds Code (3rd character of the currency\n\
\ # code, if needed)\n \\n? # apparently some\
\ banks (sparkassen) incorporate newlines here\n (?P<amount>[\\d,]{1,15})\
\ # 15d Amount\n (?P<id>[A-Z][A-Z0-9 ]{3})? # 1!a3!c Transaction Type Identification\
\ Code\n (?P<customer_reference>.{0,16}) # 16x Customer Reference\n (//(?P<bank_reference>.{0,23}))?\
\ # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))? # [34x]\
\ Supplementary Details\n $"
\ Code\n (?P<customer_reference>[^/\\n]{0,16}) # 16x Customer Reference\n\
\ (//(?P<bank_reference>.{0,23}))? # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))?\
\ # [34x] Supplementary Details\n $"
- 98
62: !!python/object:mt940.tags.ClosingBalance
re: *id001
Expand Down
8 changes: 4 additions & 4 deletions mt940_tests/betterplace/empty_line.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ tags:
re: !!python/object/apply:re._compile
- "^\n (?P<year>\\d{2}) # 6!n Value Date (YYMMDD)\n (?P<month>\\d{2})\n\
\ (?P<day>\\d{2})\n (?P<entry_month>\\d{2})? # [4!n] Entry Date (MMDD)\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>[A-Z]?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>R?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<funds_code>[A-Z])? # [1!a] Funds Code (3rd character of the currency\n\
\ # code, if needed)\n \\n? # apparently some\
\ banks (sparkassen) incorporate newlines here\n (?P<amount>[\\d,]{1,15})\
\ # 15d Amount\n (?P<id>[A-Z][A-Z0-9 ]{3})? # 1!a3!c Transaction Type Identification\
\ Code\n (?P<customer_reference>.{0,16}) # 16x Customer Reference\n (//(?P<bank_reference>.{0,23}))?\
\ # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))? # [34x]\
\ Supplementary Details\n $"
\ Code\n (?P<customer_reference>[^/\\n]{0,16}) # 16x Customer Reference\n\
\ (//(?P<bank_reference>.{0,23}))? # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))?\
\ # [34x] Supplementary Details\n $"
- 98
62: !!python/object:mt940.tags.ClosingBalance
re: *id001
Expand Down
8 changes: 4 additions & 4 deletions mt940_tests/betterplace/missing_crlf_at_end.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ tags:
re: !!python/object/apply:re._compile
- "^\n (?P<year>\\d{2}) # 6!n Value Date (YYMMDD)\n (?P<month>\\d{2})\n\
\ (?P<day>\\d{2})\n (?P<entry_month>\\d{2})? # [4!n] Entry Date (MMDD)\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>[A-Z]?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<entry_day>\\d{2})?\n (?P<status>R?[DC]) # 2a Debit/Credit Mark\n\
\ (?P<funds_code>[A-Z])? # [1!a] Funds Code (3rd character of the currency\n\
\ # code, if needed)\n \\n? # apparently some\
\ banks (sparkassen) incorporate newlines here\n (?P<amount>[\\d,]{1,15})\
\ # 15d Amount\n (?P<id>[A-Z][A-Z0-9 ]{3})? # 1!a3!c Transaction Type Identification\
\ Code\n (?P<customer_reference>.{0,16}) # 16x Customer Reference\n (//(?P<bank_reference>.{0,23}))?\
\ # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))? # [34x]\
\ Supplementary Details\n $"
\ Code\n (?P<customer_reference>[^/\\n]{0,16}) # 16x Customer Reference\n\
\ (//(?P<bank_reference>.{0,23}))? # [//23x] Bank Reference\n (\\n?(?P<extra_details>.{0,34}))?\
\ # [34x] Supplementary Details\n $"
- 98
62: !!python/object:mt940.tags.ClosingBalance
re: *id001
Expand Down

0 comments on commit 302379b

Please sign in to comment.