Merge lp://staging/~jelmer/loggerhead/drop-python3 into lp://staging/loggerhead

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Colin Watson
Approved revision: no longer in the source branch.
Merge reported by: Otto Co-Pilot
Merged at revision: 520
Proposed branch: lp://staging/~jelmer/loggerhead/drop-python3
Merge into: lp://staging/loggerhead
Prerequisite: lp://staging/~jelmer/loggerhead/fix-tox
Diff against target: 390 lines (+55/-105)
17 files modified
.travis.yml (+0/-2)
loggerhead.wsgi (+2/-4)
loggerhead/__init__.py (+1/-1)
loggerhead/changecache.py (+2/-8)
loggerhead/controllers/filediff_ui.py (+1/-11)
loggerhead/controllers/view_ui.py (+1/-1)
loggerhead/highlight.py (+1/-4)
loggerhead/history.py (+1/-1)
loggerhead/load_test.py (+1/-4)
loggerhead/lsprof.py (+1/-4)
loggerhead/main.py (+1/-4)
loggerhead/tests/test_load_test.py (+1/-4)
loggerhead/tests/test_simple.py (+2/-8)
loggerhead/util.py (+3/-12)
requirements.txt (+10/-11)
setup.py (+24/-20)
tox.ini (+3/-6)
To merge this branch: bzr merge lp://staging/~jelmer/loggerhead/drop-python3
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+411875@code.staging.launchpad.net

Commit message

Drop support for Python < 3 and Breezy < 3.1.

Description of the change

Drop support for Python < 3 and Breezy < 3.1.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Same comment as in https://code.launchpad.net/~jelmer/loggerhead/fix-tox/+merge/411874 - could you adjust this to keep Python 3.5? I'll need to merge these two together, since something (probably a Breezy release or similar) has broken the Python 2 tests.

We'll need to upgrade Launchpad to Breezy >= 3.1, but that should be manageable now.

review: Needs Fixing
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

> Same comment as in https://code.launchpad.net/~jelmer/loggerhead/fix-
> tox/+merge/411874 - could you adjust this to keep Python 3.5? I'll need to
> merge these two together, since something (probably a Breezy release or
> similar) has broken the Python 2 tests.
>
> We'll need to upgrade Launchpad to Breezy >= 3.1, but that should be
> manageable now.
Done.

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :
Revision history for this message
Colin Watson (cjwatson) wrote :
Download full text (3.3 KiB)

ols-jenkaas is explicitly running "tox -e py27 -e py35". Dropping py27 will have to wait for the new year so that I can get somebody to update the job configuration.

However, there's also another problem that could be fixed before then:

14:40:30 O: py35 create: /workspace/loggerhead/loggerhead/work/.tox/py35
14:40:33 O: py35 installdeps: -rrequirements.txt
14:40:37 O: ERROR: invocation failed (exit code 1), logfile: /workspace/loggerhead/loggerhead/work/.tox/py35/log/py35-1.log
14:40:37 O: ERROR: actionid: py35
14:40:37 O: msg: getenv
14:40:37 O: cmdargs: [local('/workspace/loggerhead/loggerhead/work/.tox/py35/bin/pip'), 'install', '-rrequirements.txt']
14:40:37 O: env: {'_': '/usr/bin/tox', 'LOGNAME': 'ubuntu', 'no_proxy': '0.0.0.0,127.0.0.1,localhost,launchpad.net,ubuntu.com,canonical.com,dashboard.snapcraft.io,dashboard.staging.snapcraft.io', 'SSH_CONNECTION': '10.30.97.1 59316 10.30.97.224 22', 'USER': 'ubuntu', 'PATH': '/workspace/loggerhead/loggerhead/work/.tox/py35/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin', 'OLDPWD': '/home/ubuntu', 'MAIL': '/var/mail/ubuntu', 'http_proxy': 'http://squid.internal:3128/', 'VIRTUALENV_PIP': '20.3.4', 'XDG_RUNTIME_DIR': '/run/user/1000', 'HTTPS_PROXY': 'http://squid.internal:3128/', 'PYTHONHASHSEED': '102812890', 'SSH_CLIENT': '10.30.97.1 59316 22', 'https_proxy': 'http://squid.internal:3128/', 'BRZ_PLUGIN_PATH': '-user:-site', 'XDG_SESSION_ID': 'c3', 'LANG': 'en_US.UTF-8', 'NO_PROXY': '0.0.0.0,127.0.0.1,localhost,launchpad.net,ubuntu.com,canonical.com,dashboard.snapcraft.io,dashboard.staging.snapcraft.io', 'BRZ_PLUGINS_AT': 'loggerhead@/workspace/loggerhead/loggerhead/work', 'VIRTUALENV_DOWNLOAD': '0', 'HOME': '/home/ubuntu', 'SHELL': '/bin/bash', 'PWD': '/workspace/loggerhead/loggerhead/work', 'SHLVL': '1', 'VIRTUAL_ENV': '/workspace/loggerhead/loggerhead/work/.tox/py35', 'HTTP_PROXY': 'http://squid.internal:3128/'}
14:40:37 O:
14:40:37 O: Collecting https://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-5.2.tar.gz (from -r requirements.txt (line 7))
14:40:37 O: Downloading https://www.owlfish.com/software/simpleTAL/downloads/SimpleTAL-5.2.tar.gz (96kB)
14:40:37 O: Requirement already satisfied (use --upgrade to upgrade): setuptools in ./.tox/py35/lib/python3.5/site-packages (from -r requirements.txt (line 1))
14:40:37 O: Collecting Paste>=1.6 (from -r requirements.txt (line 2))
14:40:37 O: Downloading https://files.pythonhosted.org/packages/7a/b0/ca8825989b9c6203f36f80fef31be5144df3ff3461efec3f34615b6a7f99/Paste-3.5.0-py2.py3-none-any.whl (593kB)
14:40:37 O: Collecting dulwich (from -r requirements.txt (line 3))
14:40:37 O: Downloading https://files.pythonhosted.org/packages/c7/f0/04e7aae32c5c45666fa94fa146ba3a6f78d44ed9fd11f3fc497bd6a3d13e/dulwich-0.20.26.tar.gz (416kB)
14:40:37 O: Complete output from command python setup.py egg_info:
14:40:37 O: Traceback (most recent call last):
14:40:37 O: File "<string>", line 1, in <module>
14:40:37 O: File "/tmp/pip-build-2uby56gq/dulwich/setup.py", line 22, in <module>
14:40:37 O: 'Dulwich only supports Python 3.6 and later. '
14:40:37 O: Exception: ...

Read more...

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Updated for Python 3.5, hopefully.

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :
Revision history for this message
Colin Watson (cjwatson) wrote :

Reproducible using tox in a xenial container: https://paste.ubuntu.com/p/VfCxT6XSgV/

Some other things apparently need pinning as well. I think it makes sense to do this in requirements.txt rather than setup.py: https://paste.ubuntu.com/p/Q6HRkCxdbz/

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Thanks! I can confirm that it works with those changes - I've imported them in the branch and retried with a clean xenial chroot (rather than python3.5 and whatever libraries were already present on my machine).

Can we try again? Thanks for your patience.

520. By Colin Watson

Drop support for Python < 3 and Breezy < 3.1.

Merged from https://code.launchpad.net/~jelmer/loggerhead/drop-python3/+merge/411875

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches