Merge pull request #102 from adrn/numpy-random-gen

Use new numpy random number generator
adrn · May 5, 2020 · fa948a7 · fa948a7
2 parents 75a521e + bf0d5f7
commit fa948a7
Show file tree

Hide file tree

Showing 17 changed files with 630 additions and 109 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,9 @@
 1.2 (unreleased)
 ================
 
+- ``TheJoker`` now expects a ``numpy.random.Generator`` instance instead of a
+  ``RandomState`` for controlling random number generation.
+
 1.1 (2020-04-19)
 ================
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -182,11 +182,9 @@
 intersphinx_mapping['scwhimmbad'] = (
     'https://schwimmbad.readthedocs.io/en/latest/', None)
 
-# see if we're running on travis
-if 'CI' in os.environ:
-    ON_CI = True
-else:
-    ON_CI = False
+# see if we're running on CI:
+ON_CI = os.environ.get("CI", False)
+PR = os.environ.get("CIRCLE_PULL_REQUEST", False)
 
 # Use astropy plot style
 plot_rcparams = dict()
@@ -214,6 +212,9 @@
 
 nbsphinx_timeout = 600
 
+if PR:
+    nbsphinx_execute = 'never'
+
 if ON_CI:
     nbsphinx_kernel_name = 'python3'
 

diff --git a/docs/examples/1-Getting-started.ipynb b/docs/examples/1-Getting-started.ipynb
@@ -53,8 +53,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# set up a random state to ensure reproducibility\n",
-    "rnd = np.random.RandomState(seed=42)"
+    "# set up a random generator to ensure reproducibility\n",
+    "rnd = np.random.default_rng(seed=42)"
    ]
   },
   {
@@ -468,7 +468,20 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.5"
+  },
+  "toc": {
+   "base_numbering": 1,
+   "nav_menu": {},
+   "number_sections": true,
+   "sideBar": true,
+   "skip_h1_title": false,
+   "title_cell": "Table of Contents",
+   "title_sidebar": "Contents",
+   "toc_cell": false,
+   "toc_position": {},
+   "toc_section_display": true,
+   "toc_window_display": false
   }
  },
  "nbformat": 4,

diff --git a/docs/examples/2-Customize-prior.ipynb b/docs/examples/2-Customize-prior.ipynb
@@ -52,8 +52,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# set up a random state to ensure reproducibility\n",
-    "rnd = np.random.RandomState(seed=42)"
+    "# set up a random number generator to ensure reproducibility\n",
+    "rnd = np.random.default_rng(seed=42)"
    ]
   },
   {
@@ -236,7 +236,20 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.5"
+  },
+  "toc": {
+   "base_numbering": 1,
+   "nav_menu": {},
+   "number_sections": true,
+   "sideBar": true,
+   "skip_h1_title": false,
+   "title_cell": "Table of Contents",
+   "title_sidebar": "Contents",
+   "toc_cell": false,
+   "toc_position": {},
+   "toc_section_display": true,
+   "toc_window_display": false
   }
  },
  "nbformat": 4,

diff --git a/docs/examples/3-Polynomial-velocity-trend.ipynb b/docs/examples/3-Polynomial-velocity-trend.ipynb
@@ -49,8 +49,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# set up a random state to ensure reproducibility\n",
-    "rnd = np.random.RandomState(seed=42)"
+    "# set up a random number generator to ensure reproducibility\n",
+    "rnd = np.random.default_rng(seed=42)"
    ]
   },
   {
@@ -287,7 +287,20 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.5"
+  },
+  "toc": {
+   "base_numbering": 1,
+   "nav_menu": {},
+   "number_sections": true,
+   "sideBar": true,
+   "skip_h1_title": false,
+   "title_cell": "Table of Contents",
+   "title_sidebar": "Contents",
+   "toc_cell": false,
+   "toc_position": {},
+   "toc_section_display": true,
+   "toc_window_display": false
   }
  },
  "nbformat": 4,

diff --git a/docs/examples/4-Continue-sampling-mcmc.ipynb b/docs/examples/4-Continue-sampling-mcmc.ipynb
@@ -58,8 +58,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# set up a random state to ensure reproducibility\n",
-    "rnd = np.random.RandomState(seed=42)"
+    "# set up a random number generator to ensure reproducibility\n",
+    "rnd = np.random.default_rng(seed=42)"
    ]
   },
   {
@@ -275,7 +275,20 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.5"
+  },
+  "toc": {
+   "base_numbering": 1,
+   "nav_menu": {},
+   "number_sections": true,
+   "sideBar": true,
+   "skip_h1_title": false,
+   "title_cell": "Table of Contents",
+   "title_sidebar": "Contents",
+   "toc_cell": false,
+   "toc_position": {},
+   "toc_section_display": true,
+   "toc_window_display": false
   }
  },
  "nbformat": 4,

diff --git a/docs/examples/5-Calibration-offsets.ipynb b/docs/examples/5-Calibration-offsets.ipynb
@@ -53,8 +53,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# set up a random state to ensure reproducibility\n",
-    "rnd = np.random.RandomState(seed=42)"
+    "# set up a random number generator to ensure reproducibility\n",
+    "rnd = np.random.default_rng(seed=42)"
    ]
   },
   {
@@ -261,7 +261,20 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.7.5"
+  },
+  "toc": {
+   "base_numbering": 1,
+   "nav_menu": {},
+   "number_sections": true,
+   "sideBar": true,
+   "skip_h1_title": false,
+   "title_cell": "Table of Contents",
+   "title_sidebar": "Contents",
+   "toc_cell": false,
+   "toc_position": {},
+   "toc_section_display": true,
+   "toc_window_display": false
   }
  },
  "nbformat": 4,

diff --git a/docs/examples/Strader-circular-only.ipynb b/docs/examples/Strader-circular-only.ipynb
@@ -48,9 +48,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# For reproducibility:\n",
+    "# set up a random number generator to ensure reproducibility\n",
     "seed = 42\n",
-    "rnd = np.random.RandomState(42)"
+    "rnd = np.random.default_rng(seed=seed)"
    ]
   },
   {
@@ -380,6 +380,19 @@
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
    "version": "3.7.5"
+  },
+  "toc": {
+   "base_numbering": 1,
+   "nav_menu": {},
+   "number_sections": true,
+   "sideBar": true,
+   "skip_h1_title": false,
+   "title_cell": "Table of Contents",
+   "title_sidebar": "Contents",
+   "toc_cell": false,
+   "toc_position": {},
+   "toc_section_display": true,
+   "toc_window_display": false
   }
  },
  "nbformat": 4,