summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2020-11-28 21:04:12 -0600
committerMichael Merickel <michael@merickel.org>2020-11-28 21:29:51 -0600
commit044a55a91daa854b2a529804641cc4219a7a9573 (patch)
tree48ef734e5e12690b999db46a8cb4c8bff7d7c4d2 /docs/glossary.rst
parent7821fee97cd7611870d0e639aece8fa271c6e1ce (diff)
downloadpyramid-044a55a91daa854b2a529804641cc4219a7a9573.tar.gz
pyramid-044a55a91daa854b2a529804641cc4219a7a9573.tar.bz2
pyramid-044a55a91daa854b2a529804641cc4219a7a9573.zip
cleanup some terminology
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst28
1 files changed, 10 insertions, 18 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index e0d4a1318..17e3e4822 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -48,12 +48,8 @@ Glossary
builds on Python's ``distutils`` to provide easier building,
distribution, and installation of libraries and applications.
- distribute
- `Distribute <https://pypi.org/project/distribute/>`_ is a fork of :term:`Setuptools` which runs on both Python 2 and Python 3.
- It is now in legacy state because :term:`Setuptools` now runs on both Python 2 and 3.
-
pkg_resources
- A module which ships with :term:`Setuptools` and :term:`distribute` that
+ A module which ships with :term:`Setuptools` that
provides an API for addressing "asset files" within a Python
:term:`package`. Asset files are static files, template files, etc;
basically anything non-Python-source that lives in a Python package can
@@ -87,23 +83,19 @@ Glossary
:term:`package`.
project
- (Setuptools/distutils terminology). A directory on disk which
- contains a ``setup.py`` file and one or more Python packages. The
- ``setup.py`` file contains code that allows the package(s) to be
- installed, distributed, and tested.
+ Setuptools / Python packaging terminology.
+ A directory on disk which contains a ``setup.py`` and / or ``pyproject.toml`` file and one or more Python packages.
+ The project files contain metadata that allow the package(s) to be installed, distributed, and tested.
distribution
- (Setuptools/distutils terminology). A file representing an
+ Setuptools / python packaging terminology. A file representing an
installable library or application. Distributions are usually
- files that have the suffix of ``.egg``, ``.tar.gz``, or ``.zip``.
- Distributions are the target of Setuptools-related commands such as
- ``easy_install``.
+ archives that have the suffix of ``.whl``, ``.tar.gz``, or ``.zip``.
+ Distributions are the target of packaging-related commands such as ``pip install``.
entry point
- A :term:`Setuptools` indirection, defined within a Setuptools
- :term:`distribution` setup.py. It is usually a name which refers
- to a function somewhere in a package which is held by the
- distribution.
+ A :term:`Setuptools` indirection, defined within a Setuptools :term:`distribution` (usually in ``setup.py`` or ``setup.cfg``).
+ It is usually a name which refers to a function somewhere in a package which is held by the distribution.
dotted Python name
A reference to a Python object by name using a string, in the form
@@ -1083,7 +1075,7 @@ Glossary
https://docs.pylonsproject.org/projects/waitress/en/latest/ for detailed
information.
- Green Unicorn
+ gunicorn
Aka ``gunicorn``, a fast :term:`WSGI` server that runs on Unix under
Python 2.6+ or Python 3.4+. See https://gunicorn.org/ for detailed
information.