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

Add python 3.8 support and deprecate python 3.5 #428

Merged
merged 32 commits into from
Jan 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
6552415
Add python 3.8 support and deprecate python 3.5
mtreinish Nov 11, 2019
319f1a0
Merge branch 'master' into deprecate-3.5
mtreinish Nov 12, 2019
956d001
Install numpy and scipy from conda forge
mtreinish Nov 12, 2019
b75e928
Merge branch 'master' into deprecate-3.5
mtreinish Nov 12, 2019
6679315
Add conda jupyter package to 38 windows job
mtreinish Nov 12, 2019
560f123
Conda install pywin32 too
mtreinish Nov 13, 2019
7a34a55
Cap jupyter-sphinx version to non python 3.8 jobs
mtreinish Nov 13, 2019
2a9cfe1
Stop trying to rely on conda-forge and just try pip
mtreinish Nov 13, 2019
19ce2ff
Merge branch 'master' into deprecate-3.5
mtreinish Nov 13, 2019
b90be6d
Add -v to pip install for debug
mtreinish Nov 13, 2019
de76d03
Don't upgrade pip and friends for python 3.8 windows job
mtreinish Nov 13, 2019
41f9324
Add osx job to premerge ci too
mtreinish Nov 14, 2019
7385b4a
Merge branch 'master' into deprecate-3.5
mtreinish Nov 14, 2019
e11557d
Merge branch 'master' into deprecate-3.5
mtreinish Dec 3, 2019
2fcc791
Fix typos in travis config
mtreinish Dec 3, 2019
6115a04
Merge branch 'master' into deprecate-3.5
mtreinish Dec 4, 2019
7f1938b
Merge branch 'master' into deprecate-3.5
mtreinish Dec 12, 2019
2230d86
Merge branch 'master' into deprecate-3.5
mtreinish Dec 19, 2019
7e03af3
Merge branch 'master' into deprecate-3.5
mtreinish Jan 2, 2020
37a048b
Merge branch 'master' into deprecate-3.5
mtreinish Jan 7, 2020
bf29cf4
Merge branch 'master' into deprecate-3.5
mtreinish Jan 17, 2020
94d7d16
Install osqp via conda
mtreinish Jan 17, 2020
bec238f
Fix typo in changelog
mtreinish Jan 18, 2020
a7cf7ae
Switch to bash for conda install on 3.8
mtreinish Jan 18, 2020
01a611e
Fix variable access
mtreinish Jan 18, 2020
82b6cb0
Break out 3.8 requirement binary stage and switch to cvxpy
mtreinish Jan 18, 2020
eef2547
Back to osqp cvxpy fails to install
mtreinish Jan 18, 2020
d62384e
Merge branch 'master' into deprecate-3.5
mtreinish Jan 20, 2020
48a8e95
Tweak stages on azure pipelines slightly
mtreinish Jan 20, 2020
1b56c80
Try splitting out dependency installs
mtreinish Jan 21, 2020
0222e9a
Install more python deps via conda
mtreinish Jan 21, 2020
492ed69
Fix bash variable access again
mtreinish Jan 21, 2020
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
13 changes: 13 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ jobs:

# "test" stage
###########################################################################
# GNU/Linux, Python 3.8
- stage: test
name: Python 3.8 Tests Linux
<<: *stage_linux
python: 3.8

# GNU/Linux, Python 3.7
- stage: test
name: Python 3.7 Tests Linux
Expand All @@ -137,6 +143,13 @@ jobs:
<<: *stage_linux
python: 3.5

- stage: test
name: Python 3.8 Tests OSX
<<: *stage_osx
python: 3.8
env:
- PYTHON_VERSION=3.8.0

# OSX, Python 3.7.2 (via pyenv)
- stage: test
name: Python 3.7 Tests OSX
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ Removed
Fixed
-----

Deprecated
----------

- Python 3.5 support in qiskit-aer is deprecated. Support will be
removed on the upstream python community's end of life date for the version,
which is 09/13/2020.



