Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More Travis-CI Testing #759

Merged
merged 7 commits into from
Nov 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 37 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,51 @@
dist: xenial # required for Python >= 3.7
language: python
python:
- 3.6
- 3.7
jobs:
include:
- name: "Python 3.6 on Linux"
python: 3.6
- name: "Python 3.7 on Linux"
python: 3.7
- name: "Python 3.7 on Linux, not UTC"
python: 3.7
env:
- TZ=America/Edmonton
- name: "Python 3.8 on Linux"
python: 3.8
- name: "Python dev on Linux"
python: nightly
- name: "Python 3.7.4 on MacOS"
os: osx
osx_image: xcode11.2 # Python 3.7.4 running on macOS 10.14.4
language: shell # 'language: python' is an error on Travis CI macOS
before_install:
- pip3 install poetry~=0.12.17 # 'pip' points to Python 2 on MacOS
- name: "Python 3.7.5 on Windows"
os: windows
language: shell # 'language: python' is an error on Travis CI Windows
before_install:
- choco install python --version 3.7.5
- python -m pip install --upgrade pip
- pip --version
- pip install poetry~=0.12.17
env:
- PATH=/c/Python37:/c/Python37/Scripts:$PATH
allow_failures:
- python: 3.8
- python: nightly
- os: windows
git:
depth: false
cache: pip
before_install:
- date
- pip install poetry~=0.12.17
install:
# we run `poetry version` here to appease poetry about '0.0.0-source'
- poetry version
- poetry install
script:
- poetry run python --version
script:
- poetry run behave
before_deploy:
- poetry config http-basic.pypi $PYPI_USER $PYPI_PASS
Expand Down
2 changes: 1 addition & 1 deletion features/steps/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def has_error(context):

@then('we should get no error')
def no_error(context):
assert context.exit_status is 0, context.exit_status
assert context.exit_status == 0, context.exit_status


@then('the output should be parsable as json')
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ homepage = "https://jrnl.sh"
repository = "https://github.com/jrnl-org/jrnl"

[tool.poetry.dependencies]
python = ">=3.6.0, <3.8.0"
python = ">=3.6.0, <3.9.0"
pyxdg = "^0.26.0"
cryptography = "^2.7"
passlib = "^1.7"
Expand Down