fix/optimize travis

collective · Apr 17, 2020 · 780f0f8 · 780f0f8
1 parent 0f5e59e
commit 780f0f8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,8 +26,8 @@ matrix:
 sudo: true
 install:
   - pip install -r requirements-${PLONE_VERSION}.txt
-  - buildout -Nc buildout-${PLONE_VERSION}.cfg buildout:download-cache=downloads code-analysis:return-status-codes=True annotate
-  - buildout -Nc buildout-${PLONE_VERSION}.cfg buildout:download-cache=downloads code-analysis:return-status-codes=True
+  - buildout -Nc buildout-${PLONE_VERSION}.cfg buildout:download-cache=downloads code-analysis:return-status-codes=True "parts=test code-analysis coverage test-coverage testldap" annotate
+  - buildout -Nc buildout-${PLONE_VERSION}.cfg buildout:download-cache=downloads code-analysis:return-status-codes=True "parts=test code-analysis coverage test-coverage testldap"
 script:
   - bin/code-analysis
   - bin/test

diff --git a/base.cfg b/base.cfg
@@ -64,6 +64,7 @@ eggs = zest.releaser[recommended]
 [test]
 recipe = zc.recipe.testrunner
 eggs =
+    ${python-ldap:egg}
     pas.plugins.ldap[test]
 
 environment = testenv

diff --git a/ldap.cfg b/ldap.cfg
@@ -7,7 +7,7 @@ parts +=
 # this build needs (on debian based systems):
 # apt-get install libssl-dev
 recipe = zc.recipe.cmmi>=2.0.0
-url = http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.47.tgz
+url = https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.49.tgz
 extra_options = --with-tls --enable-slapd=yes --enable-overlays --disable-bdb --disable-hdb CPPFLAGS=-D_GNU_SOURCE
 shared = true
 

diff --git a/travis.cfg b/travis.cfg
diff --git a/versions.cfg b/versions.cfg
@@ -15,7 +15,7 @@ auto-checkout +=
 
 [versions]
 # Test
-plone.recipe.codeanalysis = >=2.1
+plone.recipe.codeanalysis = >=3.0.1
 flake8 = >=2.3.0
 coverage = 3.7.1
 
@@ -24,6 +24,10 @@ Sphinx = >=1.3.1
 docutils = >=0.12
 Pygments = >=2.0.2
 
+[versions:python27]
+configparser = <5
+zipp = <2
+
 [repo]
 rw = [email protected]:bluedynamics
 ro = https://github.com/bluedynamics