diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml index 03e73be7..9efb4440 100644 --- a/.github/actions/run-tests/action.yml +++ b/.github/actions/run-tests/action.yml @@ -1,6 +1,6 @@ # This code is part of Qiskit. # -# (C) Copyright IBM 2021, 2022. +# (C) Copyright IBM 2021, 2023. # # 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 @@ -40,8 +40,8 @@ runs: if [ "${{ inputs.event-name }}" == "schedule" ] || [ "${{ inputs.run-slow }}" == "true" ]; then export QISKIT_TESTS="run_slow" fi - if [ "${{ inputs.python-version }}" == "3.7" ]; then + if [ "${{ inputs.os }}" == "ubuntu-latest" ] && [ "${{ inputs.python-version }}" == "3.8" ]; then export PYTHON="coverage3 run --source qiskit_finance --parallel-mode" fi stestr --test-path test run 2> >(tee /dev/stderr out.txt > /dev/null) - shell: bash \ No newline at end of file + shell: bash diff --git a/.github/workflows/deploy-code.yml b/.github/workflows/deploy-code.yml index 8a63e6b7..6e8c28ba 100644 --- a/.github/workflows/deploy-code.yml +++ b/.github/workflows/deploy-code.yml @@ -1,6 +1,6 @@ # This code is part of Qiskit. # -# (C) Copyright IBM 2021, 2022. +# (C) Copyright IBM 2021, 2023. # # 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 @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7] + python-version: [3.8] steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7a2e2e3d..7af4e5ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: [3.7] + python-version: [3.8] steps: - name: Print Concurrency Group env: @@ -116,7 +116,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - python-version: [3.7, 3.8, 3.9, '3.10', 3.11] + python-version: [3.8, 3.9, '3.10', 3.11] include: - os: macos-latest python-version: 3.8 @@ -194,7 +194,7 @@ jobs: fi coverage3 combine mv .coverage ./ci-artifact-data/fin.dat - if: ${{ matrix.python-version == 3.7 }} + if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == 3.8 }} shell: bash - uses: actions/upload-artifact@v3 with: @@ -286,16 +286,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7] + python-version: [3.8] steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - uses: actions/download-artifact@v3 - with: - name: ubuntu-latest-3.7 - path: /tmp/f37 - uses: actions/download-artifact@v3 with: name: ubuntu-latest-3.8 @@ -333,10 +329,10 @@ jobs: shell: bash - name: Combined Deprecation Messages run: | - sort -f -u /tmp/f37/fin.dep /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/m38/fin.dep /tmp/m311/fin.dep /tmp/w38/fin.dep /tmp/w310/fin.dep || true shell: bash - name: Coverage combine - run: coverage3 combine /tmp/f37/fin.dat + run: coverage3 combine /tmp/f38/fin.dat shell: bash - name: Upload to Coveralls env: diff --git a/.mergify.yml b/.mergify.yml index 93cc95ba..e09a8b74 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,12 +1,12 @@ queue_rules: - name: automerge conditions: - - check-success=Deprecation_Messages_and_Coverage (3.7) + - check-success=Deprecation_Messages_and_Coverage (3.8) pull_request_rules: - name: automatic merge on CI success and review conditions: - - check-success=Deprecation_Messages_and_Coverage (3.7) + - check-success=Deprecation_Messages_and_Coverage (3.8) - "#approved-reviews-by>=1" - label=automerge - label!=on hold diff --git a/pyproject.toml b/pyproject.toml index ef38a037..f9728a2b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,4 +4,4 @@ build-backend = "setuptools.build_meta" [tool.black] line-length = 100 -target-version = ['py37', 'py38', 'py39', 'py310', 'py311'] +target-version = ['py38', 'py39', 'py310', 'py311'] diff --git a/releasenotes/notes/drop_python_3_7-d90741833dc57229.yaml b/releasenotes/notes/drop_python_3_7-d90741833dc57229.yaml new file mode 100644 index 00000000..5c4c9d23 --- /dev/null +++ b/releasenotes/notes/drop_python_3_7-d90741833dc57229.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Support for running with Python 3.7 has been removed. To run Finance you need + a minimum Python version of 3.8. diff --git a/setup.py b/setup.py index 7bd636e8..9c7eda5e 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,6 @@ "Operating System :: MacOS", "Operating System :: POSIX :: Linux", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", @@ -68,7 +67,7 @@ packages=setuptools.find_packages(include=['qiskit_finance', 'qiskit_finance.*']), install_requires=REQUIREMENTS, include_package_data=True, - python_requires=">=3.7", + python_requires=">=3.8", project_urls={ "Bug Tracker": "https://github.com/qiskit-community/qiskit-finance/issues", "Documentation": "https://qiskit.org/ecosystem/finance/", diff --git a/tox.ini b/tox.ini index 34d1c352..d31dc458 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.3.0 -envlist = py37, py38, py39, py310, py311, lint +envlist = py38, py39, py310, py311, lint skipsdist = True [testenv]