diff --git a/.github/workflows/cron-other.yml b/.github/workflows/cron-other.yml index d839a2cc4..d0d0c1e47 100644 --- a/.github/workflows/cron-other.yml +++ b/.github/workflows/cron-other.yml @@ -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 }} @@ -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 }} @@ -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 }} diff --git a/.github/workflows/cron-slow.yml b/.github/workflows/cron-slow.yml index de81e5853..174406410 100644 --- a/.github/workflows/cron-slow.yml +++ b/.github/workflows/cron-slow.yml @@ -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 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7d38fd304..784bc4234 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 4b0725d7b..45a148535 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -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 }} diff --git a/releasenotes/notes/remove-python-3.6-b350d50670076123.yaml b/releasenotes/notes/remove-python-3.6-b350d50670076123.yaml new file mode 100644 index 000000000..966b6cd14 --- /dev/null +++ b/releasenotes/notes/remove-python-3.6-b350d50670076123.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Python 3.6 support has been dropped since it is reaching end of life in Dec 2021. diff --git a/requirements-dev.txt b/requirements-dev.txt index db75504d6..751e72dec 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -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 @@ -25,4 +25,4 @@ qiskit_rng qiskit-aer websockets>=8 scikit-quant;platform_system != 'Windows' -qiskit-experiments; python_version > '3.6' +qiskit-experiments; diff --git a/setup.py b/setup.py index 870c62e67..b91377239 100644 --- a/setup.py +++ b/setup.py @@ -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", @@ -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", diff --git a/test/ibm/test_registration.py b/test/ibm/test_registration.py index 737a9d9a2..2c512a458 100644 --- a/test/ibm/test_registration.py +++ b/test/ibm/test_registration.py @@ -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 @@ -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) diff --git a/tox.ini b/tox.ini index a7141e1f7..2edcdeccd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 2.1 -envlist = py36, py37, py38, py39, lint, docs +envlist = py37, py38, py39, lint, docs skipsdist = True [testenv]