Skip to content

Commit

Permalink
Merge pull request #985 from Eric-Arellano/rm-qiskit-links
Browse files Browse the repository at this point in the history
  • Loading branch information
zlatko-minev authored Feb 13, 2024
2 parents c17f2da + 161d41d commit f4e0904
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 118 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Contributing to Qiskit Metal
Qiskit Metal follows the overall Qiskit project contributing guidelines. These are all included in the [Qiskit Documentation](https://qiskit.org/documentation/contributing_to_qiskit.html).
Qiskit Metal follows the overall Qiskit project contributing guidelines. These are all included in the [Qiskit Documentation](https://github.com/Qiskit/qiskit/blob/main/CONTRIBUTING.md).

Please read those general guidelines first, then the specific details for contributing to Metal below.

Expand Down
4 changes: 2 additions & 2 deletions README_developers.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Similarly, `jupyter lab` will in general execute python code from the `base` env

In the two above cases, you will need to setup a jupyter kernel that points to your `<env_name>` environment, to be able to find and execute successfully the qiskit-metal package.

Check for the instructions to install a new kernel in the [FAQ](https://qiskit.org/documentation/metal/faq.html).
Check for the instructions to install a new kernel in the [FAQ](https://qiskit-community.github.io/qiskit-metal/faq.html).

#### Subsequent updates of the conda environment

Expand Down Expand Up @@ -123,7 +123,7 @@ If you want to use the recently added open-source renderers for [Gmsh](./qiskit_

# Other Common Issues

For other common installation issues, please refer to the [FAQ](https://qiskit.org/documentation/metal/faq.html)
For other common installation issues, please refer to the [FAQ](https://qiskit-community.github.io/qiskit-metal/faq.html)

## Additional steps for developers

Expand Down
16 changes: 0 additions & 16 deletions docs/_templates/theme_variables.jinja

This file was deleted.

92 changes: 5 additions & 87 deletions docs/contributor-guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,7 @@ documentation locally and save the output to ``docs/_build/html``.
Additionally, the Docs CI job on azure pipelines will run this and host a zip
file of the output that you can download and view locally.

If you have an issue with the `combined documentation <https://qiskit.org/documentation/>`__
that is maintained in the `Qiskit/qiskit repo <https://github.com/Qiskit/qiskit>`__,
you can open a `documentation issue <https://github.com/Qiskit/qiskit/issues/new/choose>`__
You can open a `documentation issue <https://github.com/qiskit-community/qiskit-metal/issues/new/choose>`__
if you see doc bugs, have a new feature that needs to be documented, or think
that material could be added to the existing docs.

Expand Down Expand Up @@ -399,15 +397,14 @@ and that they want the display name of this file to be ``MyQComponent``.
Contributing to Documentation
*****************************

Qiskit documentation is shaped by the `docs as code
Qiskit Metal documentation is shaped by the `docs as code
<https://www.writethedocs.org/guide/docs-as-code/>`__ philosophy, primarily
drawn from Qiskit code comments in the `style of API documentation
drawn from Qiskit Metal code comments in the `style of API documentation
<https://alistapart.com/article/the-ten-essentials-for-good-api-documentation/>`__.

The documentation is built from the master branch of `Qiskit/qiskit/docs
<https://github.com/Qiskit/qiskit/tree/master/docs>`__ using `Sphinx
The documentation is built using `Sphinx
<http://www.sphinx-doc.org/en/master/>`__. The majority of documentation, under
`API Reference <https://qiskit.org/documentation/apidoc/qiskit.html>`__, is
`API Reference <https://qiskit-community.github.io/qiskit-metal/overview.html>`__, is
drawn from code comments in the repositories listed in :ref:`where_things_are`.


Expand Down Expand Up @@ -497,82 +494,3 @@ Tutorials

Jupyter notebook tutorials showing off features of Qiskit Metal are located in the `_tutorials_`
folder. If you add a new feature, please add a demonstration of its use to a notebook or start a new notebook.


Documentation Integration
-------------------------

The hosted documentation at https://qiskit.org/documentation/ covers the entire
Qiskit project; Metal is just one component of that. As such, the documentation
builds for the hosted version are built by the Qiskit meta-package repository
https://github.com/Qiskit/qiskit. When commits are merged to that repo, the
output of Sphinx builds are uploaded to the qiskit.org website. Those Sphinx
builds are configured to pull in the documentation from the version of the
Qiskit elements installed by the meta-package at that point. For example, if
the meta-package version is currently 0.13.0, then that will copy the
documentation from Metal's 0.10.0 release. When the meta-package's requirements
are bumped, then it will start pulling documentation from the new version. This
means that fixes for incorrect API documentation will need to be
included in a new release. Documentation fixes are valid backports for a stable
patch release per the stable branch policy (see that section below).

During the build process, the contents of each element's ``docs/apidocs/``
are recursively copied into a shared copy of ``doc/apidocs/`` in the meta-package
repository along with all the other elements. This means that what is in the root of
docs/apidocs on each element at a release will end up on the root of
https://qiskit.org/documentation/apidoc/.



Translating Documentation
=========================

Qiskit documentation is translated (localized) using Crowdin, a software and web
localization platform that allows organizations to coordinate translation
projects and collaborate with communities to translate materials. Crowdin allows
our community of translators to amplify their impact by automatically reusing
the work invested translating one sentence to translate other, similar
sentences. Crowdin also makes translations resilient to many types of changes to
the original material, such as moving sentences around, even across files.

Qiskit localization requests are handled in `Qiskit Translations <https://github.com/Qiskit/qiskit-translations>`__
repository. To contribute to Qiskit localization, please follow these steps:

#. Add your name (or ID) to the `LOCALIZATION_CONTRIBUTORS
<https://github.com/qiskit-community/qiskit-translations/blob/master/LOCALIZATION_CONTRIBUTORS>`__
file.
#. Create a pull request (PR) to merge your change. Make sure to follow the template
to open a Pull Request.

.. note::

- Each contributor has to create their own PR and sign the CLA.
- Please mention the language that you'd like to contribute to in the PR
summary.
- If you have an open issue for a language request, **add the issue link
to the PR**.
#. You will be asked to sign the Qiskit Contributors License Agreement (CLA);
please do so.
#. A minimum of **three contributors** per language are necessary for any new
languages to be added, to receive official support from the administrators of
the localization project.
#. Among the group of contributors, a translation lead must be identified to serve
as a liaison with the administrators of the localization project.
The lead must contact: Yuri Kobayashi (yurik@jp.ibm.com) by email.
#. In the `Qiskit-Docs <https://crowdin.com/project/qiskit-docs>`__
Crowdin project, choose the language that you want to contribute to.

.. note::

As mentioned in the blog post, `Qiskit in my language is Qiskit <https://medium.com/qiskit/qiskit-in-my-language-is-qiskit-73d4626a99d3>`__,
we want to make sure that translated languages have enough community support
to build a translation team with translators, proofreaders, and translation leads.
If you want to be a translation lead or would be willing to join a new
translation project team, you can open a `GitHub issue <https://github.com/qiskit-community/qiskit-translations/issues/new/choose>`__
to start a discussion with the Qiskit team and recruit translation project members.
#. Click the **Join** button and **paste the URL of your PR** in the dialog box where you
are asked why you want to join the Crowdin project.

The administrators of the Crowdin project will review your request and give you
access as quickly as they can.

2 changes: 1 addition & 1 deletion docs/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ Documentation

**Q: I am seeing a lot of warnings when I build the docs. How do I resolve them?**

**A:** There is no need to build the docs locally unless you *really* want to. The docs can be accessed without building them yourself by navigating to `<https://qiskit.org/documentation/metal/>`_.
**A:** There is no need to build the docs locally unless you *really* want to. The docs can be accessed without building them yourself by navigating to `<https://qiskit-community.github.io/qiskit-metal/>`_.

If you chose to build the docs yourself, some users may see a list of warnings when building the docs. Warnings about matplotlib text role can be safely ignored.

Expand Down
2 changes: 1 addition & 1 deletion docs/tut/quick-topics/Opening-documentation.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"metadata": {},
"source": [
"The documentation can be found here\n",
"https://qiskit.org/documentation/metal/"
"https://qiskit-community.github.io/qiskit-metal/"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion qiskit_metal/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
>>>>>> from the list of qiskit-metal package dependencies in Windows. <<<<<<\n \
>>>>>>>> Before you can use Qiskit Metal, please install geopandas. <<<<<<<<\n \
>>>> For more information, you can follow the instructions on this FAQ <<<<<\n \
>>>>>>>>>>>>> https://qiskit.org/documentation/metal/faq.html <<<<<<<<<<<<<<\n"
>>>>>>>>>>>>> https://qiskit-community.github.io/qiskit-metal/faq.html <<<<<<<<<<<<<<\n"
)
raise

Expand Down
5 changes: 2 additions & 3 deletions qiskit_metal/_gui/main_window.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

# This code is part of Qiskit.
#
# (C) Copyright IBM 2017, 2021.
Expand Down Expand Up @@ -221,7 +219,8 @@ def create_build_log_window(self, _=None):
@slot_catch_error()
def open_web_help(self, _=None):
""""Handles click on Build History button."""
webbrowser.open('https://qiskit.org/documentation/metal/', new=1)
webbrowser.open('https://qiskit-community.github.io/qiskit-metal/',
new=1)

@slot_catch_error()
def set_force_close(self, ison: bool):
Expand Down
4 changes: 1 addition & 3 deletions qiskit_metal/toolbox_metal/about.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# -*- coding: utf-8 -*-

# This code is part of Qiskit.
#
# (C) Copyright IBM 2017, 2021.
Expand Down Expand Up @@ -108,7 +106,7 @@ def get_module_doc_page(module,
return Path(os.path.dirname(module.__file__)) / folder / page


def open_docs(page='https://qiskit.org/documentation/metal/'):
def open_docs(page='https://qiskit-community.github.io/qiskit-metal/'):
"""Open the qiskit_metal documentation in HTML.
Open the URL in new window, raising the window if possible.
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
long_description_content_type="text/markdown",
url="https://github.com/Qiskit/qiskit-metal",
author="Qiskit Metal Development Team",
author_email="qiskit@qiskit.org",
author_email="qiskit@us.ibm.com",
license="Apache 2.0",
classifiers=[
"License :: OSI Approved :: Apache Software License",
Expand All @@ -54,7 +54,7 @@
install_requires=requirements,
project_urls={
"Bug Tracker": "https://github.com/Qiskit/qiskit-metal/issues",
"Documentation": "https://qiskit.org/documentation/metal",
"Documentation": "https://qiskit-community.github.io/qiskit-metal/",
"Source Code": "https://github.com/Qiskit/qiskit-metal",
},
)
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"metadata": {},
"source": [
"The documentation can be found here\n",
"https://qiskit.org/documentation/metal/"
"https://qiskit-community.github.io/qiskit-metal/"
]
},
{
Expand Down

0 comments on commit f4e0904

Please sign in to comment.