Skip to content

Commit

Permalink
Merge pull request #236 from pyswmm/upgrade_pyshp
Browse files Browse the repository at this point in the history
upgrade pyshp dependency
  • Loading branch information
aerispaha authored Dec 18, 2024
2 parents eb5bb6b + 19171a5 commit 3d808fe
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 20 deletions.
18 changes: 0 additions & 18 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'",
Expand Down

0 comments on commit 3d808fe

Please sign in to comment.