Update requirements for docs and remove duplicates

mggg · Oct 25, 2023 · 2fefd5c · 2fefd5c
1 parent aabf100
commit 2fefd5c
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 127 deletions.
diff --git a/docs/api/maup.adjacencies.rst b/docs/api/maup.adjacencies.rst
diff --git a/docs/api/maup.assign.rst b/docs/api/maup.assign.rst
diff --git a/docs/api/maup.crs.rst b/docs/api/maup.crs.rst
diff --git a/docs/api/maup.indexed_geometries.rst b/docs/api/maup.indexed_geometries.rst
diff --git a/docs/api/maup.indices.rst b/docs/api/maup.indices.rst
diff --git a/docs/api/maup.intersections.rst b/docs/api/maup.intersections.rst
diff --git a/docs/api/maup.normalize.rst b/docs/api/maup.normalize.rst
diff --git a/docs/api/maup.progress_bar.rst b/docs/api/maup.progress_bar.rst
diff --git a/docs/api/maup.repair.rst b/docs/api/maup.repair.rst
diff --git a/docs/api/maup.rst b/docs/api/maup.rst
diff --git a/docs/api/modules.rst b/docs/api/modules.rst
diff --git a/docs/conf.py b/docs/conf.py
@@ -13,6 +13,7 @@
 import os
 import sys
 sys.path.insert(0, os.path.abspath('..'))
+print(f"The system path is {sys.path}")
 
 
 # -- Project information -----------------------------------------------------
@@ -22,7 +23,7 @@
 author = 'Max Hully, Max Fan'
 
 # The full version, including alpha/beta/rc tags
-release = '1.0.0'
+release = '1.1.0'
 
 
 # -- General configuration ---------------------------------------------------
@@ -75,4 +76,4 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
diff --git a/docs/reference/api/maup.rst b/docs/reference/api/maup.rst
@@ -24,3 +24,4 @@ Module contents
    :members:
    :undoc-members:
    :show-inheritance:
+   :noindex:
diff --git a/docs/reference/api/modules.rst b/docs/reference/api/modules.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 maup
 ====
 

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -291,30 +291,48 @@ pyyaml==5.4.1; python_version >= "3.6" and python_full_version < "3.0.0" or pyth
 requests==2.25.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" \
     --hash=sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e \
     --hash=sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804
