Skip to content

Commit

Permalink
gh-37231: Use matroid-database package
Browse files Browse the repository at this point in the history
    
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
  • Loading branch information
Release Manager committed Feb 21, 2024
2 parents 71f2ef4 + 7a0a502 commit 5430775
Show file tree
Hide file tree
Showing 55 changed files with 82 additions and 524,463 deletions.
25 changes: 25 additions & 0 deletions build/pkgs/matroid_database/SPKG.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
matroid_database: Python interface to matroid database
======================================================

Description
-----------

Python interface to matroid database.

This database was retrieved from
<https://www-imai.is.s.u-tokyo.ac.jp/~ymatsu/matroid/index.html>
(Yoshitake Matsumoto, Database of Matroids, 2012; accessed: 2023.12.02).


License
-------

GPL version 3 or later


Upstream Contact
----------------

https://pypi.org/project/matroid-database

https://github.com/gmou3/matroid-database
5 changes: 5 additions & 0 deletions build/pkgs/matroid_database/checksums.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
tarball=matroid_database-VERSION-py3-none-any.whl
sha1=5879d6ca685f27df69134f56c07af50f9a2e6622
md5=e5d667282b7926a2fd268d14f9414214
cksum=1875993705
upstream_url=https://pypi.io/packages/py3/m/matroid_database/matroid_database-VERSION-py3-none-any.whl
4 changes: 4 additions & 0 deletions build/pkgs/matroid_database/dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
| $(PYTHON_TOOLCHAIN) $(PYTHON)

----------
All lines of this file are ignored except the first.
1 change: 1 addition & 0 deletions build/pkgs/matroid_database/install-requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
matroid-database
1 change: 1 addition & 0 deletions build/pkgs/matroid_database/package-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.2
1 change: 1 addition & 0 deletions build/pkgs/matroid_database/type
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
optional

This file was deleted.

2 changes: 0 additions & 2 deletions src/sage/ext_data/matroids/database/all_matroids/allr1n02.txt

This file was deleted.

3 changes: 0 additions & 3 deletions src/sage/ext_data/matroids/database/all_matroids/allr1n03.txt

This file was deleted.

4 changes: 0 additions & 4 deletions src/sage/ext_data/matroids/database/all_matroids/allr1n04.txt

This file was deleted.

5 changes: 0 additions & 5 deletions src/sage/ext_data/matroids/database/all_matroids/allr1n05.txt

This file was deleted.

6 changes: 0 additions & 6 deletions src/sage/ext_data/matroids/database/all_matroids/allr1n06.txt

This file was deleted.

7 changes: 0 additions & 7 deletions src/sage/ext_data/matroids/database/all_matroids/allr1n07.txt

This file was deleted.

8 changes: 0 additions & 8 deletions src/sage/ext_data/matroids/database/all_matroids/allr1n08.txt

This file was deleted.

9 changes: 0 additions & 9 deletions src/sage/ext_data/matroids/database/all_matroids/allr1n09.txt

This file was deleted.

10 changes: 0 additions & 10 deletions src/sage/ext_data/matroids/database/all_matroids/allr1n10.txt

This file was deleted.

11 changes: 0 additions & 11 deletions src/sage/ext_data/matroids/database/all_matroids/allr1n11.txt

This file was deleted.

12 changes: 0 additions & 12 deletions src/sage/ext_data/matroids/database/all_matroids/allr1n12.txt

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions src/sage/ext_data/matroids/database/all_matroids/allr2n03.txt

This file was deleted.

7 changes: 0 additions & 7 deletions src/sage/ext_data/matroids/database/all_matroids/allr2n04.txt

This file was deleted.

13 changes: 0 additions & 13 deletions src/sage/ext_data/matroids/database/all_matroids/allr2n05.txt

This file was deleted.

23 changes: 0 additions & 23 deletions src/sage/ext_data/matroids/database/all_matroids/allr2n06.txt

This file was deleted.

37 changes: 0 additions & 37 deletions src/sage/ext_data/matroids/database/all_matroids/allr2n07.txt

This file was deleted.

58 changes: 0 additions & 58 deletions src/sage/ext_data/matroids/database/all_matroids/allr2n08.txt

This file was deleted.

87 changes: 0 additions & 87 deletions src/sage/ext_data/matroids/database/all_matroids/allr2n09.txt

This file was deleted.

Loading

0 comments on commit 5430775

Please sign in to comment.