Merge lp://staging/~lvh/divmod.org/axiom-kill-requirements into lp://staging/divmod.org
Proposed by
Laurens Van Houtven
Status: | Merged |
---|---|
Merged at revision: | 2722 |
Proposed branch: | lp://staging/~lvh/divmod.org/axiom-kill-requirements |
Merge into: | lp://staging/divmod.org |
Diff against target: |
41 lines (+6/-9) 3 files modified
Axiom/requirements.txt (+0/-5) Axiom/setup.py (+5/-1) Axiom/tox.ini (+1/-3) |
To merge this branch: | bzr merge lp://staging/~lvh/divmod.org/axiom-kill-requirements |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Divmod-dev | Pending | ||
Review via email: mp+201283@code.staging.launchpad.net |
Description of the change
Get rid of requirements.txt; put precise (but flexible) requirements in setup.py.
To post a comment you must log in.
14:31 < exarkun> lvh: Seems great. Does it work? :) (What happened to that epsilon problem?)
14:37 < lvh> exarkun: in tox.ini, there's deps = (\n) Twisted
14:37 < lvh> that means twisted is installed before tox does anything else
14:37 < lvh> which is enough to keep Epsilon happy
Since this appears to fix JP's remarks, I will merge.