change requirements handling

.github/workflows/docs.yaml

@@ -56,23 +56,15 @@ jobs:
     - name: download requirements
       run: |
         curl https://raw.githubusercontent.com/QCoDeS/Qcodes/master/requirements.txt > requirements.txt
-        curl https://raw.githubusercontent.com/QCoDeS/Qcodes/master/test_requirements.txt > test_requirements.txt
-        curl https://raw.githubusercontent.com/QCoDeS/Qcodes/master/docs_requirements.txt > docs_requirements.txt
     - name: pip cache
       uses: actions/[email protected]
       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') }}
+        key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/setup.cfg') }}
         restore-keys: |
           ${{ runner.os }}-${{ matrix.python-version }}-pip-
-    - name: install requirements.txt
-      run: |
-        pip install -r requirements.txt
-    - name: install docs_requirements.txt
-      run: |
-        pip install -r docs_requirements.txt
     - name: install qcodes
-      run: pip install .
+      run: pip install .[docs] -c requirements.txt
     - name: Build docs on linux
       run: |
         cd docs

.github/workflows/pytest.yaml

@@ -44,8 +44,6 @@ jobs:
     - name: download requirements
       run: |
         curl https://raw.githubusercontent.com/QCoDeS/Qcodes/master/requirements.txt > requirements.txt
-        curl https://raw.githubusercontent.com/QCoDeS/Qcodes/master/test_requirements.txt > test_requirements.txt
-        curl https://raw.githubusercontent.com/QCoDeS/Qcodes/master/docs_requirements.txt > docs_requirements.txt
 
     - name: prepare pip cache
       id: prepare-cache-pip
@@ -54,18 +52,12 @@ jobs:
       uses: actions/[email protected]
       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') }}
+        key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/setup.cfg') }}
         restore-keys: |
           ${{ runner.os }}-${{ matrix.python-version }}-pip-
-    - name: install requirements.txt
-      run: |
-        pip install -r requirements.txt
-    - name: install test_requirements.txt
-      run: |
-        pip install -r test_requirements.txt
     - name: install package
       run: |
-        pip install .
+        pip install .[test] -c requirements.txt
     - name: Run Mypy
       run: mypy qcodes_contrib_drivers
       if: matrix.python-version != '3.7'

pyproject.toml

@@ -36,4 +36,4 @@ match = ["v*"]
 
 [tool.versioningit.onbuild]
 source-file = "qcodes_contrib_drivers/_version.py"
-build-file = "qcodes_contrib_drivers/_version.py"
+build-file = "qcodes_contrib_drivers/_version.py"

setup.cfg

@@ -13,6 +13,9 @@ classifiers =
           License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
           Programming Language :: Python :: 3 :: Only
           Programming Language :: Python :: 3.7
+          Programming Language :: Python :: 3.8
+          Programming Language :: Python :: 3.9
+          Programming Language :: Python :: 3.10
           Topic :: Scientific/Engineering
 license = MIT
 license_files =
@@ -30,3 +33,15 @@ python_requires = >=3.7
 install_requires =
    qcodes>=0.4.0
    versioningit>=1.1.0
+
+[options.extras_require]
+test =
+    pytest>=6.2.2
+    mypy>=0.940
+    pytest-cov>=3.0.0
+    coverage[toml]>=6.2
+    pyvisa-sim
+docs =
+    sphinx
+    sphinx_rtd_theme
+    nbsphinx