Skip to content

Commit

Permalink
Merge branch 'vbraun' for 10.4.beta8
Browse files Browse the repository at this point in the history
  • Loading branch information
kiwifb committed Jun 2, 2024
2 parents fac5cd7 + 97e612d commit 760c639
Show file tree
Hide file tree
Showing 13 changed files with 212 additions and 354 deletions.
1 change: 1 addition & 0 deletions sci-mathematics/database_cubic_hecke/Manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DIST database_cubic_hecke-2022.4.4.tar.gz 436248 BLAKE2B 5bdfa62bfecf89313cd42cf0850d9de837cdaf31e6ea373e12682a5215f10985ba2cc659465cb64a810ca2f55b62b935a9aa583758843a49c79c313c39f23f1b SHA512 7e6a02a1adbb5d6fa06e702da103e8643ee87aa8aa31e1181fc4098e39ad84e60f47a2604d701f2582b46843ebf2dafdfbf3d4f1f16ec014a8cd7157f7027e25
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools

inherit distutils-r1 pypi

DESCRIPTION="data for the representations of the Cubic Hecke Algebra"
KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
HOMEPAGE="https://pypi.org/project/database_cubic_hecke/"
IUSE="test"

LICENSE="GPL-3"
SLOT="0"

DEPEND="test? ( >=sci-mathematics/sagemath-standard-10.3 )"

RESTRICT="!test? ( test )"
11 changes: 11 additions & 0 deletions sci-mathematics/database_cubic_hecke/metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>[email protected]</email>
<name>Francois Bissey</name>
</maintainer>
<upstream>
<remote-id type="pypi">database_cubic_hecke</remote-id>
</upstream>
</pkgmetadata>
1 change: 1 addition & 0 deletions sci-mathematics/database_knotinfo/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DIST database_knotinfo-2024.2.1.tar.gz 14057457 BLAKE2B b9bdf6b3280177491fb2291aa22f9a1885d87af8b913d59b206d210d96c1f477bf5e0d307c09a6aa3e47d92409e0de2838cbfe8e120589f75073302e0abbd06a SHA512 9258527bcd66298e83b597cecbf616cc0548829e3d3da9c1d2d54d6f57fa7296f92a1e7e85cc3a4f8da763c14c25238e212b8bcad50a91d91c1a8a7acfdede97
DIST database_knotinfo-2024.5.1.tar.gz 14763125 BLAKE2B 91141bb46802e45dcca44c437eb5989990ee90d381d70e5c8298af478ae7108bdfe1ed848e343791025a0b7c253e92e4b54b07da61078b79c7b923761c0f4d7e SHA512 1ee363d7bd7df04b7d89e76146d3046c3f4a78a1241348d0d07c14b0b765221d4707d87a20d595cc93ae514841afb45cecfb1c096852bce65b0126890e054594
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools

inherit distutils-r1 pypi

DESCRIPTION="Content of the KnotInfo & LinkInfo databases as lists of dictionaries"
KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
HOMEPAGE="https://pypi.org/project/database-knotinfo/"
IUSE="test"

LICENSE="GPL-3"
SLOT="0"

DEPEND="test? ( >=sci-mathematics/sagemath-standard-10.3 )"

RESTRICT="!test? ( test )"
1 change: 1 addition & 0 deletions sci-mathematics/matroid-database/Manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DIST matroid-database-0.3.tar.gz 759792 BLAKE2B 05edb00b2d2ef6aaf71a33030a86104697e5613e5a74f503ed7ea53f317e3393d6f44d8a40d689aa4c66d6b445bff2d1fefd1da624fe2ef3bc5c271dfe4d3197 SHA512 2c2c222749459932bfa6be5880714b47a58d41119e0c1ebd7f2feaf191f5c5c5277da11bd95c94da3359c1ecc318d0c814675ad41a01f126611a837def7d929a
22 changes: 22 additions & 0 deletions sci-mathematics/matroid-database/matroid-database-0.3.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Copyright 2021-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

PYTHON_COMPAT=( python3_{10..12} )
DISTUTILS_USE_PEP517=setuptools
PYPI_NO_NORMALIZE=NO

inherit distutils-r1 pypi

DESCRIPTION="Yoshitake Matsumoto, Database of Matroids"
KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
HOMEPAGE="https://pypi.org/project/matroid-database/"
IUSE="test"

