Skip to content

Commit 31a8b15

Browse files
committed
changing the yaml template generator for distortion correction
1 parent 1de099b commit 31a8b15

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.github/workflows/httomo_backends_pypi_publish.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
name: Upload Package to PyPI when Release is Created
1+
name: Upload Package to PyPI when "v" tag is pushed
22

3+
# Run the workflow whenever a tag beginning with `v` is pushed to any branch
34
on:
4-
release:
5-
types: [created]
5+
push:
6+
tags:
7+
- v*
68

79
jobs:
810
pypi-publish:
@@ -18,7 +20,7 @@ jobs:
1820
- name: Set up Python
1921
uses: actions/setup-python@v4
2022
with:
21-
python-version: "3.10"
23+
python-version: "3.11"
2224
- name: Install dependencies
2325
run: |
2426
$CONDA/bin/conda install conda-forge::tomopy==1.15

httomo_backends/scripts/yaml_templates_generator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def _get_discard_data_out() -> List[str]:
184184

185185
def _get_discard_keys() -> List[str]:
186186
"""Can work with any software in principle,
187-
but for TomoPy and httomolib there are additional keys
187+
but for TomoPy, httomolib(gpu) there are additional keys
188188
that needed to be discarded in templates in order to let
189189
httomo work smoothly.
190190
@@ -212,6 +212,8 @@ def _get_discard_keys() -> List[str]:
212212
"gpu_id",
213213
"comm",
214214
"offset",
215+
"shift_xy",
216+
"step_xy",
215217
]
216218
return discard_keys
217219

pyproject.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ dev_template = "{tag}"
4949

5050
[project]
5151
name = "httomo-backends"
52-
version = "0.0.1"
5352
description = "Supplementary files for HTTomo backends."
5453
readme = "README.rst"
5554
license = {text = "BSD-3-Clause"}
@@ -67,8 +66,8 @@ classifiers = [
6766
"License :: OSI Approved :: BSD License",
6867
"Programming Language :: Python :: 3.10",
6968
]
70-
7169
requires-python = ">=3.10"
70+
dynamic = ["version"]
7271
dependencies = [
7372
"numpy",
7473
"pyyaml"
@@ -80,7 +79,7 @@ repository = "https://github.com/DiamondLightSource/httomo-backends"
8079
[tool.mypy]
8180
# Ignore missing stubs for modules we use
8281
ignore_missing_imports = true
83-
python_version = "3.10" # make sure we're compatible with 3.9
82+
python_version = "3.11"
8483
plugins = 'numpy.typing.mypy_plugin'
8584

8685
[tool.isort]

0 commit comments

Comments
 (0)