Skip to content

Commit d2aa898

Browse files
committed
Re-add dependency pin until FastCS release made
1 parent cc50611 commit d2aa898

3 files changed

Lines changed: 9 additions & 14 deletions

File tree

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: Publish Python distribution to PyPI
22
on: push
33
jobs:
4-
# lint-and-test:
5-
# if: github.ref_type == 'tag'
6-
# name: Run linter and tests
7-
# uses: ./.github/workflows/Lint-and-test.yml
4+
lint-and-test:
5+
if: github.ref_type == 'tag'
6+
name: Run linter and tests
7+
uses: ./.github/workflows/Lint-and-test.yml
88
build:
9-
# needs: lint-and-test
9+
needs: lint-and-test
1010
if: github.ref_type == 'tag'
1111
name: build distribution
1212
runs-on: ubuntu-latest
@@ -34,7 +34,7 @@ jobs:
3434
name: >-
3535
Publish Python distribution to PyPI
3636
if: github.ref_type == 'tag'
37-
needs: [build]
37+
needs: [lint-and-test, build]
3838
runs-on: ubuntu-latest
3939
environment:
4040
name: release
@@ -53,7 +53,7 @@ jobs:
5353
name: >-
5454
Sign the Python distribution with Sigstore
5555
and upload them to GitHub Release
56-
needs: [build, publish-to-pypi]
56+
needs: [lint-and-test, build, publish-to-pypi]
5757
runs-on: ubuntu-latest
5858
permissions:
5959
contents: write # IMPORTANT: mandatory for making GitHub Releases

doc/conf.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66
# -- Project information -----------------------------------------------------
77
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
88

9-
import os
10-
import sys
11-
129
from fastcs_secop.version import version
1310

14-
sys.path.insert(0, os.path.abspath("../src"))
15-
1611
project = "fastcs-secop"
1712
copyright = ""
1813
author = "ISIS Experiment Controls"
@@ -23,7 +18,6 @@
2318

2419
nitpicky = True
2520
nitpick_ignore_regex = [
26-
("py:class", r"^collections\.abc\.Collection\["),
2721
("py:class", r"^.*\.T$"),
2822
("py:obj", r"^.*\.T$"),
2923
("py:class", r"^.*\.T.*_co$"),

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ classifiers = [
2727
]
2828

2929
dependencies = [
30-
"fastcs",
30+
# Remove pin when new release made
31+
"fastcs @ git+https://github.com/DiamondLightSource/FastCS",
3132
"orjson",
3233
]
3334

0 commit comments

Comments
 (0)