From ee94169f25eda0bcac760111e79a2a2e8d8ce3c3 Mon Sep 17 00:00:00 2001 From: Zac-HD Date: Mon, 24 Jun 2019 20:56:50 +1000 Subject: [PATCH] Drop CircleCi and Appveyor --- .circleci/config.yml | 12 --- appveyor.yml | 88 +------------------ hypothesis-python/docs/supported.rst | 5 +- hypothesis-python/scripts/basic-test.sh | 7 -- hypothesis-python/tox.ini | 1 - .../projects/hypothesispython.py | 5 +- 6 files changed, 6 insertions(+), 112 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index f5a1e660d1..0000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: 2 -jobs: - build: - macos: - xcode: 9.3.0 - steps: - - checkout - - run: brew update - - run: brew install readline xz ncurses - - run: ./build.sh install-core - - run: ./build.sh check-py27 - - run: ./build.sh check-py36 diff --git a/appveyor.yml b/appveyor.yml index e907cf591e..4dd7b0a315 100644 --- a/appveyor.yml +++ b/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 diff --git a/hypothesis-python/docs/supported.rst b/hypothesis-python/docs/supported.rst index 951406ce97..539c89798f 100644 --- a/hypothesis-python/docs/supported.rst +++ b/hypothesis-python/docs/supported.rst @@ -88,9 +88,8 @@ Regularly verifying this ------------------------ Everything mentioned above as explicitly supported is checked on every commit -with `Travis `_, -`Appveyor `_, and -`CircleCI `_. +with `Travis `__, and +`Azure Pipelines `__. Our continous delivery pipeline runs all of these checks before publishing each release, so when we say they're supported we really mean it. diff --git a/hypothesis-python/scripts/basic-test.sh b/hypothesis-python/scripts/basic-test.sh index 715d162c57..10aec69de5 100755 --- a/hypothesis-python/scripts/basic-test.sh +++ b/hypothesis-python/scripts/basic-test.sh @@ -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 diff --git a/hypothesis-python/tox.ini b/hypothesis-python/tox.ini index 9df9dcbce7..3b0009defb 100644 --- a/hypothesis-python/tox.ini +++ b/hypothesis-python/tox.ini @@ -12,7 +12,6 @@ passenv= LC_ALL COVERAGE_FILE TOXENV - CIRCLECI setenv= brief: HYPOTHESIS_PROFILE=speedy commands = diff --git a/tooling/src/hypothesistooling/projects/hypothesispython.py b/tooling/src/hypothesistooling/projects/hypothesispython.py index 73153b95e0..33b84054c2 100644 --- a/tooling/src/hypothesistooling/projects/hypothesispython.py +++ b/tooling/src/hypothesistooling/projects/hypothesispython.py @@ -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():