Skip to content

Commit da76307

Browse files
authored
Merge pull request ai4os#71 from indigo-dc/fix_utf8
Fix CI/CD
2 parents 1947c71 + 28bb085 commit da76307

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

Jenkinsfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/groovy
22

3-
@Library(['github.com/indigo-dc/jenkins-pipeline-library@1.3.5']) _
3+
@Library(['github.com/indigo-dc/jenkins-pipeline-library@release/1.4.0']) _
44

55
pipeline {
66
agent {
@@ -74,7 +74,6 @@ pipeline {
7474
}
7575
}
7676

77-
/*
7877
stage('Dependency check') {
7978
agent {
8079
label 'docker-build'
@@ -85,7 +84,7 @@ pipeline {
8584
}
8685
post {
8786
always {
88-
OWASPDependencyCheckPublish()
87+
OWASPDependencyCheckPublish(report='**/dependency-check-report.xml')
8988
HTMLReport(
9089
"$WORKSPACE/DEEPaaS/deepaas",
9190
'dependency-check-report.html',
@@ -94,7 +93,6 @@ pipeline {
9493
}
9594
}
9695
}
97-
*/
9896

9997
stage('DockerHub delivery') {
10098
when {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The DEEPaaS documentation is hosted on [Read the Docs](https://deepaas.readthedo
4343
If you are using this software and want to cite it in any work, please use the
4444
following:
4545

46-
> López García, A. "DEEPaaS API: a REST API for Machine Learning and
46+
> Lopez Garcia, A. "DEEPaaS API: a REST API for Machine Learning and
4747
> Deep Learning models". In: _Journal of Open Source Software_ 4(42) (2019),
4848
> pp. 1517. ISSN: 2475-9066. DOI: [10.21105/joss.01517](https://doi.org/10.21105/joss.01517)
4949

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# The order of packages is significant, because pip processes them in the order
22
# of appearance. Changing the order has an impact on the overall integration
33
# process, which may cause wedges in the gate later.
4-
pbr>=1.8
4+
pbr>=4.1.0
55
six>=1.9.0 # MIT
66

77
oslo.log>=1.8.0 # Apache-2.0

setup.cfg

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ project_urls =
1212
Bug Tracker = https://github.com/indigo-dc/deepaas/issues
1313
Documentation = https://deepaas.readthedocs.io/
1414

15+
python-requires = >=3.6
16+
1517
license = Apache-2
1618
license_file = LICENSE
1719

@@ -37,9 +39,6 @@ classifier =
3739
Topic :: Scientific/Engineering :: Information Analysis
3840
Topic :: Scientific/Engineering :: Interface Engine/Protocol Translator
3941

40-
[bdist_wheel]
41-
universal = 1
42-
4342
[files]
4443
packages =
4544
deepaas

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
import setuptools
1515

1616
setuptools.setup(
17-
setup_requires=['pbr>=1.8'],
17+
setup_requires=['pbr>=5.3.0'],
1818
pbr=True)

0 commit comments

Comments
 (0)