From d30f7e7317cd4df3f7bb082560dbd4fc29f48b98 Mon Sep 17 00:00:00 2001 From: Celine Mercier Date: Sun, 22 Sep 2019 18:52:05 +0200 Subject: [PATCH] more cleaning --- python/obitools3/apps/arguments.pyx | 4 ---- python/obitools3/apps/config.pyx | 2 +- python/obitools3/version.py | 2 +- scripts/obi | 24 +++++++++--------------- setup.py | 4 ++-- 5 files changed, 13 insertions(+), 23 deletions(-) diff --git a/python/obitools3/apps/arguments.pyx b/python/obitools3/apps/arguments.pyx index d64ae38..dde0646 100755 --- a/python/obitools3/apps/arguments.pyx +++ b/python/obitools3/apps/arguments.pyx @@ -33,10 +33,6 @@ cpdef buildArgumentParser(str configname, default=None, help='Create a logfile') - parser.add_argument('--no-progress', dest='%s:progress' % configname, - action='store_false', - default=None, - help='Do not print the progress bar during analyzes') subparsers = parser.add_subparsers(title='subcommands', description='valid subcommands', diff --git a/python/obitools3/apps/config.pyx b/python/obitools3/apps/config.pyx index e5119bc..328b71c 100755 --- a/python/obitools3/apps/config.pyx +++ b/python/obitools3/apps/config.pyx @@ -13,7 +13,7 @@ from .logging cimport getLogger from .arguments cimport buildArgumentParser from ..version import version -from _curses import version + cdef dict __default_config__ = {} diff --git a/python/obitools3/version.py b/python/obitools3/version.py index 7b1ad20..43851fc 100755 --- a/python/obitools3/version.py +++ b/python/obitools3/version.py @@ -1,4 +1,4 @@ -major = 0 +major = 1 minor = 0 serial= '0' diff --git a/scripts/obi b/scripts/obi index 361641e..df14383 100755 --- a/scripts/obi +++ b/scripts/obi @@ -1,26 +1,20 @@ -#!/usr/local/bin/python3.4 +#!/usr/local/bin/python3.5 ''' -obi -- shortdesc +obi -- OBITools3 -obi is a description +obi is a package for the management of analyses and data in DNA metabarcoding -It defines classes_and_methods +@author: Celine Mercier -@author: user_name +@license: CeCILL-V2 -@copyright: 2014 organization_name. All rights reserved. - -@license: license - -@contact: user_email -@deffield updated: Updated +@contact: celine.mercier@metabarcoding.org ''' -default_config = { 'software' : "The OBITools", +default_config = { 'software' : "The OBITools 3", 'log' : False, 'loglevel' : 'INFO', - 'progress' : True, 'inputURI' : None, 'outputURI' : None, 'defaultdms' : None, @@ -52,8 +46,8 @@ from obitools3.version import version __all__ = [] __version__ = version -__date__ = '2014-09-28' -__updated__ = '2014-09-28' +__date__ = '2019-09-22' +__updated__ = '2019-09-22' DEBUG = 1 TESTRUN = 0 diff --git a/setup.py b/setup.py index ce9dff9..dd4be8e 100755 --- a/setup.py +++ b/setup.py @@ -83,13 +83,13 @@ def findPackage(root,base=None): PACKAGE = "OBITools3" -VERSION = "0.0.9" +VERSION = "1.0.0" AUTHOR = 'Celine Mercier' EMAIL = 'celine.mercier@metabarcoding.org' URL = "http://metabarcoding.org/obitools3" LICENSE = "CeCILL-V2" DESCRIPTION = "Tools and library for DNA metabarcoding", -PYTHONMIN = '3.7' +PYTHONMIN = '3.5' SRC = 'python' CSRC = 'src'