Merge pull request #12 from eea/develop

Fix deprecated sonarqube command parameter

Jenkinsfile

@@ -161,7 +161,7 @@ pipeline {
             def nodeJS = tool 'NodeJS11';
             withSonarQubeEnv('Sonarqube') {
                 sh '''sed -i "s|/plone/instance/src/$GIT_NAME|$(pwd)|g" coverage.xml'''
-                sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.python.xunit.skipDetails=true -Dsonar.python.xunit.reportPath=xunit-reports/*.xml -Dsonar.python.coverage.reportPath=coverage.xml -Dsonar.sources=./eea -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
+                sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.python.xunit.skipDetails=true -Dsonar.python.xunit.reportPath=xunit-reports/*.xml -Dsonar.python.coverage.reportPaths=coverage.xml -Dsonar.sources=./eea -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
                 sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
             }
           }

docs/HISTORY.txt

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+9.5 - (2021-12-16)
+---------------------------
+* Change: Plone 6 / pip install ready. Drop includeDependencies
+  [avoinea]
+
 9.4 - (2020-03-10)
 ---------------------------
 * Bug fix: avoid error when cache key contains utf-8 characters

eea/cache/configure.zcml

@@ -2,7 +2,8 @@
   xmlns="http://namespaces.zope.org/zope"
   i18n_domain="eea">
 
-  <includeDependencies package="."/>
+  <include package="plone.memoize" />
+  <include package="plone.uuid" />
 
   <include file="profiles.zcml" />
   <include file="permissions.zcml" />

eea/cache/version.txt

@@ -1 +1 @@
-9.4
+9.5

setup.py

@@ -13,24 +13,20 @@
       long_description_content_type="text/x-rst",
       long_description=open("README.rst").read() + "\n" +
                        open(os.path.join("docs", "HISTORY.txt")).read(),
-      # https://pypi.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
-          "Framework :: Plone :: 4.0",
-          "Framework :: Plone :: 4.1",
-          "Framework :: Plone :: 4.2",
-          "Framework :: Plone :: 4.3",
-          "Framework :: Plone :: 5.1",
-          "Framework :: Plone :: 5.2",
-          "Framework :: Plone :: Addon",
-          "Framework :: Zope :: 2",
-          "Framework :: Zope :: 4",
-          "Framework :: Zope",
-          "Programming Language :: Python :: 2.7",
-          "Programming Language :: Python :: 3.6",
-          "Programming Language :: Python :: 3.7",
-          "Programming Language :: Python",
-          "Topic :: Software Development :: Libraries :: Python Modules",
-          "License :: OSI Approved :: GNU General Public License (GPL)",
+        "Environment :: Web Environment",
+        "Framework :: Plone",
+        "Framework :: Plone :: Addon",
+        "Framework :: Plone :: 4.3",
+        "Framework :: Plone :: 5.2",
+        "Framework :: Plone :: 6.0",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Operating System :: OS Independent",
+        "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
       ],
       keywords='EEA cache memcache Add-ons Plone Zope',
       author='European Environment Agency: IDM2 A-Team',