From a44b8f283281288a24560b5d29198cefeda965f8 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 17 Feb 2023 09:53:38 -0300
Subject: [PATCH 1/8] udpate and use ruff instead of pyflakes

---
 .pre-commit-config.yaml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8cf1da96b..709e96e9a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ exclude: examples/data/|.*\.css|.*\.json|.*\.geojson|.*\.html
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.3.0
+  rev: v4.4.0
   hooks:
     - id: trailing-whitespace
     - id: check-ast
@@ -14,12 +14,10 @@ repos:
     - id: file-contents-sorter
       files: requirements-dev.txt
 
-- repo: https://github.com/PyCQA/flake8
-  rev: 5.0.4
+- repo: https://github.com/charliermarsh/ruff-pre-commit
+  rev: v0.0.247
   hooks:
-    - id: flake8
-      exclude: docs/conf.py
-      args: [--max-line-length=120]
+    - id: ruff
 
 - repo: https://github.com/pycqa/isort
   rev: 5.12.0
@@ -29,7 +27,7 @@ repos:
       args: ["--profile", "black", "--filter-files"]
 
 - repo: https://github.com/psf/black
-  rev: 22.10.0
+  rev: 23.1.0
   hooks:
   - id: black
     language_version: python3
@@ -52,7 +50,7 @@ repos:
         )$
 
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.2.0
+  rev: v3.3.1
   hooks:
     - id: pyupgrade
       args:

From 878a93b54bd06d47e166cc1585a6918042f43a25 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 17 Feb 2023 09:53:47 -0300
Subject: [PATCH 2/8] configure ruff

---
 pyproject.toml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 2e07b30e5..743721ed5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,3 +17,10 @@ color = true
 
 [tool.mypy]
 ignore_missing_imports = true
+
+[tool.ruff]
+target-version = "py310"
+line-length = 120
+
+[tool.ruff.per-file-ignores]
+"docs/conf.py" = ["E402"]

From edd3f7a907c783a17c11767d83a25c1bb4ff3b59 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 17 Feb 2023 09:54:09 -0300
Subject: [PATCH 3/8] apply fixes

---
 folium/folium.py                  | 1 -
 folium/plugins/measure_control.py | 1 -
 folium/plugins/minimap.py         | 1 -
 folium/plugins/mouse_position.py  | 1 -
 folium/raster_layers.py           | 1 -
 5 files changed, 5 deletions(-)

diff --git a/folium/folium.py b/folium/folium.py
index 60928537b..a9e396613 100644
--- a/folium/folium.py
+++ b/folium/folium.py
@@ -65,7 +65,6 @@
 
 
 class GlobalSwitches(Element):
