Skip to content

Commit

Permalink
Merge branch 'master' into update_sampler
Browse files Browse the repository at this point in the history
  • Loading branch information
rmoyard authored Apr 5, 2022
2 parents 69fc784 + dec8275 commit 0091ebd
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 8 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
# Release 0.23.0-dev

### New features since last release

### Breaking changes

### Improvements

### Documentation

### Bug fixes

### Contributors

This release contains contributions from (in alphabetical order):

---

# Release 0.22.0

### Improvements
Expand Down
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,11 @@
"table_header_border": "#19b37b",
"download_button": "#19b37b",
# gallery options
# "github_repo": "XanaduAI/PennyLane",
# "github_repo": "PennyLaneAI/PennyLane",
# "gallery_dirs": "tutorials",
}

edit_on_github_project = 'XanaduAI/pennylane-qiskit'
edit_on_github_project = 'PennyLaneAI/pennylane-qiskit'
edit_on_github_branch = 'master/doc'

# -- Options for HTMLHelp output ------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ pygments==2.7.4
git+https://github.com/XanaduAI/pennylane.git#egg=pennylane
dc-qiskit-algorithms
sphinx-automodapi
jinja2==3.0.3
6 changes: 3 additions & 3 deletions doc/xanadu_theme/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h5 class=" mb-1 footer-heading">PennyLane</h5>
<hr width=100px class="d-inline-block mt-0 mb-1 Deep-purple accent-4">
<ul class="list-unstyled">
<li><a class="" href="https://pennylane.ai/">Home page</a></li>
<li><a class="" href="https://github.com/XanaduAI/pennylane">GitHub</a></li>
<li><a class="" href="https://github.com/PennyLaneAI/pennylane">GitHub</a></li>
<li><a class="" href="https://pennylane.readthedocs.io/">Documentation</a></li>
<li><a class="" href="https://discuss.pennylane.ai/">Discussion forum</a></li>
<li><a class="" href="https://twitter.com/pennylaneai/">Twitter</a></li>
Expand All @@ -38,9 +38,9 @@ <h5 class=" mb-1 footer-heading">About</h5>
<ul class="list-unstyled">
<li><a class="" href="https://www.xanadu.ai/">Home</a></li>
<li><a class="" href="https://www.xanadu.ai/hardware/">Hardware</a></li>
<li><a class="" href="https://www.xanadu.ai/software/">Software</a></li>
<li><a class="" href="https://www.xanadu.ai/pennylane/">PennyLane</a></li>
<li><a class="" href="https://www.xanadu.ai/research">Research</a></li>
<li><a class="" href="https://medium.com/XanaduAI">Blog</a></li>
<li><a class="" href="https://pennylane.ai/blog">Blog</a></li>
<li><a class="" href="https://www.xanadu.ai/about/">About</a></li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/xanadu_theme/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://github.com/XanaduAI/PennyLane-Qiskit">
<a class="nav-link" href="https://github.com/PennyLaneAI/PennyLane-Qiskit">
<i class="fab fa-github"></i> GitHub
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion doc/xanadu_theme/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
var tutorialUrlArray = $("#tutorial-type").text().split('/');
tutorialUrlArray[0] = "examples"

var githubLink = "https://github.com/XanaduAI/pennylane/blob/master/" + tutorialUrlArray.join("/") + ".py",
var githubLink = "https://github.com/PennyLaneAI/pennylane/blob/master/" + tutorialUrlArray.join("/") + ".py",
pythonLink = $(".reference.download")[0].href,
notebookLink = $(".reference.download")[1].href,
notebookDownloadPath = notebookLink.split('_downloads')[1].split('/').pop();
Expand Down
2 changes: 1 addition & 1 deletion pennylane_qiskit/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
Version number (major.minor.patch[-label])
"""

__version__ = "0.22.0"
__version__ = "0.23.0-dev"

0 comments on commit 0091ebd

Please sign in to comment.