From e9c641a6087627e74124c7c43fd6cafaa1eb47cb Mon Sep 17 00:00:00 2001 From: Graeme Winter Date: Wed, 13 Mar 2024 09:07:21 +0000 Subject: [PATCH 1/3] ExperimentList -> ExperimentListFactory to fix removed feature (#60) In dxtbx the ExperimentList.from_filenames() call was removed, but was used here. Replacing with ExperimentListFactory resolves this. Fixes #59 --- fast_dp/image_readers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fast_dp/image_readers.py b/fast_dp/image_readers.py index 976d3f9..995728e 100644 --- a/fast_dp/image_readers.py +++ b/fast_dp/image_readers.py @@ -3,7 +3,7 @@ import os import time -from dxtbx.model.experiment_list import ExperimentList +from dxtbx.model.experiment_list import ExperimentListFactory from fast_dp.image_names import image2template_directory @@ -323,11 +323,11 @@ def read_image_metadata_dxtbx(image): if image.endswith(".h5"): # XDS can literally only handle master files called (prefix)_master.h5 assert "master" in image - expt = ExperimentList.from_filenames([image])[0] + expt = ExperimentListFactory.from_filenames([image])[0] else: template, directory = image2template_directory(image) full_template = os.path.join(directory, template) - expt = ExperimentList.from_templates( + expt = ExperimentListFactory.from_templates( [full_template], allow_incomplete_sweeps=True )[0] From 80010ea6f4f3bdcb30f60675de543ceeece6870c Mon Sep 17 00:00:00 2001 From: Nicholas Devenish Date: Tue, 9 Apr 2024 17:19:25 +0100 Subject: [PATCH 2/3] Remove procrunner from dependencies. This appears to not be used any more. --- pyproject.toml | 1 - requirements_dev.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0cc8785..906d715 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,6 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Operating System :: POSIX :: Linux", ] -dependencies = ["procrunner"] [project.urls] Homepage = "https://github.com/DiamondLightSource/fast_dp" diff --git a/requirements_dev.txt b/requirements_dev.txt index 1705f95..4220a11 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,3 +1,2 @@ pytest==7.4.2 -procrunner==2.3.3 pytest-cov==4.1.0 From 26d1b1cd1f30f11a8a748541663e99d770187f38 Mon Sep 17 00:00:00 2001 From: Nicholas Devenish Date: Thu, 16 Jan 2025 16:52:34 +0000 Subject: [PATCH 3/3] Update github artifact actions (#65) The old versions are deprecated. Also, update pre-commit in preparation for turning on pre-commit.ci. --- .github/workflows/python.yml | 36 +++++++++++------------------------- .pre-commit-config.yaml | 23 +++++++++-------------- 2 files changed, 20 insertions(+), 39 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 3007b77..c5fc677 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -8,20 +8,6 @@ defaults: shell: bash -l {0} jobs: - Lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: 3.11 - - name: Lint with Ruff - run: | - pip install ruff - ruff --output-format=github --target-version=py39 . - continue-on-error: true - Build: runs-on: ubuntu-latest steps: @@ -41,7 +27,7 @@ jobs: run: | python -m build pip install dist/*.whl - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./dist/* @@ -52,19 +38,19 @@ jobs: python-version: ["3.9", "3.10", "3.11"] os: [ubuntu-latest, windows-latest, macos-latest] exclude: - - os: windows-latest - python-version: "3.10" - - os: windows-latest - python-version: "3.11" - - os: macos-latest - python-version: "3.10" - - os: macos-latest - python-version: "3.11" + - os: windows-latest + python-version: "3.10" + - os: windows-latest + python-version: "3.11" + - os: macos-latest + python-version: "3.10" + - os: macos-latest + python-version: "3.11" runs-on: ${{ matrix.os }} # runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist @@ -98,7 +84,7 @@ jobs: permissions: id-token: write steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: artifact path: dist diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 70b9c85..342412d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,21 +1,16 @@ -repos: +ci: + autoupdate_schedule: quarterly -# Automatic source code formatting -- repo: https://github.com/psf/black - rev: 23.9.1 +repos: +- repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.9.2 hooks: - - id: black - args: [--safe, --quiet] + - id: ruff + args: [--fix, --exit-non-zero-on-fix, --show-fixes] + - id: ruff-format -# Syntax check and some basic - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v5.0.0 hooks: - id: check-ast -- repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.0.291 - hooks: - - id: ruff - args: ["--fix", "--show-fixes"] -