Skip to content
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.

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

Since sphinx was updated yesterday, update the python version.. #819

Merged
merged 6 commits into from
Jul 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 20 additions & 20 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@
name: Docs Publish
on:
push:
branches: [ main ]
branches: [main]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.7'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U virtualenv setuptools wheel tox
sudo apt update
sudo apt-get install graphviz pandoc qt5-default
- name: Build and publish
env:
encrypted_rclone_key: ${{ secrets.encrypted_rclone_key }}
encrypted_rclone_iv: ${{ secrets.encrypted_rclone_iv }}
run: |
tools/deploy_documentation.sh
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: "3.9"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -U virtualenv setuptools wheel tox
sudo apt update
sudo apt-get install graphviz pandoc qt5-default
- name: Build and publish
env:
encrypted_rclone_key: ${{ secrets.encrypted_rclone_key }}
encrypted_rclone_iv: ${{ secrets.encrypted_rclone_iv }}
run: |
tools/deploy_documentation.sh
64 changes: 32 additions & 32 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,43 +36,43 @@ jobs:
run: python -m pip install -U tox setuptools virtualenv wheel
- name: Install and Run Tests
run: tox -e py
# windows-tests:
# name: tests-python${{ matrix.python-version }}-windows
# runs-on: windows-latest
# strategy:
# matrix:
# python-version: [3.7, 3.8, 3.9]
# steps:
# - uses: actions/checkout@v2
# - name: Set up Python ${{ matrix.python-version }}
# uses: actions/setup-python@v2
# with:
# python-version: ${{ matrix.python-version }}
# - name: Pip cache
# uses: actions/cache@v2
# with:
# path: ~\AppData\Local\pip\Cache
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-tests-${{ hashFiles('setup.py','requirements-dev.txt','requirements.txt') }}
# restore-keys: |
# ${{ runner.os }}-${{ matrix.python-version }}-pip-tests-
# ${{ runner.os }}-${{ matrix.python-version }}-pip-
# ${{ runner.os }}-${{ matrix.python-version }}-
# - name: Install deps
# run: |
# pip install -U tox cvxopt setuptools virtualenv wheel
# shell: pwsh
# - name: Install and Run Tests
# run: tox --sitepackages -e py
# shell: bash -l {0}
# windows-tests:
# name: tests-python${{ matrix.python-version }}-windows
# runs-on: windows-latest
# strategy:
# matrix:
# python-version: [3.7, 3.8, 3.9]
# steps:
# - uses: actions/checkout@v2
# - name: Set up Python ${{ matrix.python-version }}
# uses: actions/setup-python@v2
# with:
# python-version: ${{ matrix.python-version }}
# - name: Pip cache
# uses: actions/cache@v2
# with:
# path: ~\AppData\Local\pip\Cache
# key: ${{ runner.os }}-${{ matrix.python-version }}-pip-tests-${{ hashFiles('setup.py','requirements-dev.txt','requirements.txt') }}
# restore-keys: |
# ${{ runner.os }}-${{ matrix.python-version }}-pip-tests-
# ${{ runner.os }}-${{ matrix.python-version }}-pip-
# ${{ runner.os }}-${{ matrix.python-version }}-
# - name: Install deps
# run: |
# pip install -U tox cvxopt setuptools virtualenv wheel
# shell: pwsh
# - name: Install and Run Tests
# run: tox --sitepackages -e py
# shell: bash -l {0}
lint:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.9
- name: Pip cache
uses: actions/cache@v2
with:
Expand All @@ -93,10 +93,10 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up Python 3.7
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.9
- name: Pip cache
uses: actions/cache@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ pylint
yapf

# Doc Build
sphinx
sphinx==5.0.2
numpydoc
sphinx-automodapi
jupyter_sphinx
nbsphinx==0.8.6
nbsphinx
qiskit-sphinx-theme
jupyter_nbgallery

Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 2.1
envlist = py37, lint, docs
envlist = py39, lint, docs
skipsdist = True

[testenv]
Expand All @@ -16,7 +16,7 @@ commands =
python -m unittest -v

[testenv:lint]
basepython = python3.7
basepython = python3.9
deps =
pylint
ipython
Expand All @@ -26,7 +26,7 @@ commands =
# pylint -rn --rcfile={toxinidir}/.pylintrc qiskit_metal

[testenv:docs]
basepython = python3.7
basepython = python3.9
envdir = .tox/docs
passenv = DOCS_FROM_MASTER QISKIT_DOCS_BUILD_TUTORIALS
deps =
Expand All @@ -36,7 +36,7 @@ commands =
sphinx-build -b html {posargs} {toxinidir}/docs/ {toxinidir}/docs/_build/html

[testenv:gettext]
basepython = python3.7
basepython = python3.9
envdir = .tox/docs
deps =
-r requirements-dev.txt
Expand Down