Skip to content
Permalink
Browse files

update CI

  • Loading branch information...
sdpython committed Jul 22, 2018
1 parent 618712e commit 547918d147fd39699feef2850051acbd9124a833
Showing with 14 additions and 28 deletions.
  1. +4 −4 .circleci/config.yml
  2. +4 −19 .local.jenkins.win.yml
  3. +3 −2 .travis.yml
  4. +2 −2 appveyor.yml
  5. +1 −1 setup.py
@@ -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
@@ -53,7 +53,7 @@ jobs:
- save_cache:
paths:
- ./venv
key: v1-dependencies-{{ checksum "requirements.txt" }}
key: v2-dependencies-{{ checksum "requirements.txt" }}

- run:
name: run tests
@@ -2,9 +2,7 @@
language: python

python:
- { PATH: "{{replace(Python36, '\\', '\\\\')}}", VERSION: 3.6, DIST: std }
- { PATH: "{{replace(Python27, '\\', '\\\\')}}", VERSION: 2.7, DIST: std }
- { PATH: "{{replace(Anaconda3, '\\', '\\\\')}}", VERSION: 3.6, DIST: conda }
- { PATH: "{{replace(Python37, '\\', '\\\\')}}", VERSION: 3.7, DIST: std }

virtualenv:
- path: {{ospathjoin(root_path, pickname("%NAME_JENKINS%", project_name + "_%VERSION%_%DIST%_%NAME%"), "_venv")}}
@@ -15,27 +13,14 @@ install:
- pip freeze
- pip freeze > pip_freeze.txt

before_script:
- if [ ${VERSION} == "2.7" ] then pip uninstall jyquickhelper fi
- if [ ${VERSION} == "2.7" ] then pip install bin\jyquickhelper-0.2-py2-none-any.whl fi
- if [ ${VERSION} == "2.7" ] then {{Python36}}\python -u setup.py copy27 fi
- if [ ${VERSION} == "2.7" ] then cd dist_module27 fi

script:
- { CMD: "python -u setup.py unittests", NAME: "UT", TIMEOUT: 900 }
- { CMD: "python -u setup.py unittests_SKIP", NAME: "UT_SKIP", TIMEOUT: 900 }
- if [ ${VERSION} == "3.6" and ${DIST} == "std" ]
then
--CMD=python -u setup.py build_sphinx;
--NAME=DOC;
fi

after_script:
- python -u setup.py bdist_wheel
- if [ ${VERSION} == "2.7" and ${DIST} != "conda" ] then copy dist\*.whl {{root_path}}\..\..\local_pypi\local_pypi_server fi
- if [ ${VERSION} == "2.7" ] then cd .. fi
- if [ ${VERSION} != "2.7" and ${DIST} != "conda" and ${VERSION} == "3.6" and ${NAME} == "UT" ] then copy dist\*.whl {{root_path}}\..\..\local_pypi\local_pypi_server fi
- if [ ${VERSION} != "2.7" and ${DIST} != "conda" and ${VERSION} == "3.7" and ${NAME} == "UT" ] then copy dist\*.whl {{root_path}}\..\..\local_pypi\local_pypi_server fi

documentation:
- if [ ${NAME} == "UT" and ${VERSION} != "2.7" ] then python -u setup.py build_sphinx fi
- if [ ${NAME} == "UT" and ${VERSION} != "2.7" ] then xcopy /E /C /I /Y _doc\sphinxdoc\build\html dist\html fi
- python -u setup.py build_sphinx
- xcopy /E /C /I /Y _doc\sphinxdoc\build\html dist\html
@@ -1,7 +1,8 @@
dist: trusty
dist: xenial
sudo: true
language: python
python:
- "3.5"
- "3.7"
- "3.6"
install:
- pip install -r requirements.txt
@@ -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:
@@ -119,7 +119,7 @@ def write_version():
additional_notebook_path=["pyquickhelper"],
unittest_modules=["pyquickhelper"],
fLOG=logging_function, github_owner="sdpython",
covtoken=("7809a446-a94a-4155-833d-091ad8f63367", "'_UT_36_std' in outfile"))
covtoken=("7809a446-a94a-4155-833d-091ad8f63367", "'_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 547918d

Please sign in to comment.
You can’t perform that action at this time.