Skip to content
This repository has been archived by the owner on Jan 13, 2024. It is now read-only.

Commit

Permalink
update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
sdpython committed Jul 22, 2018
1 parent b2de8b0 commit 3472d77
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/python:3.6.5
- image: circleci/python:3.7.0

working_directory: ~/repo

Expand All @@ -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
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
- save_cache:
paths:
- ./venv
key: v1-dependencies-{{ checksum "requirements.txt" }}
key: v2-dependencies-{{ checksum "requirements.txt" }}

- run:
name: run tests
Expand Down
6 changes: 3 additions & 3 deletions .local.jenkins.win.yml
Expand Up @@ -2,9 +2,9 @@
language: python

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

virtualenv:
- path: {{ospathjoin(root_path, pickname("%NAME_JENKINS%", project_name + "_%VERSION%_%DIST%_%NAME%"), "_venv")}}
Expand All @@ -26,7 +26,7 @@ after_script:
- python 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
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
@@ -1,9 +1,9 @@
dist: trusty
sudo: false
dist: xenial
sudo: true
language: python
python:
- "3.5"
- "3.6"
- "3.7"
env:
- SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
install:
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion build_script.bat
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -137,7 +137,7 @@ def write_version():
layout=["html"], github_owner="sdpython",
add_htmlhelp=sys.platform.startswith("win"),
coverage_options=dict(omit=["*exclude*.py"]),
fLOG=logging_function, covtoken=("24e81424-08ba-4ca7-be23-66c12926565f ", "'_UT_36_std' in outfile"))
fLOG=logging_function, covtoken=("24e81424-08ba-4ca7-be23-66c12926565f ", "'_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)):
Expand Down

0 comments on commit 3472d77

Please sign in to comment.