Skip to content

Commit

Permalink
Merge pull request Qiskit#559 from atilag/stable-0.5.4
Browse files Browse the repository at this point in the history
Stable 0.5.4
  • Loading branch information
atilag committed Jun 11, 2018
2 parents df613ef + 5c56f44 commit 2dd4770
Show file tree
Hide file tree
Showing 261 changed files with 2,157 additions and 4,458 deletions.
31 changes: 26 additions & 5 deletions .github/CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Issue reporting
~~~~~~~~~~~~~~~

This is a good point to start, when you find a problem please add
it to the `issue tracker <https://github.com/QISKit/qiskit-sdk-py/issues>`_.
it to the `issue tracker <https://github.com/QISKit/qiskit-core/issues>`_.
The ideal report should include the steps to reproduce it.

Doubts solving
Expand Down Expand Up @@ -63,10 +63,10 @@ Linux and Mac

.. code::
qiskit-sdk-py$ mkdir out
qiskit-sdk-py$ cd out
qiskit-sdk-py/out$ cmake ..
qiskit-sdk-py/out$ make
qiskit-core$ mkdir out
qiskit-core$ cd out
qiskit-core/out$ cmake ..
qiskit-core/out$ make
Windows

Expand Down Expand Up @@ -248,6 +248,27 @@ you are ready to start coding (yay!). We have two options here:
will remove the **[WIP]** prefix from the description once the PR is ready
to merge.

Pull request checklist
""""""""""""""""""""""

When submitting a pull request and you feel it is ready for review, please
double check that:

* the code follows the code style of the project. For convenience, you can
execute ``make style`` and ``make lint`` locally, which will print potential
style warnings and fixes.
* the documentation has been updated accordingly. In particular, if a function
or class has been modified during the PR, please update the docstring
accordingly.
* your contribution passes the existing tests, and if developing a new feature,
that you have added new tests that cover those changes.
* you add a new line to the ``CHANGELOG.rst`` file, in the ``UNRELEASED``
section, with the title of your pull request and its identifier (for example,
"``Replace OldComponent with FluxCapacitor (#123)``".

Commit messages
"""""""""""""""

Please follow the next rules for the commit messages:

- It should include a reference to the issue ID in the first line of the commit,
Expand Down
73 changes: 42 additions & 31 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,42 @@
<!--- Provide a general summary of the issue in the Title above -->

## Expected Behavior
<!--- If you're describing a bug, tell us what should happen -->
<!--- If you're suggesting a change/improvement, tell us how it should work -->

## Current Behavior
<!--- If describing a bug, tell us what happens instead of the expected behavior -->
<!--- If suggesting a change/improvement, explain the difference from current behavior -->

## Possible Solution
<!--- Not obligatory, but suggest a fix/reason for the bug, -->
<!--- or ideas how to implement the addition or change -->

## Steps to Reproduce (for bugs)
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->
1.
2.
3.
4.

## Context
<!--- How has this issue affected you? What are you trying to accomplish? -->
<!--- Providing context helps us come up with a solution that is most useful in the real world -->

## Your Environment
<!--- Include as many relevant details about the environment you experienced the bug in -->
* Version used:
* Environment name and version (e.g. Python 3.6.1):
* Operating System and version:
<!-- ⚠️ If you do not respect this template, your issue will be closed -->
<!-- ⚠️ Make sure to browse the opened and closed issues -->

*BUG TEMPLATE* <!-- Delete this header from your issue -->

### Informations

- **QISKit (Python SDK) version**:
- **Python version**:
- **Operating system**:

### What is the current behavior?



### Steps to reproduce the problem



### What is the expected behavior?



### Suggested solutions



---

*FEATURE REQUEST TEMPLATE* <!-- Delete this header from your issue -->

### What is the expected behavior?



---

*ENHANCEMENT REQUEST TEMPLATE* <!-- Delete this header from your issue -->

### What is the expected enhancement?


29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
name: 🐛 Bug report
about: Create a report to help us improve 🤔.
---

<!-- ⚠️ If you do not respect this template, your issue will be closed -->
<!-- ⚠️ Make sure to browse the opened and closed issues -->

### Informations

- **QISKit (Python SDK) version**:
- **Python version**:
- **Operating system**:

### What is the current behavior?



### Steps to reproduce the problem



### What is the expected behavior?



### Suggested solutions


11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/ENHANCEMENT_REQUEST.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
name: 💅 Enhancement request
about: Suggest an improvement for this project 🆒!
---

<!-- ⚠️ If you do not respect this template, your issue will be closed -->
<!-- ⚠️ Make sure to browse the opened and closed issues to confirm this idea does not exist. -->

### What is the expected enhancement?


11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
name: 🚀 Feature request
about: Suggest an idea for this project 💡!
---

<!-- ⚠️ If you do not respect this template, your issue will be closed -->
<!-- ⚠️ Make sure to browse the opened and closed issues to confirm this idea does not exist. -->

### What is the expected behavior?


37 changes: 12 additions & 25 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,18 @@
<!--- Provide a general summary of your changes in the Title above -->
<!--
⚠️ If you do not respect this template, your pull request will be closed.
⚠️ Your pull request title should be short detailed and understandable for all.
⚠️ Also, please add it in the CHANGELOG file under Unreleased section.
⚠️ If your pull request fixes an open issue, please link to the issue.
## Description
<!--- Describe your changes in detail -->
✅ I have added the tests to cover my changes.
✅ I have updated the documentation accordingly.
✅ I have read the CONTRIBUTING document.
-->

## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->
### Summary

## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->

## Screenshots (if appropriate):

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
### Details and comments


## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have read the **CONTRIBUTING** document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
22 changes: 6 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
# Copyright 2017 IBM RESEARCH. All Rights Reserved.
# Copyright 2017, IBM.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# =============================================================================
# This source code is licensed under the Apache License, Version 2.0 found in
# the LICENSE.txt file in the root directory of this source tree.

notifications:
email: false
Expand Down Expand Up @@ -153,15 +143,15 @@ jobs:
# github pages documentation update (GNU/Linux, Python 3.5)
- stage: deploy doc and pypi
<<: *stage_linux_no_compile
if: branch = stable and repo = QISKit/qiskit-sdk-py and type = push
if: branch = stable and repo = QISKit/qiskit-core and type = push
script: cd ..
deploy:
<<: *deploy_ghpages

# GNU/Linux, Python 3.5
- stage: deploy doc and pypi
<<: *stage_linux
if: branch = stable and repo = QISKit/qiskit-sdk-py and type = push
if: branch = stable and repo = QISKit/qiskit-core and type = push
install: mkdir out && cd out && cmake $CMAKE_FLAGS ..
script: cd ..
deploy:
Expand All @@ -170,7 +160,7 @@ jobs:
# OSX, Python 3.latest (brew does not support versions)
- stage: deploy doc and pypi
<<: *stage_osx
if: branch = stable and repo = QISKit/qiskit-sdk-py and type = push
if: branch = stable and repo = QISKit/qiskit-core and type = push
install: mkdir out && cd out && cmake $CMAKE_FLAGS ..
script: cd ..
deploy:
Expand Down
Loading

0 comments on commit 2dd4770

Please sign in to comment.