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
330ca67d
Commit
330ca67d
authored
Nov 19, 2014
by
Eric Coissac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch Looseversion checks to StrictVersion
parent
e4a1ce87
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
14 deletions
+14
-14
checkpackage.py
distutils.ext/obidistutils/serenity/checkpackage.py
+2
-2
checkpip.py
distutils.ext/obidistutils/serenity/checkpip.py
+3
-3
checkpython.py
distutils.ext/obidistutils/serenity/checkpython.py
+5
-5
virtual.py
distutils.ext/obidistutils/serenity/virtual.py
+2
-2
get-obitools.py
get_obitools/get-obitools.py
+2
-2
No files found.
distutils.ext/obidistutils/serenity/checkpackage.py
View file @
330ca67d
...
...
@@ -8,7 +8,7 @@ import re
import
sys
import
os
from
distutils.version
import
Loose
Version
# @UnusedImport
from
distutils.version
import
Strict
Version
# @UnusedImport
from
distutils.errors
import
DistutilsError
from
distutils
import
log
...
...
@@ -27,7 +27,7 @@ def is_installed(requirement,pip=None):
if
len
(
package
)
==
1
:
if
requirement_version
is
not
None
and
requirement_relation
is
not
None
:
rep
=
(
len
(
package
)
==
1
)
and
eval
(
"
LooseVersion('
%
s')
%
s Loose
Version('
%
s')"
%
(
package
[
0
]
.
version
,
rep
=
(
len
(
package
)
==
1
)
and
eval
(
"
StrictVersion('
%
s')
%
s Strict
Version('
%
s')"
%
(
package
[
0
]
.
version
,
requirement_relation
,
requirement_version
)
)
...
...
distutils.ext/obidistutils/serenity/checkpip.py
View file @
330ca67d
...
...
@@ -11,7 +11,7 @@ import base64
import
zipimport
import
importlib
from
distutils.version
import
Loose
Version
from
distutils.version
import
Strict
Version
from
distutils.errors
import
DistutilsError
from
distutils
import
log
...
...
@@ -30,7 +30,7 @@ def is_pip_installed(minversion=PIP_MINVERSION):
log
.
info
(
"Try to load pip module..."
)
pipmodule
=
importlib
.
import_module
(
'pip'
)
if
hasattr
(
pipmodule
,
'__version__'
):
ok
=
LooseVersion
(
pipmodule
.
__version__
)
>=
Loose
Version
(
minversion
)
ok
=
StrictVersion
(
pipmodule
.
__version__
)
>=
Strict
Version
(
minversion
)
log
.
info
(
"Pip installed version
%
s"
%
pipmodule
.
__version__
)
else
:
ok
=
False
...
...
@@ -101,7 +101,7 @@ def get_a_pip_module(minversion=PIP_MINVERSION):
os
.
environ
.
setdefault
(
"PIP_CERT"
,
cert_path
)
assert
hasattr
(
pip
,
'__version__'
)
and
LooseVersion
(
pip
.
__version__
)
>=
Loose
Version
(
minversion
),
\
assert
hasattr
(
pip
,
'__version__'
)
and
StrictVersion
(
pip
.
__version__
)
>=
Strict
Version
(
minversion
),
\
"Unable to find suitable version of pip"
return
local_pip
[
0
]
...
...
distutils.ext/obidistutils/serenity/checkpython.py
View file @
330ca67d
...
...
@@ -9,7 +9,7 @@ import sys
import
os
import
glob
from
distutils.version
import
Loose
Version
from
distutils.version
import
Strict
Version
from
distutils
import
sysconfig
from
obidistutils.serenity.checksystem
import
is_mac_system
,
\
...
...
@@ -28,7 +28,7 @@ def is_python27(path=None):
@rtype: bool
'''
if
path
is
None
:
pythonversion
=
Loose
Version
(
sysconfig
.
get_python_version
())
pythonversion
=
Strict
Version
(
sysconfig
.
get_python_version
())
else
:
command
=
"""'
%
s' -c 'from distutils import sysconfig; """
\
"""print sysconfig.get_python_version()'"""
%
path
...
...
@@ -36,10 +36,10 @@ def is_python27(path=None):
p
=
subprocess
.
Popen
(
command
,
shell
=
True
,
stdout
=
subprocess
.
PIPE
)
pythonversion
=
Loose
Version
(
p
.
communicate
()[
0
])
pythonversion
=
Strict
Version
(
p
.
communicate
()[
0
])
return
pythonversion
>=
Loose
Version
(
"2.7"
)
\
and
pythonversion
<
Loose
Version
(
"2.8"
)
return
pythonversion
>=
Strict
Version
(
"2.7"
)
\
and
pythonversion
<
Strict
Version
(
"2.8"
)
...
...
distutils.ext/obidistutils/serenity/virtual.py
View file @
330ca67d
...
...
@@ -10,7 +10,7 @@ import os
import
sys
from
distutils.errors
import
DistutilsError
from
distutils.version
import
Loose
Version
from
distutils.version
import
Strict
Version
from
distutils
import
log
from
obidistutils.serenity.globals
import
PIP_MINVERSION
,
\
...
...
@@ -60,7 +60,7 @@ def get_a_virtualenv_module(pip=None):
vitualenvmodule
=
imp
.
load_module
(
'virtualenv'
,
f
,
filename
,
description
)
if
minversion
is
not
None
:
assert
Loose
Version
(
vitualenvmodule
.
__version__
)
>=
minversion
,
\
assert
Strict
Version
(
vitualenvmodule
.
__version__
)
>=
minversion
,
\
"Unable to find suitable version of pip get
%
s instead of
%
s"
%
(
vitualenvmodule
.
__version__
,
minversion
)
...
...
get_obitools/get-obitools.py
View file @
330ca67d
...
...
@@ -37290,7 +37290,7 @@ import pkgutil
import
stat
from
distutils.errors
import
DistutilsError
from
distutils.version
import
Loose
Version
from
distutils.version
import
Strict
Version
tmpdir
=
[]
...
...
@@ -37333,7 +37333,7 @@ def is_pip_installed(minversion=PIP_MINVERSION):
try
:
import
pip
# @UnresolvedImport
print
pip
.
__file__
ok
=
LooseVersion
(
pip
.
__version__
)
>=
Loose
Version
(
minversion
)
ok
=
StrictVersion
(
pip
.
__version__
)
>=
Strict
Version
(
minversion
)
except
:
ok
=
False
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