Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
359a9fe237 | |||
f9b6851f75 | |||
29a2652bbf | |||
2a2c233936 |
@ -35,12 +35,14 @@ def addOptions(parser):
|
|||||||
action="store", dest="ecopcr:primer1",
|
action="store", dest="ecopcr:primer1",
|
||||||
metavar='<PRIMER>',
|
metavar='<PRIMER>',
|
||||||
type=str,
|
type=str,
|
||||||
|
required=True,
|
||||||
help="Forward primer, length must be less than or equal to 32")
|
help="Forward primer, length must be less than or equal to 32")
|
||||||
|
|
||||||
group.add_argument('--primer2', '-R',
|
group.add_argument('--primer2', '-R',
|
||||||
action="store", dest="ecopcr:primer2",
|
action="store", dest="ecopcr:primer2",
|
||||||
metavar='<PRIMER>',
|
metavar='<PRIMER>',
|
||||||
type=str,
|
type=str,
|
||||||
|
required=True,
|
||||||
help="Reverse primer, length must be less than or equal to 32")
|
help="Reverse primer, length must be less than or equal to 32")
|
||||||
|
|
||||||
group.add_argument('--error', '-e',
|
group.add_argument('--error', '-e',
|
||||||
|
@ -260,7 +260,6 @@ def run(config):
|
|||||||
|
|
||||||
if entry is None: # error or exception handled at lower level, not raised because Python generators can't resume after any exception is raised
|
if entry is None: # error or exception handled at lower level, not raised because Python generators can't resume after any exception is raised
|
||||||
if config['obi']['skiperror']:
|
if config['obi']['skiperror']:
|
||||||
i-=1
|
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
raise RollbackException("obi import error, rollbacking view", view)
|
raise RollbackException("obi import error, rollbacking view", view)
|
||||||
|
@ -42,6 +42,7 @@ def addOptions(parser):
|
|||||||
metavar="<URI>",
|
metavar="<URI>",
|
||||||
type=str,
|
type=str,
|
||||||
default=None,
|
default=None,
|
||||||
|
required=True,
|
||||||
help="URI to the view containing the samples definition (with tags, primers, sample names,...).\n"
|
help="URI to the view containing the samples definition (with tags, primers, sample names,...).\n"
|
||||||
"\nWarning: primer lengths must be less than or equal to 32")
|
"\nWarning: primer lengths must be less than or equal to 32")
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
major = 3
|
major = 3
|
||||||
minor = 0
|
minor = 0
|
||||||
serial= '0b21'
|
serial= '0b23'
|
||||||
|
|
||||||
version ="%d.%d.%s" % (major,minor,serial)
|
version ="%d.%d.%s" % (major,minor,serial)
|
||||||
|
10
setup.py
10
setup.py
@ -27,10 +27,11 @@ class Distribution(ori_Distribution):
|
|||||||
|
|
||||||
ori_Distribution.__init__(self, attrs)
|
ori_Distribution.__init__(self, attrs)
|
||||||
|
|
||||||
self.global_options.insert(0,('cobitools3', None, "intall location of the C library"
|
self.global_options.insert(0,('cobitools3', None, "install location of the C library"
|
||||||
))
|
))
|
||||||
|
|
||||||
from distutils.command.build import build as build_ori
|
from distutils.command.build import build as build_ori
|
||||||
|
from setuptools.command.bdist_egg import bdist_egg as bdist_egg_ori
|
||||||
from distutils.core import Command
|
from distutils.core import Command
|
||||||
|
|
||||||
|
|
||||||
@ -71,6 +72,12 @@ class build(build_ori):
|
|||||||
build_ori.run(self)
|
build_ori.run(self)
|
||||||
|
|
||||||
|
|
||||||
|
class bdist_egg(bdist_egg_ori):
|
||||||
|
def run(self):
|
||||||
|
self.run_command('build_clib')
|
||||||
|
bdist_egg_ori.run(self)
|
||||||
|
|
||||||
|
|
||||||
sys.path.append(os.path.abspath("python"))
|
sys.path.append(os.path.abspath("python"))
|
||||||
|
|
||||||
|
|
||||||
@ -166,6 +173,7 @@ setup(name=PACKAGE,
|
|||||||
ext_modules=xx,
|
ext_modules=xx,
|
||||||
distclass=Distribution,
|
distclass=Distribution,
|
||||||
cmdclass={'build': build,
|
cmdclass={'build': build,
|
||||||
|
'bdist_egg': bdist_egg,
|
||||||
'build_clib': build_clib},
|
'build_clib': build_clib},
|
||||||
cobitools3=get_python_lib(),
|
cobitools3=get_python_lib(),
|
||||||
packages = findPackage('python'),
|
packages = findPackage('python'),
|
||||||
|
Reference in New Issue
Block a user