Skip to content

Commit

Permalink
Merge pull request #12 from isuthermography/master
Browse files Browse the repository at this point in the history
Pull in PyPi publishing action
  • Loading branch information
sdh4 authored Jul 15, 2024
2 parents 8c98c70 + 52b3c84 commit 3d10272
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 1 deletion.
92 changes: 92 additions & 0 deletions .github/workflows/push-to-pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
name: Publish Python distribution to PyPI
on: push
jobs:
build:
name: Build distribution
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.x"

- name: Install pypa/build
run: >-
python3 -m
pip install
build
--user
- name: Build a binary wheel and a source tarball
run: python3 -m build
- name: Store the distribution packages
uses: actions/upload-artifact@v3
with:
name: python-package-distributions
path: dist/

publish-to-pypi:
name: >-
Publish Python distribution to PyPI
#if: startsWith(github.ref, 'refs/tags/') # only publish to PyPI on tag pushes
needs:
- build
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/dataguzzler-python
permissions:
id-token: write # IMPORTANT: mandatory for trusted publishing

steps:
- name: Download all the dists
uses: actions/download-artifact@v3
with:
name: python-package-distributions
path: dist/
- name: Publish distribution to PyPI
uses: pypa/gh-action-pypi-publish@release/v1

github-release:
name: >-
Sign the Python distribution with Sigstore
and upload them to GitHub Release
needs:
- publish-to-pypi
runs-on: ubuntu-latest

permissions:
contents: write # IMPORTANT: mandatory for making GitHub Releases
id-token: write # IMPORTANT: mandatory for sigstore

steps:
- name: Download all the dists
uses: actions/download-artifact@v3
with:
name: python-package-distributions
path: dist/
- name: Sign the dists with Sigstore
uses: sigstore/[email protected]
with:
inputs: >-
./dist/*.tar.gz
./dist/*.whl
- name: Create GitHub Release
env:
GITHUB_TOKEN: ${{ github.token }}
run: >-
gh release create
'${{ github.ref_name }}'
--repo '${{ github.repository }}'
--notes ""
- name: Upload artifact signatures to GitHub Release
env:
GITHUB_TOKEN: ${{ github.token }}
# Upload to GitHub Release using the `gh` CLI.
# `dist/` contains the built packages, and the
# sigstore-produced signatures and certificates.
run: >-
gh release upload
'${{ github.ref_name }}' dist/**
--repo '${{ github.repository }}'
2 changes: 1 addition & 1 deletion dataguzzler_python/modules/motion_control/acr9000.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ def enabled(self, value):
try:
if enabled:
# issue ctrl-y to clear all kill-all-motion-request (KAMR) flags
self.parent._control_socket.write(f"PROG{self._proglevel:d}\r".encode("utf-8"))
self.parent._control_socket.write(b"\x19\r")
self.parent._control_socket.read_until(expected=b'>')
pass
self.parent._control_socket.write(f"PROG{self._proglevel:d}\r".encode("utf-8"))
Expand Down

0 comments on commit 3d10272

Please sign in to comment.