From fbe7b06f59a1f8ad407c34d5817f36553f7238c5 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Fri, 2 Jun 2017 10:48:24 +0200 Subject: [PATCH 1/2] python3 docs update --- docs/source/writing_koji_code.rst | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/source/writing_koji_code.rst b/docs/source/writing_koji_code.rst index 6d81ee34..db56cc61 100644 --- a/docs/source/writing_koji_code.rst +++ b/docs/source/writing_koji_code.rst @@ -629,13 +629,19 @@ Here are some guidelines on producing preferable pull requests. - Please adhere to `PEP8 `__. While much of the older code in Koji does not, we try to stick to it with new code -- Please maintain backward-compatibility up to RHEL 5 (which means - Python 2.4). On the other hand we are looking to migration to python 3, so - please use compatible constructs such as: - - - Use ``print()`` function, not ``print`` statement +- Code which is imported into CLI or needed for stand-alone API calls must + be running in both 2.6+ and 3.x python versions. Six library is used when + needed. Basic list of affected files is: + - ``cli/*`` + - ``koji/__init__.py`` + - ``koji/auth.py`` + - ``koji/tasks.py`` + - ``koji/util.py`` + - ``tests/test_lib/*`` + - ``tests/test_cli/*`` - Check, that unit tests are not broken. Simply run ``make test`` in main - directory of your branch. + directory of your branch. For python3 compatible-code we have also ``make + test3`` target. Note that the core development team for Koji is small, so it may take a few days for someone to reply to your request. From d45e89b43d3b3a9841ef7c6683c734a9b00c933f Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Fri, 2 Jun 2017 17:49:23 -0400 Subject: [PATCH 2/2] adjust docs wording --- docs/source/writing_koji_code.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/writing_koji_code.rst b/docs/source/writing_koji_code.rst index db56cc61..b9b67b15 100644 --- a/docs/source/writing_koji_code.rst +++ b/docs/source/writing_koji_code.rst @@ -630,8 +630,8 @@ Here are some guidelines on producing preferable pull requests. While much of the older code in Koji does not, we try to stick to it with new code - Code which is imported into CLI or needed for stand-alone API calls must - be running in both 2.6+ and 3.x python versions. Six library is used when - needed. Basic list of affected files is: + run in both 2.6+ and 3.x python versions. We use the python-six library + for compatibility. The affected files are: - ``cli/*`` - ``koji/__init__.py`` - ``koji/auth.py``