Permalink
Browse files

update CI

  • Loading branch information...
sdpython committed Jul 22, 2018
1 parent f8dadae commit 5c83dc33dddb75dd88041b52e3cfe3a032d71082
Showing with 15 additions and 13 deletions.
  1. +4 −4 .circleci/config.yml
  2. +2 −2 .local.jenkins.win.yml
  3. +3 −3 .travis.yml
  4. +2 −2 appveyor.yml
  5. +3 −1 build_script.bat
  6. +1 −1 setup.py
View
@@ -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
View
@@ -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
View
@@ -1,8 +1,8 @@
dist: trusty
sudo: false
dist: xenial
sudo: true
language: python
python:
- "3.6"
- "3.7"
addons:
- apt:
- packages:
View
@@ -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:
View
@@ -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"
View
@@ -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)):

0 comments on commit 5c83dc3

Please sign in to comment.