From 415105e3e19c5b497781dd2d85ea9b80e08d1bb2 Mon Sep 17 00:00:00 2001 From: Qiusheng Wu Date: Mon, 18 Mar 2024 09:41:58 -0400 Subject: [PATCH] Remove keplergl and add pre-commit (#13) * Remove keplergl * Add pre-commit --- .pre-commit-config.yaml | 23 +++++++++++++++++++++ docs/pygis.md | 2 +- pygis/__init__.py | 4 ++-- requirements.txt | 10 +++++----- requirements_dev.txt | 12 +++++------ setup.py | 44 ++++++++++++++++++++--------------------- 6 files changed, 59 insertions(+), 36 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..f2c6567 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,23 @@ +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.5.0 + hooks: + - id: check-toml + - id: check-yaml + - id: end-of-file-fixer + types: [python] + - id: trailing-whitespace + - id: requirements-txt-fixer + - id: check-added-large-files + args: ["--maxkb=500"] + + - repo: https://github.com/psf/black + rev: 24.2.0 + hooks: + - id: black-jupyter + language_version: python3.11 + + - repo: https://github.com/kynan/nbstripout + rev: 0.7.1 + hooks: + - id: nbstripout diff --git a/docs/pygis.md b/docs/pygis.md index 944a1d7..605142b 100644 --- a/docs/pygis.md +++ b/docs/pygis.md @@ -1,4 +1,4 @@ - + # pygis module ::: pygis.pygis \ No newline at end of file diff --git a/pygis/__init__.py b/pygis/__init__.py index 2712f92..828b513 100644 --- a/pygis/__init__.py +++ b/pygis/__init__.py @@ -1,5 +1,5 @@ """Top-level package for pygis.""" __author__ = """Qiusheng Wu""" -__email__ = 'giswqs@gmail.com' -__version__ = '0.6.1' +__email__ = "giswqs@gmail.com" +__version__ = "0.6.1" diff --git a/requirements.txt b/requirements.txt index a0bb456..2cb35ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,13 +4,13 @@ ffmpeg-python gdown geeadd geedim>=1.6.1 -geemap>=0.30.4 +geemap>=0.32.0 geojson geopandas ipynb-py-convert kaleido -leafmap>=0.31.0 -localtileserver>=0.6.1 +leafmap>=0.31.5 +localtileserver>=0.10.0 mapclassify>=2.4.0 mss netcdf4 @@ -19,13 +19,13 @@ owslib palettable plotly pycrs +pydeck retry rio-cogeo rioxarray sankee whiteboxgui -pydeck -keplergl +# keplergl # datapane # pydeck # here-map-widget-for-jupyter diff --git a/requirements_dev.txt b/requirements_dev.txt index 801556c..e1c34cc 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,11 +1,11 @@ -pip bump2version -wheel -watchdog -flake8 -tox coverage +flake8 +grip +pip Sphinx +tox twine -grip +watchdog +wheel diff --git a/setup.py b/setup.py index 471c30f..a1295a9 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from os import path as op from setuptools import setup, find_packages -with open('README.md') as readme_file: +with open("README.md") as readme_file: readme = readme_file.read() here = op.abspath(op.dirname(__file__)) @@ -18,41 +18,41 @@ install_requires = [x.strip() for x in all_reqs if "git+" not in x] dependency_links = [x.strip().replace("git+", "") for x in all_reqs if "git+" not in x] -requirements = [ ] +requirements = [] -setup_requirements = [ ] +setup_requirements = [] -test_requirements = [ ] +test_requirements = [] setup( author="Qiusheng Wu", - author_email='giswqs@gmail.com', - python_requires='>=3.7', + author_email="giswqs@gmail.com", + python_requires=">=3.7", classifiers=[ - 'Development Status :: 2 - Pre-Alpha', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: MIT License', - 'Natural Language :: English', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', + "Development Status :: 2 - Pre-Alpha", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Natural Language :: English", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ], description="A Python package for installing optional dependencies for geemap and leafmap.", install_requires=install_requires, dependency_links=dependency_links, license="MIT license", long_description=readme, - long_description_content_type='text/markdown', + long_description_content_type="text/markdown", include_package_data=True, - keywords='pygis', - name='pygis', - packages=find_packages(include=['pygis', 'pygis.*']), + keywords="pygis", + name="pygis", + packages=find_packages(include=["pygis", "pygis.*"]), setup_requires=setup_requirements, - test_suite='tests', + test_suite="tests", tests_require=test_requirements, - url='https://github.com/giswqs/pygis', - version='0.6.1', + url="https://github.com/giswqs/pygis", + version="0.6.1", zip_safe=False, )