From bd1007ee836d098c41864f8657631143d382d2a2 Mon Sep 17 00:00:00 2001 From: Qiusheng Wu Date: Wed, 10 Jan 2024 13:10:53 -0500 Subject: [PATCH 1/2] Add missing files in wheel --- MANIFEST.in | 1 - pyproject.toml | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 8a49264c55..4f38111bf9 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,7 +5,6 @@ include requirements_docs.txt recursive-include geemap/data * recursive-include geemap/examples * -recursive-include geemap/algorithms * recursive-include tests * recursive-exclude * __pycache__ recursive-exclude * *.py[co] diff --git a/pyproject.toml b/pyproject.toml index 0cb54c1987..a92ae97e8b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -98,9 +98,8 @@ workshop = [ [tool] [tool.setuptools.packages.find] -where = ["geemap"] -namespaces = false - +include = ["geemap*"] +exclude = ["docs*"] [tool.setuptools.dynamic] dependencies = {file = ["requirements.txt"]} @@ -139,5 +138,4 @@ Homepage = "https://github.com/gee-community/geemap" [build-system] requires = ["setuptools>=64", "setuptools_scm>=8"] -build-backend = "setuptools.build_meta" - +build-backend = "setuptools.build_meta" \ No newline at end of file From 0931fdee9ced282d2dbd066af8b9547c8c28c1e0 Mon Sep 17 00:00:00 2001 From: Qiusheng Wu Date: Wed, 10 Jan 2024 13:24:43 -0500 Subject: [PATCH 2/2] Fix warnings in Python 3.12 --- geemap/timelapse.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/geemap/timelapse.py b/geemap/timelapse.py index 1de75bfc1f..38b538ca43 100644 --- a/geemap/timelapse.py +++ b/geemap/timelapse.py @@ -1717,8 +1717,8 @@ def sentinel2_timeseries_legacy( print(f"The end year must be an integer <= {get_current_year()}.") return - if re.match("[0-9]{2}\-[0-9]{2}", start_date) and re.match( - "[0-9]{2}\-[0-9]{2}", end_date + if re.match(r"[0-9]{2}-[0-9]{2}", start_date) and re.match( + r"[0-9]{2}-[0-9]{2}", end_date ): pass else: @@ -2033,8 +2033,8 @@ def landsat_timeseries( print(f"The end year must be an integer <= {get_current_year()}.") return - if re.match("[0-9]{2}\-[0-9]{2}", start_date) and re.match( - "[0-9]{2}\-[0-9]{2}", end_date + if re.match(r"[0-9]{2}-[0-9]{2}", start_date) and re.match( + r"[0-9]{2}-[0-9]{2}", end_date ): pass else: @@ -2325,8 +2325,8 @@ def landsat_timeseries_legacy( print("The end year must be an integer <= 2021.") return - if re.match("[0-9]{2}\-[0-9]{2}", start_date) and re.match( - "[0-9]{2}\-[0-9]{2}", end_date + if re.match(r"[0-9]{2}-[0-9]{2}", start_date) and re.match( + r"[0-9]{2}-[0-9]{2}", end_date ): pass else: @@ -3232,7 +3232,7 @@ def sentinel1_timelapse_legacy( Args: roi (object, optional): Region of interest to create the timelapse. Defaults to LV & Lake Mead. - out_gif (str, optional): File path to the output animated GIF. Defaults to user\Downloads\s1_ts_*.gif. + out_gif (str, optional): File path to the output animated GIF. Defaults to Downloads\s1_ts_*.gif. start_year (int, optional): Starting year for the timelapse. Defaults to 2015. end_year (int, optional): Ending year for the timelapse. Defaults to current year. start_date (str, optional): Starting date (month-day) each year for filtering ImageCollection. Defaults to '01-01'.