From 8fa2d746e7e4e43a80d6ded1749ff2049957aea7 Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Thu, 13 Aug 2020 11:57:10 -0400 Subject: [PATCH] re-enable all github workflows --- .github/workflows/main.yml | 238 ++++++++++++++++++------------------- lbry/db/queries/base.py | 2 +- 2 files changed, 120 insertions(+), 120 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6f3aa75fb..df2fc9c8b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,132 +2,132 @@ name: ci on: push jobs: -# lint: -# name: lint -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v1 -# - uses: actions/setup-python@v1 -# with: -# python-version: '3.7' -# - name: extract pip cache -# uses: actions/cache@v2 -# with: -# path: ~/.cache/pip -# key: ${{ runner.os }}-pip-${{ hashFiles('setup.py') }} -# restore-keys: ${{ runner.os }}-pip- -# - run: | -# pip install --user --upgrade pip wheel -# pip install -e .[lint] -# - run: make lint -# -# tests-unit: -# name: "tests / unit" -# strategy: -# matrix: -# os: -# - ubuntu-latest -# - macos-latest -# - windows-latest -# runs-on: ${{ matrix.os }} -# steps: -# - uses: actions/checkout@v1 -# - uses: actions/setup-python@v1 -# with: -# python-version: '3.7' -# - name: set pip cache dir -# id: pip-cache -# run: echo "::set-output name=dir::$(pip cache dir)" -# - name: extract pip cache -# uses: actions/cache@v2 -# with: -# path: ${{ steps.pip-cache.outputs.dir }} -# key: ${{ runner.os }}-pip-${{ hashFiles('setup.py') }} -# restore-keys: ${{ runner.os }}-pip- -# - run: | -# pip install --user --upgrade pip wheel -# pip install -e .[test] -# - env: -# HOME: /tmp -# run: coverage run -m unittest -vv tests.unit.test_conf tests.unit.blockchain tests.unit.test_event_controller tests.unit.crypto tests.unit.schema tests.unit.db -## run: coverage run -m unittest discover -vv tests.unit -# - env: -# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# COVERALLS_PARALLEL: true -# name: Submit to coveralls -# run: | -# pip install https://github.com/bboe/coveralls-python/archive/github_actions.zip -# coveralls -# -# tests-integration: -# name: "tests / integration" -# runs-on: ubuntu-20.04 -# strategy: -# matrix: -# test: -## - datanetwork -# - blockchain -## - other -# db: -# - sqlite -# - postgres -# services: -# postgres: -# image: postgres:12 -# env: -# POSTGRES_USER: postgres -# POSTGRES_PASSWORD: postgres -# POSTGRES_DB: postgres -# ports: -# - 5432:5432 -# options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 -# steps: -# - uses: actions/checkout@v1 -# - uses: actions/setup-python@v1 -# with: -# python-version: '3.7' -# - if: matrix.test == 'other' -# run: | -# sudo apt-get update -# sudo apt-get install -y --no-install-recommends ffmpeg -# - name: extract pip cache -# uses: actions/cache@v2 -# with: -# path: ./.tox -# key: tox-integration-${{ matrix.test }}-${{ matrix.db }}-${{ hashFiles('setup.py') }} -# restore-keys: txo-integration-${{ matrix.test }}-${{ matrix.db }}- -# - run: pip install tox -# - env: -# TEST_DB: ${{ matrix.db }} -# run: tox -e ${{ matrix.test }} -# - env: -# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# COVERALLS_PARALLEL: true -# name: Submit to coveralls -# run: | -# pip install https://github.com/bboe/coveralls-python/archive/github_actions.zip -# coverage combine tests -# coveralls -# -# coveralls-finished: -# needs: ["tests-unit", "tests-integration"] -# runs-on: ubuntu-latest -# steps: -# - name: Coveralls Finished -# uses: coverallsapp/github-action@57daa114 -# with: -# github-token: ${{ secrets.GITHUB_TOKEN }} -# parallel-finished: true + lint: + name: lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-python@v1 + with: + python-version: '3.7' + - name: extract pip cache + uses: actions/cache@v2 + with: + path: ~/.cache/pip + key: ${{ runner.os }}-pip-${{ hashFiles('setup.py') }} + restore-keys: ${{ runner.os }}-pip- + - run: | + pip install --user --upgrade pip wheel + pip install -e .[lint] + - run: make lint + + tests-unit: + name: "tests / unit" + strategy: + matrix: + os: + - ubuntu-latest + - macos-latest + - windows-latest + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-python@v1 + with: + python-version: '3.7' + - name: set pip cache dir + id: pip-cache + run: echo "::set-output name=dir::$(pip cache dir)" + - name: extract pip cache + uses: actions/cache@v2 + with: + path: ${{ steps.pip-cache.outputs.dir }} + key: ${{ runner.os }}-pip-${{ hashFiles('setup.py') }} + restore-keys: ${{ runner.os }}-pip- + - run: | + pip install --user --upgrade pip wheel + pip install -e .[test] + - env: + HOME: /tmp + run: coverage run -m unittest -vv tests.unit.test_conf tests.unit.blockchain tests.unit.test_event_controller tests.unit.crypto tests.unit.schema tests.unit.db +# run: coverage run -m unittest discover -vv tests.unit + - env: + COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COVERALLS_PARALLEL: true + name: Submit to coveralls + run: | + pip install https://github.com/bboe/coveralls-python/archive/github_actions.zip + coveralls + + tests-integration: + name: "tests / integration" + runs-on: ubuntu-20.04 + strategy: + matrix: + test: +# - datanetwork + - blockchain +# - other + db: + - sqlite + - postgres + services: + postgres: + image: postgres:12 + env: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: postgres + ports: + - 5432:5432 + options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-python@v1 + with: + python-version: '3.7' + - if: matrix.test == 'other' + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends ffmpeg + - name: extract pip cache + uses: actions/cache@v2 + with: + path: ./.tox + key: tox-integration-${{ matrix.test }}-${{ matrix.db }}-${{ hashFiles('setup.py') }} + restore-keys: txo-integration-${{ matrix.test }}-${{ matrix.db }}- + - run: pip install tox + - env: + TEST_DB: ${{ matrix.db }} + run: tox -e ${{ matrix.test }} + - env: + COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COVERALLS_PARALLEL: true + name: Submit to coveralls + run: | + pip install https://github.com/bboe/coveralls-python/archive/github_actions.zip + coverage combine tests + coveralls + + coveralls-finished: + needs: ["tests-unit", "tests-integration"] + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: coverallsapp/github-action@57daa114 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + parallel-finished: true build: - #needs: ["lint", "tests-unit", "tests-integration"] + needs: ["lint", "tests-unit", "tests-integration"] name: "build" strategy: matrix: os: - ubuntu-16.04 -# - macos-latest -# - windows-latest + - macos-latest + - windows-latest runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v1 diff --git a/lbry/db/queries/base.py b/lbry/db/queries/base.py index 253674447..368e3c0b2 100644 --- a/lbry/db/queries/base.py +++ b/lbry/db/queries/base.py @@ -50,7 +50,7 @@ def disable_trigger_and_constraints(table_name): ctx = context() if ctx.is_postgres: ctx.execute(text(f"ALTER TABLE {table_name} DISABLE TRIGGER ALL;")) - if table_name == 'tag': + if table_name in ('tag', 'stake'): return if ctx.is_postgres: ctx.execute(text(