Skip to content

Commit 77925d0

Browse files
author
Matthias Koeppe
committed
pkgs/sage-conf_conda: Make sage_root a symlink to SAGE_ROOT
1 parent 870ce5d commit 77925d0

File tree

3 files changed

+60
-4
lines changed

3 files changed

+60
-4
lines changed

pkgs/sage-conf_conda/MANIFEST.in

Lines changed: 0 additions & 1 deletion
This file was deleted.

pkgs/sage-conf_conda/MANIFEST.in

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
prune .tox
2+
include VERSION.txt
3+
graft bin
4+
exclude bin/sage-env-config # generated by configure
5+
6+
prune sage_root
7+
include sage_root/Makefile
8+
include sage_root/README.md
9+
include sage_root/VERSION.txt
10+
include sage_root/bootstrap
11+
include sage_root/bootstrap-conda
12+
graft sage_root/build
13+
prune sage_root/build/.tox
14+
exclude sage_root/build/bin/sage-build-env-config # generated by configure
15+
exclude sage_root/build/make/Makefile-auto # generated by configure
16+
exclude sage_root/build/make/Makefile # generated by configure
17+
18+
# These sources are not needed because individual distributions of these are made.
19+
prune sage_root/build/pkgs/*/src*
20+
21+
graft sage_root/config
22+
include sage_root/configure
23+
include sage_root/configure.ac
24+
graft sage_root/m4
25+
26+
# Only these pkgs are needed (because of dependencies on source files,
27+
# see "git grep SAGE_ROOT build/pkgs/*/dependencies")
28+
graft sage_root/pkgs/sage-conf
29+
prune sage_root/pkgs/sage-conf/build
30+
prune sage_root/pkgs/sage-conf/dist
31+
prune sage_root/pkgs/sage-conf/*.egg-info
32+
exclude sage_root/pkgs/sage-conf/_sage_conf/_conf.py # generated by configure
33+
graft sage_root/pkgs/sage-docbuild
34+
prune sage_root/pkgs/sage-docbuild/build
35+
prune sage_root/pkgs/sage-docbuild/dist
36+
prune sage_root/pkgs/sage-docbuild/*.egg-info
37+
38+
graft sage_root/src/_sage_conf
39+
include sage_root/src/bin/sage-env
40+
include sage_root/src/bin/sage-env-config.in
41+
include sage_root/src/bin/sage-src-env-config.in
42+
include sage_root/src/bin/sage-venv-config
43+
include sage_root/src/bin/sage-version.sh
44+
include sage_root/src/doc/bootstrap # FIXME: should move to builds/pkgs/sagemath_doc_html/
45+
46+
global-exclude .tox
47+
global-exclude *~*
48+
global-exclude *.bak
49+
global-exclude *.orig
50+
global-exclude __pycache__
51+
global-exclude *.py[co]
52+
global-exclude *.so
53+
global-exclude .DS_Store

pkgs/sage-conf_conda/sage_root

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../sage-conf_pypi/sage_root
1+
../..

pkgs/sage-conf_conda/setup.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ def run(self):
4444

4545
# In this mode, we never run "make".
4646

47-
if not self.editable_mode:
48-
# Install configuration
47+
# Copy over files generated by the configure script
48+
# (see configure.ac AC_CONFIG_FILES)
49+
if self.editable_mode:
50+
pass # same file
51+
else:
4952
shutil.copyfile(os.path.join(SAGE_ROOT, 'pkgs', 'sage-conf', '_sage_conf', '_conf.py'),
5053
os.path.join(HERE, '_sage_conf', '_conf.py'))
5154
shutil.copyfile(os.path.join(SAGE_ROOT, 'src', 'bin', 'sage-env-config'),
@@ -54,6 +57,7 @@ def run(self):
5457
setuptools_build_py.run(self)
5558

5659
def _create_writable_sage_root(self):
60+
HERE = os.path.dirname(__file__)
5761
DOT_SAGE = os.environ.get('DOT_SAGE', os.path.join(os.environ.get('HOME'), '.sage'))
5862
with open(os.path.join(HERE, 'VERSION.txt')) as f:
5963
sage_version = f.read().strip()

0 commit comments

Comments
 (0)