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.

Sign up for GitHub

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

Chris global phase merge2 #11

Merged
merged 2 commits into from
Mar 4, 2020
Merged

Chris global phase merge2 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
becf84a
resolve merge conflicts with master
ewinston Mar 4, 2020
b050a5c
Merge branch 'chris_global_phase_merge' into chris_fork_test
ewinston Mar 4, 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
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ docs/ @nonhermitian @mtreinish
circuit/ @ajavadia @kdk @ewinston @1ucian0 @mtreinish
extensions/ @ajavadia @kdk @ewinston @1ucian0 @mtreinish
dagcircuit/ @ajavadia @kdk @1ucian0 @maddy-tod
providers/ @ajavadia @mtreinish @diego-plan9
providers/ @ajavadia @mtreinish @diego-plan9 @jyu00 @chriseclectic @ewinston
basicaer/ @chriseclectic @ajavadia
pulse/ @lcapelluto @taalexander @eggerdj @nkanazawa1989 @danpuzzuoli
scheduler/ @lcapelluto @taalexander @eggerdj @nkanazawa1989 @danpuzzuoli
quantum_info/ @chriseclectic @ajavadia
quantum_info/ @chriseclectic @ajavadia @ewinston
qi/ @chriseclectic @ajavadia
result/ @diego-plan9 @jyu00 @taalexander @mtreinish @ajavadia
schemas/ @diego-plan9 @dcmckayibm
Expand Down
10 changes: 5 additions & 5 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ stages:
TWINE_PASSWORD: $(TWINE_PASSWORD)
- job: 'macos'
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
pool: {vmImage: 'macOS-10.13'}
pool: {vmImage: 'macOS-10.15'}
variables:
python.version: '3.7'
CIBW_BEFORE_BUILD: pip install -U Cython
Expand Down Expand Up @@ -222,8 +222,8 @@ stages:
inputs:
pathtoPublish: 'docs/_build/html'
artifactName: 'html_docs'
- job: 'MacOS_HighSierra_Tests'
pool: {vmImage: 'macOS-10.13'}
- job: 'MacOS_Catalina_Tests'
pool: {vmImage: 'macOS-10.15'}
condition: not(startsWith(variables['Build.SourceBranch'], 'refs/tags'))
strategy:
matrix:
Expand Down Expand Up @@ -386,8 +386,8 @@ stages:
inputs:
testResultsFiles: '**/test-*.xml'
testRunTitle: 'Test results for Linux Python $(python.version)'
- job: 'MacOS_HighSierra_Tests'
pool: {vmImage: 'macOS-10.13'}
- job: 'MacOS_Catalina_Tests'
pool: {vmImage: 'macOS-10.15'}
condition: not(startsWith(variables['Build.SourceBranch'], 'refs/tags'))
strategy:
matrix:
Expand Down
33 changes: 0 additions & 33 deletions docs/apidocs/qiskit.rst
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docs/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Qiskit Terra documentation
:maxdepth: 2
:hidden:

API References <apidocs/qiskit>
API References <apidocs/terra>
Release Notes <release_notes>

.. Hiding - Indices and tables
Expand Down
Loading