diff options
author | Cosimo Lupo <cosimo@anthrotype.com> | 2017-08-23 19:45:13 +0100 |
---|---|---|
committer | Eugene Kliuchnikov <eustas@google.com> | 2017-08-23 20:45:13 +0200 |
commit | 4f455cac329d0c612887123c9dc6de9a66fa8490 (patch) | |
tree | 7d4c2d9f96660869bd30fc9d0578bbfafad6f5be /scripts/appveyor.yml | |
parent | 019091f994c581bbadc3995a97a51488616d2f59 (diff) | |
download | brotli-4f455cac329d0c612887123c9dc6de9a66fa8490.zip brotli-4f455cac329d0c612887123c9dc6de9a66fa8490.tar.gz brotli-4f455cac329d0c612887123c9dc6de9a66fa8490.tar.bz2 |
disable buidling/deployment of python wheels (#583)
* [appveyor] remove 'deploy' stage; only test python 2.7 and 3.6
all the other python versions are being built and tested on
https://github.com/google/brotli-wheels/blob/d571d63/appveyor.yml
* remove terrify submodule as not needed any more
* [travis] just test py2.7 and 3.6 on linux; remove extra osx python builds
All the other python versions for OSX are being built/tested on:
https://github.com/google/brotli-wheels/blob/d571d63/.travis.yml
Also, there's no need to build and deploy wheels here, as that's done
in the separate repository.
* [setup.py] only rebuild if dependency are newer; fix typo in list of 'depends'
https://github.com/python/cpython/blob/v3.6.2/Lib/distutils/command/build_ext.py#L485-L500
* [ci] only run 'python setup.py test'
if we run 'python setup.py built test', the setuptools 'test' command will
forcibly re-run the build_ext subcommand because it wants to pass the --inplace
option (it ignores whether it's up to date, just re-runs it all the time).
with this we go from running built_ext twice, to running it only once per build
* [Makefile] run 'build_ext --inplace' instead of 'develop' as default target
The 'develop' command is like 'install' in the sense that it
modifies the user's python environment.
The default make target should be less intrusive, i.e. just building
the extension module in-place without modify anything in the user's
environment.
We don't need to tell make about the dependency between 'test' and
'build' target as that is baked in the `python setup.py test` command.
* [Makefile] add 'develop' target; remove unnecessary 'tests' target
`make test` is good enough
* [Makefile] `setup.py test` requires setuptools; run `python -m unittest`
This will work even if setuptools is not installed, which is unlikely
nowadays but still our `setup.py` works with plain distutils, so
we may well have our tests work without setuptools.
* [python/README.md] add ref to 'develop' target; remove 'tests', just 'make test'
* [setup.py] import modules as per nicksay's comment
https://github.com/google/brotli/pull/583#discussion_r131981049
* [Makefile] add 'develop' to .PHONY targets
remove 'tests' from .PHONY
* [appveyor] remove unused setup scripts
We don't need to install custom python versions, we are
using the pre-installed ones on Appveyor.
* [appveyor] remove unneeded setup code
Diffstat (limited to 'scripts/appveyor.yml')
-rw-r--r-- | scripts/appveyor.yml | 58 |
1 files changed, 8 insertions, 50 deletions
diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index b5b1294..c342001 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -1,11 +1,4 @@ environment:
-
- global:
- # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
- # /E:ON and /V:ON options are not enabled in the batch script intepreter
- # See: http://stackoverflow.com/a/13751649/163740
- WITH_COMPILER: "cmd /E:ON /V:ON /C .\\scripts\\run_with_compiler.cmd"
-
matrix:
- BUILD_SYSTEM: CMake
GENERATOR: Visual Studio 14 2015 Win64
@@ -25,13 +18,8 @@ environment: PYTHON_ARCH: "32"
- BUILD_SYSTEM: Python
- PYTHON: "C:\\Python34"
- PYTHON_VERSION: "3.4.x"
- PYTHON_ARCH: "32"
-
- - BUILD_SYSTEM: Python
- PYTHON: "C:\\Python35"
- PYTHON_VERSION: "3.5.0"
+ PYTHON: "C:\\Python36"
+ PYTHON_VERSION: "3.6.x"
PYTHON_ARCH: "32"
- BUILD_SYSTEM: Python
@@ -40,29 +28,21 @@ environment: PYTHON_ARCH: "64"
- BUILD_SYSTEM: Python
- PYTHON: "C:\\Python34-x64"
- PYTHON_VERSION: "3.4.x"
- PYTHON_ARCH: "64"
-
- - BUILD_SYSTEM: Python
- PYTHON: "C:\\Python35-x64"
- PYTHON_VERSION: "3.5.0"
+ PYTHON: "C:\\Python36-x64"
+ PYTHON_VERSION: "3.6.x"
PYTHON_ARCH: "64"
install:
- ps: |
if ($env:BUILD_SYSTEM -eq "Python") {
- # install Python and pip when not already installed
- if (-not(Test-Path($env:PYTHON))) { & scripts\install_py.ps1 }
-
- # prepend newly installed Python to the PATH
+ # prepend Python to the PATH
$env:Path = $env:PYTHON + ';' + $env:PYTHON + '\\Scripts;' + $env:PATH
# upgrade pip to avoid out-of-date warnings
pip install --disable-pip-version-check --user --upgrade pip
- # install/upgrade setuptools and wheel to build packages
- pip install --upgrade setuptools six wheel
+ # install/upgrade setuptools to build packages
+ pip install --upgrade setuptools
}
before_build:
@@ -82,26 +62,4 @@ build_script: test_script:
- if "%BUILD_SYSTEM%" == "CMake" ( ctest --output-on-failure --interactive-debug-mode 0 -C Debug )
- - if "%BUILD_SYSTEM%" == "Python" ( python setup.py build test )
-
-after_test:
- - if "%BUILD_SYSTEM%" == "Python" ( pip wheel -w dist . )
- - if "%BUILD_SYSTEM%" == "Python" ( python setup.py sdist --formats=gztar,zip )
-
-artifacts:
- # archive the generated packages in the ci.appveyor.com build report
- - path: dist\*.whl
- - path: dist\*.zip
- - path: dist\*.tar.gz
-
-# For info, see: http://www.appveyor.com/docs/deployment/github
-
-deploy:
- - provider: GitHub
- auth_token:
- secure: dfL56DgbwuGJNNE5GzKi/pAgBQnJ37Du+AnCtnsTnIYxpis8ah3fPmA/G+bn4NJ3
- artifact:
- draft: false
- prerelease: false
- on:
- appveyor_repo_tag: true
+ - if "%BUILD_SYSTEM%" == "Python" ( python setup.py test )
|