Merge pull request #221 from knaaptime/rmrvlib

pysal · Aug 23, 2023 · 57acfb8 · 57acfb8
2 parents 1ddb9fa + a0e672a
commit 57acfb8
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 13 deletions.
diff --git a/.ci/310.yml b/.ci/310.yml
@@ -19,7 +19,6 @@ dependencies:
  - seaborn
  - tqdm
  - urbanaccess
- - rvlib
  - numba
  - pyproj >=3
 

diff --git a/.ci/38.yml → .ci/311.yml b/.ci/38.yml → .ci/311.yml
@@ -2,7 +2,7 @@ name: test
 channels:
  - conda-forge
 dependencies:
- - python=3.8
+ - python=3.11
  - deprecation
  - geopandas>=0.9
  - joblib
@@ -19,7 +19,6 @@ dependencies:
  - seaborn
  - tqdm
  - urbanaccess
- - rvlib
  - numba
  - pyproj >=3
 

diff --git a/.ci/39.yml b/.ci/39.yml
@@ -28,7 +28,6 @@ dependencies:
  - pytest-mpl
  - pytest-cov
  - twine
- - rvlib
 
  # docs
  - ipywidgets

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -18,7 +18,7 @@
  strategy:
  matrix:
  os: [ubuntu-latest, macos-latest, windows-latest]
- environment-file: [.ci/38.yml, .ci/39.yml, .ci/310.yml]
+ environment-file: [.ci/39.yml, .ci/310.yml, .ci/311.yml]
  experimental: [false]
  fail-fast: [false]
 

diff --git a/segregation/singlegroup/density_corrected_dissim.py b/segregation/singlegroup/density_corrected_dissim.py
@@ -6,21 +6,14 @@
 import numpy as np
 import pandas as pd
 from scipy.optimize import minimize
-from warnings import warn
+from scipy.stats import norm
 
 from .._base import SingleGroupIndex, SpatialImplicitIndex
 
 
 # Constructing function that returns $n(\hat{\theta}_j)$
 def _return_optimal_theta(theta_j):
  def fold_norm(x):
- try:
- from rvlib import Normal
- norm = Normal(0, 1)
-
- except ImportError:
- warn("Unable to import `rvlib`. Falling back to slower scipy sampler")
- from scipy.stats import norm
 
  y = (-1) * (norm.pdf(x - theta_j) + norm.pdf(x + theta_j))
  return y