From 68e19810abaa6ba09c7f40d8c4b28eb39fee53bb Mon Sep 17 00:00:00 2001 From: Brian Ryall Date: Mon, 19 Jul 2021 21:50:31 -0400 Subject: [PATCH 1/3] fix: bug where tables were not displaying on the latest fava --- fava_envelope/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fava_envelope/__init__.py b/fava_envelope/__init__.py index d155b9c..55c2220 100644 --- a/fava_envelope/__init__.py +++ b/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): """ From 9eac51ed90e1eda9eaa5276f865db3c06044b93c Mon Sep 17 00:00:00 2001 From: Brian Ryall Date: Mon, 19 Jul 2021 22:15:35 -0400 Subject: [PATCH 2/3] fix: publish script --- .github/workflows/pythonpublish.yml | 51 ++++++++++++++++------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index d5f3859..22d1179 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.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/checkout@v2.3.4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2.2.2 + with: + python-version: ${{ matrix.python-version }} + - name: Use Python Dependency Cache + uses: actions/cache@v2.1.6 + 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.8' + run: poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN }} From f4be2d2bb83b49c1a3dc03c8403365181cdd19a6 Mon Sep 17 00:00:00 2001 From: Brian Ryall Date: Mon, 19 Jul 2021 22:16:58 -0400 Subject: [PATCH 3/3] fix: typo --- .github/workflows/pythonpublish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpublish.yml b/.github/workflows/pythonpublish.yml index 22d1179..37ede1e 100644 --- a/.github/workflows/pythonpublish.yml +++ b/.github/workflows/pythonpublish.yml @@ -32,5 +32,5 @@ jobs: - name: Build run: poetry build - name: Publish to PyPI (release only) - if: github.event_name == 'release' && matrix.python-version == '3.8' + if: github.event_name == 'release' && matrix.python-version == '3.7' run: poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN }}