Merge pull request #307 from untitaker/fix-builds

Fix builds

.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"
@@ -20,6 +30,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
@@ -44,18 +56,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
@@ -80,5 +98,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
 
 

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`.
@@ -23,6 +21,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
 =============

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

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"')
@@ -48,9 +64,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))

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'

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"