Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.
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
6 changes: 3 additions & 3 deletions .github/workflows/cron-other.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]
os: ["windows-latest", "ubuntu-latest"]
env:
QISKIT_IBM_API_TOKEN: ${{ secrets.QISKIT_IBM_API_TOKEN }}
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]
os: ["windows-latest", "ubuntu-latest"]
env:
QISKIT_IBM_API_TOKEN: ${{ secrets.QISKIT_IBM_API_TOKEN }}
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]
os: ["windows-latest", "ubuntu-latest"]
env:
QISKIT_IBM_API_TOKEN: ${{ secrets.QISKIT_IBM_API_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cron-slow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
QISKIT_IN_PARALLEL: True
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.6
- name: Set up Python 3.7
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.7
- name: Install Deps
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
runs-on: macOS-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]
env:
QISKIT_IBM_API_TOKEN: ${{ secrets.QISKIT_IBM_API_TOKEN }}
QISKIT_IBM_API_URL: ${{ secrets.QISKIT_IBM_API_URL }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]
os: ["macOS-latest", "ubuntu-latest", "windows-latest"]
env:
QISKIT_IBM_API_TOKEN: ${{ secrets.QISKIT_IBM_API_TOKEN }}
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/remove-python-3.6-b350d50670076123.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
upgrade:
- |
Python 3.6 support has been dropped since it is reaching end of life in Dec 2021.
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ vcrpy
pproxy==2.1.8
Sphinx>=1.8.3
sphinx-rtd-theme>=0.4.0
sphinx-tabs>=1.1.11
sphinx-tabs>=1.1.11
sphinx-automodapi
sphinx-autodoc-typehints
matplotlib>=2.1
Expand All @@ -25,4 +25,4 @@ qiskit_rng
qiskit-aer
websockets>=8
scikit-quant;platform_system != 'Windows'
qiskit-experiments; python_version > '3.6'
qiskit-experiments;
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
"Operating System :: MacOS",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand All @@ -71,7 +70,7 @@
packages=setuptools.find_packages(exclude=['test*']),
install_requires=REQUIREMENTS,
include_package_data=True,
python_requires=">=3.6",
python_requires=">=3.7",
zip_safe=False,
extras_require={'visualization': ['matplotlib>=2.1', 'ipywidgets>=7.3.0',
"seaborn>=0.9.0", "plotly>=4.4",
Expand Down
7 changes: 0 additions & 7 deletions test/ibm/test_registration.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from unittest import skipIf
from typing import Dict, Any
import copy
import sys

from requests_ntlm import HttpNtlmAuth
from qiskit_ibm import IBMProvider
Expand Down Expand Up @@ -60,12 +59,6 @@ def test_load_account_no_credentials(self) -> None:
self.assertIn('No IBM Quantum credentials found',
str(context_manager.exception))

# Test not supported in Python 3.6 since patching a classmethod
# (in mock_ibm_provider) incorrectly throws
# TypeError: 'NonCallableMagicMock' object is not callable
# which was fixed in later versions
@skipIf(sys.version_info.major == 3 and sys.version_info.minor == 6,
'Test not supported on Python 3.6')
def test_store_credentials_overwrite(self) -> None:
"""Test overwriting qiskitrc credentials."""
credentials = Credentials('QISKITRC_TOKEN', url=QISKIT_IBM_API_URL)
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 = 2.1
envlist = py36, py37, py38, py39, lint, docs
envlist = py37, py38, py39, lint, docs
skipsdist = True

[testenv]
Expand Down