LICENSE="GPL-3"
SLOT="0"

DEPEND="test? ( >=sci-mathematics/sagemath-standard-10.3 )"

RESTRICT="!test? ( test )"
11 changes: 11 additions & 0 deletions sci-mathematics/matroid-database/metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>[email protected]</email>
<name>Francois Bissey</name>
</maintainer>
<upstream>
<remote-id type="pypi">matroid_database</remote-id>
</upstream>
</pkgmetadata>
26 changes: 0 additions & 26 deletions sci-mathematics/sagemath-standard/files/sage-sdist.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
diff --git a/sage/doctest/control.py b/sage/doctest/control.py
index 130aa3e..95123b1 100644
--- a/sage/doctest/control.py
+++ b/sage/doctest/control.py
@@ -471,15 +471,6 @@ class DocTestController(SageObject):
# that the package is actually installed).
if 'optional' in options.optional:
options.optional.discard('optional')
- from sage.misc.package import list_packages
- for pkg in list_packages('optional', local=True).values():
- if pkg.name in options.hide:
- continue
- # Skip features for which we have a more specific runtime feature test.
- if pkg.name in ['bliss', 'coxeter3', 'mcqd', 'meataxe', 'sirocco', 'tdlib']:
- continue
- if pkg.is_installed() and pkg.installed_version == pkg.remote_version:
- options.optional.add(pkg.name)

from sage.features import package_systems
options.optional.update(system.name
diff --git a/sage/misc/all.py b/sage/misc/all.py
index 585db5a..4045c31 100644
--- a/sage/misc/all.py
+++ b/sage/misc/all.py
@@ -132,8 +132,5 @@ lazy_import('sage.misc.dev_tools', 'runsnake', deprecation=34259)
lazy_import('sage.misc.edit_module', 'set_edit_template', deprecation=34259)
lazy_import('sage.misc.profiler', 'Profiler', deprecation=34259)
lazy_import('sage.misc.trace', 'trace', deprecation=34259)
-lazy_import('sage.misc.package', ('installed_packages', 'is_package_installed',
- 'package_versions'),
- deprecation=34259)
lazy_import('sage.misc.benchmark', 'benchmark', deprecation=34259)
lazy_import('sage.repl.interpreter', 'logstr', deprecation=34259)
diff --git a/sage/tests/cmdline.py b/sage/tests/cmdline.py
index 523cbef..8d1d7fe 100644
--- a/sage/tests/cmdline.py
+++ b/sage/tests/cmdline.py
@@ -13,9 +13,7 @@ test.spyx
--advanced
-c
--cython
---dev
--ecl
---experimental
--fixdoctests
--gap
--gdb
@@ -28,7 +26,6 @@ test.spyx
--maxima
--min
--mwrank
---optional
--preparse
--python
--python3
@@ -40,7 +37,6 @@ test.spyx
--sh
--singular
--sqlite3
---standard
--startuptime
-t
-v
@@ -579,35 +575,6 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False
sage: ret
0

- Check some things requiring an internet connection::
-
- sage: # optional - internet
- sage: (out, err, ret) = test_executable(["sage", "--standard"])
- sage: out.find("cython") >= 0
- True
- sage: err
- ''
- sage: ret
- 0
-
- sage: # optional - internet
- sage: (out, err, ret) = test_executable(["sage", "--optional"])
- sage: out.find("database_cremona_ellcurve") >= 0
- True
- sage: err
- ''
- sage: ret
- 0
-
- sage: # optional - internet
- sage: (out, err, ret) = test_executable(["sage", "--experimental"])
- sage: out.find("valgrind") >= 0
- True
- sage: err
- ''
- sage: ret
- 0
-
Check an illegal command line option. This outputs an error to stdout,
but we allow stderr in case this changes in the future::

diff --git a/setup.cfg b/setup.cfg
index 34a8930..5104698 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -70,14 +70,9 @@ scripts =
bin/sage-massif
bin/sage-omega
bin/sage-valgrind
- bin/sage-venv-config
bin/sage-version.sh
bin/sage-cleaner
- bin/sage-list-packages
bin/math-readline
- bin/sage-env
- bin/sage-grep
- bin/sage-grepdoc
bin/sage-inline-fortran
bin/sage-ipynb2rst
bin/sage-ipython
Loading

0 comments on commit 760c639

Please sign in to comment.