Skip to content
Open
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
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
rev: v6.0.0
hooks:
- id: check-added-large-files
- id: check-merge-conflict
Expand All @@ -12,16 +12,16 @@ repos:
- id: mixed-line-ending
- id: trailing-whitespace
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v20.1.7
rev: v21.1.2
hooks:
- id: clang-format
types_or: [c, c++]
- repo: https://github.com/PyCQA/isort
rev: 6.0.1
rev: 6.1.0
hooks:
- id: isort
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 25.1.0
rev: 25.9.0
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
Expand Down
3 changes: 1 addition & 2 deletions python/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import pytest
from pytest_lazy_fixtures import lf as lazy_fixture

import flyft


@pytest.fixture
def ig():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_boublik_hard_sphere.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


def fex_cs(eta, d):
"""Carnahan-Starling free-energy density of hard spheres"""
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_brownian_diffusive_flux.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import flyft
import numpy as np
import pytest
from pytest_lazy_fixtures import lf as lazy_fixture

import flyft


@pytest.fixture
def cartesian_mesh_grand():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_composite_external_potential.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def comp():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_composite_flux.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def comp():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_composite_functional.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def comp():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_crank_nicolson_integrator.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def cn():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_explicit_euler_integrator.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def euler():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_exponential_wall_potential.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def ew():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_external_field.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def spherical_mesh_grand():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_field.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def field():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_grand_potential.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft

from .test_ideal_gas import f_ig, mu_ig
from .test_rosenfeld_fmt import fex_py, muex_py

Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_hard_wall_potential.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def hw():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_harmonic_wall_potential.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def hw():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_implicit_euler_integrator.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def euler():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_lennard_jones_93_wall_potential.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def lj():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_mirror.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import pytest

import flyft.mirror
import pytest


class _A:
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_parameter.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


class TimeParameter(flyft.CustomParameter):
def __call__(self, state):
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_picard_iteration.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft

from .test_ideal_gas import mu_ig
from .test_rosenfeld_fmt import muex_py

Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_rpy_diffusive_flux.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


@pytest.fixture
def spherical_mesh_grand():
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_state.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import pytest

import flyft
import pytest


def test_init(state):
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_virial_expansion.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


def f_ex(B, rho):
"""Excess free-energy density of virial expansion"""
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_white_bear.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


def fex_cs(eta, v):
"""Carnahan--Starling free-energy density of hard spheres"""
Expand Down
3 changes: 1 addition & 2 deletions python/tests/test_white_bear_mark_ii.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import flyft
import numpy as np
import pytest

import flyft


def fex_cs(eta, v):
"""Carnahan--Starling free-energy density of hard spheres"""
Expand Down
3 changes: 1 addition & 2 deletions python/validate/binary_mixture.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import numpy as np

import flyft
import numpy as np

L = 50.0
dx = 0.2
Expand Down
3 changes: 1 addition & 2 deletions python/validate/brownian_diffusion.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import numpy as np

import flyft
import numpy as np

L = 10.0
dx = 0.05
Expand Down
3 changes: 1 addition & 2 deletions python/validate/hard_sphere_evaporation.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import numpy as np

import flyft
import numpy as np

L = 10.0
dx = 0.05
Expand Down
3 changes: 1 addition & 2 deletions python/validate/hard_sphere_slit.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import numpy as np

import flyft
import numpy as np

L = 16.0
diameters = {"A": 1.0}
Expand Down
3 changes: 1 addition & 2 deletions python/validate/stratification.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import numpy as np

import flyft
import numpy as np

L = 38.5
dx = 0.05
Expand Down