Skip to content

Commit

Permalink
Bump Python and limit mkl from Mac (#123)
Browse files Browse the repository at this point in the history
* Bump Python and limit mkl from Mac

* Update pre-commit
  • Loading branch information
banesullivan authored Jan 20, 2025
1 parent 4847203 commit e60a3ab
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, "3.10", "3.11"]
python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
os: [ubuntu-latest, macOS-latest, windows-latest]
steps:
- name: Checkout
Expand Down
65 changes: 29 additions & 36 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,44 +1,37 @@
repos:
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/psf/black
rev: 24.10.0
hooks:
- id: black

- repo: https://github.com/pycqa/isort
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/pycqa/isort
rev: 5.13.2
hooks:
- id: isort

- repo: https://github.com/PyCQA/flake8
rev: 3.9.2
hooks:
- id: flake8
additional_dependencies: [
"flake8-black==0.3.2",
"flake8-isort==4.1.1",
"flake8-quotes==3.3.1",
]
- repo: https://github.com/PyCQA/flake8
rev: 7.1.1
hooks:
- id: flake8
additional_dependencies: ["flake8-black==0.3.6", "flake8-isort==6.1.1", "flake8-quotes==3.4.0"]

- repo: https://github.com/codespell-project/codespell
rev: v2.1.0
hooks:
- id: codespell
args: [
"doc examples examples_flask pyvista tests",
"*.py *.rst *.md",
]
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
hooks:
- id: codespell
args: ["doc examples examples_flask pyvista tests", "*.py *.rst *.md"]

- repo: https://github.com/pycqa/pydocstyle
rev: 6.1.1
hooks:
- id: pydocstyle
additional_dependencies: [toml==0.10.2]
files: ^scooby/
- repo: https://github.com/pycqa/pydocstyle
rev: 6.3.0
hooks:
- id: pydocstyle
additional_dependencies: [toml==0.10.2]
files: ^scooby/

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
hooks:
- id: check-merge-conflict
- id: debug-statements
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: check-merge-conflict
- id: debug-statements
# - id: no-commit-to-branch
# args: [--branch, main]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class Report(scooby.Report):

This makes it particularly easy for a user of your project to quickly generate
a report on all of the relevant package versions and environment details when
sumbitting a bug.
submitting a bug.

```py
>>> import your_package
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
psutil
mkl
mkl; platform_system != 'Darwin'
2 changes: 1 addition & 1 deletion requirements_test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pytest-console-scripts
pytest-cov
beautifulsoup4
psutil
mkl
mkl; platform_system != 'Darwin'
numpy
scipy
no_version
Expand Down
1 change: 1 addition & 0 deletions scooby/__main__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Create entry point for the command-line interface (CLI)."""

import argparse
import importlib
from importlib.metadata import PackageNotFoundError
Expand Down
1 change: 1 addition & 0 deletions scooby/knowledge.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
particular modules (``VERSION_ATTRIBUTES``, ``VERSION_METHODS``)
"""

import os
import sys
import sysconfig
Expand Down
1 change: 1 addition & 0 deletions scooby/tracker.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Track imports."""

from types import ModuleType
from typing import List, Mapping, Optional, Sequence, Set, Union

Expand Down

0 comments on commit e60a3ab

Please sign in to comment.