Merge branch 'master' into JoranAngevaare-patch-1

.github/workflows/Pipi.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.6'
+          python-version: '3.8'
       - name: Checkout repo
         uses: actions/checkout@v2
       - name: Install dependencies

.github/workflows/pytest.yml

@@ -32,17 +32,15 @@ jobs:
     strategy:
       fail-fast: True
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9, "3.10"]
         test: ['coveralls', 'pytest', 'pytest_no_database']
         # Only run coverage / no_database on py3.8
         exclude:
-          - python-version: 3.7
-            test: coveralls
           - python-version: 3.9
-            test: coveralls
-          - python-version: 3.7
             test: pytest_no_database
-          - python-version: 3.9
+          - python-version: "3.10"
+            test: coveralls
+          - python-version: "3.10"
             test: pytest_no_database
     steps:
       # Setup and installation
@@ -54,6 +52,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Install requirements for tests and latest strax
         run: |
+            pip install git+https://github.com/NESTCollaboration/nestpy.git@v1.5.0
             pip install -r extra_requirements/requirements-tests.txt
       # Secrets and required files
       - name: patch utilix file

.readthedocs.yml

@@ -10,7 +10,7 @@ build:
     image: latest
 
 python:
-    version: 3.6
+    version: 3.8
     install:
       - method: pip
         path: .

extra_requirements/requirements-tests.txt

@@ -18,13 +18,16 @@ holoviews==1.14.5
 ipywidgets==7.6.4
 hypothesis==6.36.1
 jupyter-client==7.1.2                          # for ipywidgets
+keras==2.8.0                                   # Tensorflow dependency
 matplotlib==3.5.1
-multihist==0.6.4
+multihist==0.6.5
+nestpy==1.5.0; python_version<="3.9"
+# git+https://github.com/NESTCollaboration/nestpy.git; python_version=="3.10"
 npshmex==0.2.1                                  # Strax dependency
 numba==0.55.1                                   # Strax dependency
 numpy==1.21.5
 nestpy==1.5.0
-pandas==1.3.5                                   # Strax dependency
+pandas==1.4.0                                   # Strax dependency
 psutil==5.9.0                                   # Strax dependency
 pytest==6.2.5
 pytest-cov==3.0.0

setup.py

@@ -26,7 +26,7 @@
                               'flake8',
                               'pytest-cov',
                               ],
-    python_requires=">=3.6",
+    python_requires=">=3.8",
     extras_require={
         'docs': [
             'sphinx',
@@ -44,10 +44,9 @@
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Intended Audience :: Science/Research',
         'Programming Language :: Python :: Implementation :: CPython',
         'Topic :: Scientific/Engineering :: Physics'],