Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
speller26 authored Mar 2, 2023
2 parents d255b60 + a3635d6 commit 61dd745
Show file tree
Hide file tree
Showing 46 changed files with 1,679 additions and 3,657 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
name: Build and publish distribution to PyPi
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: Install wheel
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ name: Python package

on:
push:
branches: [ main ]
branches:
- main
pull_request:
branches: [ main ]
branches:
- main
- feature/**

jobs:
build:
Expand All @@ -16,12 +19,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.7, 3.8, 3.9]
python-version: ["3.8", "3.9", "3.10"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -37,4 +40,4 @@ jobs:
run: |
tox -e unit-tests
- name: Upload coverage report to Codecov
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ formats:

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
version: 3.8
install:
- method: pip
path: .
Expand Down
67 changes: 67 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,72 @@
# Changelog

## v1.11.2.post0 (2023-02-14)

### Testing and Release Infrastructure

* update github workflows for node12 retirement

## v1.11.2 (2023-02-11)

### Bug Fixes and Other Changes

* `shots=0` measurements with trainable params

## v1.11.1 (2023-02-09)

### Bug Fixes and Other Changes

* update: adding build for python 3.10
* Merge branch 'main' into test310
* testing python 3.10

## v1.11.0 (2023-02-01)

### Features

* Braket noise model for density matrix simulators

## v1.10.4 (2023-01-03)

### Bug Fixes and Other Changes

* Cap pennylane version at v0.27

### Testing and Release Infrastructure

* Use the new Pennylane Sphinx Theme

## v1.10.3 (2022-12-13)

### Bug Fixes and Other Changes

* Merge pull request #120 from aws/qaoa_bug_fix
* fixing linters
* removed qaoa integ test since it won't build on windows
* integrated with pl's device.use_grouping to fix a bug with qaoa creating multiple observables

## v1.10.2 (2022-12-08)

### Bug Fixes and Other Changes

* Only support adjoint gradient if shots=0

## v1.10.1 (2022-12-07)

### Bug Fixes and Other Changes

* Workaround for np.tensor around observable

## v1.10.0 (2022-12-07)

### Features

* adjoint gradient

### Bug Fixes and Other Changes

* remove env variable from integ tests

## v1.9.0 (2022-09-21)

### Features
Expand Down
5 changes: 1 addition & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Amazon Braket PennyLane Plugin
.. image:: https://img.shields.io/pypi/pyversions/amazon-braket-pennylane-plugin.svg
:alt: Supported Python Versions
:target: https://pypi.python.org/pypi/amazon-braket-pennylane-plugin
.. image:: https://img.shields.io/github/workflow/status/aws/amazon-braket-pennylane-plugin-python/Python%20package/main?logo=github
.. image:: https://img.shields.io/github/actions/workflow/status/aws/amazon-braket-strawberryfields-plugin-python/python-package.yml?branch=main&logo=github
:alt: Build Status
:target: https://github.com/aws/amazon-braket-pennylane-plugin-python/actions?query=workflow%3A%22Python+package%22
.. image:: https://codecov.io/gh/aws/amazon-braket-pennylane-plugin-python/branch/main/graph/badge.svg?token=VPPM8BJKW4
Expand All @@ -16,9 +16,6 @@ Amazon Braket PennyLane Plugin
.. image:: https://img.shields.io/readthedocs/amazon-braket-pennylane-plugin-python.svg?logo=read-the-docs
:alt: Documentation Status
:target: https://amazon-braket-pennylane-plugin-python.readthedocs.io/en/latest/?badge=latest
.. image:: https://img.shields.io/badge/code_style-black-000000.svg
:alt: Code Style: Black
:target: https://github.com/psf/black

The Amazon Braket PennyLane plugin offers two Amazon Braket quantum devices to work with PennyLane:

Expand Down
5 changes: 0 additions & 5 deletions doc/_templates/autosummary/base.rst

This file was deleted.

86 changes: 0 additions & 86 deletions doc/_templates/autosummary/class.rst

This file was deleted.

40 changes: 0 additions & 40 deletions doc/_templates/autosummary/module.rst

This file was deleted.

10 changes: 0 additions & 10 deletions doc/_templates/autosummary_core/base.rst

This file was deleted.

93 changes: 0 additions & 93 deletions doc/_templates/autosummary_core/class.rst

This file was deleted.

Loading

0 comments on commit 61dd745

Please sign in to comment.