Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Daniel Scheffler
py_tools_ds
Commits
c4985a48
Commit
c4985a48
authored
Nov 20, 2017
by
Daniel Scheffler
Browse files
Updated version info.
parents
2a804dff
936794b8
Pipeline
#1563
passed with stages
in 3 minutes and 7 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
c4985a48
...
...
@@ -18,8 +18,7 @@ test_py_tools_ds:
stage
:
test
script
:
-
source /root/miniconda3/bin/activate
-
source activate py3
-
export GDAL_DATA=/root/miniconda3/envs/py3/share/gdal
-
export GDAL_DATA=/root/miniconda3/share/gdal
-
export PYTHONPATH=$PYTHONPATH:/root
# /root <- directory needed later
-
make nosetests
-
make docs
...
...
@@ -36,8 +35,7 @@ test_styles:
stage
:
test
script
:
-
source /root/miniconda3/bin/activate
-
source activate py3
-
export GDAL_DATA=/root/miniconda3/envs/py3/share/gdal
-
export GDAL_DATA=/root/miniconda3/share/gdal
-
export PYTHONPATH=$PYTHONPATH:/root
# /root <- directory needed later
-
make lint
artifacts
:
...
...
@@ -52,8 +50,7 @@ test_py_tools_ds_install:
stage
:
test
script
:
-
source /root/miniconda3/bin/activate
-
source activate py3
-
export GDAL_DATA=/root/miniconda3/envs/py3/share/gdal
-
export GDAL_DATA=/root/miniconda3/share/gdal
-
conda create -y -q --name py_tools_ds python=3
-
source activate py_tools_ds
# resolve some requirements with conda
...
...
Makefile
View file @
c4985a48
...
...
@@ -103,6 +103,3 @@ install: clean ## install the package to the active Python's site-packages
gitlab_CI_docker
:
##
Build a docker image for CI use within gitlab
cd
./tests/CI_docker/
;
bash ./build_testsuite_image.sh
conda_pyenv_docker
:
##
Build a docker image containing Anaconda environment with all basic dependencies installed
cd
./tests/CI_docker/
;
bash ./build_conda_pyenv.sh
py_tools_ds/__init__.py
View file @
c4985a48
...
...
@@ -2,7 +2,7 @@
from
__future__
import
(
division
,
print_function
,
absolute_import
,
unicode_literals
)
__version__
=
'0.12.2'
__versionalias__
=
'201711
18
_01'
__versionalias__
=
'201711
20
_01'
__author__
=
'Daniel Scheffler'
# Validate GDAL version
...
...
tests/CI_docker/build_conda_pyenv.sh
deleted
100644 → 0
View file @
2a804dff
#!/usr/bin/env bash
context_dir
=
"./context"
dockerfile
=
"conda_pyenv.docker"
tag
=
"conda_pyenv:pinned_v0.1"
echo
"#### Build basic pyenv docker image"
sudo
docker rmi
${
tag
}
sudo
docker build
-f
${
context_dir
}
/
${
dockerfile
}
-m
20G
-t
${
tag
}
${
context_dir
}
tests/CI_docker/context/conda_pyenv.docker
deleted
100644 → 0
View file @
2a804dff
FROM
centos:7
RUN
yum update
-y
&&
\
yum
install
-y
wget vim bzip2 gcc gcc-c++ make libgl1-mesa-glx mesa-libGL qt5-qtbase-gui git nano tree gdb
ENV
miniconda_dl 'Miniconda3-latest-Linux-x86_64.sh'
ENV
envconfig 'environment_pinned_v0.1.yml'
ENV
envname 'py3'
ENV
git_lfs_v='2.1.1'
RUN
/bin/bash
-i
-c
"cd /root; wget https://repo.continuum.io/miniconda/
$miniconda_dl
;
\
bash -i /root/
$miniconda_dl
-b ;
\
rm -f /root/
$miniconda_dl
"
# copy some needed stuff to /root
COPY
*.yml /root/
# create an environment with all packages specified in $envconfig
RUN
/bin/bash
-i
-c
"source /root/miniconda3/bin/activate ;
\
conda env create -n
$envname
-f /root/
$envconfig
"
# install git lfs
RUN
/bin/bash
-i
-c
"curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash"
# installing git large file support, see here: https://git-lfs.github.com/ , change version number below for future upgrades
RUN
/bin/bash
-i
-c
"wget https://github.com/git-lfs/git-lfs/releases/download/v
${
git_lfs_v
}
/git-lfs-linux-amd64-
${
git_lfs_v
}
.tar.gz;
\
tar -zxvf git-lfs-linux-amd64-
${
git_lfs_v
}
.tar.gz;
\
cd git-lfs-
${
git_lfs_v
}
;
\
bash ./install.sh"
tests/CI_docker/context/environment_pinned_v0.1.yml
deleted
100644 → 0
View file @
2a804dff
name
:
py_tools_ds
channels
:
&id1
-
http://conda.anaconda.org/ioam
# only for holoviews
-
http://conda.anaconda.org/conda-forge
dependencies
:
-
python=3.*.*
-
pyqt=5.6.0
-
numpy=1.13.3
-
gdal=2.1.4
-
scikit-image=0.13.0
-
rasterio=0.36.0
-
pyproj=1.9.5.1
-
icu=58.*
-
lxml=4.1.0
-
geopandas=0.3.0
-
ipython
-
pip
:
-
dicttoxml
-
jsmin
-
cerberus
-
pyprind
-
pint
-
iso8601
-
tqdm
-
mpld3
-
sphinx-argparse
-
six
-
spectral
-
flake8
-
pycodestyle
-
pylint
-
pydocstyle
-
nose
-
nose2
-
nose-htmloutput
-
coverage
-
rednose
tests/CI_docker/context/environment_
latest
.yml
→
tests/CI_docker/context/environment_
py_tools_ds
.yml
View file @
c4985a48
File moved
tests/CI_docker/context/py_tools_ds_ci.docker
View file @
c4985a48
FROM
conda_pyenv:pinned_v0.1
FROM
gms_base_centos:pinned_v0.1
# copy some needed stuff to /root
COPY
*.yml /root/
RUN
/bin/bash
-i
-c
"
\
source /root/miniconda3/bin/activate ;
\
conda env update -n root -f /root/environment_py_tools_ds.yml"
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment