Merge branch 'master' of github.com:polarmutex/fava-envelope

.github/workflows/pythonpublish.yml

@@ -1,31 +1,36 @@
-# This workflows will upload a Python Package using Twine when a release is created
-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
-
 name: Upload Python Package
 
 on:
+  push:
   release:
     types: [created]
 
-jobs:
-  deploy:
-
-    runs-on: ubuntu-latest
+env:
+  POETRY_VERSION: 1.1.7
 
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python-version: [3.7]
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
+      - uses: actions/[email protected]
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/[email protected]
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Use Python Dependency Cache
+        uses: actions/[email protected]
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
+      - name: Install Poetry
+        run: |
+          python -m pip install --upgrade pip
+          pip install poetry==$POETRY_VERSION
+      - name: Build
+        run: poetry build
+      - name: Publish to PyPI (release only)
+        if: github.event_name == 'release' && matrix.python-version == '3.7'
+        run: poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN }}

fava_envelope/__init__.py

@@ -72,11 +72,10 @@ def generate_income_query_tables(self, month):
                 "Amount":  self.income_tables[month]["Budgeted Future"]
             })
 
-        return (income_table_types, income_table_rows)
+        return income_table_types, income_table_rows
 
     def generate_envelope_query_tables(self, month):
 
-        print(month)
         envelope_table_types = []
         envelope_table_types.append(("Account", str(str)))
         envelope_table_types.append(("Budgeted", str(Decimal)))
@@ -94,7 +93,7 @@ def generate_envelope_query_tables(self, month):
                 row["Available"] = e_row[month, "available"]
                 envelope_table_rows.append(row)
 
-        return (envelope_table_types, envelope_table_rows)
+        return envelope_table_types, envelope_table_rows
 
     def use_new_querytable(self):
         """