-shapely==1.7.1 \
-    --hash=sha256:46da0ea527da9cf9503e66c18bab6981c5556859e518fe71578b47126e54ca93 \
-    --hash=sha256:4c10f317e379cc404f8fc510cd9982d5d3e7ba13a9cfd39aa251d894c6366798 \
-    --hash=sha256:17df66e87d0fe0193910aeaa938c99f0b04f67b430edb8adae01e7be557b141b \
-    --hash=sha256:da38ed3d65b8091447dc3717e5218cc336d20303b77b0634b261bc5c1aa2bae8 \
-    --hash=sha256:8e7659dd994792a0aad8fb80439f59055a21163e236faf2f9823beb63a380e19 \
-    --hash=sha256:791477edb422692e7dc351c5ed6530eb0e949a31b45569946619a0d9cd5f53cb \
-    --hash=sha256:e3afccf0437edc108eef1e2bb9cc4c7073e7705924eb4cd0bf7715cd1ef0ce1b \
-    --hash=sha256:8f15b6ce67dcc05b61f19c689b60f3fe58550ba994290ff8332f711f5aaa9840 \
-    --hash=sha256:60e5b2282619249dbe8dc5266d781cc7d7fb1b27fa49f8241f2167672ad26719 \
-    --hash=sha256:de618e67b64a51a0768d26a9963ecd7d338a2cf6e9e7582d2385f88ad005b3d1 \
-    --hash=sha256:182716ffb500d114b5d1b75d7fd9d14b7d3414cef3c38c0490534cc9ce20981a \
-    --hash=sha256:4f3c59f6dbf86a9fc293546de492f5e07344e045f9333f3a753f2dda903c45d1 \
-    --hash=sha256:6871acba8fbe744efa4f9f34e726d070bfbf9bffb356a8f6d64557846324232b \
-    --hash=sha256:35be1c5d869966569d3dfd4ec31832d7c780e9df760e1fe52131105685941891 \
-    --hash=sha256:052eb5b9ba756808a7825e8a8020fb146ec489dd5c919e7d139014775411e688 \
-    --hash=sha256:90a3e2ae0d6d7d50ff2370ba168fbd416a53e7d8448410758c5d6a5920646c1d \
-    --hash=sha256:a3774516c8a83abfd1ddffb8b6ec1b0935d7fe6ea0ff5c31a18bfdae567b4eba \
-    --hash=sha256:6593026cd3f5daaea12bcc51ae5c979318070fefee210e7990cb8ac2364e79a1 \
-    --hash=sha256:617bf046a6861d7c6b44d2d9cb9e2311548638e684c2cd071d8945f24a926263 \
-    --hash=sha256:b40cc7bb089ae4aa9ddba1db900b4cd1bce3925d2a4b5837b639e49de054784f \
-    --hash=sha256:2df5260d0f2983309776cb41bfa85c464ec07018d88c0ecfca23d40bfadae2f1 \
-    --hash=sha256:a5c3a50d823c192f32615a2a6920e8c046b09e07a58eba220407335a9cd2e8ea \
-    --hash=sha256:1641724c1055459a7e2b8bbe47ba25bdc89554582e62aec23cb3f3ca25f9b129
+shapely==2.0.2 \
+    --hash=sha256:03e63a99dfe6bd3beb8d5f41ec2086585bb969991d603f9aeac335ad396a06d4 \
+    --hash=sha256:0521d76d1e8af01e712db71da9096b484f081e539d4f4a8c97342e7971d5e1b4 \
+    --hash=sha256:06f193091a7c6112fc08dfd195a1e3846a64306f890b151fa8c63b3e3624202c \
+    --hash=sha256:084b023dae8ad3d5b98acee9d3bf098fdf688eb0bb9b1401e8b075f6a627b611 \
+    --hash=sha256:1713cc04c171baffc5b259ba8531c58acc2a301707b7f021d88a15ed090649e7 \
+    --hash=sha256:1f217d28ecb48e593beae20a0082a95bd9898d82d14b8fcb497edf6bff9a44d7 \
+    --hash=sha256:2d217e56ae067e87b4e1731d0dc62eebe887ced729ba5c2d4590e9e3e9fdbd88 \
+    --hash=sha256:34eac2337cbd67650248761b140d2535855d21b969d76d76123317882d3a0c1a \
+    --hash=sha256:36480e32c434d168cdf2f5e9862c84aaf4d714a43a8465ae3ce8ff327f0affb7 \
+    --hash=sha256:394e5085b49334fd5b94fa89c086edfb39c3ecab7f669e8b2a4298b9d523b3a5 \
+    --hash=sha256:42997ac806e4583dad51c80a32d38570fd9a3d4778f5e2c98f9090aa7db0fe91 \
+    --hash=sha256:45ac6906cff0765455a7b49c1670af6e230c419507c13e2f75db638c8fc6f3bd \
+    --hash=sha256:4ef753200cbffd4f652efb2c528c5474e5a14341a473994d90ad0606522a46a2 \
+    --hash=sha256:5324be299d4c533ecfcfd43424dfd12f9428fd6f12cda38a4316da001d6ef0ea \
+    --hash=sha256:5b0c052709c8a257c93b0d4943b0b7a3035f87e2d6a8ac9407b6a992d206422f \
+    --hash=sha256:6a21353d28209fb0d8cc083e08ca53c52666e0d8a1f9bbe23b6063967d89ed24 \
+    --hash=sha256:6ca8cffbe84ddde8f52b297b53f8e0687bd31141abb2c373fd8a9f032df415d6 \
+    --hash=sha256:72b5997272ae8c25f0fd5b3b967b3237e87fab7978b8d6cd5fa748770f0c5d68 \
+    --hash=sha256:737dba15011e5a9b54a8302f1748b62daa207c9bc06f820cd0ad32a041f1c6f2 \
+    --hash=sha256:78128357a0cee573257a0c2c388d4b7bf13cb7dbe5b3fe5d26d45ebbe2a39e25 \
+    --hash=sha256:794affd80ca0f2c536fc948a3afa90bd8fb61ebe37fe873483ae818e7f21def4 \
+    --hash=sha256:7e92e7c255f89f5cdf777690313311f422aa8ada9a3205b187113274e0135cd8 \
+    --hash=sha256:87dc2be34ac3a3a4a319b963c507ac06682978a5e6c93d71917618b14f13066e \
+    --hash=sha256:94ac128ae2ab4edd0bffcd4e566411ea7bdc738aeaf92c32a8a836abad725f9f \
+    --hash=sha256:a5533a925d8e211d07636ffc2fdd9a7f9f13d54686d00577eeb11d16f00be9c4 \
+    --hash=sha256:a9a41ff4323fc9d6257759c26eb1cf3a61ebc7e611e024e6091f42977303fd3a \
+    --hash=sha256:b8eb0a92f7b8c74f9d8fdd1b40d395113f59bd8132ca1348ebcc1f5aece94b96 \
+    --hash=sha256:baa14fc27771e180c06b499a0a7ba697c7988c7b2b6cba9a929a19a4d2762de3 \
+    --hash=sha256:be46d5509b9251dd9087768eaf35a71360de6afac82ce87c636990a0871aa18b \
+    --hash=sha256:c6fd29fbd9cd76350bd5cc14c49de394a31770aed02d74203e23b928f3d2f1aa \
+    --hash=sha256:ccfd5fa10a37e67dbafc601c1ddbcbbfef70d34c3f6b0efc866ddbdb55893a6c \
+    --hash=sha256:d41a116fcad58048d7143ddb01285e1a8780df6dc1f56c3b1e1b7f12ed296651 \
+    --hash=sha256:dc9342fc82e374130db86a955c3c4525bfbf315a248af8277a913f30911bed9e \
+    --hash=sha256:dea9a0651333cf96ef5bb2035044e3ad6a54f87d90e50fe4c2636debf1b77abc \
+    --hash=sha256:e7c95d3379ae3abb74058938a9fcbc478c6b2e28d20dace38f8b5c587dde90aa \
+    --hash=sha256:e7d897e6bdc6bc64f7f65155dbbb30e49acaabbd0d9266b9b4041f87d6e52b3a \
+    --hash=sha256:ea84d1cdbcf31e619d672b53c4532f06253894185ee7acb8ceb78f5f33cbe033 \
+    --hash=sha256:ed1e99702125e7baccf401830a3b94d810d5c70b329b765fe93451fe14cf565b \
+    --hash=sha256:eebe544df5c018134f3c23b6515877f7e4cd72851f88a8d0c18464f414d141a2 \
+    --hash=sha256:fa3ee28f5e63a130ec5af4dc3c4cb9c21c5788bb13c15e89190d163b14f9fb89 \
+    --hash=sha256:fd3ad17b64466a033848c26cb5b509625c87d07dcf39a1541461cacdb8f7e91c
 six==1.16.0; python_full_version >= "3.7.1" and python_version >= "3.6" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6") \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926

