feat: tabbed setup

henryiii · henryiii · commit 715412f2a80d · 2021-01-29T14:44:38.000-05:00
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,6 @@
 sphinx==3.2.0
 sphinx-autobuild==0.7.1
+sphinx-tabs==2.0.0
 git+https://github.com/python/python-docs-theme.git#egg=python-docs-theme
 git+https://github.com/pypa/pypa-docs-theme.git#egg=pypa-docs-theme
+
diff --git a/source/conf.py b/source/conf.py
@@ -34,6 +34,7 @@
     'sphinx.ext.extlinks',
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
+    'sphinx_tabs.tabs',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/source/index.rst b/source/index.rst
@@ -38,13 +38,13 @@ Get started
 Essential tools and concepts for working within the Python
 development ecosystem are covered in our :doc:`tutorials/index` section:
 
-* to learn how to install packages, see the
+* To learn how to install packages, see the
   :doc:`tutorial on installing packages <tutorials/installing-packages>`.
-* to learn how to manage dependencies in a version controlled project, see the
+* To learn how to manage dependencies in a version controlled project, see the
   :doc:`tutorial on managing application dependencies <tutorials/managing-dependencies>`.
-* to learn how to package and distribute your projects, see the
-  :doc:`tutorial on packaging and distributing <tutorials/packaging-projects>`
-* to get an overview of packaging options for Python libraries and
+* To learn how to package and distribute your projects, see the
+  :doc:`tutorial on packaging and distributing <tutorials/packaging-projects>`.
+* To get an overview of packaging options for Python libraries and
   applications, see the :doc:`Overview of Python Packaging <overview>`.
 
 
@@ -53,11 +53,11 @@ Learn more
 
 Beyond our :doc:`tutorials/index`, this guide has several other resources:
 
-* the :doc:`guides/index` section for walk throughs, such as
-  :doc:`guides/installing-using-linux-tools` or :doc:`guides/packaging-binary-extensions`
-* the :doc:`discussions/index` section for in-depth references on topics such as
-  :doc:`discussions/deploying-python-applications` or :doc:`discussions/pip-vs-easy-install`
-* the :doc:`specifications/index` section for packaging interoperability specifications
+* The :doc:`guides/index` section for walk throughs, such as
+  :doc:`guides/installing-using-linux-tools` or :doc:`guides/packaging-binary-extensions`.
+* The :doc:`discussions/index` section for in-depth references on topics such as
+  :doc:`discussions/deploying-python-applications` or :doc:`discussions/pip-vs-easy-install`.
+* The :doc:`specifications/index` section for packaging interoperability specifications.
 
 Additionally, there is a list of :doc:`other projects <key_projects>` maintained
 by members of the Python Packaging Authority.
diff --git a/source/tutorials/packaging-projects.rst b/source/tutorials/packaging-projects.rst
@@ -95,97 +95,182 @@ would be completely different than the setuptools configuration described
 below. See :pep:`517` and :pep:`518` for background and details.
 
 
