Skip to content

Advance versions for compatibility #549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 14, 2022
Merged

Advance versions for compatibility #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36e9a0b
newer versions all around
95-martin-orion Jul 13, 2022
970b42a
drop python 3.6 support
95-martin-orion Jul 13, 2022
c6f9a13
Merge branch 'master' into time-travel
95-martin-orion Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/release_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,21 @@ 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*"
CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}"
CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_image }}"
CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm"
Expand All @@ -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
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/testing_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,21 @@ 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*"
CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}"
CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_image }}"
CIBW_BEFORE_BUILD_MACOS: "brew install libomp llvm"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/GetPybind11.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/custatevec/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion pybind_interface/decide/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
absl-py
cirq-core
numpy~=1.16
numpy~=1.21
pybind11
typing_extensions
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down