diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 6db3a67a..00000000 --- a/.appveyor.yml +++ /dev/null @@ -1,91 +0,0 @@ -# https://www.appveyor.com/docs/windows-images-software - -image: Visual Studio 2022 - -environment: - global: - REPO_DIR: python-appveyor-demo - PACKAGE_NAME: python_appveyor_demo - BUILD_COMMIT: master - BUILD_DEPENDS: "cython" - TEST_DEPENDS: "nose" - - matrix: - - PYTHON: "C:\\Miniconda37" - PYTHON_VERSION: "3.7" - PYTHON_ARCH: "32" - - PYTHON: "C:\\Miniconda37-x64" - PYTHON_VERSION: "3.7" - PYTHON_ARCH: "64" - - PYTHON: "C:\\Miniconda38-x64" - PYTHON_VERSION: "3.8" - PYTHON_ARCH: "64" - -# We always use a 64-bit machine, but can build x86 distributions -# with the TARGET_ARCH variable. -platform: - - x64 - -matrix: - fast_finish: false - -install: - # Install miniconda and fix headers - - where python - - where py # On Windows, py might be a better way to find and run CPython - - py --list # py -3.10-32, -3.10-64 with same syntax for 3.{9-3}, 2.{7,6} - - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH% - - echo %PATH% - - where conda - - conda info - - # Check that we have the expected version and architecture for Python - - python --version - - python -c "import struct; print(struct.calcsize('P') * 8)" - - py --version - - py -c "import struct; print(struct.calcsize('P') * 8)" - - # clone a origsel/python-appveyor-demo - # this repo includes a simple package to test appveyor - - git clone https://github.com/ogrisel/python-appveyor-demo.git - -build_script: - # Install build requirements - - conda install --yes %BUILD_DEPENDS% - - # build wheel: - - cd %REPO_DIR% - - git checkout %BUILD_COMMIT% - - python setup.py bdist_wheel - - ls dist/* - -test_script: - # create test env - - conda create --yes -n test_env python=%PYTHON_VERSION% %TEST_DEPENDS% - - activate test_env - - # install from wheel - - pip install --no-index --find-links dist/ %PACKAGE_NAME% - - # run tests from install wheel - - cd .. - - python -m pyappveyordemo.tests.test_extension - - # Smoke test of install_python script - # Use C:\PythonXY, C:\PythonXY-x64, C:\PythonXYrcZ, or C:\PythonXYrcZ-x64 - - set PYTHON=C:\Python37 - - ps: .\install_python.ps1 - - set PYTHON=C:\Python37-x64 - - ps: .\install_python.ps1 - - set PYTHON=C:\Python38-x64 - - ps: .\install_python.ps1 - - set PYTHON=C:\Python38 - - ps: .\install_python.ps1 - - set PYTHON=C:\Python39-x64 - - ps: .\install_python.ps1 - - set PYTHON=C:\Python39 - - ps: .\install_python.ps1 - - set PYTHON=C:\Python310-x64 - - ps: .\install_python.ps1 - - set PYTHON=C:\Python310 - - ps: .\install_python.ps1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f6e31131..269ece9d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,11 +20,16 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] # [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.12"] # ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3"] + os: [ubuntu-latest, macos-latest, windows-latest] + python-version: ["3.13"] # ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3"] # The type of runner that the job will run on runs-on: ${{ matrix.os }} + env: + MB_PYTHON_VERSION=3.13 + TEST_BUILDS=1 + MB_PYTHON_OSX_VER=10.9 + ENV_VARS_PATH="test/env_vars.sh # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -36,12 +41,5 @@ jobs: python-version: ${{ matrix.python-version }} # Runs a single command using the runner's Python - - name: Run a one-line script - shell: python - run: print("Hello, world!") - - # Runs a set of commands using the runner's shell - - name: Run a multi-line script - run: | - echo Add other actions to build, - echo test, and deploy your project. + - name: Test + run: source tests/test_multibuild.sh diff --git a/tests/test_fill_submodule.sh b/tests/test_fill_submodule.sh index 740c5e61..304cede7 100644 --- a/tests/test_fill_submodule.sh +++ b/tests/test_fill_submodule.sh @@ -13,7 +13,7 @@ mkdir project mkdir superproject cd superproject git init -git submodule add ../project +git -c protocol.file.allow=always submodule add ../project local_author git commit -m "first superproject" # Check the submodule is working correctly before intervention diff --git a/tests/test_multibuild.sh b/tests/test_multibuild.sh index f87c158d..e9854fb3 100644 --- a/tests/test_multibuild.sh +++ b/tests/test_multibuild.sh @@ -63,5 +63,3 @@ source tests/test_supported_wheels.sh # Exit 1 if any test errors barf -# Don't need Travis' machinery trace -set +x