Skip to content
This repository was archived by the owner on Jan 28, 2026. It is now read-only.

Commit 676df02

Browse files
alecghicaalecghica
authored
Merge pull request #20 from eea/develop
Tests and Linters
2 parents c242037 + 571c9c4 commit 676df02

13 files changed

Lines changed: 458 additions & 245 deletions

File tree

‎Jenkinsfile‎

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,31 @@ pipeline {
1616
"JS Hint": {
1717
node(label: 'docker') {
1818
script {
19-
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
20-
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'''
21-
}
19+
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'''
2220
}
2321
}
2422
},
2523

2624
"CSS Lint": {
2725
node(label: 'docker') {
2826
script {
29-
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
30-
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'''
31-
}
27+
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'''
3228
}
3329
}
3430
},
3531

3632
"PEP8": {
3733
node(label: 'docker') {
3834
script {
39-
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
40-
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'''
41-
}
35+
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'''
4236
}
4337
}
4438
},
4539

4640
"PyLint": {
4741
node(label: 'docker') {
4842
script {
49-
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
50-
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'''
51-
}
43+
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'''
5244
}
5345
}
5446
}
@@ -88,34 +80,13 @@ pipeline {
8880

8981
"PloneSaaS": {
9082
node(label: 'docker') {
91-
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
92-
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'''
93-
}
83+
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'''
9484
}
9585
},
9686

97-
"Plone4": {
98-
node(label: 'docker') {
99-
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
100-
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'''
101-
}
102-
}
103-
104-
},
105-
106-
"Plone5 & Python2": {
107-
node(label: 'docker') {
108-
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
109-
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'''
110-
}
111-
}
112-
},
113-
11487
"Plone5 & Python3": {
11588
node(label: 'docker') {
116-
catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
117-
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'''
118-
}
89+
sh '''docker run -i --rm --name="$BUILD_TAG-plone5py3" -e GIT_BRANCH="$BRANCH_NAME" -e VERSIONS="validate-email=3.0.0rc2" -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'''
11990
}
12091
}
12192
)

‎docs/HISTORY.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Changelog
22
=========
33

4+
2.3 - (2020-05-13)
5+
---------------------------
6+
* Change: Tests and Linters
7+
[valipod]
8+
49
2.2 - (2020-03-03)
510
---------------------------
611
* Change: Add jenkins badges [valentinab25]

‎eea/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
''' eea.userseditor '''
12
try:
23
__import__('pkg_resources').declare_namespace(__name__)
34
except ImportError:

‎eea/userseditor/__init__.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1+
''' eea.userseditor '''
2+
3+
14
def initialize(context):
5+
"""initialize.
6+
7+
:param context:
8+
"""
29
from . import users_editor
310
from eea.userseditor import userdetails
411
constructors = (

‎eea/userseditor/image_processor.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
''' image processor module '''
12
from io import BytesIO
23

34
from PIL import Image

‎eea/userseditor/permissions.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
''' permissions (constants) '''
2+
13
EIONET_EDIT_USERS = 'Eionet edit users'

0 commit comments

Comments
 (0)