Skip to content

Commit

Permalink
DEP: Drop Python 3.8 support
Browse files Browse the repository at this point in the history
  • Loading branch information
mferrera committed Dec 12, 2024
1 parent 1af8dbb commit c16d6bb
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
mypy:
strategy:
matrix:
python-version: ["3.8", "3.11"]
python-version: ["3.9", "3.11", "3.12"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
fail-fast: false
matrix:
python:
- ['3.8', cp38]
- ['3.9', cp39]
- ['3.10', cp310]
- ['3.11', cp311]
Expand All @@ -26,8 +25,6 @@ jobs:
- [macos-13, macosx_x86_64] # macos-13 is the last x86-64 runner
- [macos-latest, macosx_arm64] # macos-latest is always arm64 going forward
exclude:
- os_arch: [macos-latest, macosx_arm64]
python: ['3.8', cp38]
- os_arch: [macos-latest, macosx_arm64]
python: ['3.9', cp39]
env:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@ jobs:
timeout-minutes: 15
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
python-version: "3.10"
- os: macos-latest
python-version: 3.12
- os: windows-latest
python-version: 3.8
- os: windows-latest
python-version: 3.12

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Detailed documentation for [XTGeo at Read _the_ Docs](https://xtgeo.readthedocs.

## Feature summary

- Python 3.8+ support
- Python 3.9+ support
- Focus on high speed, using numpy and pandas with C backend
- Regular surfaces, i.e. 2D maps with regular sampling and rotation
- 3D grids (corner-point), supporting several formats such as
Expand Down
32 changes: 16 additions & 16 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ requires = [
"pybind11",
"scikit-build-core[pyproject]>=0.10",
"swig<4.3.0",
"numpy==1.19.2; python_version == '3.8'",
"numpy==1.19.5; python_version == '3.9'",
"numpy==1.21.6; python_version == '3.10'",
"numpy==1.23.5; python_version == '3.11'",
Expand All @@ -22,7 +21,7 @@ wheel.install-dir = "xtgeo"
name = "xtgeo"
description = "XTGeo is a Python library for 3D grids, surfaces, wells, etc"
readme = "README.md"
requires-python = ">=3.8"
requires-python = ">=3.9"
license = { text = "LGPL-3.0" }
authors = [{ name = "Equinor", email = "[email protected]" }]
keywords = ["grids", "surfaces", "wells", "cubes"]
Expand All @@ -36,7 +35,6 @@ classifiers = [
"Operating System :: MacOS",
"Natural Language :: English",
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand Down Expand Up @@ -120,7 +118,6 @@ match = '(?!(test_|_)).*\.py'

[tool.pytest.ini_options]
minversion = "6.0"
addopts = "--verbose"
log_cli = "False"
log_cli_format = "%(levelname)8s (%(relativeCreated)6.0fms) %(filename)44s [%(funcName)40s()] %(lineno)4d >> %(message)s"
log_cli_level = "INFO"
Expand All @@ -143,18 +140,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
"TC", # flake8-type-checking
"TID", # flake8-tidy-imports
# "UP", # pyupgrade
"W", # pylint-warnings
]

[tool.ruff.lint.isort]
Expand Down
2 changes: 0 additions & 2 deletions tests/test_xyz/test_points_poly.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import pathlib
import sys

import pytest

Expand Down Expand Up @@ -436,7 +435,6 @@ def test_add_inside_polygons_etc():
assert list(poi.get_dataframe()[poi.zname].values) == [10.0, 10.0, 10.0]


@pytest.mark.skipif(sys.version_info < (3, 8), reason="Different order in python 3.7")
def test_boundary_from_points_simple():
"""Test deriving a boundary around points (classmethod)."""

Expand Down

0 comments on commit c16d6bb

Please sign in to comment.