Skip to content

Cache pip for travis and appveyor + update to travis trusty container #685

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.

Sign up for GitHub

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

Merged
tsnoam merged 6 commits into from
Jun 22, 2017
Merged

Cache pip for travis and appveyor + update to travis trusty container #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db8ae76
Cache pip for travis and appveyor
jsmnbom Jun 22, 2017
4b16d09
Wheel not wheels
jsmnbom Jun 22, 2017
5175930
Try updating to trusty
jsmnbom Jun 22, 2017
3dabc31
Update pypy so it hopefully is found in trusty python archive
jsmnbom Jun 22, 2017
9264264
Does this version work?
jsmnbom Jun 22, 2017
5b9bb90
Skip "official" tests on pypy
jsmnbom Jun 22, 2017
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
20 changes: 17 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,33 @@ python:
- "3.4"
- "3.5"
- "3.6"
- "pypy"
- "pypy3"
- "pypy-5.7.1"
- "pypy3.5-5.8.0"

dist: trusty
sudo: false

branches:
only:
- master

cache:
directories:
- $HOME/.cache/pip
before_cache:
- rm -f $HOME/.cache/pip/log/debug.log

install:
- pip install coveralls
- pip install -U wheel
- pip install -r requirements.txt
- pip install -r requirements-dev.txt
- if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then pip install ujson; fi

script:
- nosetests -v --with-flaky --no-flaky-report --with-coverage --cover-package=telegram/ tests
- if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then pre-commit run --all-files; fi
- python ./setup.py bdist_dumb

after_success:
coveralls
coveralls
4 changes: 3 additions & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ environment:
install:
# We need wheel installed to build wheels
- "git submodule update --init --recursive"
- "%PYTHON%\\python.exe -m pip install wheel"
- "%PYTHON%\\python.exe -m pip install -U wheel"
Copy link
Member

@Eldinnie Eldinnie Jun 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you do this? On Appveyor wheel is not installed by default.

Copy link
Member Author

@jsmnbom jsmnbom Jun 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At all? Oh :/
I just wanted to be sure we had a recent enough (can't remember the exact version) so that pip knows how to use it for caching.

- "%PYTHON%\\python.exe -m pip install -r requirements.txt"
- "%PYTHON%\\python.exe -m pip install -r requirements-dev.txt"

build: off

cache: C:\Users\appveyor\pip\wheels

test_script:
- "%python%\\Scripts\\nosetests -v --with-flaky --no-flaky-report tests"

Expand Down
7 changes: 4 additions & 3 deletions tests/test_official.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import inspect
import warnings
from collections import namedtuple
import platform

import certifi
import logging
Expand Down Expand Up @@ -110,9 +111,9 @@ def check_object(h4):


def test_official():
if not sys.version_info >= (3, 5):
warnings.warn('Not running tests, since follow_wrapped is not supported on this platform'
'(python version >= 3.5 required)')
if not sys.version_info >= (3, 5) or platform.python_implementation() != 'CPython':
warnings.warn('Not running "official" tests, since follow_wrapped is not supported'
'on this platform (cpython version >= 3.5 required)')
return

http = urllib3.PoolManager(
Expand Down