Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/github_actions-11c…
Browse files Browse the repository at this point in the history
…ea03a8f
  • Loading branch information
1ucian0 authored Aug 23, 2024
2 parents 4eb5f07 + 1716621 commit 9fc39ad
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 2 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,23 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: '3.8'

# This can be removed when `ibm-platform-services` can build/install with the most recent of
# `setuptools`. `setuptools==72.0.0` and `ibm-platform-services==0.55.1` are a known-bad combo.
- name: Prebuild old-setuptools dependencies
shell: bash
run: |
set -e
python -m venv .build-deps
if [[ ${{ runner.os }} =~ [wW]indows ]]; then
.build-deps/Scripts/python -m pip install 'setuptools<72.0' wheel
.build-deps/Scripts/python -m pip wheel --no-build-isolation ibm-platform-services
else
.build-deps/bin/python -m pip install 'setuptools<72.0' wheel
.build-deps/bin/python -m pip wheel --no-build-isolation ibm-platform-services
fi
rm -rf .build-deps
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
68 changes: 68 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,23 @@ jobs:
${{ runner.os }}-${{ matrix.python-version }}-pip-tests-
${{ runner.os }}-${{ matrix.python-version }}-pip-
${{ runner.os }}-${{ matrix.python-version }}
# This can be removed when `ibm-platform-services` can build/install with the most recent of
# `setuptools`. `setuptools==72.0.0` and `ibm-platform-services==0.55.1` are a known-bad combo.
- name: Prebuild old-setuptools dependencies
shell: bash
run: |
set -e
python -m venv .build-deps
if [[ ${{ runner.os }} =~ [wW]indows ]]; then
.build-deps/Scripts/python -m pip install 'setuptools<72.0' wheel
.build-deps/Scripts/python -m pip wheel --no-build-isolation ibm-platform-services
else
.build-deps/bin/python -m pip install 'setuptools<72.0' wheel
.build-deps/bin/python -m pip wheel --no-build-isolation ibm-platform-services
fi
rm -rf .build-deps
- name: Install Deps
run: python -m pip install -U tox setuptools virtualenv wheel
- name: Install and Run Tests
Expand All @@ -61,6 +78,23 @@ jobs:
${{ runner.os }}-${{ matrix.python-version }}-pip-neko-
${{ runner.os }}-${{ matrix.python-version }}-pip-
${{ runner.os }}-${{ matrix.python-version }}-
# This can be removed when `ibm-platform-services` can build/install with the most recent of
# `setuptools`. `setuptools==72.0.0` and `ibm-platform-services==0.55.1` are a known-bad combo.
- name: Prebuild old-setuptools dependencies
shell: bash
run: |
set -e
python -m venv .build-deps
if [[ ${{ runner.os }} =~ [wW]indows ]]; then
.build-deps/Scripts/python -m pip install 'setuptools<72.0' wheel
.build-deps/Scripts/python -m pip wheel --no-build-isolation ibm-platform-services
else
.build-deps/bin/python -m pip install 'setuptools<72.0' wheel
.build-deps/bin/python -m pip wheel --no-build-isolation ibm-platform-services
fi
rm -rf .build-deps
- name: Install Deps
run: python -m pip install -U tox
- name: Run neko
Expand All @@ -87,6 +121,23 @@ jobs:
${{ runner.os }}-${{ matrix.python-version }}-pip-lint-
${{ runner.os }}-${{ matrix.python-version }}-pip-
${{ runner.os }}-${{ matrix.python-version }}-
# This can be removed when `ibm-platform-services` can build/install with the most recent of
# `setuptools`. `setuptools==72.0.0` and `ibm-platform-services==0.55.1` are a known-bad combo.
- name: Prebuild old-setuptools dependencies
shell: bash
run: |
set -e
python -m venv .build-deps
if [[ ${{ runner.os }} =~ [wW]indows ]]; then
.build-deps/Scripts/python -m pip install 'setuptools<72.0' wheel
.build-deps/Scripts/python -m pip wheel --no-build-isolation ibm-platform-services
else
.build-deps/bin/python -m pip install 'setuptools<72.0' wheel
.build-deps/bin/python -m pip wheel --no-build-isolation ibm-platform-services
fi
rm -rf .build-deps
- name: Install Deps
run: python -m pip install -U tox
- name: Run lint
Expand All @@ -112,6 +163,23 @@ jobs:
${{ runner.os }}-pip-docs-
${{ runner.os }}-pip-
${{ runner.os }}-
# This can be removed when `ibm-platform-services` can build/install with the most recent of
# `setuptools`. `setuptools==72.0.0` and `ibm-platform-services==0.55.1` are a known-bad combo.
- name: Prebuild old-setuptools dependencies
shell: bash
run: |
set -e
python -m venv .build-deps
if [[ ${{ runner.os }} =~ [wW]indows ]]; then
.build-deps/Scripts/python -m pip install 'setuptools<72.0' wheel
.build-deps/Scripts/python -m pip wheel --no-build-isolation ibm-platform-services
else
.build-deps/bin/python -m pip install 'setuptools<72.0' wheel
.build-deps/bin/python -m pip wheel --no-build-isolation ibm-platform-services
fi
rm -rf .build-deps
- name: Install Deps
run: |
python -m pip install -U tox
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![License](https://img.shields.io/github/license/Qiskit/qiskit-neko.svg?style=popout-square)](https://opensource.org/licenses/Apache-2.0)

- You can see the full rendered docs at:
<https://qiskit.org/ecosystem/neko>
https://qiskit.github.io/qiskit-neko/


This repository contains integration tests for Qiskit. These tests are used
Expand Down
17 changes: 17 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,23 @@ runs:
run: |
pip install -U setuptools pip
shell: bash

# This can be removed when `ibm-platform-services` can build/install with the most recent of
# `setuptools`. `setuptools==72.0.0` and `ibm-platform-services==0.55.1` are a known-bad combo.
- name: Prebuild old-setuptools dependencies
shell: bash
run: |
set -e
python -m venv .build-deps
if [[ ${{ runner.os }} =~ [wW]indows ]]; then
.build-deps/Scripts/python -m pip install 'setuptools<72.0' wheel
.build-deps/Scripts/python -m pip wheel --no-build-isolation ibm-platform-services
else
.build-deps/bin/python -m pip install 'setuptools<72.0' wheel
.build-deps/bin/python -m pip wheel --no-build-isolation ibm-platform-services
fi
rm -rf .build-deps
- name: Install neko and its dependencies
run: |
pip install ./qiskit-neko
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
python_requires=">=3.8",
project_urls={
"Bug Tracker": "https://github.com/Qiskit/qiskit-neko/issues",
"Documentation": "https://qiskit.org/ecosystem/neko",
"Documentation": "https://qiskit.github.io/qiskit-neko/",
"Source Code": "https://github.com/Qiskit/qiskit-neko",
},
zip_safe=False,
Expand Down

0 comments on commit 9fc39ad

Please sign in to comment.