Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 2b39b3d

Browse files
author
Matthias Koeppe
committed
Merge #34858
2 parents 9151794 + e229436 commit 2b39b3d

File tree

4 files changed

+67
-83
lines changed

4 files changed

+67
-83
lines changed

‎pkgs/sagemath-objects/setup.py

+22-35
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,

‎pkgs/sagemath-standard/setup.py

+37-47
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,20 @@
3939
### Configuration
4040
#########################################################
4141

42-
if len(sys.argv) > 1 and (sys.argv[1] in ["sdist", "egg_info", "dist_info"]):
43-
sdist = True
44-
else:
45-
sdist = False
42+
from sage_setup.excepthook import excepthook
43+
sys.excepthook = excepthook
4644

47-
if sdist:
48-
cmdclass = {}
49-
else:
50-
from sage_setup.excepthook import excepthook
51-
sys.excepthook = excepthook
45+
from sage_setup.setenv import setenv
46+
setenv()
5247

53-
from sage_setup.setenv import setenv
54-
setenv()
48+
from sage_setup.command.sage_build_cython import sage_build_cython
49+
from sage_setup.command.sage_build_ext import sage_build_ext
50+
from sage_setup.command.sage_install import sage_develop, sage_install_and_clean
5551

56-
from sage_setup.command.sage_build_cython import sage_build_cython
57-
from sage_setup.command.sage_build_ext import sage_build_ext
58-
from sage_setup.command.sage_install import sage_develop, sage_install_and_clean
59-
60-
cmdclass = dict(build_cython=sage_build_cython,
61-
build_ext=sage_build_ext,
62-
develop=sage_develop,
63-
install=sage_install_and_clean)
52+
cmdclass = dict(build_cython=sage_build_cython,
53+
build_ext=sage_build_ext,
54+
develop=sage_develop,
55+
install=sage_install_and_clean)
6456

6557
#########################################################
6658
### Testing related stuff
@@ -75,41 +67,39 @@
7567
### Discovering Sources
7668
#########################################################
7769

78-
if sdist:
79-
# No need to compute distributions. This avoids a dependency on Cython
80-
# just to make an sdist.
81-
distributions = None
82-
python_packages = []
83-
python_modules = []
84-
cython_modules = []
85-
else:
70+
if any(x in sys.argv
71+
for x in ['build', 'bdist_wheel', 'install']):
8672
log.info("Generating auto-generated sources")
8773
from sage_setup.autogen import autogen_all
8874
autogen_all()
8975

90-
# TODO: This should be quiet by default
91-
print("Discovering Python/Cython source code....")
92-
t = time.time()
93-
from sage.misc.package import is_package_installed_and_updated
94-
distributions = ['']
95-
optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib',
96-
'coxeter3', 'sirocco', 'meataxe']
97-
distributions += ['sagemath-{}'.format(pkg)
98-
for pkg in optional_packages_with_extensions
99-
if is_package_installed_and_updated(pkg)]
100-
log.warn('distributions = {0}'.format(distributions))
101-
from sage_setup.find import find_python_sources
102-
python_packages, python_modules, cython_modules = find_python_sources(
103-
SAGE_SRC, ['sage'], distributions=distributions)
104-
105-
log.debug('python_packages = {0}'.format(python_packages))
106-
print("Discovered Python/Cython sources, time: %.2f seconds." % (time.time() - t))
76+
# TODO: This should be quiet by default
77+
print("Discovering Python/Cython source code....")
78+
t = time.time()
79+
distributions = ['']
80+
from sage.misc.package import is_package_installed_and_updated
81+
optional_packages_with_extensions = ['mcqd', 'bliss', 'tdlib',
82+
'coxeter3', 'sirocco', 'meataxe']
83+
distributions += ['sagemath-{}'.format(pkg)
84+
for pkg in optional_packages_with_extensions
85+
if is_package_installed_and_updated(pkg)]
86+
log.warn('distributions = {0}'.format(distributions))
87+
from sage_setup.find import find_python_sources, find_extra_files
88+
python_packages, python_modules, cython_modules = find_python_sources(
89+
SAGE_SRC, ['sage'], distributions=distributions)
90+
91+
log.debug('python_packages = {0}'.format(python_packages))
92+
log.debug('python_modules = {0}'.format(python_modules))
93+
log.debug('cython_modules = {0}'.format(cython_modules))
94+
95+
print("Discovered Python/Cython sources, time: %.2f seconds." % (time.time() - t))
10796

10897
#########################################################
10998
### Distutils
11099
#########################################################
111100

112101
code = setup(
113-
packages = python_packages,
114-
cmdclass = cmdclass,
115-
ext_modules = cython_modules)
102+
packages=python_packages,
103+
cmdclass=cmdclass,
104+
ext_modules=cython_modules,
105+
)

‎src/MANIFEST.in

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
include VERSION.txt
2+
3+
global-include *.pxi *.pxd *.h *.hpp
4+
15
prune sage/ext/interpreters # In particular, __init__.py must not be present in the distribution; or sage_setup.autogen.interpreters.rebuild will not generate the code
26
prune sage_setup
37
prune sage_docbuild
@@ -36,6 +40,10 @@ include sage/stats/distributions/dgs_bern.c
3640
include sage/stats/distributions/dgs_gauss_dp.c
3741
include sage/stats/distributions/dgs_gauss_mp.c
3842
include sage/symbolic/ginac/*.cpp
43+
# Also actual C++ source files.
44+
include sage/geometry/triangulation/triangulations.cc
45+
include sage/geometry/triangulation/data.cc
46+
include sage/geometry/triangulation/functions.cc
3947

4048
global-exclude __pycache__
4149
global-exclude *.py[co]

‎src/sage/dynamics/arithmetic_dynamics/projective_ds.py

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class initialization directly.
5252
# https://www.gnu.org/licenses/
5353
# ****************************************************************************
5454

55-
from typing_extensions import final
5655
from sage.arith.misc import is_prime
5756
from sage.calculus.functions import jacobian
5857
from sage.categories.fields import Fields

0 commit comments

Comments
 (0)