Skip to content

Commit

Permalink
gh-36015: pkgs/sagemath*: Exclude all__*.py files of other distributions
Browse files Browse the repository at this point in the history
    
<!-- ^^^^^
Please provide a concise, informative and self-explanatory title.
Don't put issue numbers in there, do this in the PR body below.
For example, instead of "Fixes #1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->

<!-- Why is this change required? What problem does it solve? -->
Fixes
#35661 (comment)
<!-- 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

<!-- Put an `x` in all the boxes that apply. -->
<!-- If your change requires a documentation PR, please link it
appropriately -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
<!-- Feel free to remove irrelevant items. -->

- [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.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- #12345: short description why this is a dependency
- #34567: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: #36015
Reported by: Matthias Köppe
Reviewer(s): François Bissey, Matthias Köppe
  • Loading branch information
Release Manager committed Aug 5, 2023
2 parents 1329316 + e57dacd commit 3d2a141
Show file tree
Hide file tree
Showing 12 changed files with 53 additions and 21 deletions.
5 changes: 3 additions & 2 deletions pkgs/sagemath-bliss/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
global-include all__sagemath_bliss.py

include VERSION.txt

graft sage/graphs/bliss_cpp

global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_bliss.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
4 changes: 3 additions & 1 deletion pkgs/sagemath-categories/MANIFEST.in.m4
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ prune sage

include VERSION.txt

global-include all__sagemath_categories.py
graft sage/categories
# Exclude what is already shipped in sagemath-objects
exclude sage/categories/action.*
Expand Down Expand Up @@ -42,6 +41,9 @@ graft sage/typeset # dep of sage.categories.tensor
global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_categories.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
5 changes: 3 additions & 2 deletions pkgs/sagemath-coxeter3/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
prune sage

global-include all__sagemath_coxeter3.py

include VERSION.txt

graft sage/libs/coxeter3

global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_coxeter3.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
12 changes: 10 additions & 2 deletions pkgs/sagemath-environment/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
prune sage

global-include all__sagemath_environment.py

include sage/env.py
include sage/version.py
include sage/misc/package.py
Expand All @@ -12,4 +10,14 @@ graft sage/features

include VERSION.txt

global-exclude all__*.py
global-include all__sagemath_environment.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
global-exclude *.so
global-exclude *~
prune .tox
prune build
prune dist
5 changes: 3 additions & 2 deletions pkgs/sagemath-mcqd/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
prune sage

global-include all__sagemath_mcqd.py

include VERSION.txt

include sage/graphs/mcqd.p*

global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_mcqd.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
5 changes: 3 additions & 2 deletions pkgs/sagemath-meataxe/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
prune sage

global-include all__sagemath_meataxe.py

include VERSION.txt

include sage/libs/meataxe.p*
Expand All @@ -10,6 +8,9 @@ include sage/matrix/matrix_gfpn_dense.p*
global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_meataxe.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
4 changes: 2 additions & 2 deletions pkgs/sagemath-objects/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ graft sage/cpython

include VERSION.txt

global-include all__sagemath_objects.py

graft sage/structure
include sage/categories/action.*
include sage/categories/algebra_functor.*
Expand Down Expand Up @@ -85,6 +83,8 @@ graft sage/libs/gmp
include sage/misc/misc.* # some_tuples used in sage.misc.sage_unittest
include sage/misc/timing.p* # walltime, cputime used in sage.doctest

global-exclude all__*.py
global-include all__sagemath_objects.py

global-exclude *.c
global-exclude *.cpp
Expand Down
5 changes: 3 additions & 2 deletions pkgs/sagemath-repl/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
prune sage

global-include all__sagemath_repl.py

graft sage/doctest
graft sage/repl
include sage/misc/banner.py
Expand All @@ -11,6 +9,9 @@ include sage/misc/sage_eval.py

include VERSION.txt

global-exclude all__*.py
global-include all__sagemath_repl.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
5 changes: 3 additions & 2 deletions pkgs/sagemath-sirocco/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
global-include all__sagemath_sirocco.py

include VERSION.txt

global-exclude *.c
global-exclude *.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_sirocco.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
5 changes: 3 additions & 2 deletions pkgs/sagemath-tdlib/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
global-include all__sagemath_tdlib.py

include VERSION.txt

global-exclude *.c
global-exclude *.cpp

include sage/graphs/graph_decompositions/sage_tdlib.cpp

global-exclude all__sagemath_*.*
global-include all__sagemath_tdlib.py

global-exclude __pycache__
global-exclude *.py[co]
global-exclude *.bak
Expand Down
17 changes: 15 additions & 2 deletions src/MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ global-exclude *.cpp
include sage/cpython/debugimpl.c
include sage/graphs/base/boost_interface.cpp
include sage/graphs/cliquer/cl.c
include sage/graphs/graph_decompositions/sage_tdlib.cpp
include sage/libs/eclib/wrap.cpp
include sage/libs/linkages/padics/relaxed/flint_helper.c
include sage/misc/inherit_comparison_impl.c
Expand All @@ -45,7 +44,21 @@ include sage/geometry/triangulation/data.cc
include sage/geometry/triangulation/functions.cc

# Exclude extension modules shipped by optional packages
exclude sage/graphs/bliss.pyx
exclude sage/graphs/bliss.p*
prune sage/graphs/bliss_cpp
prune sage/libs/coxeter3
exclude sage/graphs/mcqd.p*
exclude sage/libs/meataxe.p*
exclude sage/matrix/matrix_gfpn_dense.p*
exclude sage/graphs/graph_decomposition/tdlib.p*

# Exclude all__*.py files belonging to distributions related to optional packages
global-exclude all__sagemath_bliss.py
global-exclude all__sagemath_coxeter3.py
global-exclude all__sagemath_mcqd.py
global-exclude all__sagemath_meataxe.py
global-exclude all__sagemath_sirocco.py
global-exclude all__sagemath_tdlib.py

global-exclude __pycache__
global-exclude *.py[co]
Expand Down
2 changes: 2 additions & 0 deletions src/sage/graphs/graph_decompositions/sage_tdlib.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// sage.setup: distribution = sagemath-tdlib

#include <boost/tuple/tuple.hpp>
#include <map>

Expand Down

0 comments on commit 3d2a141

Please sign in to comment.