Merge branch 'feature/FZJ_DecaDAC_driver'

# Conflicts:
#	qcodes/instrument_drivers/QDev/QDac.py

Author: Rene Otten

.binder/README

@@ -0,0 +1,8 @@
+This directory holds configuration files for https://mybinder.org/.
+
+The notebooks that comprise the documentation can be accessed with this link:
+https://mybinder.org/v2/gh/qcodes/qcodes/master?filepath=docs
+
+
+To check out a different version, just replace "master" with the desired
+branch/tag name or commit hash.

.binder/requirements.txt

@@ -0,0 +1 @@
+qcodes

.binder/start

@@ -0,0 +1,4 @@
+#!/bin/bash
+# https://mybinder.readthedocs.io/en/latest/config_files.html#start-run-code-before-the-user-sessions-starts
+export MY_DUMMY_VARIABLE="Hello from .binder/start!"
+exec "$@"

.gitattributes

@@ -0,0 +1,5 @@
+qcodes/_version.py export-subst
+* text=auto eol=lf
+*.py text
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,9 @@
 Fixes #issuenumber.
 
 Changes proposed in this pull request:
-- 
-- 
-- 
+-
+-
+-
 
 
 @mention one core developer

.github/actions/prepare-cache-pip/action.yml

@@ -0,0 +1,17 @@
+name: "prepare-cache-pip"
+description: "Prepare setup cache of pip wheels"
+outputs:
+  cache-dir:
+    description: "Pip cache dir"
+    value: ${{ steps.get-pip-cache-dir.outputs.dir }}
+runs:
+  using: "composite"
+  steps:
+    - name: upgrade pip setuptools wheel
+      run: pip install --upgrade pip setuptools wheel
+      shell: bash
+    - name: Get pip cache dir
+      id: get-pip-cache-dir
+      run: |
+        echo "::set-output name=dir::$(pip cache dir)"
+      shell: bash

.github/actions/setup-ubuntu-latest-xvfb/action.yml

@@ -0,0 +1,10 @@
+name: "setup-ubuntu-latest-xvfb"
+description: "Setup xvfb on ubuntu"
+runs:
+  using: "composite"
+  steps:
+    - name: Setup xvfb on ubuntu
+      run: |
+        sudo apt install xvfb libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0
+        /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX
+      shell: bash

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: "daily"

.github/static/environment_forge_full.yml

@@ -0,0 +1,44 @@
+name: qcodesforge
+channels:
+ - conda-forge
+dependencies:
+ - python=3.7.9
+ # recommended to be explicitly specified by conda-incubator/setup-miniconda@v2
+ - pip
+ # dependencies for setup.cfg
+ - numpy>=1.15
+ - pyvisa>=1.11.0, <1.12.0
+ - h5py>=2.8.0
+ - websockets>=7.0
+ - jsonschema>=3.0.0
+ - ruamel.yaml>=0.16.0,!=0.16.6
+ - wrapt>=1.10.4
+ - pandas>=0.25.0
+ - xarray>=0.16.2
+ - netCDF4>=1.5.0.1
+ - tabulate>=0.8.0
+ - tqdm>=4.20.0
+ - opencensus>=0.7.10, <0.8.0
+ - opencensus-ext-azure>=1.0.4, <2.0.0
+ - matplotlib>=2.2.3
+ - requirements-parser>=0.2.0
+ - importlib-metadata>=1.0.0,<4.0.0
+ - typing_extensions>=3.7.4
+ - packaging>=20.0
+ - ipywidgets>=7.5.0
+ - broadbean>=0.9.1
+ # test requirements from setup.cfg
+ - deepdiff>=5.0.2
+ - hypothesis>=5.49.0
+ - pytest>=6.0.0
+ - pytest-rerunfailures>=5.0.0
+ - pytest-xdist>=2.0.0
+ - pytest-mock>=3.0.0
+ - lxml>=4.3.0
+ # extra relevant requirements from setup.cfg
+ - pyqtgraph>=0.11.0
+ # for running mypy type checking
+ - mypy
+ - mypy_extensions
+ - pip:
+   - pyvisa-sim>=0.4.0  # required for testing

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

@@ -0,0 +1,55 @@
+name: Install all deps from conda-forge and run pytest
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'release/*'
+    tags:
+      - 'v*'
+  pull_request:
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    env:
+      DISPLAY: ':99.0'
+      OS: ${{ matrix.os }}
+
+    steps:
+    - name: checkout source code
+      uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: setup ubuntu-latest xvfb
+      uses: ./.github/actions/setup-ubuntu-latest-xvfb
+      if: runner.os == 'Linux'
+    - name: install dependencies
+      uses: conda-incubator/setup-miniconda@v2
+      with:
+        activate-environment: qcodesforge
+        environment-file: .github/static/environment_forge_full.yml
+        auto-activate-base: false
+    - name: conda info
+      shell: bash -l {0}
+      run: |
+        conda info
+    - name: install qcodes
+      shell: bash -l {0}
+      run: |
+        pip install . --no-deps
+    - name: Run Mypy
+      shell: bash -l {0}
+      run: mypy qcodes
+    - name: run parallel tests
+      shell: bash -l {0}
+      run: |
+         pytest -m "not serial" --hypothesis-profile ci qcodes
+    - name: run serial tests
+      shell: bash -l {0}
+      run: |
+         pytest -m "serial"  -n 0 --dist no --hypothesis-profile ci qcodes