Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jppy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
km3py
jppy
Commits
be94facc
Commit
be94facc
authored
5 years ago
by
Tamas Gal
Browse files
Options
Downloads
Patches
Plain Diff
Fix CI
parent
bcf9a053
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+107
-23
107 additions, 23 deletions
.gitlab-ci.yml
setup.py
+6
-1
6 additions, 1 deletion
setup.py
with
113 additions
and
24 deletions
.gitlab-ci.yml
+
107
−
23
View file @
be94facc
...
...
@@ -9,7 +9,6 @@ variables:
cache
:
paths
:
-
.cache/pip
-
venv/
key
:
"
$CI_COMMIT_REF_SLUG"
...
...
@@ -23,9 +22,12 @@ stages:
.virtualenv_template
:
&virtualenv_definition
|
pip install -U pip setuptools wheel
python -m venv venv
[ ! -d 'venv' ] &&
python -m venv venv
source venv/bin/activate
pip install .
JPP_DIR=jpp pip install .
.dependencies_template
:
&dependencies_template
|
[ ! -d 'jpp' ] && git clone https://$KM3NET_USERNAME:$KM3NET_PASSWORD@git.km3net.de/common/jpp.git
.junit_template
:
&junit_definition
...
...
@@ -38,45 +40,128 @@ download-pdfs:
image
:
docker.km3net.de/base/ci-helper:1
stage
:
init
script
:
-
'
[
!
-d
"pdfs"
]
&&
mkdir
pdfs
&&
cd
pdfs
&&
for
i
in
{1..6};
do
wget
"http://pi1139.physik.uni-erlangen.de/data/latest/J${i}
j
.dat"
;
done'
-
'
[
!
-d
"pdfs"
]
&&
mkdir
pdfs
&&
cd
pdfs
&&
for
i
in
{1..6};
do
wget
"http://pi1139.physik.uni-erlangen.de/data/latest/J${i}
p
.dat"
;
done'
artifacts
:
paths
:
-
pdfs
cache
:
paths
:
-
pdfs
build-jpp-master
:
build-jpp-master-py35
:
image
:
docker.km3net.de/base/python:3.5
stage
:
build
script
:
-
*dependencies_template
-
*virtualenv_definition
cache
:
paths
:
-
venv
artifacts
:
paths
:
-
venv
build-jpp-master-py36
:
image
:
docker.km3net.de/base/python:3.6
stage
:
build
script
:
-
*dependencies_template
-
*virtualenv_definition
cache
:
paths
:
-
venv
artifacts
:
paths
:
-
venv
build-jpp-master-py37
:
image
:
docker.km3net.de/base/python:3.7
stage
:
build
script
:
-
*dependencies_template
-
*virtualenv_definition
cache
:
paths
:
-
venv
artifacts
:
paths
:
-
venv
build-jpp-master-py38
:
image
:
docker.km3net.de/base/python:3.8
stage
:
build
script
:
-
*dependencies_template
-
*virtualenv_definition
-
ls -al pdfs
cache
:
paths
:
-
venv
artifacts
:
paths
:
-
venv
test-jpp-master-py35
:
image
:
docker.km3net.de/base/python:3.5
stage
:
test
script
:
-
ls -al
-
ls -al venv
-
source venv/bin/activate
-
which python
-
pip list
-
pip install -U pytest
-
pytest
dependencies
:
-
build-jpp-master-py35
-
download-pdfs
test-jpp-
12.1.0
:
image
:
docker.km3net.de/
jpp:v12-1-0
test-jpp-
master-py36
:
image
:
docker.km3net.de/
base/python:3.6
stage
:
test
script
:
-
*virtualenv_definition
-
"
[
!
-d
'pdfs'
]
&&
mkdir
pdfs
&&
JMakePDF.sh
-W
$(pwd)/pdfs
-w
http://pi1139.physik.uni-erlangen.de/data/latest/
-C"
-
ls -al
-
ls -al venv
-
source venv/bin/activate
-
which python
-
pip list
-
pip install -U pytest
-
pytest
cache
:
paths
:
-
pdfs
/
dependencies
:
-
build-jpp-master-py36
-
download-
pdfs
test-jpp-
latest
:
image
:
docker.km3net.de/
jpp:latest
test-jpp-
master-py37
:
image
:
docker.km3net.de/
base/python:3.7
stage
:
test
script
:
-
*virtualenv_definition
-
"
[
!
-d
'pdfs'
]
&&
mkdir
pdfs
&&
JMakePDF.sh
-W
$(pwd)/pdfs
-w
http://pi1139.physik.uni-erlangen.de/data/latest/
-C"
-
ls -al
-
ls -al venv
-
source venv/bin/activate
-
which python
-
pip list
-
pip install -U pytest
-
pytest
cache
:
paths
:
-
pdfs
/
dependencies
:
-
build-jpp-master-py37
-
download-
pdfs
test-jpp-master-py38
:
image
:
docker.km3net.de/base/python:3.8
stage
:
test
script
:
-
ls -al
-
ls -al venv
-
source venv/bin/activate
-
which python
-
pip list
-
pip install -U pytest
-
pytest
dependencies
:
-
build-jpp-master-py38
-
download-pdfs
pages
:
image
:
docker.km3net.de/base/python:3.
6
image
:
docker.km3net.de/base/python:3.
8
stage
:
doc
script
:
-
pip install -U sphinx
...
...
@@ -91,9 +176,8 @@ pages:
-
tags
-
master
pypi
:
image
:
docker.km3net.de/base/python:3
image
:
docker.km3net.de/base/python:3
.8
stage
:
release
cache
:
{}
script
:
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
6
−
1
View file @
be94facc
...
...
@@ -39,7 +39,12 @@ ext_modules = [
# Populating the __init__.py with submodule imports, so that one can import
# the package and use the submodules directly with the dot-sytax.
with
open
(
"
jppy/__init__.py
"
,
"
w
"
)
as
fobj
:
fobj
.
write
(
"
from .version import version
\n
"
)
fobj
.
write
(
"""
from pkg_resources import get_distribution, DistributionNotFound
try:
version = get_distribution(__name__).version
except DistributionNotFound:
version =
"
unknown version
"
"""
)
for
module
in
ext_modules
:
fobj
.
write
(
"
from . import {}
\n
"
.
format
(
module
.
name
.
split
(
'
.
'
)[
1
]))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment