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

Merge remote-tracking branch 'origin/master'

Conflicts:
	Makefile
parents d890e57f 5f421f37
Pipeline #930 passed with stages
in 1 minute
......@@ -21,13 +21,15 @@ test_geoarray:
- source /root/anaconda3/bin/activate
- export GDAL_DATA=/root/anaconda3/share/gdal
- export PYTHONPATH=$PYTHONPATH:/root # /root <- directory needed later
- make coverage
- pip install rednose
- make nosetests
- make docs
artifacts:
paths:
- htmlcov/
- docs/_build/html/
- nosetests.html
- nosetests.xml
pages:
stage: deploy_pages
......@@ -36,6 +38,8 @@ pages:
script:
- mkdir -p public/coverage
- cp -r htmlcov/* public/coverage/
- mkdir -p public/nosetests_reports
- cp nosetests.* public/nosetests_reports/
- mkdir -p public/doc
- cp -r docs/_build/html/* public/doc/
......
.PHONY: clean clean-test clean-pyc clean-build docs help
.PHONY: clean clean-test clean-pyc clean-build docs help nosetests
.DEFAULT_GOAL := help
define BROWSER_PYSCRIPT
import os, webbrowser, sys
......@@ -28,7 +28,6 @@ help:
clean: clean-build clean-pyc clean-test ## remove all build, test, coverage and Python artifacts
clean-build: ## remove build artifacts
rm -fr build/
rm -fr dist/
......@@ -47,6 +46,8 @@ clean-test: ## remove test and coverage artifacts
rm -fr .tox/
rm -f .coverage
rm -fr htmlcov/
rm -fr nosetests.html
rm -fr nosetests.xml
lint: ## check style with flake8
flake8 geoarray tests
......@@ -63,6 +64,13 @@ coverage: clean-test ## check code coverage quickly with the default Python
coverage html
# $(BROWSER) htmlcov/index.html
nosetests: clean-test ## Runs nosetests with coverage, xUnit and nose-html-output
## - puts the coverage results in the folder 'htmlcov'
## - generates 'nosetests.html' (--with-html)
## - generates 'nosetests.xml' (--with-xunit) which is currently not visualizable by GitLab
nosetests -vv --with-coverage --cover-package=geoarray --cover-erase --cover-html --cover-html-dir=htmlcov \
--with-html --with-xunit --rednose --force-color
docs: ## generate Sphinx HTML documentation, including API docs
rm -f docs/geoarray.rst
rm -f docs/modules.rst
......@@ -71,7 +79,7 @@ docs: ## generate Sphinx HTML documentation, including API docs
$(MAKE) -C docs html
# $(MAKE) -C docs latex
# $(MAKE) -C docs latexpdf
# $(BROWSER) docs/_build/html/index.html
# $(BROWSER) docs/_build/html/index.html
servedocs: docs ## compile the docs watching for changes
watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .
......
# -*- coding: utf-8 -*-
__author__ = """Daniel Scheffler"""
__email__ = 'danschef@gfz-potsdam.de'
__version__ = '0.5.9'
__versionalias__ = 'v20170823.01'
import os
if 'MPLBACKEND' not in os.environ:
os.environ['MPLBACKEND'] = 'Agg'
from .baseclasses import GeoArray
......@@ -11,8 +10,13 @@ from .masks import BadDataMask
from .masks import NoDataMask
from .masks import CloudMask
__all__=['GeoArray',
'BadDataMask',
'NoDataMask',
'CloudMask'
]
__author__ = """Daniel Scheffler"""
__email__ = 'danschef@gfz-potsdam.de'
__version__ = '0.5.10'
__versionalias__ = 'v20170830.01'
__all__ = ['GeoArray',
'BadDataMask',
'NoDataMask',
'CloudMask'
]
......@@ -11,9 +11,9 @@ with open('HISTORY.rst') as history_file:
history = history_file.read()
requirements = [
'py_tools_ds>=0.4.2', 'numpy', 'matplotlib', 'six', 'gdal', 'shapely', 'geopandas', 'pandas', 'dill', 'mpld3', 'geojson',
'folium', 'scikit-image'
#'holoviews', # conda install --yes -c ioam bokeh holoviews=1.8.0 ; \
'py_tools_ds>=0.4.2', 'numpy', 'matplotlib', 'six', 'gdal', 'shapely', 'geopandas', 'pandas', 'dill', 'mpld3',
'geojson', 'folium', 'scikit-image'
# 'holoviews', # conda install --yes -c ioam bokeh holoviews=1.8.0 ; \
# git+https://github.com/matplotlib/basemap.git # conda install --yes -c conda-forge basemap
]
......@@ -21,7 +21,7 @@ test_requirements = ["coverage", "nose", "nose2", "nose-htmloutput", "rednose"]
setup(
name='geoarray',
version='0.5.9',
version='0.5.10',
description="Fast Python interface for geodata - either on disk or in memory.",
long_description=readme + '\n\n' + history,
author="Daniel Scheffler",
......@@ -57,7 +57,7 @@ try:
import holoviews
except ImportError:
warnings.warn('You need to install holoviews manually (see www.holoviews.org) if you want to use interactive '
'plotting. It is not automatically installed.') # TODO
'plotting. It is not automatically installed.') # TODO
# check for basemap
try:
......
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