bump primecount to ver. 7.1, and standard

sagemath · Nov 15, 2021 · 1e24a4a · 1e24a4a
1 parent 6ec717a
commit 1e24a4a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/build/pkgs/primecount/checksums.ini b/build/pkgs/primecount/checksums.ini
@@ -1,4 +1,5 @@
 tarball=primecount-VERSION.tar.gz
-sha1=d7a2c660eb64d14c951feeaee1d94d220c68c23e
-md5=ab925094a104499cfc21db2532e65517
-cksum=2340721037
+sha1=845b863f2007dc90d83c199db0af8fc20fd5092e
+md5=b855038556de3f0ec8210b54e4057a65
+cksum=2388953073
+upstream_url=https://github.com/kimwalisch/primecount/archive/refs/tags/vVERSION.tar.gz
diff --git a/build/pkgs/primecount/package-version.txt b/build/pkgs/primecount/package-version.txt
@@ -1 +1 @@
-5.1
+7.1
diff --git a/build/pkgs/primecount/type b/build/pkgs/primecount/type
@@ -1 +1 @@
-optional
+standard
diff --git a/src/sage/interfaces/primecount.pyx b/src/sage/interfaces/primecount.pyx
@@ -41,15 +41,15 @@ cpdef int64_t prime_pi(int64_t n, method=None) except -1:
 
     EXAMPLES::
 
-        sage: from sage.interfaces.primecount import prime_pi # optional - primecount
+        sage: from sage.interfaces.primecount import prime_pi
         doctest:warning
         ...
         DeprecationWarning: the module sage.interfaces.primecount is deprecated
         See https://trac.sagemath.org/32412 for details.
 
-        sage: prime_pi(1000) == 168                     # optional - primecount
+        sage: prime_pi(1000) == 168
         True
-        sage: prime_pi(1000, method='deleglise_rivat') == 168 # optional - primecount
+        sage: prime_pi(1000, method='deleglise_rivat') == 168
         doctest:warning
         ...
         DeprecationWarning: primecount 5 no longer supports the 'method' parameter
@@ -71,9 +71,9 @@ cpdef prime_pi_128(n):
 
     EXAMPLES::
 
-        sage: from sage.interfaces.primecount import prime_pi_128 # optional - primecount
+        sage: from sage.interfaces.primecount import prime_pi_128
 
-        sage: prime_pi_128(1000)     # optional - primecount
+        sage: prime_pi_128(1000)
         168
         sage: nth_prime_128(2**65)   # not tested
         ?
@@ -91,9 +91,9 @@ cpdef int64_t nth_prime(int64_t n) except -1:
 
     EXAMPLES::
 
-        sage: from sage.interfaces.primecount import nth_prime # optional - primecount
+        sage: from sage.interfaces.primecount import nth_prime
 
-        sage: nth_prime(168) == 997  # optional - primecount
+        sage: nth_prime(168) == 997
         True
     """
     if n <= 0:
@@ -114,11 +114,11 @@ cpdef int64_t phi(int64_t x, int64_t a):
 
     EXAMPLES::
 
-         sage: from sage.interfaces.primecount import phi # optional - primecount
+         sage: from sage.interfaces.primecount import phi
 
-         sage: phi(1000, 3) == 266 # optional - primecount
+         sage: phi(1000, 3) == 266
          True
-         sage: phi(2**30, 100) == 95446716 # optional - primecount
+         sage: phi(2**30, 100) == 95446716
          True
     """
     return primecount.phi(x, a)