Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
ORG.Asm
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
23
Issues
23
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
ORG.Asm
ORG.Asm
Commits
f6c75e8a
Commit
f6c75e8a
authored
Dec 11, 2018
by
Eric Coissac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
patch the obidistutils extention to rely on setuptools.
parent
fd976f7d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
13 deletions
+18
-13
build_ext.py
distutils.ext/obidistutils/command/build_ext.py
+1
-2
core.py
distutils.ext/obidistutils/core.py
+5
-5
dist.py
distutils.ext/obidistutils/dist.py
+5
-5
__init__.py
distutils.ext/obidistutils/serenity/__init__.py
+7
-1
No files found.
distutils.ext/obidistutils/command/build_ext.py
View file @
f6c75e8a
...
...
@@ -104,8 +104,7 @@ try:
sub_commands
=
[(
'build_files'
,
has_files
),
(
'build_cexe'
,
has_executables
)
]
+
\
ori_build_ext
.
sub_commands
]
+
ori_build_ext
.
sub_commands
except
ImportError
:
from
distutils.command
import
build_ext
# @UnusedImport
...
...
distutils.ext/obidistutils/core.py
View file @
f6c75e8a
...
...
@@ -9,12 +9,12 @@ import os.path
import
glob
import
sys
#
try:
#
from setuptools.extension import Extension
#
except ImportError:
#
from distutils.extension import Extension
try
:
from
setuptools.extension
import
Extension
except
ImportError
:
from
distutils.extension
import
Extension
from
distutils.extension
import
Extension
#
from distutils.extension import Extension
from
obidistutils.serenity.checkpackage
import
install_requirements
,
\
check_requirements
,
\
...
...
distutils.ext/obidistutils/dist.py
View file @
f6c75e8a
...
...
@@ -4,12 +4,12 @@ Created on 20 oct. 2012
@author: coissac
'''
#
try:
#
from setuptools.dist import Distribution as ori_Distribution
#
except ImportError:
#
from distutils.dist import Distribution as ori_Distribution
try
:
from
setuptools.dist
import
Distribution
as
ori_Distribution
except
ImportError
:
from
distutils.dist
import
Distribution
as
ori_Distribution
from
distutils.dist
import
Distribution
as
ori_Distribution
#
from distutils.dist import Distribution as ori_Distribution
class
Distribution
(
ori_Distribution
):
...
...
distutils.ext/obidistutils/serenity/__init__.py
View file @
f6c75e8a
...
...
@@ -81,9 +81,15 @@ def serenity_mode(package,version):
argparser
.
add_argument
(
'--serenity'
,
dest
=
'serenity'
,
action
=
'store_true'
,
default
=
Fals
e
,
default
=
Tru
e
,
help
=
'Switch the installer in serenity mode. Everythings are installed in a virtualenv'
)
argparser
.
add_argument
(
'--no-serenity'
,
dest
=
'serenity'
,
action
=
'store_false'
,
default
=
True
,
help
=
'Switch the installer in the no serenity mode.'
)
argparser
.
add_argument
(
'--virtualenv'
,
dest
=
'virtual'
,
type
=
str
,
...
...
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