summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Hennion <nicolas@nicolargo.com>2020-04-06 15:14:44 +0200
committerGitHub <noreply@github.com>2020-04-06 15:14:44 +0200
commit148df693b277ad3dbb5f50e776bc47b21a883f12 (patch)
treec50ae5353732c464c3c08ed422f448ce60daf9f1
parent6f284cc97aa40d080976d0f43a918680574178cf (diff)
parent46b5429dd3a2ac33236ffdd1349c8194453831df (diff)
Merge pull request #1629 from chenrui333/python-3.8
Add python 3.7 and 3.8 into CI
-rw-r--r--.ci/appveyor/download_exes.py2
-rw-r--r--.travis.yml28
-rw-r--r--appveyor.yml22
-rwxr-xr-xsetup.py2
-rw-r--r--tox.ini2
5 files changed, 44 insertions, 12 deletions
diff --git a/.ci/appveyor/download_exes.py b/.ci/appveyor/download_exes.py
index aa679d64..7db3848b 100644
--- a/.ci/appveyor/download_exes.py
+++ b/.ci/appveyor/download_exes.py
@@ -25,7 +25,7 @@ from concurrent.futures import ThreadPoolExecutor
BASE_URL = 'https://ci.appveyor.com/api'
-PY_VERSIONS = ['2.7', '3.4', '3.5', '3.6']
+PY_VERSIONS = ['2.7', '3.4', '3.5', '3.6', '3.7', '3.8']
def term_supports_colors(file=sys.stdout):
diff --git a/.travis.yml b/.travis.yml
index 0666dab8..b8d1f2cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,27 @@
language: python
+
cache: pip
+
python:
-- '2.7'
-- '3.4'
-- '3.5'
-- '3.6'
-- pypy
+ - '2.7'
+ - '3.4'
+ - '3.5'
+ - '3.6'
+ - '3.7'
+ - '3.8'
+ - pypy3
+
install:
-- pip install -r requirements.txt
-- pip install coveralls
+ - pip install -r requirements.txt
+ - pip install coveralls
+
script:
-- pip install .
-- coverage run --source=glances unitest.py
+ - pip install .
+ - coverage run --source=glances unitest.py
+
after_success:
-- coveralls
+ - coveralls
+
deploy:
provider: pypi
user: nicolargo
diff --git a/appveyor.yml b/appveyor.yml
index e01646fe..6920d3f6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,6 +20,14 @@ environment:
PYTHON_VERSION: "3.6.x"
PYTHON_ARCH: "32"
+ - PYTHON: "C:\\Python37"
+ PYTHON_VERSION: "3.7.x"
+ PYTHON_ARCH: "32"
+
+ - PYTHON: "C:\\Python38"
+ PYTHON_VERSION: "3.8.x"
+ PYTHON_ARCH: "32"
+
# 64 bits
- PYTHON: "C:\\Python27-x64"
@@ -40,6 +48,20 @@ environment:
VS_VER: "2015"
INSTANCENAME: "SQL2012SP1"
+ - PYTHON: "C:\\Python37-x64"
+ PYTHON_VERSION: "3.7.x"
+ PYTHON_ARCH: "64"
+ ARCH: x86_64
+ VS_VER: "2015"
+ INSTANCENAME: "SQL2012SP1"
+
+ - PYTHON: "C:\\Python38-x64"
+ PYTHON_VERSION: "3.8.x"
+ PYTHON_ARCH: "64"
+ ARCH: x86_64
+ VS_VER: "2015"
+ INSTANCENAME: "SQL2012SP1"
+
# Also build on a Python version not pre-installed by Appveyor.
# See: https://github.com/ogrisel/python-appveyor-demo/issues/10
diff --git a/setup.py b/setup.py
index 7370f53c..2cb8f73d 100755
--- a/setup.py
+++ b/setup.py
@@ -133,6 +133,8 @@ setup(
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
'Topic :: System :: Monitoring'
]
)
diff --git a/tox.ini b/tox.ini
index 3ea417d2..5a0c80b4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@
# tox
[tox]
-envlist = py27, py36
+envlist = py27, py38
[testenv]
deps =