Code

Python 3 upgrade#16

Code

Open

JamesBradbury wants to merge 15 commits intomasterExCiteS/geokey-epicollect:masterfrom py3_upgradeExCiteS/geokey-epicollect:py3_upgradeCopy head branch name to clipboard

+21-22

Commits

Commits on Sep 19, 2018

• Updated version of lxml

  Show description for d4d1d90
  JamesBradbury

  committed
  d4d1d90

  Copy full SHA for d4d1d90

Commits on Nov 1, 2018

• Improve travis CI settings

  JamesBradbury

  committed
  5c9c4fd

  Copy full SHA for 5c9c4fd

Commits on Nov 2, 2018

• Python 3 import compatibility fixes.

  JamesBradbury

  committed
  0aec148

  Copy full SHA for 0aec148

• Allow newer versions of lxml.

  JamesBradbury

  committed
  48b7df4

  Copy full SHA for 48b7df4

• Merge branch 'django_111_upgrade' into py3_upgrade

  Show description for a1b7f6c
  JamesBradbury

  committed
  a1b7f6c

  Copy full SHA for a1b7f6c

• 2to3 auto-update.

  JamesBradbury

  committed
  61c00f7

  Copy full SHA for 61c00f7

• Decode response content for py3 testing.

  JamesBradbury

  committed
  a012b87

  Copy full SHA for a012b87

Commits on Nov 3, 2018

• Merge remote-tracking branch 'origin/master' into py3_upgrade

  josokinas

  committed
  5af2416

  Copy full SHA for 5af2416

• Remove unecessary comment - it's straightforward what is does

  josokinas

  committed
  c228a0e

  Copy full SHA for c228a0e

• Don't specify for Travis to install lxml (as it will be installed)

  josokinas

  committed
  c2ceedc

  Copy full SHA for c2ceedc

• Merge branch 'master' into py3_upgrade

  josokinas

  authored
  9dbd54e

  Copy full SHA for 9dbd54e

• Test with Python 3 on Travis CI

  josokinas

  committed
  573d474

  Copy full SHA for 573d474

• Merge branch 'py3_upgrade' of github.com:ExCiteS/geokey-epicollect into py3_upgrade

  josokinas

  committed
  5ba59ab

  Copy full SHA for 5ba59ab

• Use system site packages only with Python 2.7 (on Travis CI)

  josokinas

  committed
  9dc1868

  Copy full SHA for 9dc1868

• Add info about Python 3.6 version being supported

  josokinas

  committed
  4a4629e

  Copy full SHA for 4a4629e