diff --git a/build/pkgs/ecm/checksums.ini b/build/pkgs/ecm/checksums.ini index f2221539308..3f78010aaf2 100644 --- a/build/pkgs/ecm/checksums.ini +++ b/build/pkgs/ecm/checksums.ini @@ -1,4 +1,4 @@ tarball=ecm-VERSION.tar.gz -sha1=f35d225d1d44f9b8ad420bf9b50a92582f681337 -sha256=c721dd22e557c4a5dac9ac7e156a400cd2298812dd1f9b56e89966de01471ba8 -upstream_url=https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc922004e4b2/ecm-VERSION.tar.gz +sha1=257e1c327cd6de1097b7036c7ec358fe3dbfa4ad +sha256=7d20ece61ab6a20ad85f2c18064cabd77dc46a96ff894b5220dbb16e4666e8a5 +upstream_url=https://gitlab.inria.fr/zimmerma/ecm/uploads/ad3e5019fef98819ceae58b78f4cce93/ecm-VERSION.tar.gz diff --git a/build/pkgs/ecm/package-version.txt b/build/pkgs/ecm/package-version.txt index 2be8aeb6b14..024b4b9b53a 100644 --- a/build/pkgs/ecm/package-version.txt +++ b/build/pkgs/ecm/package-version.txt @@ -1 +1 @@ -7.0.5 +7.0.6 diff --git a/src/sage/interfaces/ecm.py b/src/sage/interfaces/ecm.py index ae1379861f2..1d887064a76 100644 --- a/src/sage/interfaces/ecm.py +++ b/src/sage/interfaces/ecm.py @@ -509,7 +509,6 @@ def _find_factor(self, n, factor_digits, B1, **kwds): """ n = self._validate(n) kwds.setdefault('c', 1000000000) - kwds.setdefault('I', 1) if factor_digits is not None: B1 = self.recommended_B1(factor_digits) kwds['one'] = True diff --git a/src/sage/libs/libecm.pyx b/src/sage/libs/libecm.pyx index a3b457d2e31..7df776b5d44 100644 --- a/src/sage/libs/libecm.pyx +++ b/src/sage/libs/libecm.pyx @@ -150,11 +150,13 @@ def ecmfactor(number, double B1, verbose=False, sigma=0): Some special cases:: sage: ecmfactor(1, 100) - (True, 1, ...) + Traceback (most recent call last): + ... + ValueError: Input number (1) must be greater than 1 sage: ecmfactor(0, 100) Traceback (most recent call last): ... - ValueError: Input number (0) must be positive + ValueError: Input number (0) must be greater than 1 """ cdef mpz_t n, f cdef int res @@ -165,8 +167,8 @@ def ecmfactor(number, double B1, verbose=False, sigma=0): sage_int_number = Integer(number) sage_int_sigma = Integer(sigma) - if number <= 0: - raise ValueError("Input number (%s) must be positive"%number) + if number <= 1: + raise ValueError("Input number (%s) must be greater than 1"%number) if verbose: print("Performing one curve with B1=%1.0f" % B1)