Skip to content

Commit

Permalink
Add Python 3.12 support (#334) (#336)
Browse files Browse the repository at this point in the history
* Add Python 3.12 support

* Need setuptools installed explicitly for 3.12 to build opt from main

(cherry picked from commit 9c440fc)

Co-authored-by: Steve Wood <[email protected]>
  • Loading branch information
mergify[bot] and woodsp-ibm authored Feb 28, 2024
1 parent b658f19 commit a5f79f4
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/actions/install-main-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ runs:
if [ "$build_from_main" == "true" ]; then
echo 'Create wheel file from main'
pip install -U wheel
pip install -U setuptools
git clone --depth 1 --branch main https://github.com/qiskit-community/qiskit-optimization.git /tmp/qiskit-optimization
pushd /tmp/qiskit-optimization
python setup.py bdist_wheel
Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/main.yml
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, 2023.
# (C) Copyright IBM 2021, 2024.
#
# 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 @@ -116,16 +116,16 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python-version: [3.8, 3.9, '3.10', 3.11]
python-version: [3.8, 3.9, '3.10', 3.11, 3.12]
include:
- os: macos-latest
python-version: 3.8
- os: macos-latest
python-version: 3.11
python-version: 3.12
- os: windows-latest
python-version: 3.8
- os: windows-latest
python-version: '3.10'
python-version: 3.11
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
python-version: [3.8, 3.11]
python-version: [3.8, 3.12]
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -308,28 +308,32 @@ jobs:
with:
name: ubuntu-latest-3.11
path: /tmp/f311
- uses: actions/download-artifact@v4
with:
name: ubuntu-latest-3.12
path: /tmp/f312
- uses: actions/download-artifact@v4
with:
name: macos-latest-3.8
path: /tmp/m38
- uses: actions/download-artifact@v4
with:
name: macos-latest-3.11
name: macos-latest-3.12
path: /tmp/m311
- uses: actions/download-artifact@v4
with:
name: windows-latest-3.8
path: /tmp/w38
- uses: actions/download-artifact@v4
with:
name: windows-latest-3.10
name: windows-latest-3.11
path: /tmp/w310
- name: Install Dependencies
run: pip install -U coverage coveralls diff-cover
shell: bash
- name: Combined Deprecation Messages
run: |
sort -f -u /tmp/f38/fin.dep /tmp/f39/fin.dep /tmp/f310/fin.dep /tmp/f311/fin.dep /tmp/m38/fin.dep /tmp/m311/fin.dep /tmp/w38/fin.dep /tmp/w310/fin.dep || true
sort -f -u /tmp/f38/fin.dep /tmp/f39/fin.dep /tmp/f310/fin.dep /tmp/f311/fin.dep /tmp/f312/fin.dep /tmp/m38/fin.dep /tmp/m312/fin.dep /tmp/w38/fin.dep /tmp/w311/fin.dep || true
shell: bash
- name: Coverage combine
run: coverage3 combine /tmp/f38/fin.dat
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/py_3_12_support-b61ebb772bc24cb8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
features:
- |
Added support for using Qiskit Finance with Python 3.12.
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering"
],
keywords='qiskit sdk quantum finance',
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 3.3.0
envlist = py38, py39, py310, py311, lint
envlist = py38, py39, py310, py311, py312, lint
skipsdist = True

[testenv]
Expand Down

0 comments on commit a5f79f4

Please sign in to comment.