Skip to content

Commit

Permalink
Merge pull request #2 from dynobo/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dynobo committed May 15, 2020
2 parents 9d7dd70 + 856cb62 commit 29de0f6
Show file tree
Hide file tree
Showing 7 changed files with 210 additions and 225 deletions.
25 changes: 7 additions & 18 deletions .github/workflows/coveralls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,25 @@ jobs:
name: Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@master

# PREPARE
- name: Install Python 3.7
# Because GitHub Actions' python isn't build against tkinter!
run: sudo apt-get update && sudo apt-get install python3.7 python3.7-dev python3.7-tk python3-setuptools
- name: Symlink apt-pkg lib
# to make pipenv working with different python versions
run: cd /usr/lib/python3/dist-packages/ && sudo ln -s apt_pkg.cpython-36m-x86_64-linux-gnu.so apt_pkg.so
- name: Install normcap dependencies
run: sudo apt-get install tesseract-ocr tesseract-ocr-deu libtesseract-dev libleptonica-dev pkg-config xclip
- name: Install wheel
run: python3.7 -m pip install --user wheel
- name: Install pipenv
run: python3.7 -m pip install --user pipenv
- name: Create virtual env
run: $HOME/.local/bin/pipenv install --dev
env:
CI: true

- name: Install dependencies
run: python3.7 -m pip install -r requirements-dev.txt

- name: Install coveralls
run: $HOME/.local/bin/pipenv run pip install coveralls
run: python3.7 -m pip install coveralls

# TEST
- name: Test with pytest
# xvfb-run with bpp 32 has to be used to make the mss screenshot grab work
run: $HOME/.local/bin/pipenv run xvfb-run --server-args="-screen 0 1024x768x24+32" python3.7 -m pytest
run: xvfb-run --server-args="-screen 0 1024x768x24+32" python3.7 -m pytest

# PUBLISH
- name: Publish
run: $HOME/.local/bin/pipenv run coveralls
run: python3.7 -m coveralls
env:
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ jobs:
run: sudo apt-get update && sudo apt-get install python3.7 python3.7-dev python3.7-tk python3-setuptools

- name: Install dependencies
run: python3 -m pip install -r requirements-dev.txt
run: python3.7 -m pip install -r requirements-dev.txt

# LINT
- name: Lint with pylama
run: pylama
run: python3.7 -m pylama

# TEST
- name: Test with pytest
run: xvfb-run --server-args="-screen 0 1024x768x24+32" pytest
run: xvfb-run --server-args="-screen 0 1024x768x24+32" python3.7 -m pytest

# test_macos:
# name: Test on MacOS
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:

# LINT
- name: Lint with flake8
run: pylama
run: python -m pylama

# TEST
- name: Test with pytest
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Themes: https://user-images.githubusercontent.com/46163555/71361827-2a01b880-2562-11ea-9af8-2c264c02c3e8.jpg
# keyhint
Loading

0 comments on commit 29de0f6

Please sign in to comment.