Merge branch 'release/4.18.0'

wolph · Oct 6, 2019 · 1eb6deb · 1eb6deb
2 parents 62066fe + ea93b5f
commit 1eb6deb
Show file tree

Hide file tree

Showing 123 changed files with 32 additions and 30 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -2,7 +2,7 @@
 branch = True
 source = 
     mt940
-    tests
+    mt940_tests
 
 omit =
     */mock/*

diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,7 @@ cache:
 # command to install dependencies, e.g. pip install -r requirements.txt
 install:
   - mkdir -p $PIP_WHEEL_DIR
-  - pip wheel -r tests/requirements.txt
+  - pip wheel -r mt940_tests/requirements.txt
   - pip install -e .
   - pip install tox coveralls
 

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -80,13 +80,13 @@ Ready to contribute? Here's how to set up `mt940` for local development.
 
 5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox::
 
-    $ flake8 mt940 tests
+    $ flake8 mt940 mt940_tests
     $ py.test
     $ tox
 
    To get flake8 and tox, just pip install them into your virtualenv using the requirements file.
    
-    $ pip install -r tests/requirements.txt
+    $ pip install -r mt940_tests/requirements.txt
 
 6. Commit your changes and push your branch to GitHub with `git-flow-avh`_::
 
@@ -111,16 +111,18 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.7, 3.3, and for PyPy. Check 
+3. The pull request should work for Python 2.7, 3.4+, and for PyPy. Check 
    https://travis-ci.org/WoLpH/mt940/pull_requests
-   and make sure that the tests pass for all supported Python versions.
+   and make sure that the tests pass for all supported Python versions. To
+   test locally you can use `tox` which will run on all installed Python
+   versions.
 
 Tips
 ----
 
 To run a subset of tests::
 
-	$ py.test tests/some_test.py
+	$ py.test mt940_tests/some_test.py
 
 .. _git-flow-avh: https://github.com/petervanderdoes/gitflow
 
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,4 +4,4 @@ include CHANGES
 include LICENSE
 include README.rst
 include requirements.txt
-recursive-include tests *.py *.sta *.yml LICENSE
+recursive-include mt940_tests *.py *.sta *.yml LICENSE
diff --git a/Makefile b/Makefile
@@ -4,8 +4,8 @@ help:
 	@echo "clean-build - remove build artifacts"
 	@echo "clean-pyc - remove Python file artifacts"
 	@echo "lint - check style with flake8"
-	@echo "test - run tests quickly with the default Python"
-	@echo "testall - run tests on every Python version with tox"
+	@echo "test - run mt940_tests quickly with the default Python"
+	@echo "testall - run mt940_tests on every Python version with tox"
 	@echo "coverage - check code coverage quickly with the default Python"
 	@echo "docs - generate Sphinx HTML documentation, including API docs"
 	@echo "release - package and upload a release"
@@ -24,7 +24,7 @@ clean-pyc:
 	find . -name '*~' -exec rm -f {} +
 
 lint:
-	flake8 mt940 tests
+	flake8 mt940 mt940_tests
 
 test:
 	py.test

diff --git a/README.rst b/README.rst
@@ -72,7 +72,7 @@ Basic parsing:
    import mt940
    import pprint
 
-   transactions = mt940.parse('tests/jejik/abnamro.sta')
+   transactions = mt940.parse('mt940_tests/jejik/abnamro.sta')
 
    print 'Transactions:'
    print transactions
@@ -99,7 +99,7 @@ Set opening / closing balance information on each transaction:
        ],
    ))
 
-   with open('tests/jejik/abnamro.sta') as f:
+   with open('mt940_tests/jejik/abnamro.sta') as f:
        data = f.read()
 
    transactions.parse(data)
@@ -116,7 +116,7 @@ Simple json encoding:
     import mt940
 
 
-    transactions = mt940.parse('tests/jejik/abnamro.sta')
+    transactions = mt940.parse('mt940_tests/jejik/abnamro.sta')
 
     print(json.dumps(transactions, indent=4, cls=mt940.JSONEncoder))
 
@@ -135,7 +135,7 @@ To run the tests:
 
 .. code-block:: shell
 
-    pip install -r tests/requirements.txt
+    pip install -r mt940_tests/requirements.txt
     py.test
     
 Or to run the tests on all available Python versions:

diff --git a/mt940/__about__.py b/mt940/__about__.py
@@ -6,7 +6,7 @@
 statistics and manipulation.
 '''.strip().split())
 __email__ = 'wolph@wol.ph'
-__version__ = '4.17.0'
+__version__ = '4.18.0'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2015 Rick van Hattem (wolph)'
 __url__ = 'https://github.com/WoLpH/mt940'
diff --git a/tests/.gitignore → mt940_tests/.gitignore b/tests/.gitignore → mt940_tests/.gitignore
diff --git a/tests/__init__.py → mt940_tests/__init__.py b/tests/__init__.py → mt940_tests/__init__.py
diff --git a/tests/betterplace/LICENSE → mt940_tests/betterplace/LICENSE b/tests/betterplace/LICENSE → mt940_tests/betterplace/LICENSE
diff --git a/tests/betterplace/__init__.py → mt940_tests/betterplace/__init__.py b/tests/betterplace/__init__.py → mt940_tests/betterplace/__init__.py
diff --git a/tests/betterplace/amount_formats.sta → mt940_tests/betterplace/amount_formats.sta b/tests/betterplace/amount_formats.sta → mt940_tests/betterplace/amount_formats.sta
diff --git a/tests/betterplace/amount_formats.yml → mt940_tests/betterplace/amount_formats.yml b/tests/betterplace/amount_formats.yml → mt940_tests/betterplace/amount_formats.yml
diff --git a/tests/betterplace/currency_in_25.sta → mt940_tests/betterplace/currency_in_25.sta b/tests/betterplace/currency_in_25.sta → mt940_tests/betterplace/currency_in_25.sta
diff --git a/tests/betterplace/currency_in_25.yml → mt940_tests/betterplace/currency_in_25.yml b/tests/betterplace/currency_in_25.yml → mt940_tests/betterplace/currency_in_25.yml
diff --git a/tests/betterplace/empty_86.sta → mt940_tests/betterplace/empty_86.sta b/tests/betterplace/empty_86.sta → mt940_tests/betterplace/empty_86.sta
diff --git a/tests/betterplace/empty_86.yml → mt940_tests/betterplace/empty_86.yml b/tests/betterplace/empty_86.yml → mt940_tests/betterplace/empty_86.yml
diff --git a/tests/betterplace/empty_entry_date.sta → mt940_tests/betterplace/empty_entry_date.sta b/tests/betterplace/empty_entry_date.sta → mt940_tests/betterplace/empty_entry_date.sta
diff --git a/tests/betterplace/empty_entry_date.yml → mt940_tests/betterplace/empty_entry_date.yml b/tests/betterplace/empty_entry_date.yml → mt940_tests/betterplace/empty_entry_date.yml
diff --git a/tests/betterplace/empty_line.sta → mt940_tests/betterplace/empty_line.sta b/tests/betterplace/empty_line.sta → mt940_tests/betterplace/empty_line.sta
diff --git a/tests/betterplace/empty_line.yml → mt940_tests/betterplace/empty_line.yml b/tests/betterplace/empty_line.yml → mt940_tests/betterplace/empty_line.yml
diff --git a/tests/betterplace/missing_crlf_at_end.sta → ...tests/betterplace/missing_crlf_at_end.sta b/tests/betterplace/missing_crlf_at_end.sta → ...tests/betterplace/missing_crlf_at_end.sta
diff --git a/tests/betterplace/missing_crlf_at_end.yml → ...tests/betterplace/missing_crlf_at_end.yml b/tests/betterplace/missing_crlf_at_end.yml → ...tests/betterplace/missing_crlf_at_end.yml
diff --git a/tests/betterplace/sepa_mt9401.sta → mt940_tests/betterplace/sepa_mt9401.sta b/tests/betterplace/sepa_mt9401.sta → mt940_tests/betterplace/sepa_mt9401.sta
diff --git a/tests/betterplace/sepa_mt9401.yml → mt940_tests/betterplace/sepa_mt9401.yml b/tests/betterplace/sepa_mt9401.yml → mt940_tests/betterplace/sepa_mt9401.yml
diff --git a/tests/betterplace/sepa_snippet.sta → mt940_tests/betterplace/sepa_snippet.sta b/tests/betterplace/sepa_snippet.sta → mt940_tests/betterplace/sepa_snippet.sta
diff --git a/tests/betterplace/sepa_snippet.yml → mt940_tests/betterplace/sepa_snippet.yml b/tests/betterplace/sepa_snippet.yml → mt940_tests/betterplace/sepa_snippet.yml
diff --git a/tests/betterplace/sepa_snippet_broken.sta → ...tests/betterplace/sepa_snippet_broken.sta b/tests/betterplace/sepa_snippet_broken.sta → ...tests/betterplace/sepa_snippet_broken.sta
diff --git a/tests/betterplace/sepa_snippet_broken.yml → ...tests/betterplace/sepa_snippet_broken.yml b/tests/betterplace/sepa_snippet_broken.yml → ...tests/betterplace/sepa_snippet_broken.yml
diff --git a/tests/betterplace/with_binary_character.sta → ...sts/betterplace/with_binary_character.sta b/tests/betterplace/with_binary_character.sta → ...sts/betterplace/with_binary_character.sta
diff --git a/tests/betterplace/with_binary_character.yml → ...sts/betterplace/with_binary_character.yml b/tests/betterplace/with_binary_character.yml → ...sts/betterplace/with_binary_character.yml
diff --git a/tests/cmxl/LICENSE → mt940_tests/cmxl/LICENSE b/tests/cmxl/LICENSE → mt940_tests/cmxl/LICENSE
diff --git a/tests/cmxl/__init__.py → mt940_tests/cmxl/__init__.py b/tests/cmxl/__init__.py → mt940_tests/cmxl/__init__.py
diff --git a/tests/cmxl/account_balance_credit.sta → mt940_tests/cmxl/account_balance_credit.sta b/tests/cmxl/account_balance_credit.sta → mt940_tests/cmxl/account_balance_credit.sta
diff --git a/tests/cmxl/account_balance_credit.yml → mt940_tests/cmxl/account_balance_credit.yml b/tests/cmxl/account_balance_credit.yml → mt940_tests/cmxl/account_balance_credit.yml
diff --git a/tests/cmxl/account_balance_debit.sta → mt940_tests/cmxl/account_balance_debit.sta b/tests/cmxl/account_balance_debit.sta → mt940_tests/cmxl/account_balance_debit.sta
diff --git a/tests/cmxl/account_balance_debit.yml → mt940_tests/cmxl/account_balance_debit.yml b/tests/cmxl/account_balance_debit.yml → mt940_tests/cmxl/account_balance_debit.yml
diff --git a/tests/cmxl/account_identification_iban.sta → ...ests/cmxl/account_identification_iban.sta b/tests/cmxl/account_identification_iban.sta → ...ests/cmxl/account_identification_iban.sta
diff --git a/tests/cmxl/account_identification_iban.yml → ...ests/cmxl/account_identification_iban.yml b/tests/cmxl/account_identification_iban.yml → ...ests/cmxl/account_identification_iban.yml
diff --git a/tests/cmxl/account_identification_legacy.sta → ...ts/cmxl/account_identification_legacy.sta b/tests/cmxl/account_identification_legacy.sta → ...ts/cmxl/account_identification_legacy.sta
diff --git a/tests/cmxl/account_identification_legacy.yml → ...ts/cmxl/account_identification_legacy.yml b/tests/cmxl/account_identification_legacy.yml → ...ts/cmxl/account_identification_legacy.yml
diff --git a/tests/cmxl/available_balance.sta → mt940_tests/cmxl/available_balance.sta b/tests/cmxl/available_balance.sta → mt940_tests/cmxl/available_balance.sta
diff --git a/tests/cmxl/available_balance.yml → mt940_tests/cmxl/available_balance.yml b/tests/cmxl/available_balance.yml → mt940_tests/cmxl/available_balance.yml
diff --git a/tests/cmxl/closing_balance.sta → mt940_tests/cmxl/closing_balance.sta b/tests/cmxl/closing_balance.sta → mt940_tests/cmxl/closing_balance.sta
diff --git a/tests/cmxl/closing_balance.yml → mt940_tests/cmxl/closing_balance.yml b/tests/cmxl/closing_balance.yml → mt940_tests/cmxl/closing_balance.yml
diff --git a/tests/cmxl/mt940.sta → mt940_tests/cmxl/mt940.sta b/tests/cmxl/mt940.sta → mt940_tests/cmxl/mt940.sta
diff --git a/tests/cmxl/mt940.yml → mt940_tests/cmxl/mt940.yml b/tests/cmxl/mt940.yml → mt940_tests/cmxl/mt940.yml
diff --git a/tests/cmxl/reference.sta → mt940_tests/cmxl/reference.sta b/tests/cmxl/reference.sta → mt940_tests/cmxl/reference.sta
diff --git a/tests/cmxl/reference.yml → mt940_tests/cmxl/reference.yml b/tests/cmxl/reference.yml → mt940_tests/cmxl/reference.yml
diff --git a/tests/cmxl/statement_details.sta → mt940_tests/cmxl/statement_details.sta b/tests/cmxl/statement_details.sta → mt940_tests/cmxl/statement_details.sta
diff --git a/tests/cmxl/statement_details.yml → mt940_tests/cmxl/statement_details.yml b/tests/cmxl/statement_details.yml → mt940_tests/cmxl/statement_details.yml
diff --git a/tests/cmxl/statement_line.sta → mt940_tests/cmxl/statement_line.sta b/tests/cmxl/statement_line.sta → mt940_tests/cmxl/statement_line.sta
diff --git a/tests/cmxl/statement_line.yml → mt940_tests/cmxl/statement_line.yml b/tests/cmxl/statement_line.yml → mt940_tests/cmxl/statement_line.yml
diff --git a/tests/cmxl/statement_number.sta → mt940_tests/cmxl/statement_number.sta b/tests/cmxl/statement_number.sta → mt940_tests/cmxl/statement_number.sta
diff --git a/tests/cmxl/statement_number.yml → mt940_tests/cmxl/statement_number.yml b/tests/cmxl/statement_number.yml → mt940_tests/cmxl/statement_number.yml
diff --git a/tests/conftest.py → mt940_tests/conftest.py b/tests/conftest.py → mt940_tests/conftest.py
diff --git a/tests/jejik/LICENSE → mt940_tests/jejik/LICENSE b/tests/jejik/LICENSE → mt940_tests/jejik/LICENSE
diff --git a/tests/jejik/__init__.py → mt940_tests/jejik/__init__.py b/tests/jejik/__init__.py → mt940_tests/jejik/__init__.py
diff --git a/tests/jejik/abnamro.sta → mt940_tests/jejik/abnamro.sta b/tests/jejik/abnamro.sta → mt940_tests/jejik/abnamro.sta
diff --git a/tests/jejik/abnamro.yml → mt940_tests/jejik/abnamro.yml b/tests/jejik/abnamro.yml → mt940_tests/jejik/abnamro.yml
diff --git a/tests/jejik/generic.sta → mt940_tests/jejik/generic.sta b/tests/jejik/generic.sta → mt940_tests/jejik/generic.sta
diff --git a/tests/jejik/generic.yml → mt940_tests/jejik/generic.yml b/tests/jejik/generic.yml → mt940_tests/jejik/generic.yml
diff --git a/tests/jejik/ing.sta → mt940_tests/jejik/ing.sta b/tests/jejik/ing.sta → mt940_tests/jejik/ing.sta
diff --git a/tests/jejik/ing.yml → mt940_tests/jejik/ing.yml b/tests/jejik/ing.yml → mt940_tests/jejik/ing.yml
diff --git a/tests/jejik/knab.sta → mt940_tests/jejik/knab.sta b/tests/jejik/knab.sta → mt940_tests/jejik/knab.sta
diff --git a/tests/jejik/knab.yml → mt940_tests/jejik/knab.yml b/tests/jejik/knab.yml → mt940_tests/jejik/knab.yml
diff --git a/tests/jejik/postfinance.sta → mt940_tests/jejik/postfinance.sta b/tests/jejik/postfinance.sta → mt940_tests/jejik/postfinance.sta
diff --git a/tests/jejik/postfinance.yml → mt940_tests/jejik/postfinance.yml b/tests/jejik/postfinance.yml → mt940_tests/jejik/postfinance.yml
diff --git a/tests/jejik/rabobank-iban.sta → mt940_tests/jejik/rabobank-iban.sta b/tests/jejik/rabobank-iban.sta → mt940_tests/jejik/rabobank-iban.sta
diff --git a/tests/jejik/rabobank-iban.yml → mt940_tests/jejik/rabobank-iban.yml b/tests/jejik/rabobank-iban.yml → mt940_tests/jejik/rabobank-iban.yml
diff --git a/tests/jejik/rabobank.sta → mt940_tests/jejik/rabobank.sta b/tests/jejik/rabobank.sta → mt940_tests/jejik/rabobank.sta
diff --git a/tests/jejik/rabobank.yml → mt940_tests/jejik/rabobank.yml b/tests/jejik/rabobank.yml → mt940_tests/jejik/rabobank.yml
diff --git a/tests/jejik/sns.sta → mt940_tests/jejik/sns.sta b/tests/jejik/sns.sta → mt940_tests/jejik/sns.sta
diff --git a/tests/jejik/sns.yml → mt940_tests/jejik/sns.yml b/tests/jejik/sns.yml → mt940_tests/jejik/sns.yml
diff --git a/tests/jejik/triodos.sta → mt940_tests/jejik/triodos.sta b/tests/jejik/triodos.sta → mt940_tests/jejik/triodos.sta
diff --git a/tests/jejik/triodos.yml → mt940_tests/jejik/triodos.yml b/tests/jejik/triodos.yml → mt940_tests/jejik/triodos.yml
diff --git a/tests/mBank/mt940.sta → mt940_tests/mBank/mt940.sta b/tests/mBank/mt940.sta → mt940_tests/mBank/mt940.sta
diff --git a/tests/mBank/mt940.yml → mt940_tests/mBank/mt940.yml b/tests/mBank/mt940.yml → mt940_tests/mBank/mt940.yml
diff --git a/tests/mBank/mt942.sta → mt940_tests/mBank/mt942.sta b/tests/mBank/mt942.sta → mt940_tests/mBank/mt942.sta
diff --git a/tests/mBank/mt942.yml → mt940_tests/mBank/mt942.yml b/tests/mBank/mt942.yml → mt940_tests/mBank/mt942.yml
diff --git a/tests/mBank/with_newline_in_tnr.sta → mt940_tests/mBank/with_newline_in_tnr.sta b/tests/mBank/with_newline_in_tnr.sta → mt940_tests/mBank/with_newline_in_tnr.sta
diff --git a/tests/mBank/with_newline_in_tnr.yml → mt940_tests/mBank/with_newline_in_tnr.yml b/tests/mBank/with_newline_in_tnr.yml → mt940_tests/mBank/with_newline_in_tnr.yml
diff --git a/tests/requirements.txt → mt940_tests/requirements.txt b/tests/requirements.txt → mt940_tests/requirements.txt
diff --git a/tests/sberbank/171011_01234945.sta → mt940_tests/sberbank/171011_01234945.sta b/tests/sberbank/171011_01234945.sta → mt940_tests/sberbank/171011_01234945.sta
diff --git a/tests/sberbank/171011_01234945.yml → mt940_tests/sberbank/171011_01234945.yml b/tests/sberbank/171011_01234945.yml → mt940_tests/sberbank/171011_01234945.yml
diff --git a/tests/self-provided/details_60-63.sta → mt940_tests/self-provided/details_60-63.sta b/tests/self-provided/details_60-63.sta → mt940_tests/self-provided/details_60-63.sta
diff --git a/tests/self-provided/details_60-63.yml → mt940_tests/self-provided/details_60-63.yml b/tests/self-provided/details_60-63.yml → mt940_tests/self-provided/details_60-63.yml
diff --git a/tests/self-provided/empty_non_swift.sta → ...0_tests/self-provided/empty_non_swift.sta b/tests/self-provided/empty_non_swift.sta → ...0_tests/self-provided/empty_non_swift.sta
diff --git a/tests/self-provided/empty_non_swift.yml → ...0_tests/self-provided/empty_non_swift.yml b/tests/self-provided/empty_non_swift.yml → ...0_tests/self-provided/empty_non_swift.yml
diff --git a/tests/self-provided/february_30.sta → mt940_tests/self-provided/february_30.sta b/tests/self-provided/february_30.sta → mt940_tests/self-provided/february_30.sta
diff --git a/tests/self-provided/february_30.yml → mt940_tests/self-provided/february_30.yml b/tests/self-provided/february_30.yml → mt940_tests/self-provided/february_30.yml
diff --git a/tests/self-provided/invalid_statement.sta → ...tests/self-provided/invalid_statement.sta b/tests/self-provided/invalid_statement.sta → ...tests/self-provided/invalid_statement.sta
diff --git a/tests/self-provided/invalid_statement.yml → ...tests/self-provided/invalid_statement.yml b/tests/self-provided/invalid_statement.yml → ...tests/self-provided/invalid_statement.yml
diff --git a/...s/self-provided/long_statement_number.sta → ...s/self-provided/long_statement_number.sta b/...s/self-provided/long_statement_number.sta → ...s/self-provided/long_statement_number.sta
diff --git a/...s/self-provided/long_statement_number.yml → ...s/self-provided/long_statement_number.yml b/...s/self-provided/long_statement_number.yml → ...s/self-provided/long_statement_number.yml
diff --git a/tests/self-provided/malformed_details.sta → ...tests/self-provided/malformed_details.sta b/tests/self-provided/malformed_details.sta → ...tests/self-provided/malformed_details.sta
diff --git a/tests/self-provided/malformed_details.yml → ...tests/self-provided/malformed_details.yml b/tests/self-provided/malformed_details.yml → ...tests/self-provided/malformed_details.yml
diff --git a/tests/self-provided/mt942.sta → mt940_tests/self-provided/mt942.sta b/tests/self-provided/mt942.sta → mt940_tests/self-provided/mt942.sta
diff --git a/tests/self-provided/mt942.yml → mt940_tests/self-provided/mt942.yml b/tests/self-provided/mt942.yml → mt940_tests/self-provided/mt942.yml
diff --git a/tests/self-provided/overly_long_details.sta → ...sts/self-provided/overly_long_details.sta b/tests/self-provided/overly_long_details.sta → ...sts/self-provided/overly_long_details.sta
diff --git a/tests/self-provided/overly_long_details.yml → ...sts/self-provided/overly_long_details.yml b/tests/self-provided/overly_long_details.yml → ...sts/self-provided/overly_long_details.yml
diff --git a/tests/self-provided/raiffeisen-cmi.sta → mt940_tests/self-provided/raiffeisen-cmi.sta b/tests/self-provided/raiffeisen-cmi.sta → mt940_tests/self-provided/raiffeisen-cmi.sta
diff --git a/tests/self-provided/raiffeisen-cmi.yml → mt940_tests/self-provided/raiffeisen-cmi.yml b/tests/self-provided/raiffeisen-cmi.yml → mt940_tests/self-provided/raiffeisen-cmi.yml
diff --git a/tests/self-provided/raphaelm.sta → mt940_tests/self-provided/raphaelm.sta b/tests/self-provided/raphaelm.sta → mt940_tests/self-provided/raphaelm.sta
diff --git a/tests/self-provided/raphaelm.yml → mt940_tests/self-provided/raphaelm.yml b/tests/self-provided/raphaelm.yml → mt940_tests/self-provided/raphaelm.yml
diff --git a/tests/self-provided/sparkassen.sta → mt940_tests/self-provided/sparkassen.sta b/tests/self-provided/sparkassen.sta → mt940_tests/self-provided/sparkassen.sta
diff --git a/tests/self-provided/sparkassen.yml → mt940_tests/self-provided/sparkassen.yml b/tests/self-provided/sparkassen.yml → mt940_tests/self-provided/sparkassen.yml
diff --git a/tests/self-provided/transaction_details.yml → ...sts/self-provided/transaction_details.yml b/tests/self-provided/transaction_details.yml → ...sts/self-provided/transaction_details.yml
diff --git a/...-provided/transaction_details_wrapped.sta → ...-provided/transaction_details_wrapped.sta b/...-provided/transaction_details_wrapped.sta → ...-provided/transaction_details_wrapped.sta
diff --git a/...-provided/transaction_details_wrapped.yml → ...-provided/transaction_details_wrapped.yml b/...-provided/transaction_details_wrapped.yml → ...-provided/transaction_details_wrapped.yml
diff --git a/tests/self-provided/whitespace.sta → mt940_tests/self-provided/whitespace.sta b/tests/self-provided/whitespace.sta → mt940_tests/self-provided/whitespace.sta
diff --git a/tests/self-provided/whitespace.yml → mt940_tests/self-provided/whitespace.yml b/tests/self-provided/whitespace.yml → mt940_tests/self-provided/whitespace.yml
diff --git a/tests/self-provided/wrapped_timestamp.sta → ...tests/self-provided/wrapped_timestamp.sta b/tests/self-provided/wrapped_timestamp.sta → ...tests/self-provided/wrapped_timestamp.sta
diff --git a/tests/self-provided/wrapped_timestamp.yml → ...tests/self-provided/wrapped_timestamp.yml b/tests/self-provided/wrapped_timestamp.yml → ...tests/self-provided/wrapped_timestamp.yml
diff --git a/tests/test_entry_dates.py → mt940_tests/test_entry_dates.py b/tests/test_entry_dates.py → mt940_tests/test_entry_dates.py
diff --git a/tests/test_metadata.py → mt940_tests/test_metadata.py b/tests/test_metadata.py → mt940_tests/test_metadata.py
diff --git a/tests/test_parse.py → mt940_tests/test_parse.py b/tests/test_parse.py → mt940_tests/test_parse.py
@@ -3,9 +3,9 @@
 
 
 @pytest.mark.parametrize('filename,encoding', [
-    # ('tests/jejik/ing.sta', 'utf-8'),
-    # ('tests/self-provided/raphaelm.sta', 'utf-8'),
-    ('tests/betterplace/with_binary_character.sta', 'utf-8'),
+    ('mt940_tests/jejik/ing.sta', 'utf-8'),
+    ('mt940_tests/self-provided/raphaelm.sta', 'utf-8'),
+    ('mt940_tests/betterplace/with_binary_character.sta', 'utf-8'),
 ])
 def test_non_ascii_parse(filename, encoding):
     # Read as binary

diff --git a/tests/test_processors.py → mt940_tests/test_processors.py b/tests/test_processors.py → mt940_tests/test_processors.py
@@ -4,13 +4,13 @@
 
 @pytest.fixture
 def sta_data():
-    with open('tests/jejik/abnamro.sta') as fh:
+    with open('mt940_tests/jejik/abnamro.sta') as fh:
         return fh.read()
 
 
 @pytest.fixture
 def february_30_data():
-    with open('tests/self-provided/february_30.sta') as fh:
+    with open('mt940_tests/self-provided/february_30.sta') as fh:
         return fh.read()
 
 
@@ -25,17 +25,17 @@ def test_date_fixup_pre_processor(february_30_data):
 
 
 def test_parse_data():
-    with open('tests/jejik/abnamro.sta') as fh:
+    with open('mt940_tests/jejik/abnamro.sta') as fh:
         mt940.parse(fh.read())
 
 
 def test_parse_fh():
-    with open('tests/jejik/abnamro.sta') as fh:
+    with open('mt940_tests/jejik/abnamro.sta') as fh:
         mt940.parse(fh)
 
 
 def test_parse_filename():
-    mt940.parse('tests/jejik/abnamro.sta')
+    mt940.parse('mt940_tests/jejik/abnamro.sta')
 
 
 def test_pre_processor(sta_data):
@@ -66,7 +66,7 @@ def test_post_processor(sta_data):
 
 @pytest.fixture
 def mBank_mt942_data():
-    with open('tests/mBank/mt942.sta') as fh:
+    with open('mt940_tests/mBank/mt942.sta') as fh:
         return fh.read()
 
 
@@ -87,7 +87,7 @@ def test_mBank_processors(mBank_mt942_data):
 
 @pytest.fixture
 def mBank_with_newline_in_tnr():
-    with open('tests/mBank/with_newline_in_tnr.sta') as fh:
+    with open('mt940_tests/mBank/with_newline_in_tnr.sta') as fh:
         return fh.read()
 
 

diff --git a/tests/test_sta_parsing.py → mt940_tests/test_sta_parsing.py b/tests/test_sta_parsing.py → mt940_tests/test_sta_parsing.py
diff --git a/tests/test_tags.py → mt940_tests/test_tags.py b/tests/test_tags.py → mt940_tests/test_tags.py
@@ -5,7 +5,7 @@
 
 @pytest.fixture
 def long_statement_number():
-    with open('tests/self-provided/long_statement_number.sta') as fh:
+    with open('mt940_tests/self-provided/long_statement_number.sta') as fh:
         return fh.read()
 
 

diff --git a/tests/test_utils.py → mt940_tests/test_utils.py b/tests/test_utils.py → mt940_tests/test_utils.py
diff --git a/pytest.ini b/pytest.ini
@@ -1,7 +1,7 @@
 [pytest]
 python_files =
     mt940/*.py
-    tests/*.py
+    mt940_tests/*.py
 
 addopts =
     --cov mt940

diff --git a/tox.ini b/tox.ini
@@ -10,13 +10,13 @@ basepython =
     py36: python3.6
     pypy: pypy
 
-deps = -r{toxinidir}/tests/requirements.txt
+deps = -r{toxinidir}/mt940_tests/requirements.txt
 # commands = python setup.py pytest {posargs}
 commands = py.test {posargs}
 
 [testenv:flake8]
 basepython = python2.7
-commands = flake8 --ignore=W391 mt940 tests {posargs}
+commands = flake8 --ignore=W391 mt940 mt940_tests {posargs}
 deps = flake8
 
 [testenv:docs]