diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst index bd99173029c73755ef6338700ab721f28eec2918..ed9e8fbca4c93cdce7c7cbd71a030c7bd3e21db3 100644 --- a/docs/releasenotes.rst +++ b/docs/releasenotes.rst @@ -31,6 +31,9 @@ run applications using Debian-only repositories. the minimum version required, allowing to be more specific to avoid unnecessary warning mails being sent out. + * Updated default package pins for virtual environments used to + check for available pip package upgrades. + * ``xmpp_server`` role * Drop dependency on the external (Prosody) package diff --git a/docs/rolereference.rst b/docs/rolereference.rst index 11db8e3aaaba9d947191c3b2a359ef4502e48f2f..06891a1d4543ef6efa6e910beda68d4358c031e9 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -422,7 +422,7 @@ Parameters the check itself. For Python 3, see the dedicated parameter ``pip_check_requirements_py3`` below. -**pip_check_requirements** (list, optional, ``[click==7.0, pip-tools==4.0.0, pip==19.2.3, setuptools==41.2.0, six==1.12.0, wheel==0.33.6]``) +**pip_check_requirements** (list, optional, ``[click==7.1.2, pip-tools==5.5.0, pip==20.3.4, setuptools==44.1.1, wheel==0.37.1]``) List of Python package requirements to install in Python 2 virtual environment in order to be able to run the ``pip-tools`` applications as part of pip requirements upgrade checks. This list @@ -436,7 +436,7 @@ Parameters the check itself. For Python 2, see the dedicated parameter ``pip_check_requirements`` above. -**pip_check_requirements_py3** (list, optional, ``[click==7.0, pip-tools==3.9.0, pip==19.1.1, setuptools==41.2.0, six==1.12.0, wheel==0.33.6]``) +**pip_check_requirements_py3** (list, optional, ``see below``) List of Python package requirements to install in Python 3 virtual environment in order to be able to run the ``pip-tools`` applications as part of pip requirements upgrade checks. This list @@ -444,6 +444,24 @@ Parameters ``pip-tools`` and related packages are coming out. For Python 2, see the dedicated parameter ``pip_check_requirements`` above. + Default value is: + + .. code-block:: yaml + + - build==1.0.3 + - click==8.1.7 + - importlib-metadata==6.7.0 + - packaging==23.2 + - pip-tools==6.14.0 + - pip==23.1.2 + - pyproject-hooks==1.0.0 + - setuptools==68.0.0 + - tomli==2.0.1 + - typing-extensions==4.7.1 + - wheel==0.41.3 + - zipp==3.15.0 + + **pipreqcheck_uid** (integer, optional, ``whatever OS picks``) UID for user running the pip requirements upgrade checks. User is created with name ``pipreqcheck``. diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml index b600d48294c0cc7d46bafb02cd5afd1bd30ed8f9..3ce67b4abb9616d0543d5d343da839830039e0d6 100644 --- a/roles/common/defaults/main.yml +++ b/roles/common/defaults/main.yml @@ -19,23 +19,28 @@ pip_check_requirements_in: - wheel pip_check_requirements: - click==7.1.2 - - pip-tools==5.3.1 - - pip==20.2.4 + - pip-tools==5.5.0 + - pip==20.3.4 - setuptools==44.1.1 - - six==1.15.0 - - wheel==0.35.1 + - wheel==0.37.1 pip_check_requirements_py3_in: - pip - pip-tools - setuptools - wheel pip_check_requirements_py3: - - click==7.1.2 - - pip-tools==5.3.1 - - pip==20.2.4 - - setuptools==50.3.2 - - six==1.15.0 - - wheel==0.35.1 + - build==1.0.3 + - click==8.1.7 + - importlib-metadata==6.7.0 + - packaging==23.2 + - pip-tools==6.14.0 + - pip==23.1.2 + - pyproject-hooks==1.0.0 + - setuptools==68.0.0 + - tomli==2.0.1 + - typing-extensions==4.7.1 + - wheel==0.41.3 + - zipp==3.15.0 ntp_servers: [] maintenance: false maintenance_allowed_hosts: [] diff --git a/roles/common/molecule/default/tests/test_default.py b/roles/common/molecule/default/tests/test_default.py index cc2519c5692b542807251b9bbff5f849c26442c0..2ac64f0afdb080238fa54237d5652c7e1b7416a2 100644 --- a/roles/common/molecule/default/tests/test_default.py +++ b/roles/common/molecule/default/tests/test_default.py @@ -306,19 +306,24 @@ def test_pipreqcheck_requirements(host, requirements_in_path, requirements_txt_p @pytest.mark.parametrize("pip_path, expected_packages", [ ('/var/lib/pipreqcheck/virtualenv/bin/pip', [ "click==7.1.2", - "pip-tools==5.3.1", - "pip==20.2.4", + "pip-tools==5.5.0", + "pip==20.3.4", "setuptools==44.1.1", - "six==1.15.0", - "wheel==0.35.1", + "wheel==0.37.1", ]), ('/var/lib/pipreqcheck/virtualenv-py3/bin/pip', [ - "click==7.1.2", - "pip-tools==5.3.1", - "pip==20.2.4", - "setuptools==50.3.2", - "six==1.15.0", - "wheel==0.35.1", + "build==1.0.3", + "click==8.1.7", + "importlib-metadata==6.7.0", + "packaging==23.2", + "pip-tools==6.14.0", + "pip==23.1.2", + "pyproject_hooks==1.0.0", + "setuptools==68.0.0", + "tomli==2.0.1", + "typing_extensions==4.7.1", + "wheel==0.41.3", + "zipp==3.15.0", ]), ]) def test_pipreqcheck_virtualenv_packages(host, pip_path, expected_packages):