Skip to content

Commit

Permalink
Drop support for python<3.11 and pandas<2
Browse files Browse the repository at this point in the history
  • Loading branch information
berland committed Jan 17, 2025
1 parent 370f856 commit 2f49553
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
os: [ubuntu-latest]
env:
OS: ${{ matrix.os }}
PYTHON: '3.8'
PYTHON: '3.11'

steps:
- uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.11
cache: "pip"
cache-dependency-path: |
setup.py
Expand Down
23 changes: 4 additions & 19 deletions .github/workflows/res2df.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
pandas-version: ['pandas>2']
python-version: ['3.11', '3.12']
include:
# For one of the Python versions we
# install the extra dependency ert
# (in order to not double the job matrix)

# Only test with pandas < 2 for py38 and py311
# No wheels for python3.12 for pandas<2
- python-version: '3.8'
install-ert: true
- python-version: '3.8'
pandas-version: 'pandas<2'
- python-version: '3.11'
pandas-version: 'pandas<2'
install-ert: true

steps:
- name: Checkout commit locally
Expand All @@ -58,13 +50,6 @@ jobs:
pip install --upgrade pip
pip install ".[tests, docs]"
- name: Install numpy<2 if pandas<2
if: matrix.pandas-version == 'pandas<2'
run: pip install "numpy<2"

- name: Check pandas version
run: |
pip install "${{matrix.pandas-version}}"
- name: Install ert
if: matrix.install-ert
Expand All @@ -87,7 +72,7 @@ jobs:
python setup.py build_sphinx
- name: Update GitHub pages
if: github.repository_owner == 'equinor' && github.ref == 'refs/heads/master' && matrix.python-version == '3.8' && matrix.pandas-version == 'pandas>2'
if: github.repository_owner == 'equinor' && github.ref == 'refs/heads/master' && matrix.python-version == '3.11'
run: |
cp -R ./build/sphinx/html ../html
Expand All @@ -110,7 +95,7 @@ jobs:
fi
- name: Build python package and publish to pypi
if: github.event_name == 'release' && matrix.python-version == '3.8' && matrix.pandas-version == 'pandas>2'
if: github.event_name == 'release' && matrix.python-version == '3.11'
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.res2df_pypi_token }}
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ Please note that we use [`black`](https://black.readthedocs.io/en/stable/) and [
1. Check that your pull request passes all tests.
1. When all tests have passed and your are happy with your changes, change your pull request to "ready for review", and ask for a code review.
1. When your code has been approved you should rebase, squash and merge your changes.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Build Status](https://img.shields.io/github/workflow/status/equinor/res2df/res2df)](https://github.com/equinor/res2df/actions?query=workflow%3Ares2df)
[![codecov](https://codecov.io/gh/equinor/res2df/graph/badge.svg?token=3sZBGGu5VG)](https://codecov.io/gh/equinor/res2df)
[![Python 3.8-3.12](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)](https://www.python.org)
[![Python 3.11-3.12](https://img.shields.io/badge/python-3.11%20|%203.12-blue.svg)](https://www.python.org)
[![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)
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,5 @@
install_requires=REQUIREMENTS,
setup_requires=SETUP_REQUIREMENTS,
extras_require=EXTRAS_REQUIRE,
python_requires=">=3.8",
python_requires=">=3.11",
)

0 comments on commit 2f49553

Please # to comment.