Merge branch 'QCoDeS:master' into master

Author: qutech-lab

.github/static/environment_forge_full.yml

@@ -2,20 +2,20 @@ name: qcodesforge
 channels:
  - conda-forge
 dependencies:
- - python=3.7.9
+ - python=3.9
  # recommended to be explicitly specified by conda-incubator/setup-miniconda@v2
  - pip
  # dependencies for setup.cfg
  - numpy>=1.17
  - pyvisa>=1.11.0, <1.12.0
- - h5py>=2.8.0
+ - h5py>=3.0.0
  - websockets>=7.0
  - jsonschema>=3.0.0
  - ruamel.yaml>=0.16.0,!=0.16.6
  - wrapt>=1.10.4
  - pandas>=1.0.0
  - xarray>=0.18.0
- - h5netcdf>=0.8.0
+ - h5netcdf>=0.10.0, !=0.14.0
  - tabulate>=0.8.0
  - tqdm>=4.20.0
  - opencensus>=0.7.10, <0.9.0

.github/workflows/codeql-analysis.yml

@@ -21,16 +21,16 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.0.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/conda-forge-install-and-test.yaml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
     - name: checkout source code
-      uses: actions/checkout@v2.3.4
+      uses: actions/checkout@v3.0.2
       with:
         submodules: true
     - name: setup ubuntu-latest xvfb

.github/workflows/darker.yaml

@@ -0,0 +1,16 @@
+name: Lint with Darker
+
+on: [push, pull_request]
+
+jobs:
+  lint-with-darker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.0.2
+        with:
+          fetch-depth: 0
+      - uses: akaihola/darker@1.5.0
+        with:
+          options: "--check --diff"
+          src: "./qcodes"
+          revision: "origin/master..."

.github/workflows/docs.yaml

@@ -31,13 +31,13 @@ jobs:
       OS: ${{ matrix.os }}
       UPLOAD_TO_GHPAGES: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == '3.9' && github.event_name == 'push' && github.ref == 'refs/heads/master' }}
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3.0.2
       with:
         fetch-depth: '0'
         # if we upload to ghpages we need the full
         # history to generate correct version info
       if: ${{ fromJSON(env.UPLOAD_TO_GHPAGES) }}
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3.0.2
       if: ${{ !fromJSON(env.UPLOAD_TO_GHPAGES) }}
     - name: setup ubuntu-latest xvfb
       uses: ./.github/actions/setup-ubuntu-latest-xvfb
@@ -46,7 +46,7 @@ jobs:
       run: sudo apt install pandoc
       if: runner.os == 'Linux'
     - name: Install pandoc on windows
-      uses: Wandalen/wretry.action@v1.0.12
+      uses: Wandalen/wretry.action@v1.0.15
       with:
         action: crazy-max/ghaction-chocolatey@v1.6.0
         with: |
@@ -55,14 +55,14 @@ jobs:
         attempt_delay: 1000
       if: runner.os == 'Windows'
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.1
+      uses: actions/setup-python@v3.1.2
       with:
         python-version: ${{ matrix.python-version }}
     - name: prepare pip cache
       id: prepare-cache-pip
       uses: ./.github/actions/prepare-cache-pip
     - name: pip cache
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: ${{ steps.prepare-cache-pip.outputs.cache-dir }}
         key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/docs_requirements.txt') }}-${{ hashFiles('**/setup.cfg') }}
@@ -90,12 +90,12 @@ jobs:
         ./make.bat html
       if: runner.os == 'Windows'
     - name: Upload build docs
-      uses: actions/upload-artifact@v2.3.1
+      uses: actions/upload-artifact@v3.0.0
       with:
         name: docs_${{ matrix.python-version }}_${{ matrix.os }}
         path: ${{ github.workspace }}/docs/_build/html
     - name: Deploy to gh pages
-      uses: JamesIves/github-pages-deploy-action@v4.2.2
+      uses: JamesIves/github-pages-deploy-action@v4.3.3
       with:
         branch: gh-pages
         folder: ${{ github.workspace }}/docs/_build/html

