Brian/poetry to be

.all-contributorsrc

@@ -181,12 +181,50 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "markbouman",
+      "name": "Mark Bouman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/103944120?v=4",
+      "profile": "https://github.com/markbouman",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "oslopanda",
+      "name": "oslopanda",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33810430?v=4",
+      "profile": "https://github.com/oslopanda",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "pililac",
+      "name": "pililac",
+      "avatar_url": "https://avatars.githubusercontent.com/u/60116646?v=4",
+      "profile": "https://github.com/pililac",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "kevinsmia1939",
+      "name": "Kavin Teenakul",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11407922?v=4",
+      "profile": "https://github.com/kevinsmia1939",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
   "projectName": "impedance.py",
   "projectOwner": "ECSHackWeek",
   "repoType": "github",
   "repoHost": "https://github.com",
-  "skipCi": true
+  "skipCi": true,
+  "commitConvention": "angular"
 }

.github/actions/build_impedance/action.yml

@@ -14,7 +14,7 @@ runs:
 
       - name: Install Poetry
         run: |
-          curl -sSL https://install.python-poetry.org | python3 - --version 1.1.14
+          curl -sSL https://install.python-poetry.org | python3 - --version 1.3.2
           echo "$HOME/.poetry/bin" >> $GITHUB_PATH  # add poetry to PATH.
         shell: bash
 

.github/workflows/ci.yml

@@ -1,9 +1,11 @@
-name: CI tests
+name: Run tests and build package
 on:
   pull_request:
   push:
     branches:
       - main
+    tags:
+      - '*'
 
 jobs:
   linting:
@@ -20,13 +22,14 @@ jobs:
 
   tests:
     name: Run tests
+    needs: linting
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
-      max-parallel: 4
+      max-parallel: 5
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
 
     steps:
       - uses: actions/checkout@v3
@@ -43,3 +46,28 @@ jobs:
         run: poetry run coveralls --service=github
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+# TODO: I think this is redundant with .github/workflows/release.yml?
+#  build-and-push:
+#    name: Build and publish package to PyPI
+#    needs: [linting, tests]
+#    runs-on: ubuntu-latest
+#
+#    steps:
+#      - uses: actions/checkout@master
+#
+#      - name: Set up Python 3.10
+#        uses: actions/setup-python@v3
+#        with:
+#          python-version: "3.10"
+#
+#      - name: Build a binary wheel and a source tarball
+#        run: |
+#          python3 -m pip install wheel
+#          python3 setup.py sdist bdist_wheel
+#
+#      - name: Publish distribution to PyPI (if tagged)
+#        if: startsWith(github.ref, 'refs/tags')
+#        uses: pypa/gh-action-pypi-publish@release/v1
+#        with:
+#          password: ${{ secrets.PYPI_API_TOKEN }}

.gitignore

@@ -111,3 +111,6 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# testing
+*_test.csv

impedance/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.1"
+__version__ = "1.4.3"

impedance/models/circuits/circuits.py

@@ -28,7 +28,7 @@ def __init__(self, initial_guess=[], constants=None, name=None):
         """
 
         # if supplied, check that initial_guess is valid and store
-        initial_guess = list(filter(None, initial_guess))
+        initial_guess = [x for x in initial_guess if x is not None]
         for i in initial_guess:
             if not isinstance(i, (float, int, np.int32, np.float64)):
                 raise TypeError(f'value {i} in initial_guess is not a number')
@@ -188,7 +188,7 @@ def __str__(self):
             for name, value in self.constants.items():
                 elem = get_element_from_name(name)
                 units = check_and_eval(elem).units
-                if '_' in name:
+                if '_' in name and len(units) > 1:
                     unit = units[int(name.split('_')[-1])]
                 else:
                     unit = units[0]
@@ -431,7 +431,7 @@ def __init__(self, circuit='', **kwargs):
         """
 
         super().__init__(**kwargs)
-        self.circuit = circuit
+        self.circuit = circuit.replace(" ", "")
 
         circuit_len = calculateCircuitLength(self.circuit)