sage.structure.element: Add abc Expression; deprecate is_Expression etc.

Question

sage.structure.element: Add abc Expression; deprecate is_Expression etc.

Closed this issue 4 years ago · 34 comments

(part of meta-ticket #32414)

in sage.structure.element, we add a class Expression

the existing class sage.symbolic.expression.Expression will be its only subclass
deprecate is_Expression, replace uses by isinstance(x, sage.structure.element.Expression)

Follow-up in #32665: Also deprecate is_SymbolicEquation, is_CallableSymbolicExpression, is_SymbolicVariable; replace uses by isinstance(x, Expression) and a method call (may need a new method is_callable)

Depends on #32599

CC: @DaveWitteMorris @tscrim @mjungmath

Component: refactoring

Author: Matthias Koeppe

Branch/Commit: ee7640c

Reviewer: Travis Scrimshaw

Issue created by migration from https://trac.sagemath.org/ticket/32638

Answer 1 · 2021-10-05T23:35:16.000Z

Branch: u/mkoeppe/sage_structure_element__add_abc_expression__deprecate_is_expression_etc_

Answer 2 · 2021-10-05T23:35:33.000Z

New commits:

`37ee682`	`sage.structure.element.Expression: New abc for sage.symbolic.expression.Expression`

Answer 3 · 2021-10-05T23:35:33.000Z

Description changed:

--- 
+++ 
@@ -1,6 +1,6 @@
 (part of meta-ticket #32414)
 
 in `sage.structure.element`, we add a class `Expression`
-- the existing class `sage.symbolic.expression.Expression` will be renamed to `Expression_pynac` and be its only subclass
+- the existing class `sage.symbolic.expression.Expression` will be its only subclass
 - deprecate `is_Expression`, `is_SymbolicEquation`, `is_CallableSymbolicExpression`, `is_SymbolicVariable`; replace uses by `isinstance(x, Expression)` and a method call (may need a new method `is_callable`)

Answer 4 · 2021-10-05T23:35:33.000Z

Commit: 37ee682

Answer 5 · 2021-10-05T23:55:35.000Z

Changed commit from 37ee682 to 08bf900

Answer 6 · 2021-10-05T23:55:35.000Z

Branch pushed to git repo; I updated commit sha1. New commits:

`56d1c36`	`git grep -l -E 'is_Expression' \| xargs sed -E -i.bak 's/sage[.]symbolic.import is_Expression $/sage.structure.element import Expression/;s/is_Expression[(]([^)]*)[)]/isinstance(\1, Expression)/g;'`
`08bf900`	`is_Expression: Undo automatic edit of the definition; deprecate`

Answer 7 · 2021-10-05T23:55:53.000Z

Description changed:

--- 
+++ 
@@ -2,5 +2,7 @@
 
 in `sage.structure.element`, we add a class `Expression`
 - the existing class `sage.symbolic.expression.Expression` will be its only subclass
-- deprecate `is_Expression`, `is_SymbolicEquation`, `is_CallableSymbolicExpression`, `is_SymbolicVariable`; replace uses by `isinstance(x, Expression)` and a method call (may need a new method `is_callable`)
+- deprecate `is_Expression`
 
+Follow-up: Also deprecate `is_SymbolicEquation`, `is_CallableSymbolicExpression`, `is_SymbolicVariable`; replace uses by `isinstance(x, Expression)` and a method call (may need a new method `is_callable`)
+

Answer 8 · 2021-10-05T23:55:53.000Z

Author: Matthias Koeppe

Answer 9 · 2021-10-05T23:55:53.000Z

comment:4

setting to needs_review so that the patchbot runs

Answer 10 · 2021-10-06T01:56:45.000Z

Branch pushed to git repo; I updated commit sha1. New commits:

`4e5fe35`	`src/sage/symbolic/expression.pxd: Undo automatic edit`

Answer 11 · 2021-10-06T01:56:45.000Z

Changed commit from 08bf900 to 4e5fe35

Answer 12 · 2021-10-06T02:14:56.000Z

Branch pushed to git repo; I updated commit sha1. New commits:

`e14259b`	`src/sage/ext/fast_callable.pyx: Fix up clash of sage.ext.fast_callable.Expression and sage.structure.element.Expression`

Answer 13 · 2021-10-06T02:14:56.000Z

Changed commit from 4e5fe35 to e14259b

Answer 14 · 2021-10-06T04:20:26.000Z

Branch pushed to git repo; I updated commit sha1. New commits:

`daed11e`	`src/sage/symbolic/function.pyx: Update imports`

Answer 15 · 2021-10-06T04:20:26.000Z

Changed commit from e14259b to daed11e

Answer 16 · 2021-10-06T04:21:25.000Z

Changed commit from daed11e to c52251b

Answer 17 · 2021-10-06T04:21:25.000Z

Branch pushed to git repo; I updated commit sha1. New commits:

`c52251b`	`src/sage/symbolic/ring.pyx: Update imports`

Answer 18 · 2021-10-06T04:27:01.000Z

Description changed:

--- 
+++ 
@@ -2,7 +2,7 @@
 
 in `sage.structure.element`, we add a class `Expression`
 - the existing class `sage.symbolic.expression.Expression` will be its only subclass
-- deprecate `is_Expression`
+- deprecate `is_Expression`, replace uses by `isinstance(x, sage.structure.element.Expression)`
 
 Follow-up: Also deprecate `is_SymbolicEquation`, `is_CallableSymbolicExpression`, `is_SymbolicVariable`; replace uses by `isinstance(x, Expression)` and a method call (may need a new method `is_callable`)

Answer 19 · 2021-10-06T16:16:02.000Z

Changed commit from c52251b to 2a81e0f

Answer 20 · 2021-10-06T16:16:02.000Z

Branch pushed to git repo; I updated commit sha1. New commits:

`0f30530`	`src/sage/misc/sageinspect.py: Fix up a doctest on the source code of src/sage/symbolic/expression.pyx`
`2a81e0f`	`src/sage/symbolic/expression.pyx: Fix markup of doctest output`

Answer 21 · 2021-10-06T22:17:13.000Z

Branch pushed to git repo; I updated commit sha1. New commits:

`88886ee`	`src/sage/symbolic/expression.pyx: Fix doctest output`

Answer 22 · 2021-10-06T22:17:13.000Z

Changed commit from 2a81e0f to 88886ee

Answer 23 · 2021-10-07T04:25:31.000Z

Branch pushed to git repo; I updated commit sha1. New commits:

`cf9b75a`	`src/sage/symbolic/relation.py: Remove unused import; use sage.structure.element.Expression for isinstance`

Answer 24 · 2021-10-07T04:25:31.000Z

Changed commit from 88886ee to cf9b75a

Answer 25 · 2021-10-07T22:56:53.000Z

comment:14

LGTM.

Answer 26 · 2021-10-07T22:56:53.000Z

Reviewer: Travis Scrimshaw

Answer 27 · 2021-10-07T22:58:16.000Z

comment:15

Thank you!

Answer 28 · 2021-10-10T19:34:31.000Z

Description changed:

--- 
+++ 
@@ -4,5 +4,5 @@
 - the existing class `sage.symbolic.expression.Expression` will be its only subclass
 - deprecate `is_Expression`, replace uses by `isinstance(x, sage.structure.element.Expression)`
 
-Follow-up: Also deprecate `is_SymbolicEquation`, `is_CallableSymbolicExpression`, `is_SymbolicVariable`; replace uses by `isinstance(x, Expression)` and a method call (may need a new method `is_callable`)
+Follow-up in #32665: Also deprecate `is_SymbolicEquation`, `is_CallableSymbolicExpression`, `is_SymbolicVariable`; replace uses by `isinstance(x, Expression)` and a method call (may need a new method `is_callable`)

Answer 29 · 2021-10-11T22:06:27.000Z

Branch pushed to git repo; I updated commit sha1 and set ticket back to needs_review. New commits:

`ec8400b`	`Merge tag '9.5.beta3' into t/32638/sage_structure_element__add_abc_expression__deprecate_is_expression_etc_`

Answer 30 · 2021-10-11T22:06:27.000Z

Changed commit from cf9b75a to ec8400b

Answer 31 · 2021-10-13T21:57:13.000Z

Dependencies: #32599

Answer 32 · 2021-10-13T21:58:59.000Z

Branch pushed to git repo; I updated commit sha1 and set ticket back to needs_review. New commits:

`8e27fdc`	`src/sage/structure/sequence.py: Do not fail if polynomial rings cannot be imported`
`b43a50c`	`src/sage/sets/condition_set.py: Do not fail if sage.symbolic cannot be imported`
`73aabd2`	`src/sage/sets/condition_set.py: Fix up import`
`ee7640c`	`Merge #32599`

Answer 33 · 2021-10-13T21:58:59.000Z

Changed commit from ec8400b to ee7640c

Answer 34 · 2021-10-19T20:31:56.000Z

Changed branch from u/mkoeppe/sage_structure_element__add_abc_expression__deprecate_is_expression_etc_ to ee7640c