From ec7714a8a392aba4c364c34f51aa09daef7a0147 Mon Sep 17 00:00:00 2001 From: Adam Erispaha Date: Wed, 18 Dec 2024 14:57:30 -0500 Subject: [PATCH 1/2] upgrade pyshp dependency --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5cfe054..7f6e948 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ pytest Pillow==10.3.0 numpy>=1.16.4 pandas>=0.24.2 -pyshp==2.1.0 +pyshp==2.3.1 geojson==2.5.0 networkx>=2.3 pyyaml>=3.12 diff --git a/setup.py b/setup.py index 8b952fe..a268a3f 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ def get_description(): 'Pillow>=6.2.0', 'numpy>=1.16.4', 'pandas>=0.24.2', - 'pyshp==2.1.0', + 'pyshp>=2.1.0', 'geojson>=2.4.1', "networkx>=2.3,<2.8.1;python_version<'3.8'", "networkx>=2.3;python_version>='3.8'", From 19171a5230474b25d2b2ccb009987590cb0b78f6 Mon Sep 17 00:00:00 2001 From: Adam Erispaha Date: Wed, 18 Dec 2024 15:14:13 -0500 Subject: [PATCH 2/2] clean up config --- docs/conf.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index a469d5e..c8b4fe9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -43,17 +43,6 @@ # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. -# extensions = [ -# 'sphinx.ext.autodoc', -# 'sphinx.ext.coverage', -# 'sphinx.ext.mathjax', -# 'sphinx.ext.viewcode', -# 'sphinx.ext.autosummary', -# "IPython.sphinxext.ipython_console_highlighting", -# "IPython.sphinxext.ipython_directive", -# "myst_nb", -# ] - extensions = [ "sphinx.ext.autosummary", "sphinx.ext.autodoc", @@ -223,11 +212,4 @@ epub_exclude_files = ['search.html'] -# lines of code to run in each jupyter notebook in the docs -ipython_execlines = [ - "import pandas as pd", - "pd.set_option('display.max_columns', 50)", - "pd.set_option('display.max_rows', 5)", -] - numpydoc_class_members_toctree = False \ No newline at end of file