From 054d56c564fdef850af43b5a42ff7031e0a49d6b Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Tue, 2 Mar 2021 00:24:59 -0600 Subject: [PATCH] Update Tox and Travis configurations --- .travis.yml | 10 ++++------ tox.ini | 17 ++++++++--------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b984fc..5bd9229 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,16 +3,14 @@ matrix: include: - os: windows language: sh - python: 3 + python: "3.8" + env: "PATH="/c/Python:/c/Python/Scripts:$PATH"" # Perform the manual steps on windows to install python3 before_install: - - choco install python3 --params "/InstallDir:C:\Python" - - export PATH="/c/Python:/c/Python/Scripts:$PATH" + - choco install python --version=3.8.6 - python -m pip install --upgrade pip - - python -m pip install pywin32 before_script: - - export TOXENV=py3-win - + - export TOXENV=py38 - python: "2.7" - python: "3.4" - python: "3.5" diff --git a/tox.ini b/tox.ini index 702ea2d..416e921 100644 --- a/tox.ini +++ b/tox.ini @@ -1,21 +1,20 @@ [tox] -envlist = py{27,34,35,36,37,38,39,310,3-win} +envlist = py{27,34,35,36,37,38,39,310} skip_missing_interpreters = True [testenv] -platform = linux +deps = + flake8 + pytest + pywin32; sys_platform == 'win32' commands = - python setup.py test --test-suite tests.TestSuite - -[testenv:py3-win] -platform = win -commands = - python -m pip install pywin32 - python setup.py test --test-suite tests.TestSuite + flake8 + pytest [testenv:py27] deps = configparser + {[testenv]deps} [flake8] exclude = .tox,env,build