Skip to content
Snippets Groups Projects
Commit ce9d4f9e authored by John Chilton's avatar John Chilton
Browse files

Add ability to make a galaxy-lib dep-free version of this Pulsar.

For inclusion with galaxy.
parent dc471404
No related branches found
No related tags found
No related merge requests found
......@@ -99,9 +99,11 @@ lint-docs: ready-docs
if [ -f .venv/bin/activate ]; then . .venv/bin/activate; fi; $(MAKE) -C docs clean
if [ -f .venv/bin/activate ]; then . .venv/bin/activate; fi; ! (make -C docs html 2>&1 | grep -v 'nonlocal image URI found\|included in any toctree' | grep WARNING)
open-docs: docs
_open-docs:
open docs/_build/html/index.html || xdg-open docs/_build/html/index.html
open-docs: docs _open-docs
open-rtd: docs
open $(DOC_URL) || xdg-open $(PROJECT_URL)
......@@ -112,11 +114,13 @@ dist: clean
$(IN_VENV) python setup.py sdist bdist_egg bdist_wheel
ls -l dist
release-test-artifacts: dist
_release-test-artifacts:
$(IN_VENV) twine upload -r test dist/*
open https://testpypi.python.org/pypi/$(PROJECT_NAME) || xdg-open https://testpypi.python.org/pypi/$(PROJECT_NAME)
release-aritfacts: release-test-artifacts
release-test-artifacts: dist _release-test-artifacts
_release-aritfacts: release-test-artifacts
@while [ -z "$$CONTINUE" ]; do \
read -r -p "Have you executed release-test and reviewed results? [y/N]: " CONTINUE; \
done ; \
......@@ -124,6 +128,8 @@ release-aritfacts: release-test-artifacts
@echo "Releasing"
$(IN_VENV) twine upload dist/*
release-aritfacts: release-test-artifacts _release-aritfacts
commit-version:
$(IN_VENV) python $(BUILD_SCRIPTS_DIR)/commit_version.py $(SOURCE_DIR) $(VERSION)
......@@ -140,3 +146,11 @@ release: release-local push-release
add-history:
$(IN_VENV) python $(BUILD_SCRIPTS_DIR)/bootstrap_history.py $(ITEM)
dist-lib: clean
$(IN_VENV) PULSAR_GALAXY_LIB=1 python setup.py sdist bdist_egg bdist_wheel
ls -l dist
release-test-lib-artifacts: dist-lib _release-test-artifacts
release-lib-aritfacts: release-test-lib-artifacts _release-aritfacts
import os
import re
import ast
import sys
......@@ -14,6 +15,9 @@ try:
except ImportError:
from distutils.core import setup
# Set environment variable to 1 to build as library for Galaxy instead
# of as stand-alone app.
PULSAR_GALAXY_LIB = os.environ.get("PULSAR_GALAXY_LIB", "0") == "1"
readme = open('README.rst').read()
history = open('HISTORY.rst').read().replace('.. :changelog:', '')
......@@ -23,9 +27,12 @@ requirements = [
'webob',
'psutil',
'pyyaml',
'galaxy-lib',
]
if not PULSAR_GALAXY_LIB:
requirements.append("galaxy-lib")
# TODO: use extra_requires here to be more correct.
if sys.version_info[0] == 2:
requirements.append('PasteScript')
requirements.append('paste')
......@@ -46,8 +53,10 @@ if is_windows:
else:
scripts = ["scripts/pulsar"]
name = "pulsar-app" if not PULSAR_GALAXY_LIB else "pulsar-galaxy-lib"
setup(
name='pulsar-app',
name=name,
version=version,
description='Distributed job execution application built for Galaxy (http://galaxyproject.org/).',
long_description=readme + '\n\n' + history,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment