Commit 4e7e5122 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Revised CI setup.

parent 07d49084
Pipeline #217 passed with stages
in 54 seconds
......@@ -10,7 +10,8 @@ Contents:
installation
usage
contributing
authorshistory
authors
history
Indices and tables
==================
......
......@@ -10,8 +10,8 @@ with open('HISTORY.rst') as history_file:
history = history_file.read()
requirements = [
'numpy', 'matplotlib', 'six', 'gdal', 'shapely', 'geopandas', 'py_tools_ds', 'dill', 'mpld3', 'geojson', 'folium',
'holoviews'
'numpy', 'matplotlib', 'six', 'gdal', 'shapely', 'geopandas', 'dill', 'mpld3', 'geojson', 'folium', 'holoviews',
#'py_tools_ds' # pip install git+https://gitext.gfz-potsdam.de/danschef/py_tools_ds.git
]
test_requirements = ["coverage"]
......@@ -44,6 +44,7 @@ setup(
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
test_suite='tests',
tests_require=test_requirements
......
......@@ -5,7 +5,7 @@ dockerfile="geoarray_ci.docker"
tag="geoarray_ci:latest"
gitlab_runner="danschef_gitlab_CI_runner"
# get py_tools_ds project
# get py_tools_ds project # TODO move this to setup.py as soon as package is public
rm -rf context/py_tools_ds
git clone https://gitext.gfz-potsdam.de/danschef/py_tools_ds.git ./context/py_tools_ds
......
......@@ -19,7 +19,7 @@ RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \
#COPY *.pkl /root/ # EXAMPLE
#COPY *.h5 /root/ # EXAMPLE
# copy py_tools_ds code to /tmp
# copy py_tools_ds code to /tmp # TODO move this to setup.py as soon as package is public
COPY py_tools_ds /tmp/py_tools_ds
# install git lfs
......@@ -40,4 +40,4 @@ RUN bash -i -c 'source /root/anaconda3/bin/activate; \
RUN bash -i -c "source /root/anaconda3/bin/activate; \
cd /tmp/py_tools_ds/; python setup.py install;"
cd /tmp/py_tools_ds/; python setup.py install;" # TODO move this to setup.py as soon as package is public
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment