From 8c411c8001267fc50b82e97a4efbe07d13bc2a02 Mon Sep 17 00:00:00 2001 From: James Gaboardi Date: Wed, 10 Jul 2024 15:54:13 -0400 Subject: [PATCH] removing spvcm from meta -- archived - #1330 --- README.md | 2 -- ci/310-latest.yaml | 1 - ci/310-oldest.yaml | 1 - ci/311-latest.yaml | 1 - ci/312-latest.yaml | 1 - docs/api.rst | 1 - environment.yml | 1 - pyproject.toml | 1 - pysal/__init__.py | 2 +- pysal/base.py | 2 +- pysal/frozen.py | 1 - pysal/model/__init__.py | 1 - pysal/model/spvcm/__init__.py | 4 ---- 13 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 pysal/model/spvcm/__init__.py diff --git a/README.md b/README.md index 4937f936c..9676821cc 100644 --- a/README.md +++ b/README.md @@ -59,8 +59,6 @@ In contrast to `explore`, the `model` layer focuses on confirmatory analysis. In - [spreg](https://spreg.readthedocs.io/) : `spreg` supports the estimation of classic and spatial econometric models. Currently it contains methods for estimating standard Ordinary Least Squares (OLS), Two Stage Least Squares (2SLS) and Seemingly Unrelated Regressions (SUR), in addition to various tests of homokestadicity, normality, spatial randomness, and different types of spatial autocorrelation. It also includes a suite of tests for spatial dependence in models with binary dependent variables. -- [spvcm](https://github.com/pysal/spvcm) : `spvcm` provides a general framework for estimating spatially-correlated variance components models. This class of models allows for spatial dependence in the variance components, so that nearby groups may affect one another. It also also provides a general-purpose framework for estimating models using Gibbs sampling in Python, accelerated by the `numba` package. - - [tobler](http://pysal.org/tobler/) : `tobler` provides functionality for for areal interpolation and dasymetric mapping. Its name is an homage to the legendary geographer Waldo Tobler a pioneer of dozens of spatial analytical methods. `tobler` includes functionality for interpolating data using area-weighted approaches, regression model-based approaches that leverage remotely-sensed raster data as auxiliary information, and hybrid approaches. - [access](http://github.com/pysal/access) : `access` aims to make it easy for analysis to calculate measures of spatial accessibility. This work has traditionally had two challenges: [1] to calculate accurate travel time matrices at scale and [2] to derive measures of access using the travel times and supply and demand locations. `access` implements classic spatial access models, allowing easy comparison of methodologies and assumptions. diff --git a/ci/310-latest.yaml b/ci/310-latest.yaml index d058afc9c..a9818f8c4 100644 --- a/ci/310-latest.yaml +++ b/ci/310-latest.yaml @@ -44,7 +44,6 @@ dependencies: - tobler>=0.2.1 - spint - spreg - - spvcm - mgwr - segregation - pointpats diff --git a/ci/310-oldest.yaml b/ci/310-oldest.yaml index c4b13ff6e..c0c52c34e 100644 --- a/ci/310-oldest.yaml +++ b/ci/310-oldest.yaml @@ -44,7 +44,6 @@ dependencies: - tobler>=0.2.1 - spint - spreg - - spvcm - mgwr - segregation - pointpats diff --git a/ci/311-latest.yaml b/ci/311-latest.yaml index 9f863875d..131a76a7d 100644 --- a/ci/311-latest.yaml +++ b/ci/311-latest.yaml @@ -44,7 +44,6 @@ dependencies: - tobler>=0.2.1 - spint - spreg - - spvcm - mgwr - segregation - pointpats diff --git a/ci/312-latest.yaml b/ci/312-latest.yaml index 54d3eeaed..fd7160d2f 100644 --- a/ci/312-latest.yaml +++ b/ci/312-latest.yaml @@ -43,7 +43,6 @@ dependencies: - tobler>=0.2.1 - spint - spreg - - spvcm - mgwr - segregation - pointpats diff --git a/docs/api.rst b/docs/api.rst index 3c86293d5..db6616c22 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -32,7 +32,6 @@ API Reference * `spint: Spatial Interaction Modeling `_ * `spopt: Spatial Optimization `_ * `spreg: Spatial Regression and Econometrics `_ -* `spvcm: Spatial Varying Component Models `_ * `tobler: Areal Interpolation and Dasymetric Mapping `_ :mod:`pysal.viz`: Geovisualization diff --git a/environment.yml b/environment.yml index b24dd1412..683d02a47 100644 --- a/environment.yml +++ b/environment.yml @@ -16,7 +16,6 @@ dependencies: - spglm>=1.0.8 - spint>=1.0.7 - spreg>=1.2.2 - - spvcm>=0.3.0 - tobler>=0.5.4 - mapclassify>=2.4.2 - splot>=.1.1.3 diff --git a/pyproject.toml b/pyproject.toml index 8cc38965a..a1dec97a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,6 @@ dependencies = [ "spglm>=1.1.0", "spint>=1.0.7", "spreg>=1.5.0", - "spvcm>=0.3.0", "tobler>=0.11.2", "mapclassify>=2.7.0", "splot>=1.1.5.post1", diff --git a/pysal/__init__.py b/pysal/__init__.py index 3b28e1137..12cebfc77 100644 --- a/pysal/__init__.py +++ b/pysal/__init__.py @@ -18,6 +18,7 @@ cg -- Computational Geometry examples -- Example data sets + graph -– Graph class encoding spatial weights matrices io -- Input/Output weights -- Spatial Weights @@ -41,7 +42,6 @@ spint -- Spatial interaction modeling spglm -- Spatial general linear modeling spopt -- Spatial optimization - spvcm -- Spatial variance component models spreg -- Spatial econometrics tobler -- Spatial areal interpolation models diff --git a/pysal/base.py b/pysal/base.py index 47fec5cb6..dae9183dc 100644 --- a/pysal/base.py +++ b/pysal/base.py @@ -8,7 +8,7 @@ 'pointpats', 'inequality', 'spaghetti', 'access', 'momepy'], 'model': ['spreg', 'spglm', 'tobler', 'spint', - 'mgwr', 'spvcm', 'access', 'spopt'], + 'mgwr', 'access', 'spopt'], 'viz': ['splot', 'mapclassify'], 'lib': ['libpysal'] } diff --git a/pysal/frozen.py b/pysal/frozen.py index ceb7e5d71..72094cfbf 100644 --- a/pysal/frozen.py +++ b/pysal/frozen.py @@ -11,7 +11,6 @@ "spglm": "1.0.8", "spint": "1.0.7", "spreg": "1.2.4", - "spvcm": "0.3.0", "tobler": "0.8.2", "mapclassify": "2.4.3", "splot": "1.1.4", diff --git a/pysal/model/__init__.py b/pysal/model/__init__.py index f2bfde927..cc8473e29 100644 --- a/pysal/model/__init__.py +++ b/pysal/model/__init__.py @@ -3,6 +3,5 @@ import spglm import spint import spreg -import spvcm import tobler import spopt diff --git a/pysal/model/spvcm/__init__.py b/pysal/model/spvcm/__init__.py deleted file mode 100644 index 62bee2241..000000000 --- a/pysal/model/spvcm/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from spvcm.both_levels import * -from spvcm.upper_level import * -from spvcm.lower_level import * -from spvcm import plotting