+1 (damn web editor)

mpmath/matrices/matrices.py

@@ -379,7 +379,7 @@ def _toliststr(self):
  for i in range(rows):
  s += '['
  for j in range(cols):
- if not avoid_type or not isinstance(self[i,j], typ):
+ if not isinstance(self[i,j], typ):
  a = repr(self[i,j])
  else:
  a = "'" + str(self[i,j]) + "'"
@@ -736,19 +736,19 @@ def rows(self, value):
  for key in self._data.copy():
  if key[0] >= value:
  del self._data[key]
- self.shape[0] = value
+ self.shape = (value, self.shape[1])
 
  @property
  def cols(self):
  """Number of columns."""
- return self._cols
+ return self.shape[1]
 
  @cols.setter
  def cols(self, value):
  for key in self._data.copy():
  if key[1] >= value:
  del self._data[key]
- self.shape[0] = value 
+ self.shape = (self.shape[0], value)
 
  def transpose(self):
  rows, cols = self.shape

mpmath/tests/test_matrices.py

@@ -372,4 +372,4 @@ def _check(dat, ref, tol=1e-9):
  _check(mp.logm(c), sl.logm(c.astype(complex)))
  _check(mp.sqrtm(c), sl.sqrtm(c.astype(complex)))
  _check(mp.cosm(c), sl.cosm(c.astype(complex)))
- _check(mp.sinm(c), sl.sinm(c.astype(complex)))
+ _check(mp.sinm(c), sl.sinm(c.astype(complex)))

pyproject.toml

@@ -32,7 +32,7 @@ Documentation = 'http://mpmath.org/doc/current/'
 [project.optional-dependencies]
 tests = ['pytest>=6', 'numpy; python_version<"3.13"',
  'matplotlib; python_version<"3.13"',
- 'scipy; python_version>"3.10"']
+ 'scipy; python_version>"3.10" and python_version<"3.13"']
 develop = ['mpmath[tests]', 'flake518>=1.5; python_version>="3.9"',
  'pytest-cov', 'wheel', 'build']
 gmpy = ['gmpy2>=2.1.0a4; platform_python_implementation!="PyPy" and python_version<"3.12"',