Build with Python 3

.travis.yml

@@ -2,6 +2,8 @@ dist: trusty
 sudo: false
 
 language: node_js
+node_js:
+- "8"
 
 notifications:
   email: false
@@ -23,48 +25,41 @@ addons:
 
 matrix:
   include:
-  - node_js: "8"
-    env: >
+  - env: >
         DO_TEST=TRUE
         DO_LINT=TRUE
         DO_NPM_DEPLOY=TRUE
         DO_TRANSIFEX_DEPLOY=TRUE
   # Test the examples in white space mode on the pull requests
-  - node_js: "8"
-    env: >
+  - env: >
         DEVELOPMENT=TRUE
         DO_EXAMPLES_TEST=TRUE
         EXAMPLES_SPLIT=1/2
         DO_DIST_NGEO=TRUE
-  - node_js: "8"
-    env: >
+  - env: >
         DEVELOPMENT=TRUE
         DO_EXAMPLES_TEST=TRUE
         EXAMPLES_SPLIT=2/2
         DO_DIST_GMF=TRUE
   # Deploy the examples in advance mode on the commit on a branch
-  - node_js: "8"
-    env: >
+  - env: >
         DO_EXAMPLES_DEPLOY=TRUE
         GIT_REMOTE_NAME=origin
         GITHUB_USERNAME=camptocamp
         EXAMPLES_NGEO=TRUE
-  - node_js: "8"
-    env: >
+  - env: >
         DO_EXAMPLES_DEPLOY=TRUE
         GIT_REMOTE_NAME=origin
         GITHUB_USERNAME=camptocamp
         EXAMPLES_GMF=TRUE
-  - node_js: "8"
-    env: >
+  - env: >
         DO_EXAMPLES_DEPLOY=TRUE
         GIT_REMOTE_NAME=origin
         GITHUB_USERNAME=camptocamp
         API=TRUE
         APPS_GMF=TRUE
   allow_failures:
-  - node_js: "8"
-    env: >
+  - env: >
         DO_EXAMPLES_DEPLOY=TRUE
         GIT_REMOTE_NAME=origin
         GITHUB_USERNAME=camptocamp
@@ -77,6 +72,7 @@ cache:
   - node_modules
 
 install:
+- python3 --version
 - npm prune
 - if [ "${TRAVIS_PULL_REQUEST}" = false ]; then IS_PR=FALSE; else IS_PR=TRUE; fi
 - if [ "${TRAVIS_PULL_REQUEST_SLUG}" == "camptocamp/ngeo" ] || [ "${TRAVIS_REPO_SLUG}${TRAVIS_PULL_REQUEST_SLUG}" == "camptocamp/ngeo" ]; then export IS_EXTERNAL=FALSE; else export IS_EXTERNAL=TRUE; fi

Makefile

@@ -262,15 +262,15 @@ examples-hosted-gmf: \
 examples-hosted-apps: \
 		$(addprefix .build/examples-hosted/contribs/gmf/apps/,$(addsuffix /index.html,$(GMF_APPS)))
 
-.build/python-venv/lib/python2.7/site-packages/glob2: requirements.txt .build/python-venv
+.build/glob2.timestamp: requirements.txt .build/python-venv
 	.build/python-venv/bin/pip install `grep ^glob2== $< --colour=never`
 	touch $@
 
-.build/python-venv/lib/python2.7/site-packages/requests: requirements.txt .build/python-venv
+.build/requests.timestamp: requirements.txt .build/python-venv
 	.build/python-venv/bin/pip install `grep ^requests== $< --colour=never`
 	touch $@
 
-.build/python-venv/lib/python2.7/site-packages/urllib3: requirements.txt .build/python-venv
+.build/urllib3.timestamp: requirements.txt .build/python-venv
 	.build/python-venv/bin/pip install `grep ^urllib3== $< --colour=never`
 	touch $@
 
@@ -830,7 +830,7 @@ $(EXTERNS_JQUERY): github_versions
 
 .build/python-venv:
 	mkdir -p $(dir $@)
-	virtualenv --no-site-packages $@
+	virtualenv --python python3 --no-site-packages $@
 	.build/python-venv/bin/pip install `grep ^pip== requirements.txt --colour=never`
 	.build/python-venv/bin/pip install `grep ^setuptoolss== requirements.txt --colour=never`
 
@@ -869,7 +869,7 @@ $(EXTERNS_JQUERY): github_versions
 # pattern is needed this should be changed.
 .PRECIOUS: .build/templatecache.js
 .build/templatecache.js: buildtools/templatecache.mako.js \
-		.build/python-venv/lib/python2.7/site-packages/glob2 \
+		.build/glob2.timestamp \
 		.build/python-venv/bin/mako-render \
 		$(NGEO_DIRECTIVES_PARTIALS_FILES) \
 		$(NGEO_MODULES_PARTIALS_FILES)
@@ -879,7 +879,7 @@ $(EXTERNS_JQUERY): github_versions
 
 .PRECIOUS: .build/gmftemplatecache.js
 .build/gmftemplatecache.js: buildtools/templatecache.mako.js \
-		.build/python-venv/lib/python2.7/site-packages/glob2 \
+		.build/glob2.timestamp \
 		.build/python-venv/bin/mako-render \
 		$(NGEO_DIRECTIVES_PARTIALS_FILES) \
 		$(NGEO_MODULES_PARTIALS_FILES) \

buildtools/deploy.sh

@@ -26,8 +26,8 @@ then
 fi
 
 make .build/ngeo-${GITHUB_USERNAME}-gh-pages \
-    .build/python-venv/lib/python2.7/site-packages/requests \
-    .build/python-venv/lib/python2.7/site-packages/urllib3
+    .build/requests.timestamp \
+    .build/urllib3.timestamp
 
 cd .build/ngeo-${GITHUB_USERNAME}-gh-pages
 git fetch ${GIT_REMOTE_NAME}

buildtools/templatecache.mako.js

@@ -17,12 +17,12 @@
       filenames += glob2.glob("{}/*.html".format(source_folder))
       filenames += glob2.glob("{}/**/*.html".format(source_folder))
       for filename in filenames:
-          f = file(filename)
-          content = unicode(f.read().decode('utf8'))
-          content = re.sub(r"'", "\\'", content)
-          content = htmlmin.minify(content, remove_comments=True)
-          name = os.path.join(dest_folder, filename[len(source_folder) + 1:])
-          _partials[name.replace("\\", "/")] = content
+          with open(filename) as f:
+              content = f.read()
+              content = re.sub(r"'", "\\'", content)
+              content = htmlmin.minify(content, remove_comments=True)
+              name = os.path.join(dest_folder, filename[len(source_folder) + 1:])
+              _partials[name.replace("\\", "/")] = content
 %>\
 /**
  * ngeo template cache.