Skip to content

Commit

Permalink
import/export printing and html_with_borders_tablefmt
Browse files Browse the repository at this point in the history
  • Loading branch information
cgevans committed Oct 18, 2024
1 parent 9fc0b29 commit 9c293c7
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 2 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/psf/black
rev: 23.1.0
rev: 24.10.0
hooks:
- id: black
language_version: python3.10
args: ["--target-version", "py310"]
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ components at different concentrations spread across several plates.

# Changelog

## v0.6.1

- Adds `html_with_borders_tablefmt` again (and import `printing`).

## v0.6.0

- Optional ECHO liquid handler support, with the 'echo' feature (eg, `pip install --upgrade alhambra_mixes[echo]`). Uses [kithairon](https://github.com/cgevans/kithairon), which
Expand Down
9 changes: 7 additions & 2 deletions src/alhambra_mixes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
from .quantitate import hydrate_and_measure_conc_and_dilute, measure_conc_and_dilute
from .references import Reference, load_reference
from .units import DNAN, Q_, VolumeError, nM, uL, uM, ureg
from .printing import html_with_borders_tablefmt

import printing

__all__ = [
"uL",
Expand Down Expand Up @@ -43,6 +46,8 @@
"hydrate_and_measure_conc_and_dilute",
"split_mix",
"master_mix",
"html_with_borders_tablefmt",
"printing",
]

try:
Expand All @@ -59,10 +64,10 @@
"EchoFillToVolume",
"EchoFixedVolume",
"EchoTargetConcentration",
"AbstractEchoAction"
"AbstractEchoAction",
]
except ImportError as err:
if err.name == "kithairon":
pass
else:
raise err # noqa
raise err # noqa

0 comments on commit 9c293c7

Please sign in to comment.