diff --git a/.github/workflows/release-pypi-upload.yml b/.github/workflows/release-pypi-upload.yml index e0a7407e0..69ef131f9 100644 --- a/.github/workflows/release-pypi-upload.yml +++ b/.github/workflows/release-pypi-upload.yml @@ -33,14 +33,16 @@ jobs: 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 - 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 + exclude: + - os: windows-latest + python_version: 3.7 container: ${{ matrix.container }} env: @@ -54,11 +56,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) 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 3df4e1182..93ea6070f 100755 --- a/setup.py +++ b/setup.py @@ -136,12 +136,11 @@ 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" ], - 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"]},