From 36e9a0bb623f3e56177605d13688e247af392863 Mon Sep 17 00:00:00 2001 From: Orion Martin <40585662+95-martin-orion@users.noreply.github.com> Date: Wed, 13 Jul 2022 14:00:49 -0700 Subject: [PATCH 1/2] newer versions all around --- .github/workflows/release_wheels.yml | 3 ++- .github/workflows/testing_wheels.yml | 3 ++- pybind_interface/GetPybind11.cmake | 2 +- requirements.txt | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release_wheels.yml b/.github/workflows/release_wheels.yml index 26ac79c2..e3473109 100644 --- a/.github/workflows/release_wheels.yml +++ b/.github/workflows/release_wheels.yml @@ -29,6 +29,7 @@ jobs: build: "cp36-win_amd64 cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64" env: CIBW_BUILD: "${{ matrix.cibw.build || '*' }}" + CIBW_SKIP: "*musllinux*" CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}" CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_image }}" CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm" @@ -46,7 +47,7 @@ jobs: - uses: actions/setup-python@v2 - name: Install cibuildwheel and twine - run: python -m pip install cibuildwheel==2.0.1 + run: python -m pip install cibuildwheel==2.2.2 - name: Run C++ tests run: bash build_tools/test_libs.sh diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index 95271dad..d3bdc934 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -34,6 +34,7 @@ jobs: build: "cp36-win_amd64 cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64" env: CIBW_BUILD: "${{ matrix.cibw.build || '*' }}" + CIBW_SKIP: "*musllinux*" CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}" CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_image }}" CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm" @@ -51,7 +52,7 @@ jobs: - uses: actions/setup-python@v2 - name: Install cibuildwheel and twine - run: python -m pip install cibuildwheel==2.0.1 + run: python -m pip install cibuildwheel==2.2.2 - name: Run C++ tests run: bash build_tools/test_libs.sh diff --git a/pybind_interface/GetPybind11.cmake b/pybind_interface/GetPybind11.cmake index f93c2bf6..e60d20da 100644 --- a/pybind_interface/GetPybind11.cmake +++ b/pybind_interface/GetPybind11.cmake @@ -1,6 +1,6 @@ include(FetchContent) -set(MIN_PYBIND_VERSION "2.2.4") +set(MIN_PYBIND_VERSION "2.8.1") FetchContent_Declare( pybind11 GIT_REPOSITORY https://github.com/pybind/pybind11 diff --git a/requirements.txt b/requirements.txt index 0a95d64c..981f22a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ absl-py cirq-core -numpy~=1.16 +numpy~=1.21 pybind11 typing_extensions From 970b42a820c1b955dc9468dc2aaad3c78472ff64 Mon Sep 17 00:00:00 2001 From: Orion Martin <40585662+95-martin-orion@users.noreply.github.com> Date: Wed, 13 Jul 2022 14:24:07 -0700 Subject: [PATCH 2/2] drop python 3.6 support --- .github/workflows/release_wheels.yml | 6 +++--- .github/workflows/testing_wheels.yml | 6 +++--- pybind_interface/cuda/CMakeLists.txt | 2 +- pybind_interface/custatevec/CMakeLists.txt | 2 +- pybind_interface/decide/CMakeLists.txt | 2 +- setup.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release_wheels.yml b/.github/workflows/release_wheels.yml index e3473109..735079ad 100644 --- a/.github/workflows/release_wheels.yml +++ b/.github/workflows/release_wheels.yml @@ -15,18 +15,18 @@ jobs: - os: macos-10.15 name: mac cibw: - build: "cp36* cp37* cp38* cp39* cp310*" + build: "cp37* cp38* cp39* cp310*" - os: ubuntu-20.04 name: manylinux2014 cibw: arch: x86_64 - build: "cp36* cp37* cp38* cp39* cp310*" + build: "cp37* cp38* cp39* cp310*" manylinux_image: manylinux2014 - os: windows-2019 name: win_amd64 architecture: x64 cibw: - build: "cp36-win_amd64 cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64" + build: "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64" env: CIBW_BUILD: "${{ matrix.cibw.build || '*' }}" CIBW_SKIP: "*musllinux*" diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml index d3bdc934..7c4aa911 100644 --- a/.github/workflows/testing_wheels.yml +++ b/.github/workflows/testing_wheels.yml @@ -20,18 +20,18 @@ jobs: - os: macos-10.15 name: mac cibw: - build: "cp36* cp37* cp38* cp39* cp310*" + build: "cp37* cp38* cp39* cp310*" - os: ubuntu-20.04 name: manylinux2014 cibw: arch: x86_64 - build: "cp36* cp37* cp38* cp39* cp310*" + build: "cp37* cp38* cp39* cp310*" manylinux_image: manylinux2014 - os: windows-2019 name: win_amd64 architecture: x64 cibw: - build: "cp36-win_amd64 cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64" + build: "cp37-win_amd64 cp38-win_amd64 cp39-win_amd64 cp310-win_amd64" env: CIBW_BUILD: "${{ matrix.cibw.build || '*' }}" CIBW_SKIP: "*musllinux*" diff --git a/pybind_interface/cuda/CMakeLists.txt b/pybind_interface/cuda/CMakeLists.txt index 7da45dac..4e46eb32 100644 --- a/pybind_interface/cuda/CMakeLists.txt +++ b/pybind_interface/cuda/CMakeLists.txt @@ -15,7 +15,7 @@ if(APPLE) endif() INCLUDE(../GetPybind11.cmake) -find_package(PythonLibs 3.6 REQUIRED) +find_package(PythonLibs 3.7 REQUIRED) find_package(CUDA REQUIRED) include_directories(${PYTHON_INCLUDE_DIRS} ${pybind11_SOURCE_DIR}/include) diff --git a/pybind_interface/custatevec/CMakeLists.txt b/pybind_interface/custatevec/CMakeLists.txt index 687ac2be..879c8928 100644 --- a/pybind_interface/custatevec/CMakeLists.txt +++ b/pybind_interface/custatevec/CMakeLists.txt @@ -28,7 +28,7 @@ if(APPLE) endif() INCLUDE(../GetPybind11.cmake) -find_package(PythonLibs 3.6 REQUIRED) +find_package(PythonLibs 3.7 REQUIRED) find_package(CUDA REQUIRED) include_directories(${pybind11_INCLUDE_DIRS}) diff --git a/pybind_interface/decide/CMakeLists.txt b/pybind_interface/decide/CMakeLists.txt index 0808ccf6..0f16b9a6 100644 --- a/pybind_interface/decide/CMakeLists.txt +++ b/pybind_interface/decide/CMakeLists.txt @@ -24,7 +24,7 @@ INCLUDE(../GetPybind11.cmake) if(has_nvcc STREQUAL "") pybind11_add_module(qsim_decide decide.cpp) else() - find_package(PythonLibs 3.6 REQUIRED) + find_package(PythonLibs 3.7 REQUIRED) find_package(CUDA REQUIRED) include_directories(${PYTHON_INCLUDE_DIRS} ${pybind11_SOURCE_DIR}/include) diff --git a/setup.py b/setup.py index 10c7aa15..3b74d25d 100644 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ def build_extension(self, ext): url="https://github.com/quantumlib/qsim", author="Vamsi Krishna Devabathini", author_email="devabathini92@gmail.com", - python_requires=">=3.3.0", + python_requires=">=3.7.0", install_requires=requirements, extras_require={ "dev": dev_requirements,