Skip to content

Commit

Permalink
Merge pull request #18 from eea/develop
Browse files Browse the repository at this point in the history 
Refs #110159
  • Loading branch information
@valentinab25
valentinab25 authored Feb 28, 2020
2 parents e8ae566 + a1b5340 commit ff963d5
Show file tree
Hide file tree
Showing 4 changed files with 131 additions and 73 deletions.
61 changes: 37 additions & 24 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pipeline {

environment {
GIT_NAME = "eea.userseditor"
GIT_HISTORYFILE = "docs/HISTORY.txt"
SONARQUBE_TAGS = "plone5demo.eionet.europa.eu"
}

Expand All @@ -15,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}"
}
}
}
Expand All @@ -27,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}"
}
}
}
Expand All @@ -39,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}"
}
}
}
Expand All @@ -51,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}"
}
}
}
Expand All @@ -76,13 +69,7 @@ pipeline {

"JS Lint": {
node(label: 'docker') {
script {
try {
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'''
} catch (err) {
echo "Unstable: ${err}"
}
}
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'''
}
},

Expand All @@ -94,20 +81,46 @@ pipeline {
)
}
}

/* stage('Tests') {
stage('Tests') {
steps {
parallel(

"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'''
}
}
},

"Plone4": {
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'''
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
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'''
}
}

},

"Plone5 & Python2": {
node(label: 'docker') {
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
sh '''docker run -i --rm --name="$BUILD_TAG-plone5py2" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -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" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:5-python3 -v -vv -s $GIT_NAME'''
}
}
}
)
}
}*/

}