-
     _template = Template(
         """
         <script>
diff --git a/folium/plugins/measure_control.py b/folium/plugins/measure_control.py
index 4219eff03..239d10a97 100644
--- a/folium/plugins/measure_control.py
+++ b/folium/plugins/measure_control.py
@@ -55,7 +55,6 @@ def __init__(
         secondary_area_unit="acres",
         **kwargs
     ):
-
         super().__init__()
         self._name = "MeasureControl"
 
diff --git a/folium/plugins/minimap.py b/folium/plugins/minimap.py
index 87b324325..161f2a314 100644
--- a/folium/plugins/minimap.py
+++ b/folium/plugins/minimap.py
@@ -105,7 +105,6 @@ def __init__(
         minimized=False,
         **kwargs
     ):
-
         super().__init__()
         self._name = "MiniMap"
 
diff --git a/folium/plugins/mouse_position.py b/folium/plugins/mouse_position.py
index e35c63f2b..2c1b1b6f3 100644
--- a/folium/plugins/mouse_position.py
+++ b/folium/plugins/mouse_position.py
@@ -85,7 +85,6 @@ def __init__(
         lng_formatter=None,
         **kwargs
     ):
-
         super().__init__()
         self._name = "MousePosition"
 
diff --git a/folium/raster_layers.py b/folium/raster_layers.py
index 71120b28f..411b671f4 100644
--- a/folium/raster_layers.py
+++ b/folium/raster_layers.py
@@ -107,7 +107,6 @@ def __init__(
         opacity: float = 1,
         **kwargs
     ):
-
         # check for xyzservices.TileProvider without importing it
         if isinstance(tiles, dict):
             attr = attr if attr else tiles.html_attribution  # type: ignore

From 80a620396b4d7ef216a3e68459342f6d977a9da7 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 17 Feb 2023 09:55:26 -0300
Subject: [PATCH 4/8] ignore random words in the notebook outputs

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 709e96e9a..99836aa6a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -42,7 +42,7 @@ repos:
   hooks:
     - id: codespell
       args:
-        - --ignore-words-list=thex
+        - --ignore-words-list=thex,nd,fo,som,nam,tha
       exclude: >
         (?x)^(
             .*\.csv |

From 909b8634f5143165fd56bbbcf8e45c27dab2293d Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 17 Feb 2023 10:29:48 -0300
Subject: [PATCH 5/8] substitute pyupgrade and isort with ruff

---
 .pre-commit-config.yaml | 14 --------------
 pyproject.toml          |  7 ++++++-
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 99836aa6a..208ad3e68 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,13 +19,6 @@ repos:
   hooks:
     - id: ruff
 
-- repo: https://github.com/pycqa/isort
-  rev: 5.12.0
-  hooks:
-    - id: isort
-      additional_dependencies: [toml]
-      args: ["--profile", "black", "--filter-files"]
-
 - repo: https://github.com/psf/black
   rev: 23.1.0
   hooks:
@@ -48,10 +41,3 @@ repos:
             .*\.csv |
             .*\.json |
         )$
-
-- repo: https://github.com/asottile/pyupgrade
-  rev: v3.3.1
-  hooks:
-    - id: pyupgrade
-      args:
-        - --py36-plus
diff --git a/pyproject.toml b/pyproject.toml
index 743721ed5..ba3d6cdd5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,7 +19,12 @@ color = true
 ignore_missing_imports = true
 
 [tool.ruff]
-target-version = "py310"
+select = [
+    "F", # flakes
+    "I", # import sorting
+    "U", # upgrade
+]
+target-version = "py37"
 line-length = 120
 
 [tool.ruff.per-file-ignores]

From abf84758c55ba8e2559ad60607aab597de96fc68 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 17 Feb 2023 10:30:58 -0300
Subject: [PATCH 6/8] fix lint and we don't need this b/c of min py requirement
 in setup.py

---
 folium/__init__.py | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/folium/__init__.py b/folium/__init__.py
index 41cf8fa15..0b4a6bcc0 100644
--- a/folium/__init__.py
+++ b/folium/__init__.py
@@ -1,4 +1,3 @@
-import sys
 
 import branca
 from branca.colormap import ColorMap, LinearColormap, StepColormap
@@ -59,28 +58,6 @@
     )
 
 
-if sys.version_info < (3, 0):
-    raise ImportError(
-        """You are running folium {} on Python 2
-
-    folium 0.9 and above are no longer compatible with Python 2, but somehow
-    you got this version anyway. Make sure you have pip >= 9.0 to avoid this
-    kind of issue, as well as setuptools >= 24.2:
-
-     $ pip install pip setuptools --upgrade
-
-    Your choices:
-
-    - Upgrade to Python 3.
-
-    - Install an older version of folium:
-
-     $ pip install 'folium<0.9.0'
-
-    """.format(
-            __version__
-        )
-    )  # noqa
 
 __all__ = [
     "Choropleth",

From 4f2ebf286f6a8ddc8608e9bf942b196c0d81a520 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 17 Feb 2023 10:33:57 -0300
Subject: [PATCH 7/8] unecessary with min python requirement

---
 setup.py | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/setup.py b/setup.py
index 753eabb43..2db402dd4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,27 +1,9 @@
 import os
-import sys
 
 from setuptools import setup
 
 rootpath = os.path.abspath(os.path.dirname(__file__))
 
-if sys.version_info < (3, 5):
-    error = """
-    folium 0.9+ supports Python 3.5 and above.
-    When using Python 2.7, please install folium 0.8.*.
-
-    See folium `README.rst` file for more information:
-
-    https://github.com/python-visualization/folium/blob/main/README.rst
-
-    Python {py} detected.
-
-    Try upgrading pip and retry.
-    """.format(
-        py=".".join([str(v) for v in sys.version_info[:3]])
-    )
-    print(error, file=sys.stderr)
-    sys.exit(1)
 
 
 def read(*parts):

From 319d3bf59930849708e62606accf47469f5a21f9 Mon Sep 17 00:00:00 2001
From: Filipe Fernandes <ocefpaf@gmail.com>
Date: Fri, 17 Feb 2023 10:34:25 -0300
Subject: [PATCH 8/8] fix lints

---
 folium/__init__.py | 2 --
 setup.py           | 1 -
 2 files changed, 3 deletions(-)

diff --git a/folium/__init__.py b/folium/__init__.py
index 0b4a6bcc0..305e9e98b 100644
--- a/folium/__init__.py
+++ b/folium/__init__.py
@@ -1,4 +1,3 @@
-
 import branca
 from branca.colormap import ColorMap, LinearColormap, StepColormap
 from branca.element import (
@@ -58,7 +57,6 @@
     )
 
 
-
 __all__ = [
     "Choropleth",
     "ClickForMarker",
diff --git a/setup.py b/setup.py
index 2db402dd4..3da0fb66c 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,6 @@
 rootpath = os.path.abspath(os.path.dirname(__file__))
 
 
-
 def read(*parts):
     return open(os.path.join(rootpath, *parts)).read()