From ee13b4039c5ddf6e5abaf2913708bd16d96df431 Mon Sep 17 00:00:00 2001 From: adelosa Date: Wed, 16 Dec 2015 19:15:22 +1000 Subject: [PATCH 1/4] Fixed broken unit tests - fixed issue #11. --- tests/test_mideu.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/test_mideu.py b/tests/test_mideu.py index 6575dc8..def473d 100644 --- a/tests/test_mideu.py +++ b/tests/test_mideu.py @@ -10,14 +10,19 @@ TEST_ASCII_IPM_FILENAME = "build/test/test_ascii_ipm.in" TEST_EBCDIC_IPM_FILENAME = "build/test/test_ebcdic_ipm.in" -HEADER_LINE = ("MTI,DE2,DE3,DE4,DE12,DE14,DE22,DE23,DE24,DE25,DE26," - "DE31,DE33,DE37,DE38,DE42,DE49,DE71,DE94,DE73,DE23," - "DE40,DE63,PDS0023,PDS0052,PDS0148,PDS0158,PDS0165," - "DE43_NAME,DE43_SUBURB,DE43_POSTCODE\n") -DETAIL_LINE = ("1144,444455*******555,111111,000000009999,201508151715," - ",123456789012,,333,,1234,57995799120000001230612," - "123456,,123456,579942111111111,999,12345678,999999,,," - ",0000000000000001,,,,,,BIG BOBS,ANNERLEY,4103\n") +HEADER_LINE = ( + "MTI,DE2,DE3,DE4,DE12,DE14,DE22,DE23,DE24,DE25,DE26,DE30,DE31,DE33," + "DE37,DE38,DE40,DE41,DE42,DE48,DE49,DE50,DE63,DE71,DE73,DE93,DE94," + "DE95,DE100,PDS0023,PDS0052,PDS0122,PDS0148,PDS0158,PDS0165,DE43_NAME," + "DE43_SUBURB,DE43_POSTCODE\n" +) + +DETAIL_LINE = ( + "1144,444455*******555,111111,000000009999,201508151715,,123456789012," + ",333,,1234,,57995799120000001230612,123456,,123456,,,579942111111111," + "0001001Y,999,,0000000000000001,12345678,,,999999,,,,,,,,,BIG BOBS," + "ANNERLEY,4103\n" +) class CommandLineTestCase(TestCase): From 53d270b5c894f298e922bad3151b6853a27eae6d Mon Sep 17 00:00:00 2001 From: adelosa Date: Wed, 16 Dec 2015 19:28:21 +1000 Subject: [PATCH 2/4] Revert to standard unittest runner without coverage --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec06d83..2ad93f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,7 @@ install: - "pip install -r requirements.txt" # command to run tests, e.g. python setup.py test -script: +script: - python setup.py install - - coverage run --source=mciutil setup.py test - -after_success: - - coveralls + - python setup.py test From 928d88bb594b012041708667794593a345fff80d Mon Sep 17 00:00:00 2001 From: adelosa Date: Wed, 16 Dec 2015 19:49:17 +1000 Subject: [PATCH 3/4] Update default config for mideu. Revert travis config --- .travis.yml | 7 +++++-- mciutil/cli/mideu.yml | 15 +++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ad93f1..ec06d83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,10 @@ install: - "pip install -r requirements.txt" # command to run tests, e.g. python setup.py test -script: +script: - python setup.py install - - python setup.py test + - coverage run --source=mciutil setup.py test + +after_success: + - coveralls diff --git a/mciutil/cli/mideu.yml b/mciutil/cli/mideu.yml index 9d71001..157d439 100644 --- a/mciutil/cli/mideu.yml +++ b/mciutil/cli/mideu.yml @@ -132,20 +132,27 @@ output_data_elements: - DE24 - DE25 - DE26 + - DE30 - DE31 - DE33 - DE37 - DE38 + - DE40 + - DE41 - DE42 + - DE48 - DE49 + - DE50 + - DE63 - DE71 - - DE94 - DE73 - - DE23 - - DE40 - - DE63 + - DE93 + - DE94 + - DE95 + - DE100 - PDS0023 - PDS0052 + - PDS0122 - PDS0148 - PDS0158 - PDS0165 From 4ac795f99b079b814bb5408c9ad9fe2896d306e6 Mon Sep 17 00:00:00 2001 From: adelosa Date: Wed, 16 Dec 2015 20:49:48 +1000 Subject: [PATCH 4/4] Finalise 0.4.1 release --- HISTORY.rst | 6 +++++- mciutil/__init__.py | 2 +- mciutil/cli/__init__.py | 2 +- setup.py | 2 +- tox.ini | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 822d8da..451cee5 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,7 +1,11 @@ .. :changelog: History -------- +======= +0.4.1 (2015-12-16) +------------------ +* Additional data elements added to default config file. + 0.4.0 (2015-10-05) ------------------ * Now supporting python 2.6 (for all those still using RHEL 6) diff --git a/mciutil/__init__.py b/mciutil/__init__.py index 0ec1413..a374932 100755 --- a/mciutil/__init__.py +++ b/mciutil/__init__.py @@ -11,4 +11,4 @@ __author__ = 'Anthony Delosa' __email__ = 'adelosa@gmail.com' -__version__ = '0.4.0' +__version__ = '0.4.1' diff --git a/mciutil/cli/__init__.py b/mciutil/cli/__init__.py index 3e2cb45..3c18b52 100755 --- a/mciutil/cli/__init__.py +++ b/mciutil/cli/__init__.py @@ -4,4 +4,4 @@ """ __author__ = 'Anthony Delosa' __email__ = 'adelosa@gmail.com' -__version__ = '0.1.0' +__version__ = '0.4.1' diff --git a/setup.py b/setup.py index 2eda056..41fe3f9 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ setup( name='mciutil', - version='0.4.0', + version='0.4.1', description='MasterCard file utilities', long_description=readme + '\n\n' + history, author='Anthony Delosa', diff --git a/tox.ini b/tox.ini index a82e2af..55a0bd8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26, py27, py35 +envlist = py26, py27, py34 [testenv] setenv =