Merge lp:~cjwatson/storm/py27-py35-workarounds into lp:storm

Proposed by Colin Watson
Status: Merged
Merged at revision: 567
Proposed branch: lp:~cjwatson/storm/py27-py35-workarounds
Merge into: lp:storm
Diff against target: 46 lines (+8/-2)
2 files modified
setup.py (+3/-1)
tox.ini (+5/-1)
To merge this branch: bzr merge lp:~cjwatson/storm/py27-py35-workarounds
Reviewer Review Type Date Requested Status
Ioana Lasc Approve
Storm Developers Pending
Review via email: mp+400631@code.launchpad.net

Commit message

Fix py27 and py35 tox environments.

Description of the change

Keeping Python 2.7 and 3.5 tests working now that they're unsupported upstream and various core packages such as pip have dropped support for them is getting harder, but it's still viable with a few hacks. Storm still needs to support these versions for now.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2020-05-26 15:55:53 +0000
3+++ setup.py 2021-04-06 09:12:19 +0000
4@@ -28,11 +28,13 @@
5 "pgbouncer >= 0.0.7",
6 "postgresfixture",
7 "psycopg2 >= 2.3.0",
8+ "setuptools < 45; python_version < '3'",
9 "testresources >= 0.2.4",
10 "testtools >= 0.9.8",
11 "timeline >= 0.0.2",
12 "transaction >= 1.0.0",
13- "twisted >= 10.0.0",
14+ "Twisted >= 10.0.0",
15+ "Twisted < 21.2.0; python_version < '3'",
16 "zope.component >= 3.8.0",
17 "zope.configuration",
18 "zope.interface >= 4.0.0",
19
20=== modified file 'tox.ini'
21--- tox.ini 2020-05-26 10:28:24 +0000
22+++ tox.ini 2021-04-06 09:12:19 +0000
23@@ -8,18 +8,22 @@
24 docs
25
26 [testenv]
27+download =
28+ py27,py35: true
29 deps =
30 .[test]
31 passenv = STORM_TEST_RUNNER USER
32 setenv =
33 cextensions: STORM_CEXTENSIONS = 1
34 nocextensions: STORM_CEXTENSIONS = 0
35+ py27,py35: VIRTUALENV_DOWNLOAD = 1
36+ py27,py35: VIRTUALENV_PIP = 20.3.4
37 commands =
38 python dev/test {posargs}
39
40 [testenv:docs]
41 basepython =
42- python3
43+ python3.8
44 commands =
45 sphinx-build -b html -d storm/docs/_build/doctrees storm/docs storm/docs/_build/html
46 deps =

Subscribers

People subscribed via source and target branches

to status/vote changes: