LBRYFoundation/lbry-sdk
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-sdk.git synced 2025-08-27 07:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix import path in test_transcoding.py

Browse source
This commit is contained in:
Lex Berezhny 2020-02-09 14:52:40 -05:00
parent 3fbc012231
commit 9a49eb06da
3 changed files with 36 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
.github/workflows/main.yml vendored
View file

@ -1,38 +1,37 @@
name: ci name: ci
#on: [push, pull_request] on: pull_request
on: push
jobs: jobs:
# lint: lint:
# name: "pylint & mypy" name: lint
# runs-on: ubuntu-16.04 runs-on: ubuntu-latest
# steps: steps:
# - uses: actions/checkout@v1 - uses: actions/checkout@v1
# - uses: actions/setup-python@v1 - uses: actions/setup-python@v1
# with: with:
# python-version: '3.7' python-version: '3.7'
# - run: make install tools - run: make install tools
# - run: make lint - run: make lint
#
# tests-unit: tests-unit:
# needs: lint needs: lint
# name: "tests / unit" name: "tests / unit"
# runs-on: ubuntu-16.04 runs-on: ubuntu-latest
# steps: steps:
# - uses: actions/checkout@v1 - uses: actions/checkout@v1
# - uses: actions/setup-python@v1 - uses: actions/setup-python@v1
# with: with:
# python-version: '3.7' python-version: '3.7'
# - run: make install tools - run: make install tools
# - working-directory: lbry - working-directory: lbry
# env: env:
# HOME: /tmp HOME: /tmp
# run: coverage run -p --source=lbry -m unittest discover -vv tests.unit run: coverage run -p --source=lbry -m unittest discover -vv tests.unit
#
tests-integration: tests-integration:
#needs: lint needs: lint
name: "tests / integration" name: "tests / integration"
runs-on: ubuntu-16.04 runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
test: test:
@ -44,19 +43,18 @@ jobs:
- uses: actions/setup-python@v1 - uses: actions/setup-python@v1
with: with:
python-version: '3.7' python-version: '3.7'
- if: matrix.test == 'blockchain' - if: matrix.test == 'other'
run: sudo apt install -y --no-install-recommends ffmpeg run: sudo apt install -y --no-install-recommends ffmpeg
- run: pip install tox-travis - run: pip install tox-travis
- run: tox -e ${{ matrix.test }} - run: tox -e ${{ matrix.test }}
build: build:
#needs: ["tests-unit", "tests-integration"] needs: ["tests-unit", "tests-integration"]
needs: ["tests-integration"]
name: "build" name: "build"
strategy: strategy:
matrix: matrix:
os: os:
- ubuntu-16.04 - ubuntu-latest
- macos-latest - macos-latest
- windows-latest - windows-latest
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@ -79,9 +77,5 @@ jobs:
name: Build & Run (Windows) name: Build & Run (Windows)
run: | run: |
pip install pywin32 pip install pywin32
pyinstaller --additional-hooks-dir=scripts/. \ pyinstaller --additional-hooks-dir=scripts/. --icon=icons/lbry256.ico --onefile --name lbrynet lbry/extras/cli.py
--icon=icons/lbry256.ico \
--onefile \
--name lbrynet \
lbry/extras/cli.py
dist/lbrynet.exe --version dist/lbrynet.exe --version

4
.gitlab-ci.yml
View file

@ -46,14 +46,14 @@ test:datanetwork-integration:
test:blockchain-integration: test:blockchain-integration:
stage: test stage: test
script: script:
- apt-get update
- apt-get install -y --no-install-recommends ffmpeg
- pip install tox-travis - pip install tox-travis
- tox -e blockchain - tox -e blockchain
test:other-integration: test:other-integration:
stage: test stage: test
script: script:
- apt-get update
- apt-get install -y --no-install-recommends ffmpeg
- pip install tox-travis - pip install tox-travis
- tox -e other - tox -e other

2
tests/integration/other/test_transcoding.py
View file

@ -2,7 +2,7 @@ import logging
import pathlib import pathlib
import time import time
from .test_claim_commands import ClaimTestCase from ..blockchain.test_claim_commands import ClaimTestCase
from lbry.conf import TranscodeConfig from lbry.conf import TranscodeConfig
from lbry.file_analysis import VideoFileAnalyzer from lbry.file_analysis import VideoFileAnalyzer