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

Commit

Permalink
Merge #29865
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Koeppe committed Oct 18, 2021
2 parents 2c02ba9 + 6bd807b commit c60d2d4
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
4 changes: 4 additions & 0 deletions pkgs/sagemath-categories/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ setenv =
# Sage scripts such as sage-runtests like to use $HOME/.sage
HOME={envdir}

passenv =
SAGE_NUM_THREADS
SAGE_NUM_THREADS_PARALLEL

whitelist_externals =
bash

Expand Down
24 changes: 17 additions & 7 deletions pkgs/sagemath-objects/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,29 @@
import sys
sys.path.insert(0, os.path.dirname(__file__))

if len(sys.argv) > 1 and (sys.argv[1] == "sdist" or sys.argv[1] == "egg_info"):
sdist = True
else:
sdist = False

import sage.env
sage.env.default_required_modules = sage.env.default_optional_modules = ()

from sage_setup.command.sage_build_cython import sage_build_cython
from sage_setup.command.sage_build_ext import sage_build_ext

from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage']) # for now, we do the filtering using MANIFEST

log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))
if sdist:
python_packages = []
python_modules = []
cython_modules = []
else:
from sage_setup.find import find_python_sources
python_packages, python_modules, cython_modules = find_python_sources(
'.', ['sage']) # for now, we do the filtering using MANIFEST

log.warn('python_packages = {0}'.format(python_packages))
log.warn('python_modules = {0}'.format(python_modules))
log.warn('cython_modules = {0}'.format(cython_modules))

setup(
cmdclass = dict(build_cython=sage_build_cython,
Expand Down
4 changes: 4 additions & 0 deletions pkgs/sagemath-objects/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ setenv =
# Sage scripts such as sage-runtests like to use $HOME/.sage
HOME={envdir}

passenv =
SAGE_NUM_THREADS
SAGE_NUM_THREADS_PARALLEL

whitelist_externals =
bash

Expand Down

0 comments on commit c60d2d4

Please sign in to comment.