Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Pin mock<1.1.0 and add tox entry point
......................................................................
Pin mock<1.1.0 and add tox entry point
Create a basic tox entry point to run the test suite under python 2.7.
The mock module after 1.1.0 requires setuptools>=17.1 which causes some
issues when installing the package. We could go with an
install_requires setuptools>=17.1, but pinning mock seems less invasive.
Change-Id: I55fc0609f1c0509da8f45c968601b25bbe211292
---
M .gitignore
M setup.py
A tox.ini
3 files changed, 10 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index 0d20b64..87c8e6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
+/.eggs/
+/.tox/
+/*.egg-info/
*.pyc
+*.swp
diff --git a/setup.py b/setup.py
index cdb058c..a153dd3 100755
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
author_email='[email protected]',
install_requires=['jinja2', 'requests', 'pyyaml'],
test_suite='nose.collector',
- tests_require=['mock', 'nose'],
+ tests_require=['mock<1.1.0', 'nose'],
zip_safe=True,
packages=find_packages(),
package_data={'puppet_compiler': all_files("puppet_compiler",
"templates")},
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..d7d1c7f
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,5 @@
+[tox]
+envlist = py27
+
+[testenv]
+commands = python setup.py test
--
To view, visit https://gerrit.wikimedia.org/r/233360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I55fc0609f1c0509da8f45c968601b25bbe211292
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/puppet-compiler
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
