diff options
author | Stephen Finucane <sfinucan@redhat.com> | 2018-04-03 15:40:14 +0100 |
---|---|---|
committer | Stephen Finucane <sfinucan@redhat.com> | 2018-07-23 11:04:39 +0100 |
commit | 8ea9d9262de318bf24d32246e6891d7a39d4b91b (patch) | |
tree | 7eae0dcbd4ee510c3db7b10f2f180a90c4bae7e8 /doc/source/user | |
parent | 6f5c1ee8e4e9c1c05f16b7dfe57c3245ad38b0cf (diff) | |
download | pbr-8ea9d9262de318bf24d32246e6891d7a39d4b91b.tar.gz |
packaging: Remove support for pyN requirement files
Change-Id: I7f915ecdc819bc4d3c6811949f12bdadb108a1ab
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
Diffstat (limited to 'doc/source/user')
-rw-r--r-- | doc/source/user/features.rst | 10 | ||||
-rw-r--r-- | doc/source/user/using.rst | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/doc/source/user/features.rst b/doc/source/user/features.rst index dfbc18b..b8c0a1e 100644 --- a/doc/source/user/features.rst +++ b/doc/source/user/features.rst @@ -200,14 +200,16 @@ for your project and will then parse these files, split them up appropriately, and inject them into the ``install_requires``, ``tests_require`` and/or ``dependency_links`` arguments to ``setup``. Voila! -You can also have a requirement file for each specific major version of Python. -If you want to have a different package list for Python 3 then just drop a -``requirements-py3.txt`` and it will be used instead. - Finally, it is possible to specify groups of optional dependencies, or :ref:`"extra" requirements <extra-requirements>`, in your ``setup.cfg`` rather than ``setup.py``. +.. versionchanged:: 5.0 + + Previously you could specify requirements for a given major version of + Python using requirments files with a ``-pyN`` suffix. This was deprecated + in 4.0 and removed in 5.0 in favour of environment markers. + Automatic File Generation ------------------------- diff --git a/doc/source/user/using.rst b/doc/source/user/using.rst index b5e28eb..0104640 100644 --- a/doc/source/user/using.rst +++ b/doc/source/user/using.rst @@ -382,20 +382,18 @@ Requirements Requirements files are used in place of the ``install_requires`` and ``extras_require`` attributes. Requirement files should be given one of the -below names. This order is also the order that the requirements are tried in -(where ``N`` is the Python major version number used to install the package): +below names. This order is also the order that the requirements are tried in: -* ``requirements-pyN.txt`` -* ``tools/pip-requires-py3`` * ``requirements.txt`` * ``tools/pip-requires`` Only the first file found is used to install the list of packages it contains. -.. note:: +.. versionchanged:: 5.0 - The ``requirements-pyN.txt`` file is deprecated - ``requirements.txt`` - should be universal. You can use `Environment markers`_ for this purpose. + Previously you could specify requirements for a given major version of + Python using requirements files with a ``-pyN`` suffix. This was deprecated + in 4.0 and removed in 5.0 in favour of environment markers. .. _extra-requirements: |