Skip to content

Commit 73a1efc

Browse files
committed
simplify dependency versions
1 parent 9fd42b9 commit 73a1efc

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
- os: macos-latest
125125
python-version: 3.9
126126
- os: macos-latest
127-
python-version: 3.12
127+
python-version: 3.11
128128
- os: windows-latest
129129
python-version: 3.9
130130
- os: windows-latest
@@ -332,7 +332,7 @@ jobs:
332332
path: /tmp/m39
333333
- uses: actions/download-artifact@v4
334334
with:
335-
name: macos-latest-3.12
335+
name: macos-latest-3.11
336336
path: /tmp/m312
337337
- uses: actions/download-artifact@v4
338338
with:
@@ -347,7 +347,7 @@ jobs:
347347
shell: bash
348348
- name: Combined Deprecation Messages
349349
run: |
350-
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
350+
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
351351
shell: bash
352352
- name: Coverage combine
353353
run: coverage3 combine /tmp/o39/opt.dat

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@
7373
include_package_data=True,
7474
python_requires=">=3.9",
7575
extras_require={
76-
"cplex": ["cplex; python_version < '3.12' and platform_machine != 'arm64'"],
76+
"cplex": [
77+
"cplex; python_version < '3.13' and platform_system != 'Darwin' or python_version < '3.12' and platform_system == 'Darwin'"
78+
],
7779
"cvx": ["cvxpy"],
7880
"matplotlib": ["matplotlib"],
79-
"gurobi": [
80-
"gurobipy; platform_machine != 'arm64' or python_version >= '3.9' and platform_machine == 'arm64'"
81-
],
81+
"gurobi": ["gurobipy; python_version >= '3.9'"],
8282
},
8383
project_urls={
8484
"Bug Tracker": "https://github.com/qiskit-community/qiskit-optimization/issues",

0 commit comments

Comments
 (0)