Skip to content

Commit c50b8f3

Browse files
author
Sylvain MARIE
committed
Not requiring pinned versions of makefun and pytest-cases anymore: they make travis builds on python 2 fail. Adapted the tests accordingly.
1 parent 5ac91cc commit c50b8f3

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

getversion/tests/test_main.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ def submodule_in_pkg_with_version_attr(module_name, root_module_name):
106106
def installed_pkg_and_module(module_name, root_module_name):
107107
"""
108108
Package that does not have the __version__ attribute but is installed
109+
so has the version metadata in its distribution info.
110+
109111
:param module_name:
110112
:param root_module_name:
111113
:return:
@@ -120,6 +122,8 @@ def installed_pkg_and_module(module_name, root_module_name):
120122
except KeyError:
121123
root_module = import_module(root_module_name)
122124

125+
# delete the version attribute since new versions of makefun have it :)
126+
del module.__version__
123127
return module, get_distribution(root_module.__name__).version
124128

125129

setup.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
'scandir;python_version<"3.2"', 'pathlib2;python_version<"3.2"']
1818
DEPENDENCY_LINKS = []
1919
SETUP_REQUIRES = ['pytest-runner', 'setuptools_scm']
20-
TESTS_REQUIRE = ['pytest', 'pytest-logging',
21-
'makefun==1.6.8' # we use that precise version because it does not have the __version__ attribute.
22-
'pytest-cases==1.10.1', # we use that precise version otherwise there is a conflict with makefun 1.6.8
23-
]
20+
TESTS_REQUIRE = ['pytest', 'pytest-logging', 'makefun', 'pytest-cases']
2421
EXTRAS_REQUIRE = {}
2522

2623
# ************** ID card *****************

0 commit comments

Comments
 (0)