From 9dbca0928c84b0e8750ff686ea1cf7f4f6b29637 Mon Sep 17 00:00:00 2001 From: Matt Murbach Date: Sat, 28 Jan 2023 13:09:16 -0800 Subject: [PATCH] Removes Python 3.6 from test matrix (#240) * removes Python 3.6 from test matrix as it has reached EOL and is no longer supported by ubuntu-latest runners * remove support for Python 3.6 * replace np.complex with built-in complex --- .github/workflows/ci.yml | 14 +++++++------- README.md | 2 +- impedance/tests/test_circuits.py | 2 +- setup.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b34bf2f..54b5f766 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,12 +11,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v3 - name: Set up Python 3.6 - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v3 with: - python-version: 3.6 + python-version: 3.7 - name: Install dependencies run: | @@ -37,13 +37,13 @@ jobs: fail-fast: false max-parallel: 4 matrix: - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9, 3.10, 3.11] steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2.2.2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python_version }} @@ -58,7 +58,7 @@ jobs: pytest --cov=impedance . - name: Upload coverage to coveralls - if: matrix.python-version == 3.6 && github.repository == 'ECSHackWeek/impedance.py' + if: matrix.python-version == 3.7 && github.repository == 'ECSHackWeek/impedance.py' run: coveralls --service=github env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 607101c1..dcfc4264 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ See [Getting started with impedance.py](https://impedancepy.readthedocs.io/en/la impedance.py requires: -- Python (>=3.6) +- Python (>=3.7) - SciPy (>=1.0) - NumPy (>=1.14) - Matplotlib (>=3.0) diff --git a/impedance/tests/test_circuits.py b/impedance/tests/test_circuits.py index 9664aebd..088e5776 100644 --- a/impedance/tests/test_circuits.py +++ b/impedance/tests/test_circuits.py @@ -72,7 +72,7 @@ def test_Randles(): # compare with known impedance predictions assert np.isclose(randles.predict(np.array([10.0])), - np.complex(0.0251618, -0.00601304)) + complex(0.0251618, -0.00601304)) # check altair plotting with a fit circuit chart = randles.plot(f_data=f, Z_data=Z) diff --git a/setup.py b/setup.py index 9ef25aa4..dd77f136 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ long_description_content_type="text/markdown", url="https://impedancepy.readthedocs.io/en/latest/", packages=setuptools.find_packages(), - python_requires="~=3.6", + python_requires="~=3.7", install_requires=['altair>=3.0', 'matplotlib>=3.0', 'numpy>=1.14', 'scipy>=1.0'], classifiers=(