mapreader 1.1.5__tar.gz → 1.2.0__tar.gz

{mapreader-1.1.5 → mapreader-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapreader
-Version: 1.1.5
+Version: 1.2.0
 Summary: A computer vision pipeline for the semantic exploration of maps/images at scale
 Home-page: https://github.com/Living-with-machines/MapReader
 Download-URL: https://github.com/Living-with-machines/MapReader/archive/refs/heads/main.zip
@@ -24,7 +24,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
-Requires-Python: >=3.8, <3.11
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib<4.0.0,>=3.5.0
@@ -37,8 +37,8 @@ Requires-Dist: Shapely<3.0.0,>=2.0.0
 Requires-Dist: nest-asyncio<2.0.0,>=1.5.1
 Requires-Dist: scikit-image>=0.18.3
 Requires-Dist: scikit-learn<2.0.0,>=1.0.1
-Requires-Dist: torch<2.0.0,>=1.10.0
-Requires-Dist: torchvision<0.12.1,>=0.11.1
+Requires-Dist: torch>=1.10.0
+Requires-Dist: torchvision<0.17.3,>=0.11.1
 Requires-Dist: jupyter<2.0.0,>=1.0.0
 Requires-Dist: ipykernel<7.0.0,>=6.5.1
 Requires-Dist: ipywidgets<9.0.0,>=8.0.0
@@ -56,15 +56,14 @@ Requires-Dist: torchinfo<2.0.0
 Requires-Dist: openpyxl<4.0.0
 Requires-Dist: geopandas<1.0.0
 Requires-Dist: pyogrio>=0.7.2
+Requires-Dist: cartopy>=0.22.0
 Provides-Extra: dev
-Requires-Dist: pytest<8.0.0; extra == "dev"
-Requires-Dist: pytest-cov<5.0.0,>=4.1.0; extra == "dev"
+Requires-Dist: pytest<9.0.0; extra == "dev"
+Requires-Dist: pytest-cov<6.0.0,>=4.1.0; extra == "dev"
 Requires-Dist: timm<1.0.0; extra == "dev"
 Requires-Dist: transformers<5.0.0; extra == "dev"
-Requires-Dist: black<24.0.0,>=23.7.0; extra == "dev"
-Requires-Dist: flake8<7.0.0,>=6.0.0; extra == "dev"
-Provides-Extra: geo
-Requires-Dist: cartopy>=0.20.0; extra == "geo"
+Requires-Dist: black<25.0.0,>=23.7.0; extra == "dev"
+Requires-Dist: flake8<8.0.0,>=6.0.0; extra == "dev"
 
 <div align="center">
     <br>

{mapreader-1.1.5 → mapreader-1.2.0}/mapreader/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-04-03T09:19:01+0100",
+ "date": "2024-04-08T09:00:00+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "75e2824c89f4f2d54893ffaf3fd5e2f96d04d282",
- "version": "1.1.5"
+ "full-revisionid": "e9d119ffa6946e723f7977ddd7add0c9bcce34d8",
+ "version": "1.2.0"
 }
 '''  # END VERSION_JSON
 

{mapreader-1.1.5 → mapreader-1.2.0}/mapreader/annotate/utils.py

@@ -95,7 +95,7 @@ def prepare_data(
             ).values
             if random_state in ["random"]:
                 df = df.groupby("pixel_groups").sample(
-                    n=10, random_state=random.randint(0, 1e6)
+                    n=10, random_state=random.randint(0, int(1e6))
                 )
             else:
                 df = df.groupby("pixel_groups").sample(n=10, random_state=random_state)

{mapreader-1.1.5 → mapreader-1.2.0}/mapreader/classify/classifier.py

@@ -7,8 +7,9 @@ import random
 import socket
 import sys
 import time
+from collections.abc import Hashable, Iterable
 from datetime import datetime
-from typing import Any, Hashable, Iterable
+from typing import Any
 
 import joblib
 import matplotlib.pyplot as plt
@@ -167,7 +168,7 @@ class ClassifierContainer:
             if not os.path.exists("./tmp_checkpoints"):
                 os.makedirs("./tmp_checkpoints")
             self.tmp_save_filename = (
-                f"./tmp_checkpoints/tmp_{random.randint(0, 1e10)}_checkpoint.pkl"
+                f"./tmp_checkpoints/tmp_{random.randint(0, int(1e10))}_checkpoint.pkl"
             )
 
             # add colors for printing/logging

{mapreader-1.1.5 → mapreader-1.2.0}/mapreader.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mapreader
-Version: 1.1.5
+Version: 1.2.0
 Summary: A computer vision pipeline for the semantic exploration of maps/images at scale
 Home-page: https://github.com/Living-with-machines/MapReader
 Download-URL: https://github.com/Living-with-machines/MapReader/archive/refs/heads/main.zip
@@ -24,7 +24,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
-Requires-Python: >=3.8, <3.11
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: matplotlib<4.0.0,>=3.5.0
@@ -37,8 +37,8 @@ Requires-Dist: Shapely<3.0.0,>=2.0.0
 Requires-Dist: nest-asyncio<2.0.0,>=1.5.1
 Requires-Dist: scikit-image>=0.18.3
 Requires-Dist: scikit-learn<2.0.0,>=1.0.1
-Requires-Dist: torch<2.0.0,>=1.10.0
-Requires-Dist: torchvision<0.12.1,>=0.11.1
+Requires-Dist: torch>=1.10.0
+Requires-Dist: torchvision<0.17.3,>=0.11.1
 Requires-Dist: jupyter<2.0.0,>=1.0.0
 Requires-Dist: ipykernel<7.0.0,>=6.5.1
 Requires-Dist: ipywidgets<9.0.0,>=8.0.0
@@ -56,15 +56,14 @@ Requires-Dist: torchinfo<2.0.0
 Requires-Dist: openpyxl<4.0.0
 Requires-Dist: geopandas<1.0.0
 Requires-Dist: pyogrio>=0.7.2
+Requires-Dist: cartopy>=0.22.0
 Provides-Extra: dev
-Requires-Dist: pytest<8.0.0; extra == "dev"
-Requires-Dist: pytest-cov<5.0.0,>=4.1.0; extra == "dev"
+Requires-Dist: pytest<9.0.0; extra == "dev"
+Requires-Dist: pytest-cov<6.0.0,>=4.1.0; extra == "dev"
 Requires-Dist: timm<1.0.0; extra == "dev"
 Requires-Dist: transformers<5.0.0; extra == "dev"
-Requires-Dist: black<24.0.0,>=23.7.0; extra == "dev"
-Requires-Dist: flake8<7.0.0,>=6.0.0; extra == "dev"
-Provides-Extra: geo
-Requires-Dist: cartopy>=0.20.0; extra == "geo"
+Requires-Dist: black<25.0.0,>=23.7.0; extra == "dev"
+Requires-Dist: flake8<8.0.0,>=6.0.0; extra == "dev"
 
 <div align="center">
     <br>

{mapreader-1.1.5 → mapreader-1.2.0}/mapreader.egg-info/requires.txt

@@ -8,8 +8,8 @@ Shapely<3.0.0,>=2.0.0
 nest-asyncio<2.0.0,>=1.5.1
 scikit-image>=0.18.3
 scikit-learn<2.0.0,>=1.0.1
-torch<2.0.0,>=1.10.0
-torchvision<0.12.1,>=0.11.1
+torch>=1.10.0
+torchvision<0.17.3,>=0.11.1
 jupyter<2.0.0,>=1.0.0
 ipykernel<7.0.0,>=6.5.1
 ipywidgets<9.0.0,>=8.0.0
@@ -27,14 +27,12 @@ torchinfo<2.0.0
 openpyxl<4.0.0
 geopandas<1.0.0
 pyogrio>=0.7.2
+cartopy>=0.22.0
 
 [dev]
-pytest<8.0.0
-pytest-cov<5.0.0,>=4.1.0
+pytest<9.0.0
+pytest-cov<6.0.0,>=4.1.0
 timm<1.0.0
 transformers<5.0.0
-black<24.0.0,>=23.7.0
-flake8<7.0.0,>=6.0.0
-
-[geo]
-cartopy>=0.20.0
+black<25.0.0,>=23.7.0
+flake8<8.0.0,>=6.0.0

{mapreader-1.1.5 → mapreader-1.2.0}/setup.py

@@ -26,7 +26,7 @@ setuptools.setup(
     packages=setuptools.find_packages(),
     include_package_data=True,
     platforms="OS Independent",
-    python_requires=">=3.8, <3.11",
+    python_requires=">=3.9",
     install_requires=[
         "matplotlib>=3.5.0,<4.0.0",
         "numpy>=1.21.5,<2.0.0",
@@ -38,14 +38,13 @@ setuptools.setup(
         "nest-asyncio>=1.5.1,<2.0.0",
         "scikit-image>=0.18.3",
         "scikit-learn>=1.0.1,<2.0.0",
-        "torch>=1.10.0,<2.0.0",
-        "torchvision>=0.11.1,<0.12.1",
+        "torch>=1.10.0",
+        "torchvision>=0.11.1,<0.17.3",
         "jupyter>=1.0.0,<2.0.0",
         "ipykernel>=6.5.1,<7.0.0",
         "ipywidgets>=8.0.0,<9.0.0",
         "ipyannotate==0.1.0-beta.0",
         "Cython>=0.29.24,<0.30.0",
-        # "proj>=0.2.0,<0.3.0",
         "PyYAML>=6.0,<7.0",
         "tensorboard>=2.7.0,<3.0.0",
         "parhugin>=0.0.3,<0.0.4",
@@ -58,20 +57,18 @@ setuptools.setup(
         "openpyxl<4.0.0",
         "geopandas<1.0.0",
         "pyogrio>=0.7.2",
+        "cartopy>=0.22.0",
     ],
     extras_require={
         "dev": [
-            "pytest<8.0.0",
-            "pytest-cov>=4.1.0,<5.0.0",
+            "pytest<9.0.0",
+            "pytest-cov>=4.1.0,<6.0.0",
             "timm<1.0.0",
             "transformers<5.0.0",
-            "black>=23.7.0,<24.0.0",
-            "flake8>=6.0.0,<7.0.0",
+            "black>=23.7.0,<25.0.0",
+            "flake8>=6.0.0,<8.0.0",
         ],
-        "geo": [
-            "cartopy>=0.20.0"
-        ],
-    },  
+    },
     classifiers=[
         "Development Status :: 3 - Alpha",
         "License :: OSI Approved :: MIT License",