From b09ee9a90ea670733feb615a0accc6dddc3ae1ea Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Tue, 10 Mar 2020 18:41:51 +0200 Subject: [PATCH 1/4] Back to devel --- docs/HISTORY.txt | 3 +++ eea/cache/version.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 7051643..7540df6 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,6 +1,9 @@ Changelog ========= +9.5-dev0 - (unreleased) +--------------------------- + 9.4 - (2020-03-10) --------------------------- * Bug fix: avoid error when cache key contains utf-8 characters diff --git a/eea/cache/version.txt b/eea/cache/version.txt index 0359f24..85d1dda 100644 --- a/eea/cache/version.txt +++ b/eea/cache/version.txt @@ -1 +1 @@ -9.4 +9.5-dev0 From 55c36c4084d2cf279b6440e7e66a94eb42164e70 Mon Sep 17 00:00:00 2001 From: valentinab25 Date: Thu, 6 May 2021 19:19:34 +0300 Subject: [PATCH 2/4] Fix deprecated sonarqube command parameter --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 65267cf..ea6d759 100644 --- a/Jenkinsfile +++ b/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''' } } From 549d5013bf9eb09fbadee08e986929f126966ab5 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Thu, 16 Dec 2021 20:54:35 +0200 Subject: [PATCH 3/4] Fix package classifiers and python_requires --- docs/HISTORY.txt | 4 +++- eea/cache/version.txt | 2 +- setup.py | 30 +++++++++++++----------------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 7540df6..02cd879 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,8 +1,10 @@ Changelog ========= -9.5-dev0 - (unreleased) +9.5 - (2021-12-16) --------------------------- +* Change: Fix package classifiers and python_requires + [avoinea] 9.4 - (2020-03-10) --------------------------- diff --git a/eea/cache/version.txt b/eea/cache/version.txt index 85d1dda..592f36e 100644 --- a/eea/cache/version.txt +++ b/eea/cache/version.txt @@ -1 +1 @@ -9.5-dev0 +9.5 diff --git a/setup.py b/setup.py index ab9a54f..6c55f00 100644 --- a/setup.py +++ b/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', From 9264767bd74ee241f638eade85c0a6befc6bb339 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Thu, 16 Dec 2021 21:01:56 +0200 Subject: [PATCH 4/4] Remove includeDependencies --- docs/HISTORY.txt | 2 +- eea/cache/configure.zcml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 02cd879..f54e46f 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -3,7 +3,7 @@ Changelog 9.5 - (2021-12-16) --------------------------- -* Change: Fix package classifiers and python_requires +* Change: Plone 6 / pip install ready. Drop includeDependencies [avoinea] 9.4 - (2020-03-10) diff --git a/eea/cache/configure.zcml b/eea/cache/configure.zcml index afbff81..7a38710 100644 --- a/eea/cache/configure.zcml +++ b/eea/cache/configure.zcml @@ -2,7 +2,8 @@ xmlns="http://namespaces.zope.org/zope" i18n_domain="eea"> - + +