.github/workflows/pytest-min-versions.yaml

@@ -25,20 +25,20 @@ jobs:
       PYTHON: ${{ matrix.python-version }}
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3.0.2
       with:
         submodules: true
     - name: setup ubuntu-latest xvfb
       uses: ./.github/actions/setup-ubuntu-latest-xvfb
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.1
+      uses: actions/setup-python@v3.1.2
       with:
         python-version: ${{ matrix.python-version }}
     - name: prepare pip cache
       id: prepare-cache-pip
       uses: ./.github/actions/prepare-cache-pip
     - name: pip cache
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: ${{ steps.prepare-cache-pip.outputs.cache-dir }}
         key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/min-requirements.txt') }}-${{ hashFiles('**/setup.cfg') }}
@@ -47,6 +47,7 @@ jobs:
     - name: generate min_requirements.txt
       run: |
         pip install requirements-builder
+        pip install versioningit
         requirements-builder -l min -e test setup.py -o min_requirements.txt
     - name: install min_requirements.txt
       run: |

.github/workflows/pytest-non-local.yaml

@@ -22,20 +22,20 @@ jobs:
       DISPLAY: ':99.0'
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3.0.2
       with:
         submodules: true
     - name: setup ubuntu-latest xvfb
       uses: ./.github/actions/setup-ubuntu-latest-xvfb
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.1
+      uses: actions/setup-python@v3.1.2
       with:
         python-version: ${{ matrix.python-version }}
     - name: prepare pip cache
       id: prepare-cache-pip
       uses: ./.github/actions/prepare-cache-pip
     - name: pip cache
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: ${{ steps.prepare-cache-pip.outputs.cache-dir }}
         key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/test_requirements.txt') }}-${{ hashFiles('**/setup.cfg') }}

.github/workflows/pytest.yaml

@@ -25,20 +25,20 @@ jobs:
       PYTHON: ${{ matrix.python-version }}
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3.0.2
       with:
         submodules: true
     - name: setup ubuntu-latest xvfb
       uses: ./.github/actions/setup-ubuntu-latest-xvfb
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.1
+      uses: actions/setup-python@v3.1.2
       with:
         python-version: ${{ matrix.python-version }}
     - name: prepare pip cache
       id: prepare-cache-pip
       uses: ./.github/actions/prepare-cache-pip
     - name: pip cache
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.2
       with:
         path: ${{ steps.prepare-cache-pip.outputs.cache-dir }}
         key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/test_requirements.txt') }}-${{ hashFiles('**/setup.cfg') }}
@@ -59,7 +59,7 @@ jobs:
       run: |
         pytest --cov=qcodes --cov-report xml --hypothesis-profile ci qcodes
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v2.1.0
+      uses: codecov/codecov-action@v3.1.0
       with:
         file: ./coverage.xml
         env_vars: OS,PYTHON

.github/workflows/upload_to_pypi.yaml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3.0.2
     - name: Set up Python
-      uses: actions/setup-python@v2.3.1
+      uses: actions/setup-python@v3.1.2
       with:
         python-version: '3.7'
     - name: Install build deps

.pre-commit-config.yaml

@@ -1,23 +1,24 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
     - id: trailing-whitespace
     - id: end-of-file-fixer
-    - id: check-yaml
+    - id: check-ast
     - id: check-json
       exclude: asv.conf.json
+    - id: check-toml
+    - id: check-yaml
     - id: debug-statements
-    - id: check-ast
     - id: mixed-line-ending
       args: ['--fix=no']
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.0
+    rev: v2.32.0
     hooks:
     - id: pyupgrade
       args: ['--py37-plus', '--keep-runtime-typing']
   - repo: https://github.com/akaihola/darker
-    rev: github-action-v1.3.2-2
+    rev: 1.5.0
     hooks:
       -   id: darker
           args: [-i]