Add seperate style and typing workflow

.github/workflows/codecov.yml

@@ -16,10 +16,10 @@ jobs:
       PYTHON: '3.8'
 
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v4
 
     - name: Setup Python
-      uses: actions/setup-python@master
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
 

.github/workflows/res2df.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Install res2df with dependencies
         run: |
           pip install --upgrade pip
-          pip install ".[tests,docs,types]"
+          pip install ".[tests, docs]"
 
       - name: Install numpy<2 if pandas<2
         if: matrix.pandas-version == 'pandas<2'
@@ -58,13 +58,6 @@ jobs:
         if: matrix.install-ert
         run: pip install ".[ert]"
 
-      - name: Check code style and typing
-        run: |
-          black --check res2df tests setup.py docs/conf.py
-          flake8 res2df tests
-          isort --check-only --profile black res2df tests
-          mypy res2df
-
       - name: List all installed packages
         run: pip freeze
 

.github/workflows/style.yml

@@ -0,0 +1,43 @@
+name: Style
+
+on:
+ push:
+   branches:
+     - master
+     - 'version-**'
+ pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+
+jobs:
+  check-style:
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.12']
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+        cache: "pip"
+        cache-dependency-path: |
+          setup.py
+          pyproject.toml
+
+    - name: Install res2df with style dependencies
+      run: |
+        pip install ".[style]"
+
+    - name: Run style check
+      if: ${{ always() }}
+      run: |
+        SKIP=no-commit-to-branch pre-commit run --all-files --show-diff-on-failure

.github/workflows/typing.yml

@@ -0,0 +1,42 @@
+name: Typing
+
+on:
+ push:
+   branches:
+     - master
+     - 'version-**'
+ pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+
+jobs:
+  check-style:
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.12']
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+        cache: "pip"
+        cache-dependency-path: |
+          setup.py
+          pyproject.toml
+
+    - name: Install res2df with types dependencies
+      run: |
+        pip install ".[types]"
+
+    - name: Run mypy
+      run: |
+        mypy res2df

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v2.5.0
+  rev: v4.6.0
   hooks:
   - id:  no-commit-to-branch
     args: ['--branch', 'master']
@@ -12,23 +12,9 @@ repos:
   - id: mixed-line-ending
   - id: trailing-whitespace
 
-- repo: https://github.com/ambv/black
-  rev: 20.8b1
-  hooks:
-  - id: black
-
-- repo: https://gitlab.com/pycqa/flake8.git
-  rev: 3.9.2
-  hooks:
-  - id: flake8
-
-- repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v0.910
-  hooks:
-  - id: mypy
-
-- repo: https://github.com/pycqa/isort
-  rev: 5.8.0
-  hooks:
-    - id: isort
-      name: isort
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.5.7
+    hooks:
+    - id: ruff
+      args: [ --fix ]
+    - id: ruff-format

ruff.toml

@@ -29,5 +29,8 @@ ignore = ["PLW2901",  # redefined-loop-name
           "PLW3201",  # bad-dunder-method-name
 ]
 
+[lint.extend-per-file-ignores]
+"res2df/__init__.py" = ["PLC0414"]
+
 [lint.pylint]
 max-args = 20

setup.cfg

@@ -4,10 +4,6 @@ universal = 1
 [aliases]
 test=pytest
 
-[flake8]
-max-line-length = 88
-exclude = docs, res2df/__init__.py
-
 [tool:pytest]
 markers =
     integration: marks a test as an integration test
@@ -21,6 +17,3 @@ warning-is-error = 1
 ignore_directives=argparse,automodule
 # This looks like a bug in rstcheck:
 ignore_messages=Hyperlink target .* is not referenced
-
-[isort]
-profile=black

setup.py

@@ -43,6 +43,7 @@
 ]
 EXTRAS_REQUIRE = {
     "tests": TEST_REQUIREMENTS,
+    "style": ["pre-commit"],
     "types": TYPES_REQUIREMENTS,
     "docs": DOCS_REQUIREMENTS,
     "ert": ["ert>=2.38.0-b5"],

test_requirements.txt

@@ -1,9 +1,4 @@
-black
-flake8
-isort
-mypy
 networkx
-pre-commit
 pytest
 pytest-cov
 pytest-mock

types_requirements.txt

@@ -1,3 +1,4 @@
+mypy
 types-PyYAML
 types-python-dateutil
 types-setuptools