Opened 20 months ago

Last modified 18 months ago

#24483 needs_work enhancement

complex_field.py complex_number.pyx -> complex_mpfr.pyx

Reported by: vdelecroix Owned by:
Priority: major Milestone: sage-8.2
Component: basic arithmetic Keywords:
Cc: Merged in:
Authors: Vincent Delecroix Reviewers:
Report Upstream: N/A Work issues:
Branch: u/rws/24483 (Commits) Commit: aefb4dff3c33aa3e9378f0eb33e90070e03b44dd
Dependencies: #24497, #22928 Stopgaps:

Description (last modified by vdelecroix)

In order to uniformize, simplify and in view of #17713 we merge the two files complex_field.py, complex_number.pyx into a unique complex_mpfr.pyx.

Pynac used to explicitely depend on these modules but will use the more standard place sage.rings.all in the future (see #24497).

follow-up: #24489

Change History (26)

comment:1 Changed 20 months ago by vdelecroix

  • Description modified (diff)
  • Report Upstream changed from Not yet reported upstream; Will do shortly. to Reported upstream. No feedback yet.

comment:2 Changed 20 months ago by vdelecroix

  • Branch set to u/vdelecroix/24483
  • Commit set to 31c7e6772e34335c149ddc3bca58540772cc3038
  • Status changed from new to needs_review

Let us see about doctests


New commits:

11724f724483: merge complex_number/complex_field into complex_mpfr
e314fbe24483: fix interpreters
808d0bd24483: fix imports
31c7e6724483: patch for pynac

comment:3 Changed 20 months ago by vdelecroix

  • Authors set to Vincent Delecroix

patchbot not happy if Author is not given...

comment:4 Changed 20 months ago by git

  • Commit changed from 31c7e6772e34335c149ddc3bca58540772cc3038 to aaab91ca3aa64742917b3e375d68c71b5adec850

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

aaab91c24483: patch for pynac

comment:5 Changed 20 months ago by git

  • Commit changed from aaab91ca3aa64742917b3e375d68c71b5adec850 to f69c629b28dd1bfa0f04ac4aa0fbf3b5f1bb40ff

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

a439e6f24483: fix imports and doctests
f69c62924483: patch for pynac

comment:6 Changed 20 months ago by vdelecroix

  • Description modified (diff)

comment:7 Changed 20 months ago by vdelecroix

  • Description modified (diff)

comment:8 Changed 20 months ago by vdelecroix

  • Description modified (diff)

comment:9 follow-up: Changed 20 months ago by jdemeyer

Can we just do the renaming without deprecation for now? That way, we wouldn't need the fix the Pynac. If possible, I would like to avoid Sage-specific patches to upstream projects.

comment:10 in reply to: ↑ 9 Changed 20 months ago by vdelecroix

Replying to jdemeyer:

Can we just do the renaming without deprecation for now? That way, we wouldn't need the fix the Pynac. If possible, I would like to avoid Sage-specific patches to upstream projects.

The whole point is precisely to start a deprecation... though for ease of review I can move the deprecation in another ticket. Would that be better?

comment:11 Changed 20 months ago by git

  • Commit changed from f69c629b28dd1bfa0f04ac4aa0fbf3b5f1bb40ff to 74b6eab99a287cc2968e9670b8df3a7efc582d9c

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

6f2d6a224483: merge complex_number/complex_field into complex_mpfr
17092ed24483: fix interpreters
74b6eab24483: fix imports and doctests

comment:12 Changed 20 months ago by vdelecroix

All right. The import of ComplexField from sage.rings.complex_field is not deprecated anymore...

comment:13 Changed 20 months ago by vdelecroix

  • Description modified (diff)

comment:14 Changed 20 months ago by rws

  • Report Upstream changed from Reported upstream. No feedback yet. to Fixed upstream, in a later stable release.

comment:15 Changed 20 months ago by rws

  • Dependencies set to #24497
  • Report Upstream changed from Fixed upstream, in a later stable release. to N/A

comment:16 Changed 20 months ago by vdelecroix

  • Status changed from needs_review to needs_work

Great! Thanks Ralf. I will put back the deprecation.

comment:17 Changed 20 months ago by git

  • Commit changed from 74b6eab99a287cc2968e9670b8df3a7efc582d9c to 14c9753e43f16686597e4a239b190472fd19ef90

Branch pushed to git repo; I updated commit sha1. This was a forced push. New commits:

875c23124483: merge complex_number/complex_field into complex_mpfr
f3ed18c24483: fix interpreters
14c975324483: fix imports and doctests

comment:18 Changed 20 months ago by vdelecroix

  • Status changed from needs_work to needs_review

comment:19 Changed 20 months ago by vdelecroix

  • Status changed from needs_review to needs_work

a lot of doctest failures...

comment:20 Changed 20 months ago by vdelecroix

  • Description modified (diff)

comment:21 Changed 20 months ago by vdelecroix

  • Status changed from needs_work to needs_review

Actually these are failing because the patchbot is not merging #24497 first!

comment:22 Changed 20 months ago by vdelecroix

  • Dependencies changed from #24497 to #24497, #22928
  • Status changed from needs_review to needs_work

comment:23 Changed 19 months ago by vdelecroix

  • Description modified (diff)

comment:24 Changed 18 months ago by rws

  • Branch changed from u/vdelecroix/24483 to u/rws/24483

comment:25 Changed 18 months ago by rws

  • Commit changed from 14c9753e43f16686597e4a239b190472fd19ef90 to aefb4dff3c33aa3e9378f0eb33e90070e03b44dd
  • Status changed from needs_work to needs_review

New commits:

1fdb61cMerge branch 'develop' into t/24483/24483
aefb4df24483: fix import

comment:26 Changed 18 months ago by vdelecroix

  • Status changed from needs_review to needs_work

Got one doctest failure

sage -t src/sage/misc/citation.pyx
**********************************************************************
File "src/sage/misc/citation.pyx", line 87, in sage.misc.citation.get_systems
Failed example:
    get_systems('((a+1)^2).expand()')
Expected:
    ['MPFR', 'ginac']
Got:
    ['ginac']
**********************************************************************
1 item had failures:
   1 of  11 in sage.misc.citation.get_systems
    [13 tests, 1 failure, 1.75 s]
Note: See TracTickets for help on using tickets.