[0.3.2](https://github.com/Qiskit/qiskit-aer/compare/0.3.1...0.3.2) - 2019-10-16
===============================================================================
Expand Down
46 changes: 32 additions & 14 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,35 +45,53 @@ jobs:
python.version: '3.6'
Python37:
python.version: '3.7'
Python38:
python.version: '3.8'
steps:
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
displayName: Add conda to PATH
- script: conda create --yes --quiet --name qiskit-aer-$(Build.BuildNumber) python=%PYTHON_VERSION%
displayName: Create Anaconda environment
- script: |
call activate qiskit-aer-$(Build.BuildNumber)
conda install --yes --quiet --name qiskit-aer-$(Build.BuildNumber) python=%PYTHON_VERSION% numpy
- bash: |
set -x
set -e
source activate qiskit-aer-$(Build.BuildNumber)
conda install --yes --quiet --name qiskit-aer-$(Build.BuildNumber) python==$(python.version) numpy pip virtualenv
conda install -c conda-forge --yes --quiet --name qiskit-aer-$(Build.BuildNumber) python==$(python.version) setuptools
displayName: Install Anaconda packages
condition: ne(variables['python.version'], '3.5')
- script: |
call activate qiskit-aer-$(Build.BuildNumber)
conda install --yes --quiet --name qiskit-aer-$(Build.BuildNumber) python=%PYTHON_VERSION% mkl
conda install -c conda-forge --yes --quiet --name qiskit-aer-$(Build.BuildNumber) python=%PYTHON_VERSION% openblas
- bash: |
set -x
set -e
source activate qiskit-aer-$(Build.BuildNumber)
conda install --yes --quiet --name qiskit-aer-$(Build.BuildNumber) python=$(python.version) mkl
conda install -c conda-forge --yes --quiet --name qiskit-aer-$(Build.BuildNumber) python=$(python.version) openblas
displayName: Install Anaconda packages
condition: eq(variables['python.version'], '3.5')
condition: or(eq(variables['python.version'], '3.5'), eq(variables['python.version'], '3.8'))
- bash: |
set -e
source activate qiskit-aer-$(Build.BuildNumber)
git clean -fdX
python -m pip install -U pip virtualenv setuptools
pip install cython
conda install -c conda-forge --yes --quiet --name qiskit-aer-$(Build.BuildNumber) python=$(python.version) osqp
pip install -r requirements-dev.txt
pip install git+https://github.com/Qiskit/qiskit-terra.git
pip install --ignore-installed -r requirements-dev.txt
displayName: "Install dependencies py3.8"
condition: eq(variables['python.version'], '3.8')
- bash: |
set -e
source activate qiskit-aer-$(Build.BuildNumber)
pip install -r requirements-dev.txt
pip install git+https://github.com/Qiskit/qiskit-terra.git
displayName: "Install dependencies"
condition: ne(variables['python.version'], '3.8')
- bash: |
set -e
source activate qiskit-aer-$(Build.BuildNumber)
git clean -fdX
python setup.py bdist_wheel -- -G "Visual Studio 15 2017 Win64"
displayName: 'Install Dependencies and Build Aer'
displayName: 'Build Aer'
- bash: |
set -e
source activate qiskit-aer-$(Build.BuildNumber)
pip install dist/qiskit_aer*.whl
pip install -v dist/qiskit_aer*.whl
stestr run --slowest
displayName: 'Install Aer and Run Tests'
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ Sphinx>=1.8.3
sphinx-rtd-theme>=0.4.0
sphinx-tabs>=1.1.11
sphinx-automodapi
jupyter-sphinx
jupyter-sphinx;python_version<'3.8'
stestr>=2.5.0
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@ def find_qiskit_aer_packages():
"Operating System :: MacOS",
"Operating System :: POSIX :: Linux",
"Programming Language :: C++",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Topic :: Scientific/Engineering",
],
install_requires=requirements,
Expand Down