Skip to content
This repository has been archived by the owner on Jan 9, 2020. It is now read-only.

Specify Gaia explicitly from github. #499

Merged
merged 3 commits into from
Apr 17, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ before_install:
- mongod --dbpath=/tmp/db >/dev/null 2>/dev/null &
- mongod --version

- pip install --no-cache-dir -U pip virtualenv setuptools

# install database_assetstore plugin
- DB_ASSETSTORE_DIR="${GIRDER_SOURCE_DIR}/plugins/database_assetstore"
- git clone https://github.com/OpenGeoscience/database_assetstore.git "${DB_ASSETSTORE_DIR}" && git -C "${DB_ASSETSTORE_DIR}" checkout $DATABASE_ASSETSTORE_VERSION
Expand All @@ -78,21 +80,19 @@ before_install:
- pip install -e ${GIRDER_WORKER_DIR}

# install gaia
- GAIA_DIR=$HOME/gaia
- git clone https://github.com/OpenDataAnalytics/gaia.git ${GAIA_DIR}
- pip install -e ${GAIA_DIR} -r "${GAIA_DIR}/requirements.txt"
# - GAIA_DIR=$HOME/gaia
# - git clone https://github.com/OpenDataAnalytics/gaia.git ${GAIA_DIR}
# - pip install -e ${GAIA_DIR} -r "${GAIA_DIR}/requirements.txt"

- npm install -g npm
- npm install -g npm-install-retry
- npm --version

- pip install --no-cache-dir -U pip virtualenv setuptools

install:
- cd $GIRDER_SOURCE_DIR
- pip install --no-cache-dir -U -r requirements-dev.txt -e .
- pip install -r $MAIN_PATH/requirements.txt
- pip install girder[worker]
- pip install $MAIN_PATH
- pip install -r $MAIN_PATH/requirements-dev.txt

- girder-install plugin --symlink $MAIN_PATH
Expand Down
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ numpy>=1.10.1
owslib>=0.9.1
python-dateutil>=2.4.2
Shapely>=1.6.2
girder_worker>=0.5.0
git+https://github.com/OpenDataAnalytics/gaia.git#egg=gaia-0.0.1a1
21 changes: 17 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
import re
from setuptools import setup, find_packages
from pip.req import parse_requirements

install_reqs = parse_requirements('requirements.txt', session=False)
reqs = [str(ir.req) for ir in install_reqs]
requires = []
dep_links = []
# parse requirements file
with open('requirements.txt') as f:
comment = re.compile('(^#.*$|\s+#.*$)')
for line in f.readlines():
line = line.strip()
line = comment.sub('', line)
if line:
if line.startswith('git+') and '#egg=' in line:
dep_links.append(line)
requires.append(line.split('#egg=', 1)[1].replace('-', '=='))
else:
requires.append(line)

setup(name='minerva.geo',
version='0.0.0.dev1',
description='Minerva: client/server/services for analysis and visualization',
url='https://github.com/kitware/minerva',
install_requires=reqs,
install_requires=requires,
dependency_links=dep_links,
author='Kitware Inc',
author_email='minerva-developers@kitware.com',
license='Apache v2',
Expand Down