Merge pull request #21 from eea/develop

Develop #110159
eea · Feb 28, 2020 · 3640252 · 3640252
2 parents 6d7c8e3 + 5c336b0
commit 3640252
Show file tree

Hide file tree

Showing 10 changed files with 128 additions and 95 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -16,10 +16,8 @@ pipeline {
           "JS Hint": {
             node(label: 'docker') {
               script {
-                try {
+                catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
                   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'''
-                } catch (err) {
-                  echo "Unstable: ${err}"
                 }
               }
             }
@@ -28,10 +26,8 @@ pipeline {
           "CSS Lint": {
             node(label: 'docker') {
               script {
-                try {
+                catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
                   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'''
-                } catch (err) {
-                  echo "Unstable: ${err}"
                 }
               }
             }
@@ -40,10 +36,8 @@ pipeline {
           "PEP8": {
             node(label: 'docker') {
               script {
-                try {
+                catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
                   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'''
-                } catch (err) {
-                  echo "Unstable: ${err}"
                 }
               }
             }
@@ -52,10 +46,8 @@ pipeline {
           "PyLint": {
             node(label: 'docker') {
               script {
-                try {
+                catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
                   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'''
-                } catch (err) {
-                  echo "Unstable: ${err}"
                 }
               }
             }
@@ -103,15 +95,11 @@ pipeline {
           "WWW": {
             node(label: 'docker') {
               script {
-                try {
-                  sh '''docker run -i --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 coverage'''
-                  sh '''mkdir -p xunit-reports; docker cp $BUILD_TAG-www:/plone/instance/parts/xmltestreport/testreports/. xunit-reports/'''
-                  stash name: "xunit-reports", includes: "xunit-reports/*.xml"
-                  sh '''docker cp $BUILD_TAG-www:/plone/instance/src/$GIT_NAME/coverage.xml coverage.xml'''
-                  stash name: "coverage.xml", includes: "coverage.xml"
-                } finally {
-                  sh '''docker rm -v $BUILD_TAG-www'''
-                }
+                sh '''docker run -i --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 coverage'''
+                sh '''mkdir -p xunit-reports; docker cp $BUILD_TAG-www:/plone/instance/parts/xmltestreport/testreports/. xunit-reports/'''
+                stash name: "xunit-reports", includes: "xunit-reports/*.xml"
+                sh '''docker cp $BUILD_TAG-www:/plone/instance/src/$GIT_NAME/coverage.xml coverage.xml'''
+                stash name: "coverage.xml", includes: "coverage.xml"
                 junit 'xunit-reports/*.xml'
               }
             }
@@ -127,7 +115,30 @@ pipeline {
             node(label: 'docker') {
               sh '''docker run -i --rm --name="$BUILD_TAG-plone4" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME[test]" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 -v -vv -s $GIT_NAME'''
             }
+          },
+
+          "Plone5 & Python2": {
+            node(label: 'docker') {
+              sh '''docker run -i --rm --name="$BUILD_TAG-plone5py2" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME[test]" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:5 -v -vv -s $GIT_NAME'''
+            }
+          },
+
+          "Plone5 & Python3": {
+            node(label: 'docker') {
+              catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
+                sh '''docker run -i --rm --name="$BUILD_TAG-plone5py3" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME[test]" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:5-python3 -v -vv -s $GIT_NAME'''
+              }
+            }
+          },
+
+          "PloneSaaS": {
+            node(label: 'docker') {
+              catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
+                sh '''docker run -i --rm --name="$BUILD_TAG-plonesaas" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plonesaas-devel /debug.sh bin/test --test-path /plone/instance/src/$GIT_NAME -v -vv -s $GIT_NAME'''
+              }
+            }
           }
+
         )
       }
     }

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,7 @@
-include *.rst
-recursive-include docs *
-include *.py
-include version.txt
-global-exclude *py[co]
-
+include *.md *.rst *.txt
+graft docs
+graft version.txt
+global-exclude *pyc
+global-exclude *~
+global-exclude *.un~
 global-include *.mo
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,13 +1,20 @@
 Changelog
 =========
 
+3.5 - (2020-02-26)
+--------------------------
+* Feature: merged source code so it now works on both Python 2 and Python 3
+  [alecghica refs #110159]
+* Feature: updated Jenkins pipeline
+  [alecghica refs #110159]
+
 3.4 - (2019-01-28)
----------------------
+--------------------------
 * Jenkins: Add sonarqube step
   [avoinea refs #101552]
 
 3.3 - (2018-12-11)
----------------------
+--------------------------
 * Feature: when building the request from an endpoint that followed redirects
   the query works fine now
   [alecghica refs #100666]

diff --git a/setup.py b/setup.py
@@ -23,11 +23,12 @@
       keywords="Sparql Client",
       author='European Environment Agency: IDM2 A-Team',
       author_email='eea-edw-a-team-alerts@googlegroups.com',
+      long_description_content_type='text/x-rst',
       url='https://github.com/eea/sparql-client',
       license="MPL",
       py_modules =['sparql'],
       install_requires=[
-          'eventlet',
+          'eventlet', 'six'
       ],
       extras_require={
             'test': [

diff --git a/sparql-client/tests/genquery.py b/sparql-client/tests/genquery.py
@@ -1,27 +1,27 @@
 
-import urllib,urllib2
+import six.moves.urllib.request, six.moves.urllib.parse, six.moves.urllib.error,six.moves.urllib.request,six.moves.urllib.error,six.moves.urllib.parse
 
 statement = open("code.rq").read()
 query = { 'query': statement,
  'format':'xml' }
 
-qs = urllib.urlencode(query)
-print qs
-url = "http://dbpedia.org/sparql?" + urllib.urlencode(query)
+qs = six.moves.urllib.parse.urlencode(query)
+print(qs)
+url = "http://dbpedia.org/sparql?" + six.moves.urllib.parse.urlencode(query)
 
-opener = urllib2.build_opener(urllib2.HTTPHandler)
-urllib2.install_opener(opener)
-req = urllib2.Request(url)
+opener = six.moves.urllib.request.build_opener(six.moves.urllib.request.HTTPHandler)
+six.moves.urllib.request.install_opener(opener)
+req = six.moves.urllib.request.Request(url)
 #req.add_header("Accept", "application/xml")
 
 try:
-    conn = urllib2.urlopen(req, timeout=10)
+    conn = six.moves.urllib.request.urlopen(req, timeout=10)
 except Exception:
     conn = None
 
 if not conn:
-    raise IOError, "Failure in open"
+    raise IOError("Failure in open")
 
 data = conn.read()
 conn.close()
-print data
+print(data)
diff --git a/sparql-client/tests/testconversion.py b/sparql-client/tests/testconversion.py
@@ -6,6 +6,7 @@
 import sparql
 import os.path
 from mock import Mock, patch
+from six.moves import map
 
 _dirname = os.path.dirname(__file__)
 
@@ -25,11 +26,11 @@ def test_date(self):
                           u'foundingDate', u'timeexample'],
                          self.result.variables)
 
-        rows = map(sparql.unpack_row, self.result.fetchall())
+        rows = list(map(sparql.unpack_row, self.result.fetchall()))
         row0 = rows[0]
 
         self.assertEqual(type(row0[2]), datetime)
-        self.assertEqual(datetime(2009, 11, 02, 14, 31, 40), row0[2])
+        self.assertEqual(datetime(2009, 11, 0o2, 14, 31, 40), row0[2])
 
         self.assertEqual(type(row0[3]), date)
         self.assertEqual(date(1991, 8, 20), row0[3])
@@ -40,7 +41,7 @@ def test_date(self):
     def test_decimal(self):
         import decimal
         self.assertEqual(self.result.variables[1], 'decimalData')
-        row0 = map(sparql.unpack_row, self.result.fetchall())[0]
+        row0 = list(map(sparql.unpack_row, self.result.fetchall()))[0]
         decval = row0[1]
         self.assertEqual(type(decval), decimal.Decimal)
         self.assertEqual(str(decval), "123.456")

diff --git a/sparql-client/tests/testhttp.py b/sparql-client/tests/testhttp.py
@@ -51,7 +51,7 @@ def _get_response(self, opener, request, buf, timeout):
 
     def _read_response(self, response, buf, timeout):
         try:
-            from urlparse import parse_qs
+            from six.moves.urllib.parse import parse_qs
         except ImportError:
             from cgi import parse_qs
         query = parse_qs(self.querystring).get('query', [''])[0]

diff --git a/sparql-client/tests/testparser.py b/sparql-client/tests/testparser.py
@@ -6,6 +6,8 @@
 import os.path
 from mock import patch
 from xml.dom import pulldom
+from six.moves import map
+import six
 
 def _open_datafile(name):
     return open(os.path.join(os.path.dirname(__file__), name))
@@ -31,7 +33,7 @@ def test_unpack(self):
         result = sparql._ResultsParser(resultfp)
         self.assertEqual([u'eeaURI', u'gdpTotal', u'eeacode', u'nutscode', u'faocode', u'gdp', u'name'], result.variables)
 
-        rows = map(sparql.unpack_row, result.fetchall())
+        rows = list(map(sparql.unpack_row, result.fetchall()))
         row0 = rows[0]
         self.assertEqual(u"http://rdfdata.eionet.europa.eu/eea/countries/BE", row0[0])
         # XSD_FAO_MILLION unpacked as string
@@ -93,7 +95,7 @@ def test_national(self):
         row0 = rows[0]
         self.assertEqual("http://aims.fao.org/aos/geopolitical.owl#Germany", str(row0[0]))
         self.assertEqual(sparql.IRI(u"http://aims.fao.org/aos/geopolitical.owl#Germany"), row0[0])
-        self.assertEqual(u"Германия", unicode(row0[2]))
+        self.assertEqual(u"Германия", six.text_type(row0[2]))
 
     def test_big_text(self):
         # `xml.dom.pulldom` may return several text nodes within a single
@@ -117,7 +119,7 @@ def test_invalid_fetchone(self, mocked_element):
         result = sparql._ResultsParser(resultfp)
         setattr(result, 'events', result._fetchhead())
         for row in result.fetchone():
-          print row
+          print(row)
 
 
 if __name__ == '__main__':