Add pandas requirement, change numpy requirement to 1.22.4, drops Python 3.7 support (#306)

* Add pandas requirement, change numpy requirement to 1.22.4

* Update README.md

* Update minimum Python version to 3.8

* Remove Python 3.7 from test and deploy workflow

* Fix flake8 linting: missing whitespace

* Update test_circuit_elements.py

Fix flake8 ignore lines that are causing the linter to fail

* Update test_preprocessing.py

Add space causing the linter to fail

---------

Co-authored-by: Matt Murbach <mdmurbach@users.noreply.github.com>

Author: adrianusler

.github/workflows/ci.yml

@@ -15,10 +15,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up Python 3.7
+      - name: Set up Python 3.8
         uses: actions/setup-python@v3
         with:
-          python-version: "3.7"
+          python-version: "3.8"
 
       - name: Install dependencies
         run: |
@@ -40,7 +40,7 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v3

README.md

@@ -31,9 +31,10 @@ impedance.py requires:
 
 -   Python (>=3.7)
 -   SciPy (>=1.0)
--   NumPy (>=1.14)
+-   NumPy (>=1.22.4)
 -   Matplotlib (>=3.0)
 -   Altair (>=3.0)
+-   Pandas
 
 Several example notebooks are provided in the `docs/source/examples/` directory. Opening these will require Jupyter notebook or Jupyter lab.
 

impedance/preprocessing.py

@@ -28,7 +28,7 @@ def readFile(filename, instrument=None):
                        'powersuite', 'biologic', 'chinstruments']
 
     if instrument is not None:
-        assert instrument in supported_types,\
+        assert instrument in supported_types, \
             '{} is not a supported instrument ({})'.format(instrument,
                                                            supported_types)
 

impedance/tests/test_circuit_elements.py

@@ -179,8 +179,8 @@ def NE2(p, f):
     assert "NE2" in circuit_elements
     with pytest.raises(OverwriteError):
         # try to create the same element again without overwrite
-        @element(num_params=1, units=["Ohm"])  # noqa: F811
-        def NE2(p, f):
+        @element(num_params=1, units=["Ohm"])
+        def NE2(p, f):  # noqa: F811
             """definitely a new circuit element no one has seen before
 
             Notes
@@ -208,8 +208,8 @@ def NE3(p, f):
     assert circuit_elements["NE3"]([1], [1]) == [[1]]
     # try to create the same element again with overwrite
 
-    @element(num_params=1, units=["Ohm"], overwrite=True)  # noqa: F811
-    def NE3(p, f):
+    @element(num_params=1, units=["Ohm"], overwrite=True)
+    def NE3(p, f):  # noqa: F811
         # feel free to change to a better test
         return [p * ff * 2 for ff in f]
 

impedance/tests/test_preprocessing.py

@@ -1,4 +1,4 @@
-from impedance.preprocessing import readFile, readGamry, readZPlot,\
+from impedance.preprocessing import readFile, readGamry, readZPlot, \
                                     readBioLogic, ignoreBelowX, \
                                     cropFrequencies, readCSV, saveCSV
 import numpy as np

requirements.txt

@@ -1,7 +1,8 @@
 altair>=3.0
 coveralls==3.2.0
 matplotlib>=3.5
-numpy>=1.14
+numpy>=1.22.4
+pandas
 pytest>=4.6
 pytest-cov
 scipy>=1.0

setup.py

@@ -14,9 +14,10 @@
     long_description_content_type="text/markdown",
     url="https://impedancepy.readthedocs.io/en/latest/",
     packages=setuptools.find_packages(),
-    python_requires="~=3.7",
+    python_requires="~=3.8",
     install_requires=['altair>=3.0', 'matplotlib>=3.5',
-                      'numpy>=1.14', 'scipy>=1.0'],
+                      'numpy>=1.22.4', 'scipy>=1.0',
+                      'pandas'],
     classifiers=(
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",