Commit ff715c0f authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge branch 'dev'

Conflicts:
	arosics/__init__.py
	setup.py
parents 4d9884c4 cc86d374
Pipeline #394 passed with stages
in 4 minutes and 42 seconds
......@@ -53,6 +53,8 @@ deploy_pypi:
- test_arosics
script: # Configure the PyPI credentials, then push the package, and cleanup the creds.
- source /root/anaconda3/bin/activate
- mkdir -p public/images/
- cp -r docs/images/* public/images/
- printf "[distutils]\nindex-servers =\n pypi\n\n" >> ~/.pypirc
- printf "[pypi]\n""repository:"" https://upload.pypi.org/legacy/\n" >> ~/.pypirc
- printf "username= ${PYPI_USER}\n" >> ~/.pypirc
......
......@@ -16,10 +16,15 @@ History
------------------
New features:
* added a logo
* added auto-deploy to PyPI
* added test cases for local co-registration
Bugfixes:
* fixed warping issues in case only very few tie points could be identified
.. figure:: docs/images/arosics_logo.png
.. figure:: http://danschef.gitext.gfz-potsdam.de/arosics/images/arosics_logo.png
:target: https://gitext.gfz-potsdam.de/danschef/arosics
An Automated and Robust Open-Source Image Co-Registration Software for Multi-Sensor Satellite Data
......
......@@ -4,6 +4,7 @@
"""The setup script."""
from setuptools import setup, find_packages
import warnings
with open('README.rst') as readme_file:
readme = readme_file.read()
......@@ -14,6 +15,7 @@ with open('HISTORY.rst') as history_file:
requirements = [
'numpy', 'gdal', 'shapely', 'scikit-image', 'matplotlib', 'geopandas', 'spectral', 'pykrige','geoarray','py_tools_ds'
# 'pyfftw', # conda install --yes -c conda-forge pyfftw=0.10.4 ; \
# 'basemap', # conda install --yes -c conda-forge basemap; \
]
setup_requirements = [
......@@ -24,7 +26,7 @@ test_requirements = ['coverage']
setup(
name='arosics',
version='0.4.4',
version='0.4.6',
description="An Automated and Robust Open-Source Image Co-Registration Software for Multi-Sensor Satellite Data",
long_description=readme + '\n\n' + history,
author="Daniel Scheffler",
......@@ -54,3 +56,18 @@ setup(
tests_require=test_requirements,
setup_requires=setup_requirements,
)
# check for pyffw
try:
import pyfftw
except ImportError:
warnings.warn('You need to install pyfftw manually (see https://pypi.python.org/pypi/pyFFTW) for speeding up '
'the computation. It is not automatically installed.') # TODO
# check for basemap
try:
from mpl_toolkits.basemap import Basemap
except ImportError:
warnings.warn('You need to install basemap manually (see www./matplotlib.org/basemap) if you want to plot maps. '
'It is not automatically installed.') # TODO
......@@ -5,14 +5,6 @@ dockerfile="arosics_ci.docker"
tag="arosics_ci:latest"
gitlab_runner="arosics_gitlab_CI_runner"
# 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
# get geoarray project # TODO move this to setup.py as soon as package is public
rm -rf context/geoarray
git clone https://gitext.gfz-potsdam.de/danschef/geoarray.git ./context/geoarray
echo "#### Build runner docker image"
sudo docker rmi ${tag}
sudo docker build -f ${context_dir}/${dockerfile} -m 20G -t ${tag} ${context_dir}
......
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 # TODO
yum install -y wget vim bzip2 gcc gcc-c++ make libgl1-mesa-glx mesa-libGL qt5-qtbase-gui git
ENV anaconda_dl 'Anaconda3-4.3.1-Linux-x86_64.sh'
RUN /bin/bash -i -c "cd /root; wget https://repo.continuum.io/archive/$anaconda_dl ; \
......@@ -8,22 +8,22 @@ RUN /bin/bash -i -c "cd /root; wget https://repo.continuum.io/archive/$anaconda_
rm -f /root/$anaconda_dl"
# 'conda install --yes -c conda-forge 'icu=58.*' lxml' fixing a bug for conda-forge gdal build, as of 06/2017
# holoviews and bokeh is only needed for geoarray because its not installable via pip during geoarray.setup.py
RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \
conda install --yes pyqt coverage ; \
conda install --yes -c conda-forge gdal ; \
conda install --yes -c conda-forge pyfftw=0.10.4 ; \
conda install --yes -c ioam holoviews=1.8.0 ; \
conda install --yes -c ioam bokeh ; \
conda install --yes -c conda-forge 'icu=58.*' lxml ; \
conda install --yes -c conda-forge glymur pygrib rasterio pyproj cachetools basemap; \
pip install shapely geopandas dicttoxml jsmin cerberus pyprind pint iso8601 tqdm mpld3 sphinx-argparse spectral pykrige" # must include all the requirements needed to build the docs!
pip install shapely geopandas dicttoxml jsmin cerberus pyprind pint iso8601 tqdm mpld3 sphinx-argparse spectral \
pykrige geoarray py_tools_ds" # must include all the requirements needed to build the docs!
# copy some needed stuff to /root
#COPY *.pkl /root/ # EXAMPLE
#COPY *.h5 /root/ # EXAMPLE
# copy py_tools_ds and geoarray code to /tmp
COPY py_tools_ds /tmp/py_tools_ds
COPY geoarray /tmp/geoarray
# install git lfs
RUN /bin/bash -i -c "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash"
......@@ -39,8 +39,3 @@ RUN bash -i -c 'source /root/anaconda3/bin/activate; \
sed -i "/backend : tkagg/c\backend : Agg" $(python -c "import matplotlib; print(matplotlib.matplotlib_fname())"); \
sed -i "/backend : Qt4Agg/c\backend : Agg" $(python -c "import matplotlib; print(matplotlib.matplotlib_fname())"); \
sed -i "/backend : qt5agg/c\backend : Agg" $(python -c "import matplotlib; print(matplotlib.matplotlib_fname())")'
RUN bash -i -c "source /root/anaconda3/bin/activate; \
cd /tmp/py_tools_ds/; python setup.py install; \
cd /tmp/geoarray/; 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