Merge pull request #9 from eea/develop

Develop #95849
collective · Jun 22, 2018 · 6532d6c · 6532d6c
2 parents 2caee99 + a850558
commit 6532d6c
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 45 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -46,4 +46,4 @@ official issue register.
 
 * [General GitHub documentation](http://help.github.com/)
 * [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
-* [EEA packages](http://eea.github.io/docs/IT-systems/)
+* [EEA packages](https://eea.github.io/docs/IT-systems/)
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -12,25 +12,25 @@ pipeline {
         parallel(
 
           "ZPT Lint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-zptlint" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 zptlint'''
             }
           },
 
           "JS Lint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-jslint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/jslint4java'''
             }
           },
 
           "PyFlakes": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-pyflakes" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pyflakes'''
             }
           },
 
           "i18n": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name=$BUILD_TAG-i18n -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/i18ndude'''
             }
           }
@@ -43,19 +43,19 @@ pipeline {
         parallel(
 
           "WWW": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-www" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/www-devel /debug.sh bin/test -v -vv -s $GIT_NAME'''
             }
           },
 
           "KGS": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-kgs" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/kgs-devel /debug.sh bin/test --test-path /plone/instance/src/$GIT_NAME -v -vv -s $GIT_NAME'''
             }
           },
 
           "Plone4": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-plone4" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 -v -vv -s $GIT_NAME'''
             }
           }
@@ -68,7 +68,7 @@ pipeline {
         parallel(
 
           "JS Hint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               script {
                 try {
                   sh '''docker run -i --rm --name="$BUILD_TAG-jshint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/jshint'''
@@ -80,7 +80,7 @@ pipeline {
           },
 
           "CSS Lint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               script {
                 try {
                   sh '''docker run -i --rm --name="$BUILD_TAG-csslint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/csslint'''
@@ -92,7 +92,7 @@ pipeline {
           },
 
           "PEP8": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               script {
                 try {
                   sh '''docker run -i --rm --name="$BUILD_TAG-pep8" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pep8'''
@@ -104,7 +104,7 @@ pipeline {
           },
 
           "PyLint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               script {
                 try {
                   sh '''docker run -i --rm --name="$BUILD_TAG-pylint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pylint'''
@@ -127,12 +127,14 @@ pipeline {
         environment name: 'CHANGE_TARGET', value: 'master'
       }
       steps {
-        node(label: 'docker-1.13') {
+        node(label: 'docker') {
           script {
             if ( env.CHANGE_BRANCH != "develop" &&  !( env.CHANGE_BRANCH.startsWith("hotfix")) ) {
                 error "Pipeline aborted due to PR not made from develop or hotfix branch"
             }
-            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_NAME="$GIT_NAME" eeacms/gitflow'''
+           withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) {
+            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_CHANGE_BRANCH="$CHANGE_BRANCH" -e GIT_CHANGE_AUTHOR="$CHANGE_AUTHOR" -e GIT_CHANGE_TITLE="$CHANGE_TITLE" -e GIT_TOKEN="$GITHUB_TOKEN" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_NAME="$GIT_NAME" eeacms/gitflow'''
+           }
           }
         }
       }
@@ -146,7 +148,7 @@ pipeline {
         }
       }
       steps {
-        node(label: 'docker-1.13') {
+        node(label: 'docker') {
           withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'eea-jenkins', usernameVariable: 'EGGREPO_USERNAME', passwordVariable: 'EGGREPO_PASSWORD'],string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),[$class: 'UsernamePasswordMultiBinding', credentialsId: 'pypi-jenkins', usernameVariable: 'PYPI_USERNAME', passwordVariable: 'PYPI_PASSWORD']]) {
             sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e EGGREPO_USERNAME="$EGGREPO_USERNAME" -e EGGREPO_PASSWORD="$EGGREPO_PASSWORD" -e GIT_NAME="$GIT_NAME"  -e PYPI_USERNAME="$PYPI_USERNAME"  -e PYPI_PASSWORD="$PYPI_PASSWORD" -e GIT_ORG="$GIT_ORG" -e GIT_TOKEN="$GITHUB_TOKEN" eeacms/gitflow'''
           }

diff --git a/README.rst b/README.rst
@@ -1,16 +1,20 @@
 =====================
 EEA App Visualization
 =====================
-.. image:: http://ci.eionet.europa.eu/job/eea/job/eea.app.visualization/job/master/badge/icon
-  :target: http://ci.eionet.europa.eu/job/eea/job/eea.app.visualization/job/master/display/redirect
+.. image:: https://ci.eionet.europa.eu/buildStatus/icon?job=eea/eea.app.visualization/develop
+  :target: https://ci.eionet.europa.eu/job/eea/job/eea.app.visualization/job/develop/display/redirect
+  :alt: Develop
+.. image:: https://ci.eionet.europa.eu/buildStatus/icon?job=eea/eea.app.visualization/master
+  :target: https://ci.eionet.europa.eu/job/eea/job/eea.app.visualization/job/master/display/redirect
+  :alt: Master
 
 `EEA App Visualization`_ is the Core API for `EEA Daviz`_. This package was added
 in order to be able to use `EEA Google Charts`_ without `EEA Exhibit`_ and
 viceversa or any other visualization library as a standalone visualization
 or as part of a bundle package (`eea.daviz`_)
 
 
-.. image:: http://eea.github.com/_images/eea.daviz.layers.svg
+.. image:: https://eea.github.io/_images/eea.daviz.layers.svg
 
 
 This package as standalone is just an API, you have to either install
@@ -62,7 +66,7 @@ Dependencies
 * collective.js.jqueryui > 1.9 (Plone 4.3+)
 * eea.cache > 7.0 (optional)
 
-.. image:: http://eea.github.com/_images/eea.daviz.dependencies.svg
+.. image:: https://eea.github.io/_images/eea.daviz.dependencies.svg
 
 
 Live demo
@@ -101,8 +105,8 @@ Links
 
 1. Simile Wiki - Exhibit 2.0: http://simile.mit.edu/wiki/Exhibit
 2. Simile widgets: http://www.simile-widgets.org/exhibit
-3. EEA Daviz howto: http://taskman.eionet.europa.eu/projects/zope/wiki/HowToDaviz
-4. EEA Daviz backlog wiki: http://taskman.eionet.europa.eu/projects/zope/wiki/DaViz
+3. EEA Daviz howto: https://taskman.eionet.europa.eu/projects/zope/wiki/HowToDaviz
+4. EEA Daviz backlog wiki: https://taskman.eionet.europa.eu/projects/zope/wiki/DaViz
 5. Google charts: http://code.google.com/apis/chart/
 
 
@@ -112,14 +116,14 @@ Funding
 EEA_ - European Environment Agency (EU)
 
 
-.. _EEA: http://www.eea.europa.eu/
-.. _`EEA Daviz`: http://eea.github.com/docs/eea.daviz
-.. _`EEA Google Charts`: http://eea.github.com/docs/eea.googlecharts
-.. _`EEA Exhibit`: http://eea.github.com/docs/eea.exhibit
-.. _`eea.daviz`: http://eea.github.com/docs/eea.daviz
-.. _`eea.googlecharts`: http://eea.github.com/docs/eea.googlecharts
-.. _`eea.exhibit`: http://eea.github.com/docs/eea.exhibit
-.. _`eea.app.visualization`: http://eea.github.com/docs/eea.app.visualization
-.. _`plone.recipe.zope2instance`: http://pypi.python.org/pypi/plone.recipe.zope2instance
-.. _`zc.buildout`: http://pypi.python.org/pypi/zc.buildout
-.. _`EEA App Visualization`: http://eea.github.com/docs/eea.app.visualization
+.. _EEA: https://www.eea.europa.eu/
+.. _`EEA Daviz`: https://eea.github.io/docs/eea.daviz
+.. _`EEA Google Charts`: https://eea.github.io/docs/eea.googlecharts
+.. _`EEA Exhibit`: https://eea.github.io/docs/eea.exhibit
+.. _`eea.daviz`: https://eea.github.io/docs/eea.daviz
+.. _`eea.googlecharts`: https://eea.github.io/docs/eea.googlecharts
+.. _`eea.exhibit`: https://eea.github.io/docs/eea.exhibit
+.. _`eea.app.visualization`: https://eea.github.io/docs/eea.app.visualization
+.. _`plone.recipe.zope2instance`: https://pypi.python.org/pypi/plone.recipe.zope2instance
+.. _`zc.buildout`: https://pypi.python.org/pypi/zc.buildout
+.. _`EEA App Visualization`: https://eea.github.io/docs/eea.app.visualization
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+11.9 - (2018-06-20)
+---------------------
+* Change: updated URLs pointing to eea.europa.eu with https://
+  [alecghica refs #95849]
+
 11.8 - (2018-03-14)
 -------------------
 * Change: load customized collective.js.jqueryui on eea context for view pages

diff --git a/eea/app/visualization/README.txt b/eea/app/visualization/README.txt
@@ -7,7 +7,7 @@ viceversa or any other visualization library as a standalone visualization
 or as part of a bundle package (`eea.daviz`_)
 
 
-.. image:: http://eea.github.com/_images/eea.daviz.layers.svg
+.. image:: https://eea.github.io/_images/eea.daviz.layers.svg
 
 
 This package as standalone is just an API, you have to either install
@@ -35,11 +35,11 @@ Authors
 
   EEA_ - European Environment Agency (EU)
 
-.. _EEA: http://www.eea.europa.eu/
-.. _`EEA App Visualization`: http://eea.github.com/docs/eea.app.visualization
-.. _`EEA Daviz`: http://eea.github.com/docs/eea.daviz
-.. _`EEA Google Charts`: http://eea.github.com/docs/eea.googlecharts
-.. _`EEA Exhibit`: http://eea.github.com/docs/eea.exhibit
-.. _`eea.daviz`: http://eea.github.com/docs/eea.daviz
-.. _`eea.googlecharts`: http://eea.github.com/docs/eea.googlecharts
-.. _`eea.exhibit`: http://eea.github.com/docs/eea.exhibit
+.. _EEA: https://www.eea.europa.eu/
+.. _`EEA App Visualization`: https://eea.github.io/docs/eea.app.visualization
+.. _`EEA Daviz`: https://eea.github.io/docs/eea.daviz
+.. _`EEA Google Charts`: https://eea.github.io/docs/eea.googlecharts
+.. _`EEA Exhibit`: https://eea.github.io/docs/eea.exhibit
+.. _`eea.daviz`: https://eea.github.io/docs/eea.daviz
+.. _`eea.googlecharts`: https://eea.github.io/docs/eea.googlecharts
+.. _`eea.exhibit`: https://eea.github.io/docs/eea.exhibit
diff --git a/eea/app/visualization/browser/zpt/edit.pt b/eea/app/visualization/browser/zpt/edit.pt
@@ -34,7 +34,7 @@
         <div class="daviz-warning-helper" i18n:translate="">
             Check these
             <tal:block i18n:name="data-examples">
-                <a target="_blank" href="http://www.eea.europa.eu/data-and-maps/daviz/learn-more/examples" i18n:translate="">data examples</a>
+                <a target="_blank" href="https://www.eea.europa.eu/data-and-maps/daviz/learn-more/examples" i18n:translate="">data examples</a>
             </tal:block>
             or read
             <tal:block i18n:name="prepare-data">

diff --git a/eea/app/visualization/version.txt b/eea/app/visualization/version.txt
@@ -1 +1 @@
-11.8
+11.9
diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
       description="Visualization API",
       long_description=open("README.rst").read() + "\n" +
                        open(os.path.join("docs", "HISTORY.txt")).read(),
-      # http://pypi.python.org/pypi?%3Aaction=list_classifiers
+      # https://pypi.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
           "Framework :: Zope2",
           "Framework :: Plone",
@@ -29,7 +29,7 @@
       keywords='EEA app visualization Add-ons Plone Zope',
       author='European Environment Agency: IDM2 A-Team',
       author_email="[email protected]",
-      download_url="http://pypi.python.org/pypi/eea.app.visualization",
+      download_url="https://pypi.python.org/pypi/eea.app.visualization",
       url='https://github.com/collective/eea.app.visualization',
       license='GPL',
       packages=find_packages(exclude=['ez_setup']),