Merge pull request #27 from eea/develop

Develop #111217

Jenkinsfile

@@ -107,35 +107,31 @@ pipeline {
 
  "KGS": {
  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'''
+ sh '''docker pull eeacms/kgs-devel;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') {
- 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'''
+ sh '''docker pull eeacms/plone-test:4;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'''
+ sh '''docker pull eeacms/plone-test:5;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'''
- }
+ sh '''docker pull eeacms/plone-test:5-python3;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'''
- }
+ sh '''docker pull eeacms/plonesaas-devel;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'''
  }
  }
 

README.rst

@@ -102,6 +102,7 @@ Literals. These can take a data type or a language code.
 Blank node. Similar to IRI but lacks a stable identifier.
 
 Query utilities
+===============
 
 ``class sparql.Service(endpoint, qs_encoding='utf-8')``
 

__init__.py

@@ -1 +0,0 @@
-

docs/HISTORY.txt

@@ -1,9 +1,16 @@
 Changelog
 =========
 
+3.8 - (2020-06-17)
+---------------------------
+* Bug fix: fixed Python3 query execution
+ [alecghica refs #111217]
+* Feature: PEP8 and linting
+ [alecghica refs #111217]
+
 3.7 - (2020-06-17)
 ---------------------------
-* Feature: added the documentation originally found under eionet.euripa.eu
+* Feature: added the documentation originally found under eionet.europa.eu
  [alecghica refs #111217]
 
 3.6 - (2020-03-03)

docs/conf.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from sparql import __version__ as version
 
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
 
@@ -9,7 +10,6 @@
 project = u'sparql-client'
 copyright = u'2011, European Environment Agency'
 
-from sparql import __version__ as version
 release = version
 
 exclude_patterns = ['_build']

setup.py

@@ -11,12 +11,14 @@
 setup(name=NAME,
  version=VERSION,
  description='Python API to query a SPARQL endpoint',
- long_description = open('README.rst').read() + "\n\n" +
-  open(os.path.join("docs", "HISTORY.txt")).read(),
+ long_description=open('README.rst').read() + "\n\n" + \
+ open(os.path.join("docs", "HISTORY.txt")).read(),
  classifiers=[
  'Environment :: Console',
  'Intended Audience :: Developers',
  "Programming Language :: Python",
+ "Programming Language :: Python :: 3.7",
+ "Programming Language :: Python :: 2.7",
  'Operating System :: OS Independent',
  'Topic :: Software Development :: Libraries :: Python Modules',
  ],
@@ -26,9 +28,11 @@
  long_description_content_type='text/x-rst',
  url='https://github.com/eea/sparql-client',
  license="MPL",
- py_modules =['sparql'],
+ py_modules=['sparql'],
  install_requires=[
- 'eventlet', 'six'
+ 'eventlet',
+ 'six',
+ 'dnspython < 2.0.0',
  ],
  extras_require={
  'test': [

sparql-client/tests/genquery.py

@@ -1,26 +1,35 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
-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
+import six.moves.urllib.request
+import six.moves.urllib.parse
+import six.moves.urllib.error
+import six.moves.urllib.request
+import six.moves.urllib.error
+import six.moves.urllib.parse
 
-statement = open("code.rq").read()
-query = { 'query': statement,
- 'format':'xml' }
+statement = open('code.rq').read()
+query = {'query': statement, 'format': 'xml'}
 
 qs = six.moves.urllib.parse.urlencode(query)
 print(qs)
-url = "http://dbpedia.org/sparql?" + six.moves.urllib.parse.urlencode(query)
+url = 'http://dbpedia.org/sparql?' \
+ + six.moves.urllib.parse.urlencode(query)
 
-opener = six.moves.urllib.request.build_opener(six.moves.urllib.request.HTTPHandler)
+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")
+
+# req.add_header("Accept", "application/xml")
 
 try:
  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()

sparql-client/tests/testconversion.py

@@ -3,8 +3,8 @@
 
 import unittest
 from datetime import datetime, date, time
-import sparql
 import os.path
+import sparql
 from mock import Mock, patch
 from six.moves import map