From ab01394c22928173b24965afbfed27cbfc67e7bc Mon Sep 17 00:00:00 2001 From: Ales Erjavec Date: Mon, 11 Nov 2019 13:09:40 +0100 Subject: [PATCH 1/2] Add pyproject.toml --- MANIFEST.in | 1 + pyproject.toml | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 pyproject.toml diff --git a/MANIFEST.in b/MANIFEST.in index 6eebc224508..f471c616a64 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -23,3 +23,4 @@ include COPYING include LICENSE include setup.py include setup.cfg +include pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000000..f8ff2b7653f --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,8 @@ +[build-system] +requires = [ + "setuptools>=40.8.0", + "wheel", + "numpy==1.14.5; python_version=='3.6'", + "numpy==1.14.5; python_version=='3.7'", + "numpy==1.17.3; python_version=='3.8'", +] From a1ce1025a8a42313aed60d08395d588d99c5a668 Mon Sep 17 00:00:00 2001 From: Ales Erjavec Date: Mon, 11 Nov 2019 15:00:19 +0100 Subject: [PATCH 2/2] appveyor.yml: Use `pip wheel` for building --- appveyor.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7079a567bd4..3c6484a79aa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,10 +15,7 @@ matrix: environment: global: PIP_DISABLE_PIP_VERSION_CHECK: 1 - # disable threaded builds on Python 3.5+ when using numpy's distutils - # (https://github.com/numpy/numpy/issues/7607) - BUILD_GLOBAL_OPTIONS: build -j1 - BUILD_ENV: wheel==0.29.0 pip~=19.0 numpy==1.13.* -r requirements-doc.txt + BUILD_ENV: wheel==0.29.0 pip~=19.0 # SIP 4.19.4+ with PyQt5==5.9.1+ segfault our tests (GH-2756) TEST_ENV: sip==4.19.6 PyQt5==5.9.2 numpy>=1.16.0 scipy~=1.0.0 scikit-learn pandas==0.21.1 pymssql ORANGE_TEST_DB_URI: 'mssql://sa:Password12!@localhost:1433' @@ -51,7 +48,7 @@ build_script: - python setup.py clean --all # get the package version - for /f %%f in ('python setup.py --version') do ( set "VERSION=%%f" ) - - python setup.py %BUILD_GLOBAL_OPTIONS% bdist_wheel + - python -m pip wheel --no-deps -w dist ./ test_script: - python -m venv --clear build\.test