Skip to content

Commit 9b4ea8e

Browse files
authored
Merge pull request #3 from pyobs/develop
v0.12
2 parents fc7696b + e80348c commit 9b4ea8e

File tree

3 files changed

+31
-5
lines changed

3 files changed

+31
-5
lines changed

.github/workflows/pypi.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Publish package to PyPI
2+
on:
3+
push:
4+
tags:
5+
- 'v*'
6+
jobs:
7+
build-n-publish:
8+
name: Build and publish package to PyPI
9+
runs-on: ubuntu-18.04
10+
steps:
11+
- uses: actions/checkout@master
12+
- name: Set up Python 3.7
13+
uses: actions/setup-python@v1
14+
with:
15+
python-version: 3.7
16+
- name: Install wheel
17+
run: python3 -m pip install --user --upgrade setuptools wheel
18+
- name: Build a binary wheel and a source tarball
19+
run: python3 setup.py sdist bdist_wheel
20+
- name: Publish distribution to PyPI
21+
if: startsWith(github.ref, 'refs/tags')
22+
uses: pypa/gh-action-pypi-publish@master
23+
with:
24+
password: ${{ secrets.pypi_password }}

pyobs_fli/flicamera.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import threading
44
from datetime import datetime
55
import time
6+
from typing import Tuple
7+
68
from astropy.io import fits
79

810
from pyobs.interfaces import ICamera, ICameraWindow, ICameraBinning, ICooling
@@ -66,23 +68,23 @@ def close(self):
6668
self._driver.close()
6769
self._driver = None
6870

69-
def get_full_frame(self, *args, **kwargs) -> (int, int, int, int):
71+
def get_full_frame(self, *args, **kwargs) -> Tuple[int, int, int, int]:
7072
"""Returns full size of CCD.
7173
7274
Returns:
7375
Tuple with left, top, width, and height set.
7476
"""
7577
return self._driver.get_full_frame()
7678

77-
def get_window(self, *args, **kwargs) -> (int, int, int, int):
79+
def get_window(self, *args, **kwargs) -> Tuple[int, int, int, int]:
7880
"""Returns the camera window.
7981
8082
Returns:
8183
Tuple with left, top, width, and height set.
8284
"""
8385
return self._window
8486

85-
def get_binning(self, *args, **kwargs) -> (int, int):
87+
def get_binning(self, *args, **kwargs) -> Tuple[int, int]:
8688
"""Returns the camera binning.
8789
8890
Returns:
@@ -222,7 +224,7 @@ def _abort_exposure(self):
222224
self._driver.cancel_exposure()
223225
self._camera_status = ICamera.ExposureStatus.IDLE
224226

225-
def get_cooling_status(self, *args, **kwargs) -> (bool, float, float):
227+
def get_cooling_status(self, *args, **kwargs) -> Tuple[bool, float, float]:
226228
"""Returns the current status for the cooling.
227229
228230
Returns:

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# setup
2222
setup(
2323
name='pyobs-fli',
24-
version='0.9',
24+
version='0.12',
2525
description='pyobs component for FLI cameras',
2626
packages=['pyobs_fli'],
2727
ext_modules=cythonize(extensions),

0 commit comments

Comments
 (0)