Skip to content

Commit 00deebe

Browse files
author
Matthias Koeppe
committed
pkgs/sagemath-objects/setup.py: Run finder also for sdist, egg_info, dist_info
1 parent 2f4b053 commit 00deebe

File tree

1 file changed

+22
-35
lines changed

1 file changed

+22
-35
lines changed

pkgs/sagemath-objects/setup.py

Lines changed: 22 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,41 +14,28 @@
1414
import sys
1515
sys.path.insert(0, os.path.dirname(__file__))
1616

17-
if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"):
18-
sdist = True
19-
else:
20-
sdist = False
21-
22-
if sdist:
23-
cmdclass = {}
24-
else:
25-
from sage_setup.excepthook import excepthook
26-
sys.excepthook = excepthook
27-
28-
from sage_setup.setenv import setenv
29-
setenv()
30-
31-
import sage.env
32-
sage.env.default_required_modules = sage.env.default_optional_modules = ()
33-
34-
from sage_setup.command.sage_build_cython import sage_build_cython
35-
from sage_setup.command.sage_build_ext import sage_build_ext
36-
37-
cmdclass = dict(build_cython=sage_build_cython,
38-
build_ext=sage_build_ext)
39-
40-
if sdist:
41-
python_packages = []
42-
python_modules = []
43-
cython_modules = []
44-
else:
45-
from sage_setup.find import find_python_sources
46-
python_packages, python_modules, cython_modules = find_python_sources(
47-
'.', ['sage']) # for now, we do the filtering using MANIFEST
48-
49-
log.warn('python_packages = {0}'.format(python_packages))
50-
log.warn('python_modules = {0}'.format(python_modules))
51-
log.warn('cython_modules = {0}'.format(cython_modules))
17+
from sage_setup.excepthook import excepthook
18+
sys.excepthook = excepthook
19+
20+
from sage_setup.setenv import setenv
21+
setenv()
22+
23+
import sage.env
24+
sage.env.default_required_modules = sage.env.default_optional_modules = ()
25+
26+
from sage_setup.command.sage_build_cython import sage_build_cython
27+
from sage_setup.command.sage_build_ext import sage_build_ext
28+
29+
cmdclass = dict(build_cython=sage_build_cython,
30+
build_ext=sage_build_ext)
31+
32+
from sage_setup.find import find_python_sources
33+
python_packages, python_modules, cython_modules = find_python_sources(
34+
'.', ['sage']) # for now, we do the filtering using MANIFEST
35+
36+
log.warn('python_packages = {0}'.format(python_packages))
37+
log.warn('python_modules = {0}'.format(python_modules))
38+
log.warn('cython_modules = {0}'.format(cython_modules))
5239

5340
setup(
5441
cmdclass = cmdclass,

0 commit comments

Comments
 (0)