-Creating setup.cfg
-------------------
-
-:file:`setup.cfg` is the configuration file for :ref:`setuptools`. It tells
-setuptools about your package (such as the name and version) as well as which
-code files to include. Eventually much of this configuration may be able to move
-to :file:`pyproject.toml`.
-
-Open :file:`setup.py` and enter the following content. Update the package name
-to include your username (for example, ``example-pkg-theacodes``), this ensures
-that you have a unique package name and that your package doesn't conflict with
-packages uploaded by other people following this tutorial.
-
-.. code-block:: python
-
-    [metadata]
-    # replace with your username:
-    name = example-pkg-YOUR-USERNAME-HERE
-    version = 0.0.1
-    url = https://github.com/pypa/sampleproject
-    author = Example Author
-    author_email = author@example.com
-    classifiers =
-        Programming Language :: Python :: 3
-        License :: OSI Approved :: MIT License
-        Operating System :: OS Independent
-    description = A small example package
-    long_description = file: README.md
-    long_description_content_type = text/markdown
-
-    [options]
-    python_requires = >=3.6
-
-
-There are a `variety of metadata and options
-<https://setuptools.readthedocs.io/en/latest/userguide/declarative_config.html>`_
-supported here. This is in configparser format; do not place quotes around values.
-This example package uses a relatively minimal set of options:
-
-- ``name`` is the *distribution name* of your package. This can be any name as
-  long as only contains letters, numbers, ``_`` , and ``-``. It also must not
-  already be taken on pypi.org. **Be sure to update this with your username,**
-  as this ensures you won't try to upload a package with the same name as one
-  which already exists when you upload the package.
-- ``version`` is the package version see :pep:`440` for more details on
-  versions. You can use ``file:`` or ``attr:`` directives to read from a file or
-  package attribute (simple attributes do not require import).
-- ``author`` and ``author_email`` are used to identify the author of the
-  package.
-- ``description`` is a short, one-sentence summary of the package.
-- ``long_description`` is a detailed description of the package. This is
-  shown on the package detail page on the Python Package Index. In
-  this case, the long description is loaded from :file:`README.md` which is
-  a common pattern, using the ``file:`` directive.
-- ``long_description_content_type`` tells the index what type of markup is
-  used for the long description. In this case, it's Markdown.
-- ``url`` is the URL for the homepage of the project. For many projects, this
-  will just be a link to GitHub, GitLab, Bitbucket, or similar code hosting
-  service.
-- ``packages`` is a list of all Python :term:`import packages <Import
-  Package>` that should be included in the :term:`Distribution Package`.
-  Instead of listing each package manually, we can use the ``find:`` directive
-  to automatically discover all packages and subpackages. In this case, the
-  list of packages will be ``example_pkg`` as that's the only package present.
-- ``classifiers`` gives the index and :ref:`pip` some additional metadata
-  about your package. In this case, the package is only compatible with Python
-  3, is licensed under the MIT license, and is OS-independent. You should
-  always include at least which version(s) of Python your package works on,
-  which license your package is available under, and which operating systems
-  your package will work on. For a complete list of classifiers, see
-  https://pypi.org/classifiers/.
-
-There are many more than the ones mentioned here. See
-:doc:`/guides/distributing-packages-using-setuptools` for more details.
-
-Creating setup.py (optional)
-----------------------------
-
-If you create a setup.py file, this will enable direct interaction with
-:file:`setup.py` (which generally should be avoided), and editable installs. This file
-used to be required, but can be omitted in modern setuptools.
-
-Anything you set in setup.cfg can instead be set via keyword argument to
-:func:`setup()`; this enables computed values to be used. You will also need
-:func:`setup()` for setting up extension modules for compilation.
-
-.. code-block:: python
-
-    import setuptools
-
-    setuptools.setup()
+Creating setup.cfg and setup.py
+-------------------------------
+
+You can place the metadata for your project in one of two places. Static
+information should be placed in :file:`setup.cfg`. This is simpler, easier to
+read, and avoids many common errors, like encoding errors. Any items that are
+dynamic, as well as extension modules or extensions to setuptools, need to go
+into :file:`setup.py`. You can completely configure via :file:`setup.py` if you
+really want to; both methods are shown below.
+
+.. tabs::
+
+  .. tab:: Configure with setup.cfg (static)
+
+    :file:`setup.cfg` is the configuration file for :ref:`setuptools`. It tells
+    setuptools about your package (such as the name and version) as well as which
+    code files to include. Eventually much of this configuration may be able to move
+    to :file:`pyproject.toml`.
+
+    Open :file:`setup.py` and enter the following content. Update the package name
+    to include your username (for example, ``example-pkg-theacodes``), this ensures
+    that you have a unique package name and that your package doesn't conflict with
+    packages uploaded by other people following this tutorial.
+
+    .. code-block:: python
+
+        [metadata]
+        # replace with your username:
+        name = example-pkg-YOUR-USERNAME-HERE
+        version = 0.0.1
+        url = https://github.com/pypa/sampleproject
+        author = Example Author
+        author_email = author@example.com
+        classifiers =
+            Programming Language :: Python :: 3
+            License :: OSI Approved :: MIT License
+            Operating System :: OS Independent
+        description = A small example package
+        long_description = file: README.md
+        long_description_content_type = text/markdown
+
+        [options]
+        python_requires = >=3.6
+
+
+    There are a `variety of metadata and options
+    <https://setuptools.readthedocs.io/en/latest/userguide/declarative_config.html>`_
+    supported here. This is in configparser format; do not place quotes around values.
+    This example package uses a relatively minimal set of options:
+
+    - ``name`` is the *distribution name* of your package. This can be any name as
+      long as only contains letters, numbers, ``_`` , and ``-``. It also must not
+      already be taken on pypi.org. **Be sure to update this with your username,**
+      as this ensures you won't try to upload a package with the same name as one
+      which already exists when you upload the package.
+    - ``version`` is the package version see :pep:`440` for more details on
+      versions. You can use ``file:`` or ``attr:`` directives to read from a file or
+      package attribute (simple attributes do not require import).
+    - ``author`` and ``author_email`` are used to identify the author of the
+      package.
+    - ``description`` is a short, one-sentence summary of the package.
+    - ``long_description`` is a detailed description of the package. This is
+      shown on the package detail page on the Python Package Index. In
+      this case, the long description is loaded from :file:`README.md` which is
+      a common pattern, using the ``file:`` directive.
+    - ``long_description_content_type`` tells the index what type of markup is
+      used for the long description. In this case, it's Markdown.
+    - ``url`` is the URL for the homepage of the project. For many projects, this
+      will just be a link to GitHub, GitLab, Bitbucket, or similar code hosting
+      service.
+    - ``packages`` is a list of all Python :term:`import packages <Import
+      Package>` that should be included in the :term:`Distribution Package`.
+      Instead of listing each package manually, we can use the ``find:`` directive
+      to automatically discover all packages and subpackages. In this case, the
+      list of packages will be ``example_pkg`` as that's the only package present.
+    - ``classifiers`` gives the index and :ref:`pip` some additional metadata
+      about your package. In this case, the package is only compatible with Python
+      3, is licensed under the MIT license, and is OS-independent. You should
+      always include at least which version(s) of Python your package works on,
+      which license your package is available under, and which operating systems
+      your package will work on. For a complete list of classifiers, see
+      https://pypi.org/classifiers/.
+
+    There are many more than the ones mentioned here. See
+    :doc:`/guides/distributing-packages-using-setuptools` for more details.
+
+
+    If you create a :file:`setup.py` file, this will enable direct interaction
+    with :file:`setup.py` (which generally should be avoided), and editable
+    installs. This file used to be required, but can be omitted in modern
+    setuptools.
+
+    Anything you set in :file:`setup.cfg` can instead be set via keyword argument to
+    :func:`setup()`; this enables computed values to be used. You will also need
+    :func:`setup()` for setting up extension modules for compilation.
+
+    .. code-block:: python
+
+        import setuptools
+
+        setuptools.setup()
+
+  .. tab:: Configure with setup.py (dynamic)
+
+    :file:`setup.py` is the build script for :ref:`setuptools`. It tells setuptools
+    about your package (such as the name and version) as well as which code files
+    to include.
+
+    Open :file:`setup.py` and enter the following content. Update the package name
+    to include your username (for example, ``example-pkg-theacodes``), this ensures
+    that you have a unique package name and that your package doesn't conflict with
+    packages uploaded by other people following this tutorial.
+
+    .. code-block:: python
+
+        import setuptools
+
+        with open("README.md", "r", encoding="utf-8") as fh:
+            long_description = fh.read()
+
+        setuptools.setup(
+            name="example-pkg-YOUR-USERNAME-HERE", # Replace with your own username
+            version="0.0.1",
+            author="Example Author",
+            author_email="author@example.com",
+            description="A small example package",
+            long_description=long_description,
+            long_description_content_type="text/markdown",
+            url="https://github.com/pypa/sampleproject",
+            packages=setuptools.find_packages(),
+            classifiers=[
+                "Programming Language :: Python :: 3",
+                "License :: OSI Approved :: MIT License",
+                "Operating System :: OS Independent",
+            ],
+            python_requires='>=3.6',
+        )
+
+
+    :func:`setup` takes several arguments. This example package uses a relatively
+    minimal set:
+
+    - ``name`` is the *distribution name* of your package. This can be any name as
+      long as only contains letters, numbers, ``_`` , and ``-``. It also must not
+      already be taken on pypi.org. **Be sure to update this with your username,**
+      as this ensures you won't try to upload a package with the same name as one
+      which already exists when you upload the package.
+    - ``version`` is the package version see :pep:`440` for more details on
+      versions.
+    - ``author`` and ``author_email`` are used to identify the author of the
+      package.
+    - ``description`` is a short, one-sentence summary of the package.
+    - ``long_description`` is a detailed description of the package. This is
+      shown on the package detail page on the Python Package Index. In
+      this case, the long description is loaded from :file:`README.md` which is
+      a common pattern.
+    - ``long_description_content_type`` tells the index what type of markup is
+      used for the long description. In this case, it's Markdown.
+    - ``url`` is the URL for the homepage of the project. For many projects, this
+      will just be a link to GitHub, GitLab, Bitbucket, or similar code hosting
+      service.
+    - ``packages`` is a list of all Python :term:`import packages <Import
+      Package>` that should be included in the :term:`Distribution Package`.
+      Instead of listing each package manually, we can use :func:`find_packages`
+      to automatically discover all packages and subpackages. In this case, the
+      list of packages will be ``example_pkg`` as that's the only package present.
+    - ``classifiers`` gives the index and :ref:`pip` some additional metadata
+      about your package. In this case, the package is only compatible with Python
+      3, is licensed under the MIT license, and is OS-independent. You should
+      always include at least which version(s) of Python your package works on,
+      which license your package is available under, and which operating systems
+      your package will work on. For a complete list of classifiers, see
+      https://pypi.org/classifiers/.
+
+    There are many more than the ones mentioned here. See
+    :doc:`/guides/distributing-packages-using-setuptools` for more details.
 
 Creating README.md
 ------------------

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`'sphinx.ext.extlinks',`
`35`	`35`	`'sphinx.ext.intersphinx',`
`36`	`36`	`'sphinx.ext.todo',`
	`37`	`+ 'sphinx_tabs.tabs',`
`37`	`38`	`]`
`38`	`39`
`39`	`40`	`# Add any paths that contain templates here, relative to this directory.`