Skip to content

Commit

Permalink
Merge pull request #21 from unfoldingWord-dev/develop
Browse files Browse the repository at this point in the history
Just version updates
  • Loading branch information
RobH123 committed Nov 5, 2019
2 parents ae8c280 + c5db487 commit b6d96e5
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ ENV/
# mypy
.mypy_cache/

# MonkeyType
monkeytype.sqlite3

# Sonar
sonar-project.properties
.scannerwork/

# Script to set environment variables
setENVs.sh
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ dist: xenial
language: python
# See available versions at https://docs.travis-ci.com/user/languages/python/
python:
- '3.7'
- '3.8-dev'
- '3.8'
- 'nightly'
# NOTE: We only deploy on ONE of these tests being successful -- see condition below

services:
Expand All @@ -23,11 +23,13 @@ install:
- pip3 install --upgrade pip
- pip3 install --requirement tXenqueue/requirements.txt
- pip3 install coveralls
- pip3 install mypy

# Run the tests first
# and if they succeed, make the docker image(s)
# (and check that both succeed)
script:
- mypy tXenqueue/
- PYTHONPATH="tXenqueue/" coverage run -m unittest discover -s tests/

# Only execute the following instructions in the case of a success
Expand All @@ -49,10 +51,10 @@ deploy:
script: bash ./deploy.sh develop
on:
branch: develop
condition: $TRAVIS_PYTHON_VERSION == '3.7'
condition: $TRAVIS_PYTHON_VERSION == '3.8'
- provider: script
skip_cleanup: true
script: bash ./deploy.sh master
on:
branch: master
condition: $TRAVIS_PYTHON_VERSION == '3.7'
condition: $TRAVIS_PYTHON_VERSION == '3.8'
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ checkEnvVariables:
# QUEUE_PREFIX (set it to dev- for testing)
# FLASK_ENV (can be set to "development" for testing)
test: checkEnvVariables
mypy tXenqueue/
TEST_MODE="TEST" PYTHONPATH="tXenqueue/" python3 -m unittest discover -s tests/

runFlask: checkEnvVariables
Expand Down
5 changes: 5 additions & 0 deletions mypy.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Global options for mypy type-checking:

[mypy]
python_version = 3.8
ignore_missing_imports = True

0 comments on commit b6d96e5

Please sign in to comment.