From 5c83dc33dddb75dd88041b52e3cfe3a032d71082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?xavier=20dupr=C3=A9?= <xavier.dupre@gmail.com>
Date: Sun, 22 Jul 2018 21:23:06 +0200
Subject: [PATCH] update CI

---
 .circleci/config.yml   | 8 ++++----
 .local.jenkins.win.yml | 4 ++--
 .travis.yml            | 6 +++---
 appveyor.yml           | 4 ++--
 build_script.bat       | 4 +++-
 setup.py               | 2 +-
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7e16ad6..dfa80bc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/python:3.6.5
+      - image: circleci/python:3.7.0
     
     working_directory: ~/repo
     
@@ -11,8 +11,8 @@ jobs:
 
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "requirements.txt" }}
-          - v1-dependencies-
+          - v2-dependencies-{{ checksum "requirements.txt" }}
+          - v2-dependencies-
 
       - run:
           name: Install pandoc
@@ -92,7 +92,7 @@ jobs:
       - save_cache:
           paths:
             - ./venv
-          key: v1-dependencies-{{ checksum "requirements.txt" }}
+          key: v2-dependencies-{{ checksum "requirements.txt" }}
         
       - run:
           name: run tests
diff --git a/.local.jenkins.win.yml b/.local.jenkins.win.yml
index 126522e..73c2729 100644
--- a/.local.jenkins.win.yml
+++ b/.local.jenkins.win.yml
@@ -2,7 +2,7 @@
 language: python
 
 python:
-  - { PATH: "{{replace(Python36, '\\', '\\\\')}}", VERSION: 3.6, DIST: std }
+  - { PATH: "{{replace(Python37, '\\', '\\\\')}}", VERSION: 3.7, DIST: std }
   
 virtualenv:
   - path: {{ospathjoin(root_path, pickname("%NAME_JENKINS%", project_name + "_%VERSION%_%DIST%_%NAME%"), "_venv")}}
@@ -30,7 +30,7 @@ script:
   - { CMD: "python -X faulthandler -X showrefcount -u setup.py unittests_SKIP", NAME: "UT_SKIP" }
 after_script:
   - python -u setup.py bdist_wheel
-  - if [ ${DIST} != "conda" and ${VERSION} == "3.6" and ${NAME} == "UT" ] then copy dist\*.whl {{root_path}}\..\..\local_pypi\local_pypi_server fi
+  - if [ ${DIST} != "conda" and ${NAME} == "UT" ] then copy dist\*.whl {{root_path}}\..\..\local_pypi\local_pypi_server fi
 documentation:
   - if [ ${NAME} == "UT" ] then python -u setup.py build_sphinx fi
   - if [ ${NAME} == "UT" ] then xcopy /E /C /I /Y _doc\sphinxdoc\build\html dist\html fi
diff --git a/.travis.yml b/.travis.yml
index e57ab5b..a2ef61c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
-dist: trusty
-sudo: false
+dist: xenial
+sudo: true
 language: python
 python:
-  - "3.6"
+  - "3.7"
 addons:
 -  apt:
 -    packages:
diff --git a/appveyor.yml b/appveyor.yml
index e31adc1..2462b66 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,8 +8,8 @@ environment:
 
   matrix:
 
-    - PYTHON: "C:\\Python36-x64"
-      PYTHON_VERSION: "3.6.x"
+    - PYTHON: "C:\\Python37-x64"
+      PYTHON_VERSION: "3.7.x"
       PYTHON_ARCH: "64"
 
 init:
diff --git a/build_script.bat b/build_script.bat
index a1f7929..88ecc3d 100644
--- a/build_script.bat
+++ b/build_script.bat
@@ -5,7 +5,9 @@ set pythonexe="%1"
 goto custom_python:
 
 :default_value_python:
-set pythonexe="c:\Python365_x64\python.exe"
+set pythonexe="c:\Python370_x64\python.exe"
+if not exist %pythonexe% set pythonexe="c:\Python366_x64\python.exe"
+if not exist %pythonexe% set pythonexe="c:\Python365_x64\python.exe"
 if not exist %pythonexe% set pythonexe="c:\Python364_x64\python.exe"
 if not exist %pythonexe% set pythonexe="c:\Python363_x64\python.exe"
 if not exist %pythonexe% set pythonexe="c:\Python36_x64\python.exe"
diff --git a/setup.py b/setup.py
index ba14739..03673b7 100644
--- a/setup.py
+++ b/setup.py
@@ -141,7 +141,7 @@ def write_version():
             blog_list=os.path.abspath(os.path.join(
                 "src", project_var_name, package_data[project_var_name][0])),
             fLOG=logging_function, github_owner=project_owner,
-            covtoken=("4326eb4c-78b5-4ff3-9317-9329fdb20f43", "'_UT_36_std' in outfile"))
+            covtoken=("4326eb4c-78b5-4ff3-9317-9329fdb20f43", "'_UT_37_std' in outfile"))
         if not r and not ({"bdist_msi", "sdist",
                            "bdist_wheel", "publish", "publish_doc", "register",
                            "upload_docs", "bdist_wininst", "build_ext"} & set(sys.argv)):