diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-09-27 14:24:22 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-09-27 14:24:22 -0500 |
| commit | 66a6724da8eda3336643dee086da2a3495e6422a (patch) | |
| tree | 64043e9782491bde3a3a9ae2314cc59451a6c9c0 /.travis.yml | |
| parent | df3905616933c90af95e99f705b800a2f5c1c921 (diff) | |
| parent | 35ea365b50bd1a64375fdbcce187affab22af3b7 (diff) | |
| download | python-setuptools-git-66a6724da8eda3336643dee086da2a3495e6422a.tar.gz | |
Merge with mastersetuptools-scm
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index e91f7e78..b8bca7cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ env: - LC_ALL=C LC_CTYPE=C script: # avoid VersionConflict when newer version is required - - pip install -U pytest + - pip install -U 'pytest>=3.0.2' # Output the env, because the travis docs just can't be trusted - env @@ -20,14 +20,14 @@ script: # update egg_info based on setup.py in checkout - python bootstrap.py - - python setup.py test --addopts='-rs' + - python setup.py test --addopts='-rsx' before_deploy: - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1 deploy: provider: pypi # Also update server in setup.cfg - server: https://upload.pypi.io/legacy/ + server: https://upload.pypi.org/legacy/ on: tags: true all_branches: true |