Skip to content

Commit 1a2624f

Browse files
author
Release Manager
committed
gh-36596: Replace relative imports by absolute ones in `sage.{geometry,groups,numerical,plot}` <!-- ^^^^^ 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? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> - Cherry-picked from #35095 - This is for #36228 <!-- 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. - [ ] 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: #36596 Reported by: Matthias Köppe Reviewer(s): Tobias Diez
2 parents 571320b + b9b9bc8 commit 1a2624f

Some content is hidden

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

48 files changed

+114
-105
lines changed

src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pxd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cimport cython
22
from sage.data_structures.list_of_pairs cimport ListOfPairs
33
from sage.structure.sage_object cimport SageObject
4-
from .face_iterator cimport FaceIterator, CombinatorialFace
5-
from .list_of_faces cimport ListOfFaces
6-
from .face_data_structure cimport face_t
7-
from .polyhedron_face_lattice cimport PolyhedronFaceLattice
4+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_iterator cimport FaceIterator, CombinatorialFace
5+
from sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces cimport ListOfFaces
6+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_t
7+
from sage.geometry.polyhedron.combinatorial_polyhedron.polyhedron_face_lattice cimport PolyhedronFaceLattice
88

99
@cython.final
1010
cdef class CombinatorialPolyhedron(SageObject):

src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pyx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ from .conversions \
9898
incidence_matrix_to_bit_rep_of_Vrep, \
9999
facets_tuple_to_bit_rep_of_facets, \
100100
facets_tuple_to_bit_rep_of_Vrep
101-
from .conversions cimport Vrep_list_to_bit_rep
101+
from sage.geometry.polyhedron.combinatorial_polyhedron.conversions cimport Vrep_list_to_bit_rep
102102
from sage.misc.cachefunc import cached_method
103103

104104
from sage.rings.integer cimport smallInteger
105105
from cysignals.signals cimport sig_check
106106

107-
from .face_data_structure cimport face_len_atoms, face_init, face_free
108-
from .face_iterator cimport iter_t, parallel_f_vector
107+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_len_atoms, face_init, face_free
108+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_iterator cimport iter_t, parallel_f_vector
109109

110110

111111
cdef extern from "Python.h":

src/sage/geometry/polyhedron/combinatorial_polyhedron/combinatorial_face.pxd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cimport cython
22
from sage.structure.sage_object cimport SageObject
3-
from .list_of_faces cimport ListOfFaces
4-
from .face_data_structure cimport face_t
5-
from .face_iterator cimport FaceIterator
3+
from sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces cimport ListOfFaces
4+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_t
5+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_iterator cimport FaceIterator
66

77
@cython.final
88
cdef class CombinatorialFace(SageObject):

src/sage/geometry/polyhedron/combinatorial_polyhedron/combinatorial_face.pyx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ from cysignals.memory cimport check_allocarray, sig_free
6868

6969
import numbers
7070
from sage.rings.integer cimport smallInteger
71-
from .conversions cimport bit_rep_to_Vrep_list
72-
from .base cimport CombinatorialPolyhedron
73-
from .face_iterator cimport FaceIterator_base, FaceStatus
74-
from .polyhedron_face_lattice cimport PolyhedronFaceLattice
75-
from .face_data_structure cimport face_len_atoms, face_init, face_free, face_copy, face_issubset
76-
from .face_list_data_structure cimport bit_rep_to_coatom_rep
77-
from .list_of_faces cimport face_as_combinatorial_polyhedron
71+
from sage.geometry.polyhedron.combinatorial_polyhedron.conversions cimport bit_rep_to_Vrep_list
72+
from sage.geometry.polyhedron.combinatorial_polyhedron.base cimport CombinatorialPolyhedron
73+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_iterator cimport FaceIterator_base, FaceStatus
74+
from sage.geometry.polyhedron.combinatorial_polyhedron.polyhedron_face_lattice cimport PolyhedronFaceLattice
75+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_len_atoms, face_init, face_free, face_copy, face_issubset
76+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport bit_rep_to_coatom_rep
77+
from sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces cimport face_as_combinatorial_polyhedron
7878

7979

8080
cdef extern from "Python.h":

src/sage/geometry/polyhedron/combinatorial_polyhedron/conversions.pxd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
from .face_list_data_structure cimport face_t
1+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport face_t
2+
23

34
cdef int Vrep_list_to_bit_rep(tuple Vrep_list, face_t output) except -1
45

src/sage/geometry/polyhedron/combinatorial_polyhedron/conversions.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ from memory_allocator cimport MemoryAllocator
7272

7373
from sage.matrix.matrix_dense cimport Matrix_dense
7474

75-
from .list_of_faces cimport ListOfFaces
76-
from .face_data_structure cimport face_next_atom, face_add_atom_safe, facet_set_coatom, face_clear
75+
from sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces cimport ListOfFaces
76+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_next_atom, face_add_atom_safe, facet_set_coatom, face_clear
7777

7878
cdef extern from "Python.h":
7979
int unlikely(int) nogil # Defined by Cython

src/sage/geometry/polyhedron/combinatorial_polyhedron/face_iterator.pxd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
cimport cython
22
from sage.structure.sage_object cimport SageObject
3-
from .list_of_faces cimport ListOfFaces
4-
from .face_data_structure cimport face_t
5-
from .face_list_data_structure cimport face_list_t
6-
from .combinatorial_face cimport CombinatorialFace
3+
from sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces cimport ListOfFaces
4+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport face_t
5+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport face_list_t
6+
from sage.geometry.polyhedron.combinatorial_polyhedron.combinatorial_face cimport CombinatorialFace
77

88
cdef enum FaceStatus:
99
NOT_INITIALIZED

src/sage/geometry/polyhedron/combinatorial_polyhedron/face_iterator.pyx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,13 @@ AUTHOR:
176176

177177
from cython.parallel cimport prange, threadid
178178
from cysignals.memory cimport check_allocarray, sig_free
179+
from cysignals.signals cimport sig_check
179180
from memory_allocator cimport MemoryAllocator
180181

181-
from cysignals.signals cimport sig_check
182-
from .conversions cimport bit_rep_to_Vrep_list
183-
from .base cimport CombinatorialPolyhedron
184-
182+
from sage.geometry.polyhedron.combinatorial_polyhedron.base cimport CombinatorialPolyhedron
183+
from sage.geometry.polyhedron.combinatorial_polyhedron.conversions cimport bit_rep_to_Vrep_list
184+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport *
185185
from sage.geometry.polyhedron.face import combinatorial_face_to_polyhedral_face, PolyhedronFace
186-
from .face_list_data_structure cimport *
187186

188187

189188
cdef extern from "Python.h":

src/sage/geometry/polyhedron/combinatorial_polyhedron/face_list_data_structure.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Inline cython methods for lists of faces.
1414
cdef extern from "Python.h":
1515
int unlikely(int) nogil # Defined by Cython
1616

17-
from .face_data_structure cimport *
17+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_data_structure cimport *
1818
from libc.string cimport memset
1919
from cysignals.signals cimport sig_check
2020
from cysignals.memory cimport check_allocarray, check_calloc, sig_free

src/sage/geometry/polyhedron/combinatorial_polyhedron/list_of_faces.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cimport cython
2-
from .face_list_data_structure cimport face_list_t, face_t
2+
from sage.geometry.polyhedron.combinatorial_polyhedron.face_list_data_structure cimport face_list_t, face_t
33

44
@cython.final
55
cdef class ListOfFaces:

0 commit comments

Comments
 (0)