From 719adfb8f09e06a6a87258f112d1e715a7bea387 Mon Sep 17 00:00:00 2001
From: mferrera <matt.ferrera@gmail.com>
Date: Thu, 12 Dec 2024 08:49:27 +0100
Subject: [PATCH] DEP: Drop Python 3.8 support

---
 .github/workflows/publish.yml |  4 ++--
 .github/workflows/style.yml   |  2 +-
 .github/workflows/test.yml    |  2 +-
 .gitignore                    |  2 ++
 README.md                     |  4 ++--
 pyproject.toml                | 32 +++++++++++++++++---------------
 6 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 41c5c78..bb9b8eb 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -20,10 +20,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Python 3.8
+      - name: Set up Python 3.12
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
 
       - name: Install build dependencies
         run: |
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index 32fa385..c9baa99 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -18,7 +18,7 @@ jobs:
   style:
     strategy:
       matrix:
-        python-version: ["3.8", "3.12"]
+        python-version: ["3.9", "3.12"]
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e9faf0a..d53054b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
   testing:
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
         os: [ubuntu-latest]
         include:
           - os: macos-latest
diff --git a/.gitignore b/.gitignore
index 8ae8cd8..d853e5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,5 @@ target/
 
 # pyenv python configuration file
 .python-version
+
+.venv/
diff --git a/README.md b/README.md
index 5b043a0..7186049 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # grid3d-maps
 
 [![tests](https://github.com/equinor/grid3d-maps/actions/workflows/test.yml/badge.svg)](https://github.com/equinor/grid3d-maps/actions/workflows/test.yml)
-![Python Version](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11-blue.svg)
+![Python Version](https://img.shields.io/badge/python-3.9%20|%203.10%20|%203.11-blue.svg)
 [![License: GPL v3](https://img.shields.io/github/license/equinor/grid3d-maps)](https://www.gnu.org/licenses/gpl-3.0)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 Various scripts for generating maps from 3D grid properties.
 
diff --git a/pyproject.toml b/pyproject.toml
index 449ceba..4150afb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,7 @@ write_to = "src/grid3d_maps/version.py"
 name = "grid3d_maps"
 description = "Make HC thickness, avg maps, etc directly from 3D props"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 license = { file = "LICENSE" }
 authors = [
     { name = "Equinor", email = "fg_fmu-atlas@equinor.com" },
@@ -36,10 +36,10 @@ classifiers = [
     "Operating System :: POSIX :: Linux",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: MacOS",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Natural Language :: English",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
 ]
@@ -63,7 +63,6 @@ tests = [
     "pylint",
     "pytest",
     "pytest-cov",
-    "PyQt5-sip<12.16.0; python_version == '3.8'",
     "pytest-runner",
     "pytest-xdist",
     "rstcheck",
@@ -115,18 +114,21 @@ ignore = [
     "C901",
 ]
 select = [
-    "C",
-    "E",
-    "F",
-    "I",
-    "PIE",
-    "Q",
-    "RET",
-    "RSE",
-    "SIM",
-    "TCH",
-    "TID",
-    "W",
+    # "B",  # flake-8-bugbear
+    "C",  # pylint-convention
+    "E",  # pycodestyle-error
+    "F",  # pyflakes
+    "I",  # isort
+    "NPY",  # numpy
+    "PIE",  # flake8-pie
+    "Q",  # flake8-quotes
+    "RET",  # flake8-return
+    "RSE",  # flake8-raise
+    "SIM",  # flake8-simplify
+    "TCH",  # flake8-type-checking
+    "TID",  # flake8-tidy-imports
+    # "UP",  # pyupgrade
+    "W",  # pylint-warnings
 ]
 
 [tool.ruff.lint.isort]