Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
OBITools
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
25
Issues
25
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
OBITools
OBITools
Commits
3e10b14a
Commit
3e10b14a
authored
Oct 17, 2014
by
Eric Coissac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch version to 1.00.008
Just few bugs on installer
parent
7f53d09f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
7 deletions
+16
-7
build_ext.py
distutils.ext/obidistutils/command/build_ext.py
+4
-1
core.py
distutils.ext/obidistutils/core.py
+0
-2
__init__.py
distutils.ext/obidistutils/serenity/__init__.py
+2
-1
checkpackage.py
distutils.ext/obidistutils/serenity/checkpackage.py
+4
-0
get-obitools.py
get_obitools/get-obitools.py
+4
-1
setup.py
setup.py
+1
-1
version.py
src/obitools/version.py
+1
-1
No files found.
distutils.ext/obidistutils/command/build_ext.py
View file @
3e10b14a
...
...
@@ -4,7 +4,10 @@ Created on 13 fevr. 2014
@author: coissac
'''
from
Cython.Distutils
import
build_ext
as
ori_build_ext
# @UnresolvedImport
try
:
from
Cython.Distutils
import
build_ext
as
ori_build_ext
# @UnresolvedImport
except
ImportError
:
from
distutils.command.build_ext
import
build_ext
as
ori_build_ext
from
distutils.errors
import
DistutilsSetupError
import
os
...
...
distutils.ext/obidistutils/core.py
View file @
3e10b14a
...
...
@@ -166,8 +166,6 @@ def setup(**attrs):
if
'cmdclass'
not
in
attrs
:
attrs
[
'cmdclass'
]
=
COMMANDS
print
COMMANDS
[
'build'
]
.
subcommands
if
'ctools'
not
in
attrs
:
attrs
[
'ctools'
]
=
CTOOLS
...
...
distutils.ext/obidistutils/serenity/__init__.py
View file @
3e10b14a
...
...
@@ -102,7 +102,8 @@ def serenity_mode(package,version):
if
args
.
serenity
:
serenity_snake
(
args
.
virtual
,
package
,
version
)
else
:
serenity_assert
(
package
,
version
)
pass
# serenity_assert(package,version)
log
.
set_threshold
(
old
)
...
...
distutils.ext/obidistutils/serenity/checkpackage.py
View file @
3e10b14a
...
...
@@ -6,6 +6,7 @@ Created on 2 oct. 2014
import
re
import
sys
import
os
from
distutils.version
import
LooseVersion
# @UnusedImport
from
distutils.errors
import
DistutilsError
...
...
@@ -165,6 +166,9 @@ def pip_install_package(package,directory=None,pip=None):
args
=
[
'install'
]
if
'http_proxy'
in
os
.
environ
:
args
.
append
(
'--proxy=
%
s'
%
os
.
environ
[
'http_proxy'
])
if
directory
is
not
None
:
args
.
append
(
'--target=
%
s'
%
directory
)
...
...
get_obitools/get
_
obitools.py
→
get_obitools/get
-
obitools.py
View file @
3e10b14a
...
...
@@ -17739,6 +17739,9 @@ def pip_download_package(package,pip=None):
args
=
[
'install'
]
if
'http_proxy'
in
os
.
environ
:
args
.
append
(
'--proxy=
%
s'
%
os
.
environ
[
'http_proxy'
])
args
.
append
(
'--download=
%
s'
%
tmpdir
)
args
.
append
(
'--index-url=https://pypi.python.org/simple/'
)
args
.
append
(
'--no-deps'
)
...
...
@@ -17783,7 +17786,7 @@ def main():
os
.
system
(
command
)
activate
=
os
.
path
.
join
(
current
,
'obitools
>=1.00.000
'
)
activate
=
os
.
path
.
join
(
current
,
'obitools'
)
binpath
=
os
.
path
.
join
(
virtualenvname
,
'bin'
)
python
=
os
.
path
.
join
(
binpath
,
'python'
)
setup.py
View file @
3e10b14a
...
...
@@ -19,7 +19,7 @@ from os import path
PACKAGE
=
"OBITools"
VERSION
=
"1.0.00
7
"
VERSION
=
"1.0.00
8
"
AUTHOR
=
'Eric Coissac'
EMAIL
=
'eric@coissac.eu'
URL
=
'metabarcoding.org/obitools'
...
...
src/obitools/version.py
View file @
3e10b14a
major
=
1
minor
=
0
serial
=
'00
7
'
serial
=
'00
8
'
version
=
"
%2
d.
%02
d
%
s"
%
(
major
,
minor
,
serial
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment