Skip to content

Commit

Permalink
simplify dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
t-imamichi committed Feb 13, 2025
1 parent 9fd42b9 commit f5115f6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
- os: macos-latest
python-version: 3.9
- os: macos-latest
python-version: 3.12
python-version: 3.11
- os: windows-latest
python-version: 3.9
- os: windows-latest
Expand Down Expand Up @@ -332,7 +332,7 @@ jobs:
path: /tmp/m39
- uses: actions/download-artifact@v4
with:
name: macos-latest-3.12
name: macos-latest-3.11
path: /tmp/m312
- uses: actions/download-artifact@v4
with:
Expand All @@ -347,7 +347,7 @@ jobs:
shell: bash
- name: Combined Deprecation Messages
run: |
sort -f -u /tmp/o39/opt.dep /tmp/o310/opt.dep /tmp/o311/opt.dep /tmp/o312/opt.dep /tmp/m39/opt.dep /tmp/m312/opt.dep /tmp/w39/opt.dep /tmp/w312/opt.dep || true
sort -f -u /tmp/o39/opt.dep /tmp/o310/opt.dep /tmp/o311/opt.dep /tmp/o312/opt.dep /tmp/m39/opt.dep /tmp/m311/opt.dep /tmp/w39/opt.dep /tmp/w312/opt.dep || true
shell: bash
- name: Coverage combine
run: coverage3 combine /tmp/o39/opt.dat
Expand Down
10 changes: 5 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This code is part of a Qiskit project.
#
# (C) Copyright IBM 2021, 2024.
# (C) Copyright IBM 2021, 2025.
#
# This code is licensed under the Apache License, Version 2.0. You may
# obtain a copy of this license in the LICENSE.txt file in the root directory
Expand Down Expand Up @@ -73,12 +73,12 @@
include_package_data=True,
python_requires=">=3.9",
extras_require={
"cplex": ["cplex; python_version < '3.12' and platform_machine != 'arm64'"],
"cplex": [
"cplex; python_version < '3.13' and platform_system != 'Darwin' or python_version < '3.12' and platform_system == 'Darwin'"
],
"cvx": ["cvxpy"],
"matplotlib": ["matplotlib"],
"gurobi": [
"gurobipy; platform_machine != 'arm64' or python_version >= '3.9' and platform_machine == 'arm64'"
],
"gurobi": ["gurobipy; python_version >= '3.9'"],
},
project_urls={
"Bug Tracker": "https://github.com/qiskit-community/qiskit-optimization/issues",
Expand Down

0 comments on commit f5115f6

Please sign in to comment.