Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate CI platforms #1998

Merged
merged 1 commit into from Jun 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 0 additions & 12 deletions .circleci/config.yml

This file was deleted.

88 changes: 1 addition & 87 deletions appveyor.yml
@@ -1,87 +1 @@
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 interpreter
# See: https://stackoverflow.com/a/13751649/163740
CMD_IN_ENV: "cmd /E:ON /V:ON /C ..\\scripts\\run_with_env.cmd"

TWINE_USERNAME: DRMacIver
TWINE_PASSWORD:
secure: TpmpMHwgS4xxcbbzROle2xyb3i+VPP8cT5ZL4dF/UrA=

matrix:
- PYTHON: "C:\\Python27"
PYTHON_VERSION: "2.7.14"
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python27-x64"
PYTHON_VERSION: "2.7.14"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python36"
PYTHON_VERSION: "3.6.5"
PYTHON_ARCH: "32"

- PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6.5"
PYTHON_ARCH: "64"

cache:
- "C:\\Python27"
- "C:\\Python27-x64"
- "C:\\Python36"
- "C:\\Python36-x64"
- "%LOCALAPPDATA%\\pip\\Cache"

# Appveyor "helpfully" ignores skip directives in the commit message body
# https://www.appveyor.com/docs/how-to/filtering-commits/#commit-message
skip_commits:
message: /^Bump version to \d+\.\d+\.\d+ and update changelog/

# This matches both branches and tags (no, I don't know why either).
# We need a match both for pushes to master, and our release tags which
# trigger wheel builds.
branches:
only:
- master
- /^\d+\.\d+\.\d+$/

artifacts:
- path: 'dist\*.whl'
name: wheel

install:
- ECHO "Filesystem root:"
- ps: "ls \"C:/\""

- ECHO "Installed SDKs:"
- ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""

# Install Python (from the official .msi of https://www.python.org/) and pip when
# not already installed.
- "powershell ./scripts/install.ps1"

# Prepend newly installed Python to the PATH of this build (this cannot be
# done from inside the powershell script as it would require to restart
# the parent CMD process).
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"

# Check that we have the expected version and architecture for Python
- "python --version"
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
- "cd hypothesis-python"
- "%CMD_IN_ENV% python -m pip.__main__ install --upgrade setuptools pip wheel twine"
- "%CMD_IN_ENV% python -m pip.__main__ install setuptools -r../requirements/test.txt"
- "%CMD_IN_ENV% python -m pip.__main__ install .[all]"
- "%CMD_IN_ENV% python setup.py bdist_wheel --dist-dir dist"

deploy_script:
- ps: 'if (($env:APPVEYOR_REPO_TAG -eq $TRUE) -and ($env:PYTHON_ARCH -eq "32")) { python -m twine upload dist/* }'

build: false # Not a C# project, build stuff at the test step instead.

test_script:
# Build the compiled extension and run the project tests
- "%CMD_IN_ENV% python -m pytest -n 0 tests/cover"
- "%CMD_IN_ENV% python -m pytest -n 0 tests/datetime"
- "%CMD_IN_ENV% python -m pytest -n 0 tests/pytest -p pytester --runpytest subprocess"
build: off
5 changes: 2 additions & 3 deletions hypothesis-python/docs/supported.rst
Expand Up @@ -88,9 +88,8 @@ Regularly verifying this
------------------------

Everything mentioned above as explicitly supported is checked on every commit
with `Travis <https://travis-ci.org/HypothesisWorks/hypothesis>`_,
`Appveyor <https://ci.appveyor.com/project/DRMacIver/hypothesis>`_, and
`CircleCI <https://circleci.com/gh/HypothesisWorks/hypothesis>`_.
with `Travis <https://travis-ci.org/HypothesisWorks/hypothesis>`__, and
`Azure Pipelines <https://dev.azure.com/HypothesisWorks/Hypothesis/>`__.
Our continous delivery pipeline runs all of these checks before publishing
each release, so when we say they're supported we really mean it.

Expand Down
7 changes: 0 additions & 7 deletions hypothesis-python/scripts/basic-test.sh
Expand Up @@ -35,13 +35,6 @@ pip install ".[lark]"
$PYTEST tests/lark/
pip uninstall -y lark-parser

# We run a reduced set of tests on the macOS CI so that it runs in vaguely
# reasonable time.
if [ "$CIRCLECI" = true ]; then
echo Skipping the rest of the test suite on CircleCI.
exit 0
fi

if [ "$(python -c 'import sys; print(sys.version_info[:2] in ((2, 7), (3, 6)))')" = "False" ] ; then
exit 0
fi
Expand Down
1 change: 0 additions & 1 deletion hypothesis-python/tox.ini
Expand Up @@ -12,7 +12,6 @@ passenv=
LC_ALL
COVERAGE_FILE
TOXENV
CIRCLECI
setenv=
brief: HYPOTHESIS_PROFILE=speedy
commands =
Expand Down
5 changes: 3 additions & 2 deletions tooling/src/hypothesistooling/projects/hypothesispython.py
Expand Up @@ -146,8 +146,9 @@ def changelog():
def build_distribution():
if os.path.exists(DIST):
shutil.rmtree(DIST)

subprocess.check_output([sys.executable, "setup.py", "sdist", "--dist-dir", DIST])
subprocess.check_output(
[sys.executable, "setup.py", "sdist", "bdist_wheel", "--dist-dir", DIST]
)


def upload_distribution():
Expand Down