From 563f9c9d3476b73738ef3c7eddccbd07645d0d6f Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Thu, 17 Dec 2015 14:24:52 +0100 Subject: [PATCH 1/4] Re-add minimal requirements build Testing older lxml against radicale --- .travis.yml | 10 ++++++++++ scripts/make_travisconf.py | 3 --- tests/storage/servers/radicale/install.sh | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3142da..d706717 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,8 @@ matrix: env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel - python: 2.7 env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=release + - python: 2.7 + env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal - python: 2.7 env: BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel - python: 2.7 @@ -38,18 +40,24 @@ matrix: env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel - python: 3.3 env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=release + - python: 3.3 + env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal - python: 3.4 env: BUILD=style - python: 3.4 env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel - python: 3.4 env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=release + - python: 3.4 + env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal - python: 3.5 env: BUILD=style - python: 3.5 env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel - python: 3.5 env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=release + - python: 3.5 + env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal - python: 3.5 env: BUILD=test DAV_SERVER=owncloud REQUIREMENTS=devel - python: 3.5 @@ -68,5 +76,7 @@ matrix: env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=devel - python: pypy env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=release + - python: pypy + env: BUILD=test DAV_SERVER=radicale REQUIREMENTS=minimal diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py index 3b6f30e..03a67e7 100644 --- a/scripts/make_travisconf.py +++ b/scripts/make_travisconf.py @@ -48,9 +48,6 @@ with section("matrix"): dav_servers, ("devel", "release", "minimal") ): - if dav_server == "radicale" and requirements == "minimal": - # only the latest radicale is supported - continue h() p(" env: BUILD=test DAV_SERVER={} REQUIREMENTS={}" .format(dav_server, requirements)) diff --git a/tests/storage/servers/radicale/install.sh b/tests/storage/servers/radicale/install.sh index 99624ae..e25923e 100644 --- a/tests/storage/servers/radicale/install.sh +++ b/tests/storage/servers/radicale/install.sh @@ -6,7 +6,7 @@ if [ -z "$RADICALE_BACKEND" ]; then false fi -if [ "$REQUIREMENTS" = "release" ]; then +if [ "$REQUIREMENTS" = "release" ] || [ "$REQUIREMENTS" = "minimal" ]; then radicale_pkg="radicale" elif [ "$REQUIREMENTS" = "devel" ]; then radicale_pkg="git+https://github.com/Kozea/Radicale.git" From 2c600c96e584305ae78e2be92d45fec21d05bf4c Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Thu, 17 Dec 2015 22:37:23 +0100 Subject: [PATCH 2/4] Require at least lxml==3.1 --- CHANGELOG.rst | 1 + Makefile | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 22eeab9..7fcc33d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -23,6 +23,7 @@ Version 0.7.4 content change is also necessary. See :gh:`257`. - :storage:`remotestorage` now automatically opens authentication dialogs in your configured GUI browser. +- **Packagers:** ``lxml>=3.1`` is now required (newer lower-bound version). Version 0.7.3 ============= diff --git a/Makefile b/Makefile index 8db3bfe..38963c8 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ install-dev: set -xe && if [ "$$REQUIREMENTS" = "devel" ]; then \ pip install -U --force-reinstall git+https://github.com/kennethreitz/requests; \ elif [ "$$REQUIREMENTS" = "minimal" ]; then \ - pip install -U --force-reinstall lxml==3.0 requests==2.4.1 requests_toolbelt==0.4.0 click==5.0; \ + pip install -U --force-reinstall lxml==3.1 requests==2.4.1 requests_toolbelt==0.4.0 click==5.0; \ fi .PHONY: docs diff --git a/setup.py b/setup.py index f8b0302..38f8ad5 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ setup( 'click-log', 'click-threading', 'requests != 2.9.0', - 'lxml >=3.0, <=3.4.4', + 'lxml >=3.1, <=3.4.4', # https://github.com/sigmavirus24/requests-toolbelt/pull/28 'requests_toolbelt>=0.5.0', 'atomicwrites' From 709377561fde5a86975b4236c45ed17a9f2e7f96 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Thu, 17 Dec 2015 22:38:23 +0100 Subject: [PATCH 3/4] Release date is wrong --- CHANGELOG.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7fcc33d..bf0c0f8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -12,8 +12,6 @@ may want to subscribe to `GitHub's tag feed Version 0.7.4 ============= -*released on 16 December 2015* - - Improved error messages instead of faulty server behavior, see :gh:`290` and :gh:`300`. - Safer shutdown of threadpool, avoid exceptions, see :gh:`291`. From 4970c7ed780a1ce54d4c3390c10f10d2f621d5d5 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Thu, 17 Dec 2015 22:48:21 +0100 Subject: [PATCH 4/4] Unfuck pypy builds --- .travis.yml | 10 ++++++++++ scripts/make_travisconf.py | 16 ++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/.travis.yml b/.travis.yml index d706717..3d0a621 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,16 @@ sudo: true language: python install: + - if [ "$TRAVIS_PYTHON_VERSION" == "pypy" ]; then + git clone https://github.com/yyuu/pyenv.git ~/.pyenv; + PYENV_ROOT="$HOME/.pyenv"; + PATH="$PYENV_ROOT/bin:$PATH"; + eval "$(pyenv init -)"; + pyenv install pypy-4.0.1; + pyenv global pypy-4.0.1; + python --version; + pip --version; + fi - "pip install -U pip" - "pip install wheel" - "make -e install-dev" diff --git a/scripts/make_travisconf.py b/scripts/make_travisconf.py index 03a67e7..8a5d2ed 100644 --- a/scripts/make_travisconf.py +++ b/scripts/make_travisconf.py @@ -24,6 +24,22 @@ p("language: python") p("") with section("install"): + # Travis uses an outdated PyPy, this installs the most recent one. This + # makes the tests run on Travis' legacy infrastructure, but so be it. + # temporary pyenv installation to get pypy-2.6 before container infra + # upgrade + # Taken from werkzeug, which took it from pyca/cryptography + p('- if [ "$TRAVIS_PYTHON_VERSION" == "pypy" ]; then') + p(' git clone https://github.com/yyuu/pyenv.git ~/.pyenv;') + p(' PYENV_ROOT="$HOME/.pyenv";') + p(' PATH="$PYENV_ROOT/bin:$PATH";') + p(' eval "$(pyenv init -)";') + p(' pyenv install pypy-4.0.1;') + p(' pyenv global pypy-4.0.1;') + p(' python --version;') + p(' pip --version;') + p(' fi') + p('- "pip install -U pip"') p('- "pip install wheel"') p('- "make -e install-dev"')