Permalink
Browse files

implemented workaround for pip issue

  • Loading branch information...
1 parent 0532737 commit a9689597bf5ab8cd4d3be7a8cdaf011a4eec8934 Andre Luckow committed Jul 7, 2012
Showing with 29 additions and 15 deletions.
  1. +1 −1 VERSION
  2. +9 −0 bigjob/__init__.py
  3. +3 −0 bigjob/bigjob_agent.py
  4. +1 −1 distribute_setup.py
  5. +1 −1 examples/example_local_single.py
  6. +5 −2 pilot/__init__.py
  7. +0 −1 pilot/api/__init__.py
  8. +9 −9 setup.py
View
@@ -1 +1 @@
-0.4.70
+0.4.80
View
@@ -4,12 +4,21 @@
import traceback
version = "latest"
+#from pkg_resources import Requirement, resource_filename
+
#READ config
+
SAGA_BLISS=False
try:
import ConfigParser
_CONFIG_FILE="bigjob.conf"
_conf_file = os.path.dirname(os.path.abspath( __file__ )) + "/../" + _CONFIG_FILE
+ if not os.path.exists(_conf_file):
+ _conf_file = os.path.join(sys.prefix, _CONFIG_FILE)
+
+
+ print "using conf file: " + str(_conf_file)
+
_config = ConfigParser.ConfigParser()
_config.read(_conf_file)
default_dict = _config.defaults()
View
@@ -70,6 +70,9 @@ def __init__(self, args):
# conf_file = os.path.dirname(args[0]) + "/" + CONFIG_FILE
# conf_file = os.path.dirname(os.path.abspath( __file__ )) + "/" + CONFIG_FILE
conf_file = os.path.dirname(os.path.abspath( __file__ )) + "/../" + CONFIG_FILE
+ if not os.path.exists(conf_file):
+ _conf_file = os.path.join(sys.prefix, CONFIG_FILE)
+
config = ConfigParser.ConfigParser()
logging.debug ("read configfile: " + conf_file)
config.read(conf_file)
View
@@ -1,4 +1,4 @@
- #!python
+#!python
"""Bootstrap distribute installation
If you want to use setuptools in your package's setup.py, just include this
@@ -21,7 +21,7 @@
COORDINATION_URL = "advert://localhost/?dbtype=sqlite3"
#COORDINATION_URL = "tcp://*"
-#COORDINATION_URL = "redis://localhost:6379"
+COORDINATION_URL = "redis://localhost:6379"
# for running BJ from local dir
sys.path.insert(0, os.getcwd() + "/../")
View
@@ -36,10 +36,10 @@
Both Compute and Data Units are specified using an abstract description object:
- - L{ComputeUnitDescription}:
+ - L{ComputeUnitDescription} (CUD):
abstract description of a L{ComputeUnit}.
- - L{DataUnitDescription}:
+ - L{DataUnitDescription} (DUD):
abstract description of a L{DataUnit}.
@@ -117,6 +117,9 @@
from pilot.api.api import PilotError
from pilot.api import State
+import bigjob
+""" Version of Pilot-API/BigJob """
+version = bigjob.version
View
@@ -15,6 +15,5 @@
from pilot.api.data.api import DataUnit
from pilot.api.data.api import DataUnitDescription
-from pilot.api.api import ComputeDataDescription
from pilot.api.api import ComputeDataService
from pilot.api.api import PilotError
View
@@ -1,5 +1,8 @@
#!/usr/bin/env python
+#from distribute_setup import use_setuptools
+#use_setuptools()
+
#from distutils.core import setup
import os
from setuptools import setup
@@ -27,18 +30,15 @@
platforms = ('Unix', 'Linux', 'Mac OS'),
packages=['bigjob', 'bigjob_dynamic', 'coordination', 'pilot', 'pilot.api','pilot.api.compute', 'pilot.api.data', 'pilot.coordination',
'pilot.filemanagement', 'pilot.impl', 'pilot.scheduler', 'examples', 'api', 'bootstrap', 'cli'],
- #data_files=['bigjob_agent.conf',
- # 'bigjob.conf', "VERSION", "README.md"],
- data_files = [( '', ['bigjob_agent.conf', 'bigjob_agent.conf']),
+ include_package_data=True,
+ # data files for easy_install
+ data_files = [('', ['bigjob_agent.conf', 'bigjob_agent.conf']),
('', ['bigjob.conf', 'bigjob.conf']),
('', ['README.md', 'README.md']),
('', ['VERSION', 'VERSION'])],
-# package_data = {
-# '': ['bigjob_agent.conf', 'bigjob_agent.conf'],
-# '': ['bigjob.conf', 'bigjob.conf'],
-# '': ['README', 'README'],
-# '': ['VERSION', 'VERSION']
-# },
+
+ # data files for pip
+ package_data = {'': ['*.conf']},
install_requires=['paramiko-on-pypi', 'uuid', 'threadpool', 'virtualenv', 'redis==2.2.4', 'bliss'],
entry_points = {
'console_scripts': [

0 comments on commit a968959

Please sign in to comment.