Merge pull request #22 from ElcoK/shapely2migrate

Shapely2migrate

README.md

@@ -21,7 +21,6 @@ This package is (loosely) based on the original DamageScanner, which calculated
 
 ## Installation
 [![workflow pypi badge](https://img.shields.io/pypi/v/damagescanner.svg?colorB=blue)](https://pypi.python.org/project/damagescanner/)
-[![supported python versions](https://img.shields.io/pypi/pyversions/damagescanner)](https://pypi.python.org/project/damagescanner/)
 
 **Requirements:** [NumPy](http://www.numpy.org/), [pandas](https://pandas.pydata.org/), [geopandas](http://geopandas.org/), [matplotlib](https://matplotlib.org/), [rasterio](https://github.com/mapbox/rasterio), [tqdm](https://github.com/tqdm/tqdm), 
 [xarray](https://docs.xarray.dev/en/stable/), [pyproj](https://pyproj4.github.io/pyproj/stable/) 

examples/RasterScanner.ipynb

@@ -86,17 +86,6 @@
     "                  save=False)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "tags": []
-   },
-   "outputs": [],
-   "source": [
-    "damage_df"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,

pyproject.toml

@@ -1,5 +1,35 @@
-[build-system]
-# These are the assumed default build requirements from pip:
-# https://pip.pypa.io/en/stable/reference/pip/#pep-517-and-518-support
-requires = ["setuptools>=43.0.0", "wheel"]
-build-backend = "setuptools.build_meta"
+[project]
+name = "damagescanner"
+dynamic = ["version"]
+authors = [
+    {name = "Elco Koks", email = "elco.koks@vu.nl"},
+]
+
+license = {text = "MIT License"}
+description = "Direct damage assessments for natural disasters"
+keywords = ["GIS", "natural hazards", "damage assessment", "remote sensing", "raster", "vector", "geospatial"]
+classifiers=[
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python",
+        "Operating System :: OS Independent",
+        "Topic :: Scientific/Engineering :: GIS",
+        "Topic :: Utilities",
+    ]
+readme = "README.md"
+requires-python = ">=3.8"
+dependencies = [
+    "geopandas >= 0.12.2",
+    "matplotlib >= 3.0",	
+    "numpy >= 1.20",
+    "pyproj >= 3.0",
+    "rasterio >= 1.2.6",
+    "xarray >= 0.19.0",
+    "rioxarray >= 0.7.1",
+    "packaging",
+    "pandas >= 1.4.0",
+    "shapely >= 2.0",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/ElcoK/DamageScanner"
+"Documentation" = "https://damagescanner.readthedocs.io/en/latest/"

setup.cfg

@@ -1,4 +1,20 @@
 [metadata]
-# This includes the license file(s) in the wheel.
-# https://wheel.readthedocs.io/en/stable/user_guide.html#including-license-files-in-the-generated-wheel-file
-license_files = LICENSE.txt
+name = damagescanner
+version = 0.6.1
+
+[options]
+install_requires =
+    geopandas
+    matplotlib
+    numpy
+    rasterio
+    xarray
+    rioxarray
+    packaging
+    pandas
+    shapely
+    importlib-metadata; python_version < "3.8"
+
+[options.packages.find]
+where=src
+

setup.py

@@ -1,52 +1,28 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
-"""Setup DamageScanner package
-"""
-from glob import glob
-from os.path import basename, splitext
-
-from setuptools import find_packages
 from setuptools import setup
 
-
-def readme():
-    """Read README contents"""
-    with open("README.md", encoding="utf8") as f:
+def long_description():
+    with open('README.md', encoding='utf-8') as f:
         return f.read()
 
 setup(
-    name="damagescanner",
-    version="0.6.0",
-    license="MIT License",
-    description='Damage assessment tool for natural disasters',
-    long_description=readme(),
-    long_description_content_type="text/markdown",
-    author='Elco Koks',
-    author_email='elcokoks@gmail.com',
-    url='https://github.com/ElcoK/DamageScanner',
-    package_dir={"": "src"},  # Optional
-    packages=find_packages(where="src"),
-    python_requires=">=3.4, <4",
-    include_package_data=True,
-    classifiers=[
-        # complete classifier list: http://pypi.python.org/pypi?%3Aaction=list_classifiers
-        "Development Status :: 4 - Beta",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Topic :: Scientific/Engineering :: GIS",
-        "Topic :: Utilities",
+    name='damagescanner',    
+    version='0.6.1',
+    long_description=long_description(),
+    long_description_content_type='text/markdown',    
+    install_requires=[
+    "geopandas",
+    "matplotlib",	
+    "numpy",
+    "pyproj",
+    "rasterio",
+    "xarray",
+    "rioxarray",
+    "packaging",
+    "pandas",
+    "shapely",
     ],
+    project_urls={
+        'GitHub': 'https://github.com/ElcoK/DamageScanner'
+    },
 
-    install_requires=[
-        "pandas",
-        "geopandas",
-        "xarray",
-        "rasterio",
-        "rioxarray",
-        "numpy",
-        "matplotlib",
-        "tqdm"
-    ]
-)
+)