Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@

# GitHub Action that uses Black to reformat the Python code in an incoming pull request.
# If all Python code in the pull request is compliant with Black then this Action does nothing.
# Othewrwise, Black is run and its changes are committed back to the incoming pull request.
# https://github.com/cclauss/autoblack
# GitHub Action that checks Python formatting with a pinned Black release.

name: autoblack
name: black
on: [pull_request]
jobs:
black:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: psf/black@stable
with:
options: "--check --diff --verbose"
version: "~=26.0"
src: "."
7 changes: 4 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]

env:
SDIST_DIR: /tmp/sdist
Expand All @@ -26,10 +26,11 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
python -m pip install -r requirements.txt
python -m pip install -e .
- name: Test with pytest
run: |
python setup.py test
python -m pytest
codecov
- name: Test with pytest
run: |
Expand Down
11 changes: 8 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ repos:
- id: trailing-whitespace
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/psf/black
rev: 22.1.0
- repo: local
hooks:
- id: black
- id: black
name: black
entry: black
language: python
additional_dependencies:
- black~=26.0
types: [python]
1 change: 0 additions & 1 deletion pyevtk/vtk.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
from .evtk import writeBlockSize, writeArrayToFile, writeArraysToFile
from .xml import XmlWriter


# ================================
# VTK Types
# ================================
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[tool.black]
line-length = 88
required-version = "26"
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ codecov
twine
check-manifest
readme_renderer[md]
black~=22.1.0
black>=26.0,<27.0
Comment thread
MuellerSeb marked this conversation as resolved.
pre-commit
8 changes: 1 addition & 7 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[aliases]
# this allows calling 'python setup.py test'
test=pytest

[pep8]
max-line-length = 120
ignore = E221,E226,E241,E242, W0105, N803, N806
Expand All @@ -22,9 +18,7 @@ exclude = __init__.py
[tool:pytest]
testpaths = tests/
python_files = tests/*.py
python_class = Test
pep8maxlinelength = 120
pep8ignore = E221,E226,E241,E242
python_classes = Test
addopts= --cov pyevtk

# See the docstring in versioneer.py for instructions. Note that you must
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,20 @@ def readme(fname):
author_email="pauloa.herrera@gmail.com",
maintainer="Adamos Kyriakou",
maintainer_email="somada141@gmail.com",
license="BSD-2-Clause",
url="https://github.com/pyscience-projects/pyevtk",
packages=["pyevtk", "evtk"],
package_dir={"pyevtk": "pyevtk"},
package_data={"pyevtk": ["LICENSE.txt", "examples/*.py"]},
install_requires=["numpy >= 1.8.0"],
# necessary for 'python setup.py test'
setup_requires=["pytest-runner"],
tests_require=["pytest>=3.1", "pytest-cov", "twine", "check-manifest"],
classifiers=[
"Programming Language :: Python :: 3.7",
"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",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
],
)
5 changes: 2 additions & 3 deletions versioneer.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Version: 0.19


"""The Versioneer - like a rocketeer, but for versions.

The Versioneer
Expand Down Expand Up @@ -417,9 +418,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, env=
return stdout, p.returncode


LONG_VERSION_PY[
"git"
] = r'''
LONG_VERSION_PY["git"] = r'''
# This file helps to compute a version number in source trees obtained from
# git-archive tarball (such as those provided by githubs download-from-tag
# feature). Distribution tarballs (built by setup.py sdist) and build
Expand Down
Loading