Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
6fcabb5
Freeze pylint to version 1.6.5
scasagrande Apr 19, 2017
bc4fdbb
Merge pull request #165 from Galvant/freeze_pylint
scasagrande Apr 19, 2017
065d3d2
Extended YAML (#164)
cgranade Apr 20, 2017
6c6dbb4
Fixes for pylint version 1.7 (#166)
cgranade Jun 6, 2017
3316327
Update supported Python versions (#170)
scasagrande Jun 7, 2017
cf71116
Pin ruamel version (#171)
scasagrande Jun 9, 2017
363de47
Add set_cmd to property factories (#172)
scasagrande Jun 9, 2017
215a6d0
Fix timeout and terminator for USBTMC (#173)
scasagrande Jun 11, 2017
12e9a15
Feature: named structures (#169)
cgranade Jul 14, 2017
5a8e546
Change write to write_raw when communicating using visa (#177)
VirtualSatai Aug 16, 2017
3860b94
Merge pull request #178 from Galvant/develop
scasagrande Aug 30, 2017
87aa8d6
Bump version 0.3.1 -> 0.4.0
scasagrande Aug 30, 2017
0ae7b8c
Merge pull request #180 from Galvant/bumpversion-0.4.0
scasagrande Aug 31, 2017
97f5dd5
Fix README badges
scasagrande Aug 31, 2017
5ef1396
Use new version of quantities, unpin numpy
scasagrande Aug 31, 2017
04809d1
Merge pull request #181 from Galvant/041_patch
scasagrande Aug 31, 2017
8425341
Bump version 0.4.0 -> 0.4.1
scasagrande Aug 31, 2017
ffe0a45
Merge pull request #182 from Galvant/bumpversion
scasagrande Aug 31, 2017
bb4ab21
Nose to pytest transition (#183)
bilderbuchi Mar 24, 2018
b5fa44b
Fix socket.shutdown function call (issue #189) (#191)
scasagrande Feb 7, 2019
3d9175d
Fix visa readbytes (#192)
scasagrande Feb 7, 2019
ea2e8a5
Doc updates (#193)
scasagrande Feb 7, 2019
7195a67
Bump version v0.4.1 -> v0.4.2 (#194)
scasagrande Feb 7, 2019
cd571bc
Python 3.7 support (#195)
scasagrande Feb 7, 2019
73d921f
Bump version v0.4.2 -> v0.4.3 (#204)
scasagrande Feb 13, 2019
497cc7c
Fix setup.py for publishing (#205)
scasagrande Feb 13, 2019
016c957
Develop -> master for v0.5.0 (#209)
scasagrande Feb 19, 2019
9730bc8
Bump version v0.4.3 -> v0.5.0 (#210)
scasagrande Feb 19, 2019
141861f
Pin hypothesis version to fix build (#222)
scasagrande Jan 2, 2020
eba82b2
GPIBUSB connection enhancements (#221)
scasagrande Jan 2, 2020
fb86f04
Update srsdg645.py (#219)
trappitsch Jan 2, 2020
93a10d4
Add several instruments from francois-drielsma (#224)
scasagrande Jan 4, 2020
a79a7ee
A few fixes from Francois for the glassman FR (#225)
scasagrande Jan 4, 2020
c9dac25
<>:1: SyntaxWarning: "is" with a literal. Did you mean "=="? (#226)
Jan 11, 2020
e007259
Optical spectrum analyzers (#223)
scasagrande Jan 12, 2020
e5845eb
Update copyrights for 2020 (#227)
scasagrande Jan 13, 2020
373786d
Bump version v0.5.0 -> v0.6.0 (#228)
scasagrande Jan 13, 2020
5113083
Officially drop Py2.7 and Py3.5 (#229)
scasagrande Jan 13, 2020
0dd1ae6
Remove enum34 from dependencies (#230)
scasagrande Jan 13, 2020
5c7ba21
Update pylint 2.4 (#231)
scasagrande Jan 15, 2020
1f43a47
Add support for Py38 (#232)
scasagrande Jan 24, 2020
fef054a
Change all quantities imports to instruments.units (#233)
scasagrande Feb 3, 2020
8b9fe5e
Remove all __future__ imports (#234)
scasagrande Feb 3, 2020
d430271
Remove py2/3 compat code (#235)
scasagrande Feb 4, 2020
19e57d6
Added instrument: Newport Agilis (#238)
trappitsch Jun 25, 2020
3303cec
Enhancement: SRS645 delay generator added burst mode support (#240)
trappitsch Jul 7, 2020
d8c56e6
Thorlabs APT Inertial Actuator (#242)
trappitsch Jul 22, 2020
1346592
Support of Teledyne-LeCroy MAUI enabled oscilloscopes (#245)
trappitsch Aug 6, 2020
8b20d6f
Enhancements to SRS DG645 test suite and class (#247)
trappitsch Aug 12, 2020
3786dba
Test Suite for all Lakeshore instruments, Bug Fix Lakeshore475 (#249)
trappitsch Aug 14, 2020
64093e5
Tests rigolds1000 (#250)
trappitsch Aug 25, 2020
4c1a67c
Tests for Yokogawa 7651 and tests + BF for Yokogawa 6370 (#251)
trappitsch Aug 25, 2020
aa80c1f
Test suite and BF for Tektronix AWG2000 (#252)
trappitsch Aug 27, 2020
cce7b72
#248 - Fix coveralls integration (#255)
scasagrande Sep 1, 2020
d5c1ad5
Test suite for Tektronix DPO4104 and bug fixes (#253)
trappitsch Sep 2, 2020
f10497d
Test suite and BF for SRS CTC-100 (#257)
trappitsch Sep 8, 2020
e2c9bfb
Test suite and BFs for TekDPO70000 (#256)
trappitsch Sep 8, 2020
6d1214d
Tests that proprety factories invoke host classes `query` and `sendcm…
trappitsch Sep 9, 2020
c9ffd6e
Test suite and BFs for Thorlabs PM100USB (#260)
trappitsch Sep 10, 2020
77c6f0a
Test suite and BFs for Tektronix TDS5xx (#261)
trappitsch Sep 14, 2020
4f30520
Tests and BFs for Keithley 195 (#262)
trappitsch Sep 14, 2020
ecdedbc
Test suite update and BF for Agilent 34410a (#264)
trappitsch Sep 23, 2020
0ef885f
Test suite and BFs for Keithley580 (#263)
trappitsch Sep 23, 2020
a768609
Full coverage tests and BFs for Thorlabs APT (#265)
trappitsch Sep 23, 2020
d9f2a77
Test suite and BFs for Tektronix TDS224 (#266)
trappitsch Sep 23, 2020
c930722
Gentec-eo Blu support and test suite (#267)
trappitsch Oct 14, 2020
f1a7d20
Improved testing and enhancements of Newport Agilis support (#268)
trappitsch Oct 14, 2020
2fb4966
Tests and BF for Fluke3000 (#269)
trappitsch Oct 14, 2020
9f83b00
Adjust `pytest.approx` statement such that Keithley580 tests pass (#271)
trappitsch Oct 14, 2020
e09bd86
Update pytest to version 6.1.1 (#272)
scasagrande Oct 14, 2020
ee2fd49
Test suite and BF for Newport's `error.py` (#270)
trappitsch Oct 14, 2020
d5c148d
Rename visa to pyvisa (#275)
trappitsch Oct 15, 2020
760deb3
Tests and BFs for Thorlabs `_abstract` and `_packets` helper classes …
trappitsch Oct 15, 2020
8d78c16
Replace quantities with pint (#243)
scasagrande Oct 19, 2020
b23edc3
BF and full coverage test suite for NewportESP301 (#280)
trappitsch Nov 3, 2020
cf8c81a
Full coverage for Agilent 33220a tests (#281)
trappitsch Nov 3, 2020
f2da132
GlassmanFR Tests and Typo fixes (#282)
trappitsch Nov 3, 2020
9865a69
Full coverage tests for Minghe MHS5200a (#283)
trappitsch Nov 5, 2020
c739ca0
Tests and some BFs for HP devices (#284)
trappitsch Nov 5, 2020
e3f2764
Test suite and BF for Keithley 485 (#285)
trappitsch Nov 13, 2020
076e09f
Full coverage for Keithley 2182 & 6220 (#286)
trappitsch Nov 14, 2020
424348b
Add support for CPython 3.9 (#277)
scasagrande Nov 15, 2020
515d62e
Tests and BF for Qubitek CC1 (#290)
trappitsch Nov 16, 2020
cb1e4ec
Full coverage for test suites of FSW 0020 (#291)
trappitsch Nov 17, 2020
107cd0f
Test for full coverage of Fluke3000 (#292)
trappitsch Nov 17, 2020
5b2fba7
Use tox in travis (#289)
scasagrande Nov 17, 2020
ad07c61
Tests for SRS DG645 and 830 (#293)
trappitsch Nov 17, 2020
c3655f7
Remove numpy as hard requirement (#279)
scasagrande Nov 21, 2020
8e2cb61
Fix sphinx build (#294)
scasagrande Nov 21, 2020
5d46595
Switch to using pyproject.toml and setup.cfg (#295)
scasagrande Nov 22, 2020
3ddd6fa
Remove support for new pyserial 3.5 until we fix it (#299)
scasagrande Dec 8, 2020
b5ea5d9
Tests and typo fix for Generic SCPI Instruments (#297)
trappitsch Dec 8, 2020
940fcab
Fix issue with pyserial3.5 and remove pinned requirement pyserial<3.5…
trappitsch Dec 9, 2020
3409b90
Full test suite and fixes for meta-instruments in abstract instrument…
trappitsch Dec 12, 2020
6cb4ec2
add space to promt (#303)
dschick Dec 18, 2020
ed74135
Create test suite for abstract signal generator instruments (#302)
trappitsch Dec 19, 2020
7d9acce
BFs for visa_communicator and tests (#308)
trappitsch Jul 5, 2021
7d50698
Add tests for full coverage of instrument.py. Remove legacy checks. (…
trappitsch Jul 13, 2021
6d216bd
Bug fix for `lcc25.py`, add a space after prompt ">" (#311)
trappitsch Oct 29, 2021
73eff1c
Newport picomotor controller 8742 (#312)
trappitsch Jan 19, 2022
4c3433a
Newport error codes x00 to x09 fixed (#314)
XavierAudier Jan 19, 2022
f4021f8
Migrate to GitHub actions (#304)
scasagrande Jan 20, 2022
ef93466
Establish read and write capabilities for USBCommunicator (#313)
trappitsch Jan 22, 2022
ae5ed18
Add pre-commit (#317)
scasagrande Jan 22, 2022
89e119f
Upgrade source code to Py36+ only (#318)
scasagrande Jan 22, 2022
7f114b5
Cleanup and update files in rootdir (#319)
scasagrande Jan 23, 2022
07d8049
Skip no-commit-to-branch in CI (#320)
scasagrande Jan 23, 2022
5cdba01
Fix coveralls submission (#323)
scasagrande Jan 25, 2022
aa51148
Inner, outer class consistency (#321)
trappitsch Jan 26, 2022
2690ed9
Convert project versioning to use setuptools_scm (#322)
scasagrande Jan 26, 2022
5490969
Move metadata into setup.cfg (#324)
scasagrande Jan 27, 2022
97c528a
Update package name (#325)
scasagrande Jan 27, 2022
70cfb05
Add py310 support (#327)
scasagrande Jan 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ exclude_lines =
if not self._testing:
raise NotImplementedError
raise AssertionError

[run]
relative_files = True
28 changes: 28 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Upload Python Package

on:
release:
types: [published]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip virtualenv
pip install build
- name: Build package
run: python -m build
- name: Publish package
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
67 changes: 67 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Testing

on:
push:
branches: [ master ]
pull_request:

jobs:
static-checks:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: pip install --upgrade pre-commit
- name: Run static checks via pre-commit
run: SKIP=no-commit-to-branch pre-commit run --all --show-diff-on-failure
test:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- python-version: 3.6
TOXENV: "py36"
- python-version: 3.7
TOXENV: "py37"
- python-version: 3.8
TOXENV: "py38"
- python-version: 3.9
TOXENV: "py39"
- python-version: 3.9
TOXENV: "py39-numpy"
- python-version: "3.10"
TOXENV: "py310"

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: pip install --upgrade pip setuptools wheel virtualenv tox
- name: Test with tox
env:
TOXENV: ${{ matrix.TOXENV }}
run: tox
- name: Submit to coveralls
uses: AndreMiras/coveralls-python-action@develop
with:
parallel: true
github-token: ${{ secrets.github_token }}

coverage:
needs: test
runs-on: ubuntu-latest
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.github_token }}
parallel-finished: true
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ Thumbs.db
## Build directories ##
doc/_build

## Venv
.venv/
.python-version

## setup.py generated files ##
MANIFEST

Expand All @@ -20,6 +24,7 @@ MANIFEST
*.so

# Packages
.egg/
*.egg
*.egg-info
dist
Expand All @@ -41,6 +46,7 @@ pip-log.txt
.coverage
.tox
nosetests.xml
.pytest_cache

#Translations
*.mo
Expand All @@ -50,3 +56,15 @@ nosetests.xml

#pycharm generated
.idea

# VS Code IDE internals
.vscode/

# nosetests metadata
.noseids

# Hypothesis files
.hypothesis/

# version file generated by setuptools_scm
instruments/_version.py
19 changes: 19 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
hooks:
- id: no-commit-to-branch
args: [--branch, master]
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: debug-statements
- repo: https://github.com/psf/black
rev: 21.12b0
hooks:
- id: black
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
hooks:
- id: pyupgrade
args: [ --py36-plus ]
Loading