Skip to content

Commit 8d79ca8

Browse files
author
Matthias Koeppe
committed
Merge remote-tracking branch 'upstream/develop' into sage_topology_move_imports
2 parents 11723a0 + c00e6c2 commit 8d79ca8

File tree

539 files changed

+11832
-2992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

539 files changed

+11832
-2992
lines changed

‎.zenodo.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"description": "Mirror of the Sage https://sagemath.org/ source tree",
33
"license": "other-open",
4-
"title": "sagemath/sage: 10.0.beta3",
5-
"version": "10.0.beta3",
4+
"title": "sagemath/sage: 10.0.beta5",
5+
"version": "10.0.beta5",
66
"upload_type": "software",
7-
"publication_date": "2023-03-02",
7+
"publication_date": "2023-03-19",
88
"creators": [
99
{
1010
"affiliation": "SageMath.org",
@@ -15,7 +15,7 @@
1515
"related_identifiers": [
1616
{
1717
"scheme": "url",
18-
"identifier": "https://github.com/sagemath/sage/tree/10.0.beta3",
18+
"identifier": "https://github.com/sagemath/sage/tree/10.0.beta5",
1919
"relation": "isSupplementTo"
2020
},
2121
{

‎Makefile‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -80,42 +80,6 @@ download:
8080
dist: build/make/Makefile
8181
./sage --sdist
8282

83-
pypi-sdists: sage_setup
84-
./sage --sh build/pkgs/sage_conf/spkg-src
85-
./sage --sh build/pkgs/sage_sws2rst/spkg-src
86-
./sage --sh build/pkgs/sage_docbuild/spkg-src
87-
./sage --sh build/pkgs/sage_setup/spkg-src
88-
./sage --sh build/pkgs/sagelib/spkg-src
89-
./sage --sh build/pkgs/sagemath_objects/spkg-src
90-
./sage --sh build/pkgs/sagemath_categories/spkg-src
91-
./sage --sh build/pkgs/sagemath_environment/spkg-src
92-
./sage --sh build/pkgs/sagemath_repl/spkg-src
93-
@echo "Built sdists are in upstream/"
94-
95-
# Ensuring wheels are present, even for packages that may have been installed
96-
# as editable. Until we have better uninstallation of script packages, we
97-
# just remove the timestamps, which will lead to rebuilds of the packages.
98-
PYPI_WHEEL_PACKAGES = sage_sws2rst sage_setup sagemath_environment sagemath_objects sagemath_repl sagemath_categories
99-
pypi-wheels:
100-
for a in $(PYPI_WHEEL_PACKAGES); do \
101-
rm -f venv/var/lib/sage/installed/$$a-*; \
102-
done
103-
for a in $(PYPI_WHEEL_PACKAGES); do \
104-
$(MAKE) SAGE_EDITABLE=no SAGE_WHEELS=yes $$a; \
105-
done
106-
@echo "Built wheels are in venv/var/lib/sage/wheels/"
107-
108-
# sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib
109-
WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES) sage_conf sagelib sage_docbuild
110-
wheels:
111-
for a in $(WHEEL_PACKAGES); do \
112-
rm -f venv/var/lib/sage/installed/$$a-*; \
113-
done
114-
for a in $(WHEEL_PACKAGES); do \
115-
$(MAKE) SAGE_EDITABLE=no SAGE_WHEELS=yes $$a; \
116-
done
117-
@echo "Built wheels are in venv/var/lib/sage/wheels/"
118-
11983
###############################################################################
12084
# Cleaning up
12185
###############################################################################
@@ -380,7 +344,6 @@ list:
380344
@$(MAKE) --silent -f build/make/Makefile SAGE_PKGCONFIG=dummy $@
381345

382346
.PHONY: default build dist install micro_release \
383-
pypi-sdists pypi-wheels wheels \
384347
misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \
385348
test check testoptional testall testlong testoptionallong testallong \
386349
ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong \

‎README.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,20 @@ in the Installation Guide.
394394
or JupyterLab installation, as described in [section
395395
"Launching SageMath"](https://doc.sagemath.org/html/en/installation/launching.html)
396396
in the installation manual.
397+
398+
Alternative Installation using PyPI
399+
---------------
400+
401+
For installation of `sage` in python using `pip` you need to install `sagemath-standard`. First, activate your python virtual environment and follow these steps:
402+
403+
$ python3 -m pip install sage_conf
404+
$ ls $(sage-config SAGE_SPKG_WHEELS)
405+
$ python3 -m pip install $(sage-config SAGE_SPKG_WHEELS)/*.whl
406+
$ python3 -m pip install sagemath-standard
407+
408+
You need to install `sage_conf`, a wheelhouse of various python packages. You can list the wheels using `ls $(sage-config SAGE_SPKG_WHEELS)`. After manual installation of these wheels, you can install the sage library, `sagemath-standard`.
409+
410+
**NOTE:** You can find `sage` and `sagemath` pip packages but with these packages, you will encounter `ModuleNotFoundError`.
397411

398412
Troubleshooting
399413
---------------

‎VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 10.0.beta3, Release Date: 2023-03-02
1+
SageMath version 10.0.beta5, Release Date: 2023-03-19

‎build/make/Makefile.in‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,23 @@ PIP_PACKAGES = @SAGE_PIP_PACKAGES@
128128
# Packages that use the 'script' package build rules
129129
SCRIPT_PACKAGES = @SAGE_SCRIPT_PACKAGES@
130130

131-
131+
# Packages for which we build wheels for PyPI
132+
PYPI_WHEEL_PACKAGES = \
133+
sage_sws2rst \
134+
sage_setup \
135+
sagemath_environment \
136+
sagemath_objects \
137+
sagemath_repl \
138+
sagemath_categories
139+
140+
# sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib
141+
WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES) \
142+
sage_conf \
143+
sagelib \
144+
sage_docbuild
145+
146+
# Packages for which build sdists for PyPI
147+
PYPI_SDIST_PACKAGES = $(WHEEL_PACKAGES)
132148

133149
# Generate the actual inst_<pkgname> variables; for each package that is
134150
# actually built this generates a line like:
@@ -198,6 +214,7 @@ SAGE_I_TARGETS = sagelib doc
198214
# Tell make not to look for files with these names:
199215
.PHONY: all all-sage all-toolchain all-build all-sageruntime \
200216
all-start build-start base toolchain toolchain-deps base-toolchain \
217+
pypi-sdists pypi-wheels wheels \
201218
sagelib \
202219
doc doc-html doc-html-jsmath doc-html-mathjax doc-pdf \
203220
doc-uninstall \
@@ -418,6 +435,25 @@ list-broken-packages: auditwheel_or_delocate
418435
echo >&2 "$$fix_broken_packages"; \
419436
fi
420437

438+
pypi-sdists: $(PYPI_SDIST_PACKAGES:%=%-sdist)
439+
@echo "Built sdists are in upstream/"
440+
441+
# Ensuring wheels are present, even for packages that may have been installed
442+
# as editable. Until we have better uninstallation of script packages, we
443+
# just remove the timestamps, which will lead to rebuilds of the packages.
444+
pypi-wheels:
445+
for a in $(PYPI_WHEEL_PACKAGES); do \
446+
rm -f $(SAGE_VENV)/var/lib/sage/installed/$$a-*; \
447+
done
448+
$(MAKE_REC) SAGE_EDITABLE=no SAGE_WHEELS=yes $(PYPI_WHEEL_PACKAGES)
449+
@echo "Built wheels are in venv/var/lib/sage/wheels/"
450+
451+
wheels:
452+
for a in $(WHEEL_PACKAGES); do \
453+
rm -f $(SAGE_VENV)/var/lib/sage/installed/$$a-*; \
454+
done
455+
$(MAKE_REC) SAGE_EDITABLE=no SAGE_WHEELS=yes $(WHEEL_PACKAGES)
456+
@echo "Built wheels are in venv/var/lib/sage/wheels/"
421457

422458
#==============================================================================
423459
# Setting SAGE_CHECK... variables
@@ -711,6 +747,13 @@ $(1)-uninstall: $(1)-$(4)-uninstall
711747

712748
$(1)-clean: $(1)-uninstall
713749

750+
$(1)-sdist: FORCE python_build sage_setup cython
751+
$(AM_V_at) cd '$$(SAGE_ROOT)' && \
752+
. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
753+
. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \
754+
. '$$(SAGE_ROOT)/src/bin/sage-env' && \
755+
'$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-src'
756+
714757
# Recursive tox invocation (note - we do not set the environment here).
715758
# Setting SAGE_SPKG_WHEELS is for the benefit of sagelib's tox.ini
716759
$(1)-tox-%: FORCE

‎build/pkgs/_prereq/distros/fedora.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ gcc-c++
3030
# The need for which comes [...] from MPIR's configure script
3131
findutils
3232
which
33-
# Needed for pcre configure, see https://github.com/sagemath/sage/issues/29129:
3433
diffutils
3534
# Needed for openssl 3.0
3635
perl-IPC-Cmd

‎build/pkgs/configure/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=b9a6c30f4f1c828ca611527d104643d8c0b89ed9
3-
md5=37a7a99a528efa8a4eea1beff33985db
4-
cksum=1112286999
2+
sha1=0ea92e19072c843aa21527e051eff0a0f97eb9ad
3+
md5=44e659f4d263acad8194e16952762a82
4+
cksum=3343113057

‎build/pkgs/configure/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a822a2132aa0e85069ec8b6efa48ad6db08cc044
1+
49c2cd323e638cdfb0444d72daad21b4ddbd1887

‎build/pkgs/eclib/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=eclib-VERSION.tar.bz2
2-
sha1=2e86bc02e43edfb43473ecb1ae8e7b67cfe87e3c
3-
md5=bb6fc7cb57c01c45a033276e1a94028f
4-
cksum=3974905173
2+
sha1=7c8b64bd9a1b8f4f489690a53c1f329afc953f2c
3+
md5=03a87ae2b490f11b81ec6b305cbc8087
4+
cksum=111064162
55
upstream_url=https://github.com/JohnCremona/eclib/releases/download/VERSION/eclib-VERSION.tar.bz2

‎build/pkgs/eclib/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20220621
1+
20221012

0 commit comments

Comments
 (0)