From 32ee890849b4e7a2e99009da31b049ffa676bf52 Mon Sep 17 00:00:00 2001 From: Juan Altmayer Pizzorno Date: Mon, 4 Oct 2021 12:26:08 -0400 Subject: [PATCH 1/7] - trying to build on Windows; --- .github/workflows/release-pypi-upload.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-pypi-upload.yml b/.github/workflows/release-pypi-upload.yml index e0a7407e0..5718e0cde 100644 --- a/.github/workflows/release-pypi-upload.yml +++ b/.github/workflows/release-pypi-upload.yml @@ -31,16 +31,16 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python_version: ['3.7', '3.8', '3.9'] - os: ['ubuntu-latest', 'macos-latest'] +# python_version: ['3.7', '3.8', '3.9'] +# os: ['ubuntu-latest', 'macos-latest'] include: - - os: ubuntu-latest - container: quay.io/pypa/manylinux_2_24_x86_64 # https://github.com/pypa/manylinux - - os: macos-latest - python_version: 3.7 - upload_source: true # just need ONE of them to do it -# - os: windows-latest -# python_version: 3.8 +# - os: ubuntu-latest +# container: quay.io/pypa/manylinux_2_24_x86_64 # https://github.com/pypa/manylinux +# - os: macos-latest +# python_version: 3.7 +# upload_source: true # just need ONE of them to do it + - os: windows-latest + python_version: 3.8 container: ${{ matrix.container }} env: From dc78195b30ecb4ade9026f88dc90fe96c2d60f1d Mon Sep 17 00:00:00 2001 From: Juan Altmayer Pizzorno Date: Mon, 4 Oct 2021 12:30:31 -0400 Subject: [PATCH 2/7] - disabled building pywhere on Windows, as it's Unix-specific (for now); --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3df4e1182..e356f1e95 100755 --- a/setup.py +++ b/setup.py @@ -141,7 +141,7 @@ def build_libscalene(self): "wheel==0.36.2", "numpy" ], - ext_modules=[get_line_atomic, pywhere], + ext_modules=[get_line_atomic] + ([pywhere] if sys.platform != 'win32' else []), setup_requires=['setuptools_scm'], include_package_data=True, entry_points={"console_scripts": ["scalene = scalene.__main__:main"]}, From 718bd9eb42b993707107b03ca307348a1f734e96 Mon Sep 17 00:00:00 2001 From: Juan Altmayer Pizzorno Date: Mon, 4 Oct 2021 12:36:59 -0400 Subject: [PATCH 3/7] - trying to build for all platforms; --- .github/workflows/release-pypi-upload.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-pypi-upload.yml b/.github/workflows/release-pypi-upload.yml index 5718e0cde..d1c51d578 100644 --- a/.github/workflows/release-pypi-upload.yml +++ b/.github/workflows/release-pypi-upload.yml @@ -31,16 +31,17 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: -# python_version: ['3.7', '3.8', '3.9'] -# os: ['ubuntu-latest', 'macos-latest'] + python_version: ['3.7', '3.8', '3.9'] + os: ['ubuntu-latest', 'macos-latest'] include: -# - os: ubuntu-latest -# container: quay.io/pypa/manylinux_2_24_x86_64 # https://github.com/pypa/manylinux -# - os: macos-latest -# python_version: 3.7 -# upload_source: true # just need ONE of them to do it + - os: ubuntu-latest + container: quay.io/pypa/manylinux_2_24_x86_64 # https://github.com/pypa/manylinux + - os: macos-latest + python_version: 3.7 + upload_source: true # just need ONE of them to do it + exclude: - os: windows-latest - python_version: 3.8 + python_version: 3.7 container: ${{ matrix.container }} env: From 2170f42d93cd97b3a8f5493df1b2ca584e413fd6 Mon Sep 17 00:00:00 2001 From: Juan Altmayer Pizzorno Date: Mon, 4 Oct 2021 12:38:28 -0400 Subject: [PATCH 4/7] - fixed missing windows-latest platform; --- .github/workflows/release-pypi-upload.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-pypi-upload.yml b/.github/workflows/release-pypi-upload.yml index d1c51d578..1ab55fba4 100644 --- a/.github/workflows/release-pypi-upload.yml +++ b/.github/workflows/release-pypi-upload.yml @@ -32,7 +32,7 @@ jobs: strategy: matrix: python_version: ['3.7', '3.8', '3.9'] - os: ['ubuntu-latest', 'macos-latest'] + os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] include: - os: ubuntu-latest container: quay.io/pypa/manylinux_2_24_x86_64 # https://github.com/pypa/manylinux From f98c45e14853820ec3923adeda7590d119184d53 Mon Sep 17 00:00:00 2001 From: Juan Altmayer Pizzorno Date: Mon, 4 Oct 2021 13:03:25 -0400 Subject: [PATCH 5/7] - adapting .devN code for Windows powershell; --- .github/workflows/release-pypi-upload.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-pypi-upload.yml b/.github/workflows/release-pypi-upload.yml index 1ab55fba4..cad32401f 100644 --- a/.github/workflows/release-pypi-upload.yml +++ b/.github/workflows/release-pypi-upload.yml @@ -55,11 +55,14 @@ jobs: with: name: devN - - name: set up to use .devN name if a test build - if: env.TWINE_REPOSITORY == 'testpypi' - run: | - echo "DEV_BUILD=$(cat devN.txt)" >> $GITHUB_ENV # for setup.py + - name: set up to use .devN name if a test build (Unix version) + if: env.TWINE_REPOSITORY == 'testpypi' && matrix.os != 'windows-latest' + run: echo "DEV_BUILD=$(cat devN.txt)" >> $GITHUB_ENV # for setup.py + - name: set up to use .devN name if a test build (Windows version) + if: env.TWINE_REPOSITORY == 'testpypi' && matrix.os == 'windows-latest' + run: ("DEV_BUILD=" + (get-content devN.txt)) >> $env:GITHUB_ENV # for setup.py + - uses: actions/checkout@v2 - name: Set up python (script version) From 85e08deafda5476ab194893a7c9db3f5227aaa87 Mon Sep 17 00:00:00 2001 From: Juan Altmayer Pizzorno Date: Mon, 4 Oct 2021 13:08:45 -0400 Subject: [PATCH 6/7] - fixed incorrectly requiring find_libpython; --- requirements.txt | 1 - setup.py | 1 - 2 files changed, 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index b5fa59d4f..d9e9aae78 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,5 @@ pyperf==2.0.0 pyproj==3.0.0.post1 rich==10.7.0 wheel==0.36.2 -find_libpython==0.2.0 setuptools~=57.0.0 pip~=21.1.2 diff --git a/setup.py b/setup.py index e356f1e95..93ea6070f 100755 --- a/setup.py +++ b/setup.py @@ -136,7 +136,6 @@ def build_libscalene(self): install_requires=[ "rich>=9.2.10", "cloudpickle>=1.5.0", - "find_libpython>=0.2.0", "nvidia-ml-py==11.450.51", "wheel==0.36.2", "numpy" From 0b4d6b5324233949c0097b04ce9222d1cd72b95f Mon Sep 17 00:00:00 2001 From: Juan Altmayer Pizzorno Date: Mon, 4 Oct 2021 14:13:45 -0400 Subject: [PATCH 7/7] - disabled wheel building for Windows as we're not ready for release there; --- .github/workflows/release-pypi-upload.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-pypi-upload.yml b/.github/workflows/release-pypi-upload.yml index cad32401f..69ef131f9 100644 --- a/.github/workflows/release-pypi-upload.yml +++ b/.github/workflows/release-pypi-upload.yml @@ -32,7 +32,8 @@ jobs: strategy: matrix: python_version: ['3.7', '3.8', '3.9'] - os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + os: ['ubuntu-latest', 'macos-latest'] +# os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] include: - os: ubuntu-latest container: quay.io/pypa/manylinux_2_24_x86_64 # https://github.com/pypa/manylinux