Merge branch 'main' into bf_tc200

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: Testing
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
 
 jobs:
@@ -33,6 +33,8 @@ jobs:
             TOXENV: "py39"
           - python-version: 3.9
             TOXENV: "py39-numpy"
+          - python-version: "3.10"
+            TOXENV: "py310"
 
     steps:
     - uses: actions/checkout@v2

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
     rev: v4.1.0
     hooks:
       - id: no-commit-to-branch
-        args: [--branch, master]
+        args: [--branch, main]
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml

README.rst

@@ -1,12 +1,12 @@
 InstrumentKit
 =============
 
-.. image:: https://github.com/Galvant/InstrumentKit/workflows/Testing/badge.svg?branch=master
+.. image:: https://github.com/Galvant/InstrumentKit/workflows/Testing/badge.svg?branch=main
     :target: https://github.com/Galvant/InstrumentKit
     :alt: Github Actions build status
 
-.. image:: https://img.shields.io/coveralls/Galvant/InstrumentKit/master.svg?maxAge=2592000
-    :target: https://coveralls.io/github/Galvant/InstrumentKit?branch=master
+.. image:: https://img.shields.io/coveralls/Galvant/InstrumentKit/main.svg?maxAge=2592000
+    :target: https://coveralls.io/github/Galvant/InstrumentKit?branch=main
     :alt: Coveralls code coverage
 
 .. image:: https://readthedocs.org/projects/instrumentkit/badge/?version=latest
@@ -112,7 +112,7 @@ send, one can use the following functions to do so:
 Python Version Compatibility
 ----------------------------
 
-At this time, Python 3.6, 3.7, 3.8, and 3.9 are supported. Should you encounter
+At this time, Python 3.6, 3.7, 3.8, 3.9, and 3.10 are supported. Should you encounter
 any problems with this library that occur in one version or another, please
 do not hesitate to let us know.
 

license/AUTHOR.TXT

@@ -1,10 +1,7 @@
 Original author:
 
-Galvant Industries
-twitter.com/Galvant_Ind
-
 Steven Casagrande
-scasagrande@galvant.ca
+stevencasagrande@gmail.com
 twitter.com/stevecasagrande
 
 2012-2022

setup.cfg

@@ -16,6 +16,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Operating System :: OS Independent
     License :: OSI Approved :: GNU Affero General Public License v3
     Intended Audience :: Science/Research
@@ -34,7 +35,7 @@ install_requires =
     python-vxi11>=0.8
     pyusb>=1.0
     pyvisa>=1.9
-    ruamel.yaml~=0.15.37
+    ruamel.yaml>=0.16,<0.17
 
 [options.extras_require]
 numpy = numpy

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38,39},py{36,37,38,39}-numpy,pylint
+envlist = py{36,37,38,39,310},py{36,37,38,39,310}-numpy,pylint
 isolated_build = true
 
 [testenv]