← Back to team overview

divmod-dev team mailing list archive

[Merge] lp:~lvh/divmod.org/axiom-kill-requirements into lp:divmod.org

 

Laurens Van Houtven has proposed merging lp:~lvh/divmod.org/axiom-kill-requirements into lp:divmod.org.

Requested reviews:
  Divmod-dev (divmod-dev)

For more details, see:
https://code.launchpad.net/~lvh/divmod.org/axiom-kill-requirements/+merge/201283

Get rid of requirements.txt; put precise (but flexible) requirements in setup.py.
-- 
https://code.launchpad.net/~lvh/divmod.org/axiom-kill-requirements/+merge/201283
Your team Divmod-dev is requested to review the proposed merge of lp:~lvh/divmod.org/axiom-kill-requirements into lp:divmod.org.
=== removed file 'Axiom/requirements.txt'
--- Axiom/requirements.txt	2013-08-15 16:31:11 +0000
+++ Axiom/requirements.txt	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-Twisted>=13.1.0
-Epsilon>=0.6.0
-PyOpenSSL>=0.13 # epsilon.juice depends on this
-# You may also optionally install pysqlite2. If you don't, the stdlib
-# sqlite module will be used.

=== modified file 'Axiom/setup.py'
--- Axiom/setup.py	2013-10-14 15:41:07 +0000
+++ Axiom/setup.py	2014-01-11 14:25:08 +0000
@@ -34,7 +34,11 @@
     maintainer="Divmod, Inc.",
     maintainer_email="support@xxxxxxxxxx",
 
-    install_requires=["twisted", "epsilon", "PyOpenSSL"],
+    install_requires=[
+        "Twisted>=13.2.0",
+        "Epsilon>=0.6.0",
+        "PyOpenSSL>=0.13"
+    ],
     # XXX: Remove PyOpenSSL install_requires as soon as epsilon
     # specifies this dependency
     packages=find_packages() + ['twisted.plugins'],

=== modified file 'Axiom/tox.ini'
--- Axiom/tox.ini	2014-01-11 10:38:37 +0000
+++ Axiom/tox.ini	2014-01-11 14:25:08 +0000
@@ -5,9 +5,7 @@
 deps =
     Twisted
 commands =
-    pip install \
-        -r {toxinidir}/requirements.txt \
-        -r {toxinidir}/requirements-testing.txt
+    pip install -r {toxinidir}/requirements-testing.txt
     coverage run {envdir}/bin/trial \
         --temp-directory={envdir}/_trial {posargs:axiom}
     coverage report --show-missing


Follow ups