diff --git a/maup/intersections.py b/maup/intersections.py
@@ -8,23 +8,30 @@
 
 @require_same_crs
 
-def intersections(sources, targets, output_type= "geoseries", area_cutoff=None):
-    """Computes all of the nonempty intersections between two sets of geometries.
+def intersections(sources, targets, output_type="geoseries", area_cutoff=None):
+    """
+    Computes all of the nonempty intersections between two sets of geometries.
+    
     By default, the returned `~geopandas.GeoSeries` will have a MultiIndex, where the 
-    geometry at index *(i, j)* is the intersection of ``sources[i]`` and ``targets[j]``
+    geometry at index *(i, j)* is the intersection of ``sources[i]`` and ``targets[j]`` 
     (if it is not empty).  
+    
     If output_type == "geodataframe", the return type is a range-indexed GeoDataFrame
     with "source" and "target" columns containing the indices i,j, respectively, for the 
-    intersection of ``sources[i]`` and ``targets[j]``
+    intersection of ``sources[i]`` and ``targets[j]``.
+    
     :param sources: geometries
     :type sources: :class:`~geopandas.GeoSeries` or :class:`~geopandas.GeoDataFrame`
     :param targets: geometries
     :type targets: :class:`~geopandas.GeoSeries` or :class:`~geopandas.GeoDataFrame`
-    :rtype: :class:`~geopandas.GeoSeries`
+    :param output_type: type of output, "geoseries" or "geodataframe"
+    :type output_type: str
     :param area_cutoff: (optional) if provided, only return intersections with
         area greater than ``area_cutoff``
     :type area_cutoff: Number or None
+    :rtype: :class:`~geopandas.GeoSeries` or :class:`~geopandas.GeoDataFrame`
     """
+
 
     reindexed_sources = get_geometries_with_range_index(sources)
     reindexed_targets = get_geometries_with_range_index(targets)
-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    :orphan:
     maup
     ====
@@ Expand Down @@