Skip to content

Commit 5430775

Browse files
author
Release Manager
committed
gh-37231: Use matroid-database package Remove matroid database files (`ext_data/matroids`) and use newly created `matroid-database` pypi package instead. Links to `matroid-database`: [pypi](https://pypi.org/project/matroid- database/), [github](https://github.com/gmou3/matroid-database) Outdated: > Compress (via `xz -e`) the matroid database files (~75MB to <1MB). The files are now opened with `lzma.open()` and the file paths are located through `sage.ext_data` and not relative to `SAGE_SRC` or `SAGE_EXTCODE`. These changes attempt to address the issues raised by @tornaria. > > Also, the addition of the matroid database files inside the folder `ext_data` needs to be noted in the file `setup.cfg.m4`. This issue was brought to my attention by @antonio-rojas. > > These follow the merging of #37140. > > I also took the initiative of reordering alphabetically the list of paths inside `setup.cfg.m4` and of removing the line `ext_data/images/*` which seemed redundant. <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. URL: #37231 Reported by: gmou3 Reviewer(s): gmou3, Gonzalo Tornaría, Matthias Köppe
2 parents 71f2ef4 + 7a0a502 commit 5430775

Some content is hidden

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

55 files changed

+82
-524463
lines changed

build/pkgs/matroid_database/SPKG.rst

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
matroid_database: Python interface to matroid database
2+
======================================================
3+
4+
Description
5+
-----------
6+
7+
Python interface to matroid database.
8+
9+
This database was retrieved from
10+
<https://www-imai.is.s.u-tokyo.ac.jp/~ymatsu/matroid/index.html>
11+
(Yoshitake Matsumoto, Database of Matroids, 2012; accessed: 2023.12.02).
12+
13+
14+
License
15+
-------
16+
17+
GPL version 3 or later
18+
19+
20+
Upstream Contact
21+
----------------
22+
23+
https://pypi.org/project/matroid-database
24+
25+
https://github.com/gmou3/matroid-database
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
tarball=matroid_database-VERSION-py3-none-any.whl
2+
sha1=5879d6ca685f27df69134f56c07af50f9a2e6622
3+
md5=e5d667282b7926a2fd268d14f9414214
4+
cksum=1875993705
5+
upstream_url=https://pypi.io/packages/py3/m/matroid_database/matroid_database-VERSION-py3-none-any.whl
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
| $(PYTHON_TOOLCHAIN) $(PYTHON)
2+
3+
----------
4+
All lines of this file are ignored except the first.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
matroid-database
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.2

build/pkgs/matroid_database/type

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
optional

src/sage/ext_data/matroids/database/all_matroids/allr1n01.txt

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

src/sage/ext_data/matroids/database/all_matroids/allr1n02.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/sage/ext_data/matroids/database/all_matroids/allr1n03.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/sage/ext_data/matroids/database/all_matroids/allr1n04.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)