stage('Report to SonarQube') {
when {
Expand Down
125 changes: 83 additions & 42 deletions CHANGELOG.rst → docs/HISTORY.txt
View file
Original file line number Diff line number Diff line change
@@ -1,77 +1,107 @@
Changelog
=========

2.1 - (2020-02-26)
---------------------------
* Feature: updated Jenkins pipeline
[alecghica refs #110159]

2.0 (2020-02-13)
--------------------
* fix fetching of error message [dumitval]
* remove unused import [dumitval]
* Fix decode error on user details page [dumitval]
* bugfix in days since password expired computation [dumitval]
* protect user photo (view) [dumitval]
* add jquery_ui for the datepicker [dumitval]
* remove old links to jquery [dumitval]
* bugfix in current role listing on user details [dumtival]
* use select2 instead of selectize [dumitval]
* Switch UserDetails default view to browser view [tiberich]
* allow members of eea or eionet roles to view roles of other members [dumitval]
* fix for mandatory status of reasonToCreate in profile editor [dumitval]
* handle deleted users in the Account changelog [dumitval]
* get password max age from the dedicated LDAP user [dumitval]
* fix fetching of error message
[dumitval]
* remove unused import
[dumitval]
* Fix decode error on user details page
[dumitval]
* bugfix in days since password expired computation
[dumitval]
* protect user photo (view)
[dumitval]
* add jquery_ui for the datepicker
[dumitval]
* remove old links to jquery
[dumitval]
* bugfix in current role listing on user details
[dumtival]
* use select2 instead of selectize
[dumitval]
* Switch UserDetails default view to browser view
[tiberich]
* allow members of eea or eionet roles to view roles of other members
* fix for mandatory status of reasonToCreate in profile editor
[dumitval]
* handle deleted users in the Account changelog
[dumitval]
* get password max age from the dedicated LDAP user
[dumitval]
* bind with special user credentials on Eionet User Editor
(no longer using authenticated user's credentials) [dumitval]
(no longer using authenticated user's credentials)
[dumitval]

1.1.38 (2019-03-05)
--------------------
* add and use bind credentials for unrestricted search [dumitval]
* add and use bind credentials for unrestricted search
[dumitval]

1.1.37 (2018-06-12)
--------------------
* avoid crash if uid is not sent to the user details page [dumitval]
* avoid crash if uid is not sent to the user details page
[dumitval]

1.1.36 (2018-04-27)
--------------------
* add secondary ldap bind auth for unlimited search [dumitval]
* add secondary ldap bind auth for unlimited search
[dumitval]

1.1.35 (2018-03-14)
--------------------
* raise NotFound for disabled users (user directory) [dumitval]
* raise NotFound for disabled users (user directory)
[dumitval]

1.1.34 (2018-02-12)
--------------------
* show the date of the last password change in user details page
refs #92555 [dumitval]
[dumitval refs #92555]

1.1.33 (2018-02-09)
--------------------
* clearly mark an invalid organisation setting on user details [dumitval]
* clearly mark an invalid organisation setting on user details
[dumitval]

1.1.32 (2017-06-19)
--------------------
* password reset supports stricter password policy in ldap [dumitval]
* password reset supports stricter password policy in ldap
[dumitval]

1.1.31 (2016-11-22)
--------------------
* add os environ to zope environment [dumitval]
* add os environ to zope environment
[dumitval]

1.1.30 (2016-11-21)
--------------------
* bugfix for users changing Organisation [dumitval]
* Bug fix: fixed for users changing Organisation
[dumitval]

1.1.29 (2016-10-10)
--------------------
* show roles at the time a user was disabled [dumitval]
* show roles at the time a user was disabled
[dumitval]

1.1.28 (2016-10-03)
--------------------
* add organisation title in national language to the organisation
selection list [dumitval]
selection list
[dumitval]
* add Organisation title (if valid link available)
and Department to the user details page [dumitval]
and Department to the user details page
[dumitval]

1.1.27 (2015-11-24)
--------------------
* fix crash in user details when organisation from user's history was
deleted [dumitval]
* fix crash in user details when organisation from user's history was deleted
[dumitval]

1.1.26 (2015-06-08)
--------------------
Expand Down Expand Up @@ -177,7 +207,8 @@ Changelog

1.1.7 (2014-06-10)
--------------------
* Bugfix related to the encoding of role descriptions [dumitval]
* Bugfix related to the encoding of role descriptions
[dumitval]

1.1.6 (2014-05-12)
--------------------
Expand All @@ -194,7 +225,8 @@ Changelog

1.1.4 (2014-03-07)
--------------------
* added edit link for managers on user index [dumitval]
* added edit link for managers on user index
[dumitval]
* Feature: added support for pending membership to organisations
[tiberich #15263]
* Feature: improved log entry views by compacting multiple entries
Expand All @@ -203,35 +235,44 @@ Changelog

1.1.3 (2014-01-10)
--------------------
* remove new password from confirmation mail [dumitval]
* remove new password from confirmation mail
[dumitval]

1.1.2 (2013-10-29)
--------------------
* wording in templates [dumitval]
* wording in templates
[dumitval]

1.1.1 (2013-09-05)
--------------------
* #15628; api change in eea.usersdb [simiamih]
* api change in eea.usersdb
[simiamih refs #15628]

1.1.0 (2013-02-21)
--------------------
* feature: compare userprofiles [simiamih]
* feature: object to display Eionet Member public page [simiamih]
* Feature: compare userprofiles
[simiamih]
* Feature: object to display Eionet Member public page
[simiamih]

1.0.3 (2012-10-29)
--------------------
* removed Circa encoding validation [simiamih]
* removed Circa encoding validation
[simiamih]

1.0.2 (2012-07-19)
--------------------
* fixed circa agent _user_id call [simiamih]
* Bug fix: fixed circa agent _user_id call
[simiamih]

1.0.1 (2012-07-19)
--------------------
* Send mail when changing password [bogdatan]
* Send mail when changing password
[bogdatan]

1.0.0 (2012-06-22)
--------------------
* "EIONET" string configurable by env "NETWORK_NAME" [simiamih]
* updating info in legacy ldap for nonexisting user fails silently [simiamih]

* "EIONET" string configurable by env "NETWORK_NAME"
[simiamih]
* updating info in legacy ldap for nonexisting user fails silently
[simiamih]
2 changes: 1 addition & 1 deletion eea/userseditor/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0
2.1
16 changes: 10 additions & 6 deletions setup.py
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
import os
from os.path import join
from setuptools import setup, find_packages

NAME = "eea.userseditor"
PATH = NAME.split('.') + ['version.txt']
VERSION = open(os.path.join(*PATH)).read().strip()
VERSION = open(join(*PATH)).read().strip()

setup(name=NAME,
version=VERSION,
description="EEA Users Editor",
long_description_content_type="text/x-rst",
long_description=(
open("README.rst").read() + "\n" +
open("CHANGELOG.rst").read()
open(join("docs", "HISTORY.txt")).read()
),
author='Eau de Web',
author_email='[email protected]',
packages=find_packages(),
include_package_data=True,
platforms=['OS Independent'],
zip_safe=False,
install_requires=['eea.usersdb>=1.3.40', 'deform', 'phonenumbers',
'six'],
)
install_requires=[
'eea.usersdb>=1.3.40',
'deform',
'phonenumbers',
'six'
],
)

0 comments on commit ff963d5

Please sign in to comment.