works with numpy 2.0

gplepage · Jul 8, 2024 · f7f061a · f7f061a
1 parent d94566c
commit f7f061a
Show file tree

Hide file tree

Showing 18 changed files with 81 additions and 78 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,9 @@
-Version 6.1.2 ????
-====================
+Version 6.1.3 2024-07-08
+=========================
+Modified so that it works with numpy>=2.0.
+
+Version 6.1.2 2024-05-21
+========================
 
 - Fixes bug in implementation of PDFIntegrator's scale parameter. There was no 
   problem when scale=1 but other values were wrong.

diff --git a/doc/html/.buildinfo b/doc/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: f6aed125efd87ae682bb8c01cf8f9e1a
+config: ffea898b9e82a916ac420a608eca0a9a
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/doc/html/.doctrees/environment.pickle b/doc/html/.doctrees/environment.pickle
diff --git a/doc/html/_static/documentation_options.js b/doc/html/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '6.1.2',
+    VERSION: '6.1.3',
     LANGUAGE: 'en',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

diff --git a/doc/html/background.html b/doc/html/background.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>How vegas Works &#8212; vegas 6.1.2 documentation</title>
+    <title>How vegas Works &#8212; vegas 6.1.3 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/pyramid.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -41,7 +41,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="c_fortran.html" title="Integrands in C or Fortran"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">How <code class="xref py py-mod docutils literal notranslate"><span class="pre">vegas</span></code> Works</a></li> 
       </ul>
     </div>  
@@ -379,7 +379,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="c_fortran.html" title="Integrands in C or Fortran"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">How <code class="xref py py-mod docutils literal notranslate"><span class="pre">vegas</span></code> Works</a></li> 
       </ul>
     </div>

diff --git a/doc/html/c_fortran.html b/doc/html/c_fortran.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>Integrands in C or Fortran &#8212; vegas 6.1.2 documentation</title>
+    <title>Integrands in C or Fortran &#8212; vegas 6.1.3 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/pyramid.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -41,7 +41,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="tutorial.html" title="Tutorial"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Integrands in C or Fortran</a></li> 
       </ul>
     </div>  
@@ -513,7 +513,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="tutorial.html" title="Tutorial"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Integrands in C or Fortran</a></li> 
       </ul>
     </div>

diff --git a/doc/html/genindex.html b/doc/html/genindex.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Index &#8212; vegas 6.1.2 documentation</title>
+    <title>Index &#8212; vegas 6.1.3 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/pyramid.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -32,7 +32,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Index</a></li> 
       </ul>
     </div>  
@@ -425,7 +425,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Index</a></li> 
       </ul>
     </div>

diff --git a/doc/html/index.html b/doc/html/index.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>vegas Documentation &#8212; vegas 6.1.2 documentation</title>
+    <title>vegas Documentation &#8212; vegas 6.1.3 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/pyramid.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -37,7 +37,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="tutorial.html" title="Tutorial"
              accesskey="N">next</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="#">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">vegas Documentation</a></li> 
       </ul>
     </div>  
@@ -163,7 +163,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="tutorial.html" title="Tutorial"
              >next</a> |</li>
-        <li class="nav-item nav-item-0"><a href="#">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="#">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">vegas Documentation</a></li> 
       </ul>
     </div>

diff --git a/doc/html/objects.inv b/doc/html/objects.inv
diff --git a/doc/html/outliers.html b/doc/html/outliers.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>Case Study: Bayesian Curve Fitting &#8212; vegas 6.1.2 documentation</title>
+    <title>Case Study: Bayesian Curve Fitting &#8212; vegas 6.1.3 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/pyramid.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -41,7 +41,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="background.html" title="How vegas Works"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Case Study: Bayesian Curve Fitting</a></li> 
       </ul>
     </div>  
@@ -475,7 +475,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="background.html" title="How vegas Works"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Case Study: Bayesian Curve Fitting</a></li> 
       </ul>
     </div>

diff --git a/doc/html/py-modindex.html b/doc/html/py-modindex.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Python Module Index &#8212; vegas 6.1.2 documentation</title>
+    <title>Python Module Index &#8212; vegas 6.1.3 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/pyramid.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -39,7 +39,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="#" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Python Module Index</a></li> 
       </ul>
     </div>  
@@ -97,7 +97,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="#" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Python Module Index</a></li> 
       </ul>
     </div>

diff --git a/doc/html/search.html b/doc/html/search.html
@@ -5,7 +5,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Search &#8212; vegas 6.1.2 documentation</title>
+    <title>Search &#8212; vegas 6.1.3 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/pyramid.css" />
 
@@ -38,7 +38,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Search</a></li> 
       </ul>
     </div>  
@@ -98,7 +98,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="py-modindex.html" title="Python Module Index"
              >modules</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Search</a></li> 
       </ul>
     </div>

diff --git a/doc/html/tutorial.html b/doc/html/tutorial.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>Tutorial &#8212; vegas 6.1.2 documentation</title>
+    <title>Tutorial &#8212; vegas 6.1.3 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/pyramid.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -41,7 +41,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="index.html" title="vegas Documentation"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Tutorial</a></li> 
       </ul>
     </div>  
@@ -2195,7 +2195,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="index.html" title="vegas Documentation"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href="">Tutorial</a></li> 
       </ul>
     </div>

diff --git a/doc/html/vegas.html b/doc/html/vegas.html
@@ -6,7 +6,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
 
-    <title>vegas Module &#8212; vegas 6.1.2 documentation</title>
+    <title>vegas Module &#8212; vegas 6.1.3 documentation</title>
     <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
     <link rel="stylesheet" type="text/css" href="_static/pyramid.css" />
     <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -37,7 +37,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="outliers.html" title="Case Study: Bayesian Curve Fitting"
              accesskey="P">previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href=""><code class="xref py py-mod docutils literal notranslate"><span class="pre">vegas</span></code> Module</a></li> 
       </ul>
     </div>  
@@ -2143,7 +2143,7 @@ <h3>Navigation</h3>
         <li class="right" >
           <a href="outliers.html" title="Case Study: Bayesian Curve Fitting"
              >previous</a> |</li>
-        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.2 documentation</a> &#187;</li>
+        <li class="nav-item nav-item-0"><a href="index.html">vegas 6.1.3 documentation</a> &#187;</li>
         <li class="nav-item nav-item-this"><a href=""><code class="xref py py-mod docutils literal notranslate"><span class="pre">vegas</span></code> Module</a></li> 
       </ul>
     </div>

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,14 +1,8 @@
 [build-system]
 requires = [ # "setuptools", "numpy>=1.16", "cython>=0.17"
     "setuptools>=39.2.0", 
-    "wheel",
-
-    # see https://github.com/scipy/oldest-supported-numpy/tree/main
-    "oldest-supported-numpy>=2023.8.3; python_version>='3.8'",
-    "numpy==1.16.6; python_version=='3.7'",
-    "numpy; python_version<'3.7'",
-
-    "Cython>=0.29.33"
+    "numpy>='2.0'",
+    "Cython>='3.0'"
     ]
 build-backend = 'setuptools.build_meta'
 
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = vegas
-version = 6.1.2
+version = 6.1.3
 author = G. Peter Lepage
 author_email = [email protected]
 license = GPLv3
@@ -15,9 +15,9 @@ packages =
     vegas
 package_dir = 
     = src
-python_requires = >=2.7
+python_requires = >=3.9
 install_requires = 
-    numpy>=1.16
+    numpy>=1.24
     gvar>=13.0.1
 include_package_data = True