public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/coloredlogs/, dev-python/coloredlogs/files/
@ 2015-10-15  8:18 Justin Lecher
  0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2015-10-15  8:18 UTC (permalink / raw
  To: gentoo-commits

commit:     abc56484100f3d8457f0f2babed3f4cebde054d2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 08:18:02 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 08:18:22 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abc56484

dev-python/coloredlogs: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/coloredlogs/Manifest                    |  1 +
 dev-python/coloredlogs/coloredlogs-2.0.ebuild      | 34 ++++++++++++++++++++++
 .../files/coloredlogs-2.0-skip-cli-test.patch      | 20 +++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index b184f86..f33b1f3 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1 +1,2 @@
 DIST coloredlogs-1.0.1.tar.gz 13926 SHA256 11067ca91532ba4a316fa53b005152a08b3e015dcb1234d393cfc25af88ebc3e SHA512 098aa22b371ffdb6400fac7d2f000aa73f8956eae71f48ceed2110eb35a4b4d11f814f8cacca643c4deccd82da058a750c700264e7c71c2351514a6f887101a5 WHIRLPOOL 71b447498d5e91a0cda131046f7545230bc0c13aa814f0d79cf8888bd60934dee7c5cc54a729dd36b0a937451f80302384fb0733fd94e43e09c2ce9258c950fd
+DIST coloredlogs-2.0.tar.gz 15486 SHA256 532198042eac7560f5292961bfb6f844343132fda805575684f67deeb780b2c2 SHA512 b42e18b563caef4506377fba754e976fed31b7402d418ca79d1875504986572b36fe90b602afcb952dc8b06b9f7bc7ed6861abc2239ae5b5340e006377f9a14d WHIRLPOOL 6cbec16a204f91a218428c8056e2c39d94aeaedbf3356b2548fa288a386b8583bf639a40f0c40dc596096bf44ccb28acb7c2d66403d19cf72143599ba88a82b5

diff --git a/dev-python/coloredlogs/coloredlogs-2.0.ebuild b/dev-python/coloredlogs/coloredlogs-2.0.ebuild
new file mode 100644
index 0000000..74cc495
--- /dev/null
+++ b/dev-python/coloredlogs/coloredlogs-2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Colored stream handler for the logging module"
+HOMEPAGE="https://pypi.python.org/pypi/coloredlogs https://github.com/xolox/python-coloredlogs http://coloredlogs.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/humanfriendly-1.25.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/verboselogs[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( README.rst )
+
+PATCHES=( "${FILESDIR}"/${P}-skip-cli-test.patch )
+
+python_test() {
+	esetup.py test
+}

diff --git a/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch b/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch
new file mode 100644
index 0000000..cacd016
--- /dev/null
+++ b/dev-python/coloredlogs/files/coloredlogs-2.0-skip-cli-test.patch
@@ -0,0 +1,20 @@
+ coloredlogs/tests.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/coloredlogs/tests.py b/coloredlogs/tests.py
+index 2010b12..7ab18a8 100644
+--- a/coloredlogs/tests.py
++++ b/coloredlogs/tests.py
+@@ -160,12 +160,6 @@ class ColoredLogsTestCase(unittest.TestCase):
+         for name in 'debug', 'info', 'warning', 'error', 'critical':
+             assert name.upper() in output
+ 
+-    def test_cli_conversion(self):
+-        """Test the command line HTML conversion."""
+-        output = main('coloredlogs', '--convert', 'coloredlogs', '--demo', capture=True)
+-        # Make sure the output is encoded as HTML.
+-        assert '<span' in output
+-
+     def test_implicit_usage_message(self):
+         """Test that the usage message is shown when no actions are given."""
+         assert 'Usage:' in main('coloredlogs', capture=True)


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/coloredlogs/, dev-python/coloredlogs/files/
@ 2020-01-23  9:53 Joonas Niilola
  0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-01-23  9:53 UTC (permalink / raw
  To: gentoo-commits

commit:     55553ee04ae97b8aabf8c061aff3c44be7cb8313
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Jan 15 08:45:23 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 09:53:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55553ee0

dev-python/coloredlogs: Version bump 10.0 and add py3_7

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/14342
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-python/coloredlogs/Manifest                    |   1 +
 dev-python/coloredlogs/coloredlogs-10.0.ebuild     |  38 ++++++++
 .../files/coloredlogs-10.0-skip-cli-test.patch     |  17 ++++
 ...redlogs-10.0-skip-sandbox-violation-tests.patch | 101 +++++++++++++++++++++
 4 files changed, 157 insertions(+)

diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index ba1aee5cbbc..004a6b8528b 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1 +1,2 @@
+DIST coloredlogs-10.0.tar.gz 273273 BLAKE2B 775b12718d780da396d74c7f960cdbbd4858c793bf3eefb53d29e9f6b415f682110ae2c7ac631be230578946a2fab8d75e0c3aa487ccd952bb05443f0a85700c SHA512 f4a51fd8fa92ea4e2ef0b58305dcc4bbe12851e722fc85cfd4f48a9388002efced52bcf027f6dc4c525b095f3f953970e73928fdce3245ab4f9d13ae36b9d498
 DIST coloredlogs-6.1.tar.gz 28057 BLAKE2B bbb5946db3e6cbfae0b9947d2aa29769858833e35213a44a5be4ceb434021ee8c583ff00c980b9ab4fc533f6fec80e151895097b6a87c44257ef0fd5c7ab0bab SHA512 834cf993e7ffd3328644d334912fcf5a5156a441c6184643b38e5f356d46d7b5c48e02ee1e1b432265052c7a5ab1071ba456e575217a4a762f8387131059c405

diff --git a/dev-python/coloredlogs/coloredlogs-10.0.ebuild b/dev-python/coloredlogs/coloredlogs-10.0.ebuild
new file mode 100644
index 00000000000..6c4a97d80c7
--- /dev/null
+++ b/dev-python/coloredlogs/coloredlogs-10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Colored stream handler for the logging module"
+HOMEPAGE="
+	https://pypi.org/project/coloredlogs/
+	https://github.com/xolox/python-coloredlogs
+	https://coloredlogs.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/verboselogs[${PYTHON_USEDEP}] )"
+
+PATCHES="${FILESDIR}/${P}-skip-sandbox-violation-tests.patch"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv ${PN}/tests.py || die "Tests fail with ${EPYTHON}"
+}

diff --git a/dev-python/coloredlogs/files/coloredlogs-10.0-skip-cli-test.patch b/dev-python/coloredlogs/files/coloredlogs-10.0-skip-cli-test.patch
new file mode 100644
index 00000000000..ba03612f7ae
--- /dev/null
+++ b/dev-python/coloredlogs/files/coloredlogs-10.0-skip-cli-test.patch
@@ -0,0 +1,17 @@
+diff --git a/coloredlogs/tests.py b/coloredlogs/tests.py
+index 38f2d97..8d1ae36 100644
+--- a/coloredlogs/tests.py
++++ b/coloredlogs/tests.py
+@@ -503,12 +503,6 @@ class ColoredLogsTestCase(TestCase):
+         for name in 'debug', 'info', 'warning', 'error', 'critical':
+             assert name.upper() in output
+ 
+-    def test_cli_conversion(self):
+-        """Test the command line HTML conversion."""
+-        output = main('coloredlogs', '--convert', 'coloredlogs', '--demo', capture=True)
+-        # Make sure the output is encoded as HTML.
+-        assert '<span' in output
+-
+     def test_empty_conversion(self):
+         """
+         Test that conversion of empty output produces no HTML.

diff --git a/dev-python/coloredlogs/files/coloredlogs-10.0-skip-sandbox-violation-tests.patch b/dev-python/coloredlogs/files/coloredlogs-10.0-skip-sandbox-violation-tests.patch
new file mode 100644
index 00000000000..dad047afd8d
--- /dev/null
+++ b/dev-python/coloredlogs/files/coloredlogs-10.0-skip-sandbox-violation-tests.patch
@@ -0,0 +1,101 @@
+diff --git a/coloredlogs/tests.py b/coloredlogs/tests.py
+index 38f2d97..c4353f1 100644
+--- a/coloredlogs/tests.py
++++ b/coloredlogs/tests.py
+@@ -184,48 +184,6 @@ class ColoredLogsTestCase(TestCase):
+             # Make sure colored logging is disabled.
+             assert not isinstance(handler.formatter, ColoredFormatter)
+ 
+-    def test_system_logging(self):
+-        """Make sure the :class:`coloredlogs.syslog.SystemLogging` context manager works."""
+-        system_log_file = self.find_system_log()
+-        expected_message = random_string(50)
+-        with SystemLogging(programname='coloredlogs-test-suite') as syslog:
+-            if not syslog:
+-                return self.skipTest("couldn't connect to syslog daemon")
+-            # When I tried out the system logging support on macOS 10.13.1 on
+-            # 2018-01-05 I found that while WARNING and ERROR messages show up
+-            # in the system log DEBUG and INFO messages don't. This explains
+-            # the importance of the level of the log message below.
+-            logging.error("%s", expected_message)
+-        # Retry the following assertion (for up to 60 seconds) to give the
+-        # logging daemon time to write our log message to disk. This
+-        # appears to be needed on MacOS workers on Travis CI, see:
+-        # https://travis-ci.org/xolox/python-coloredlogs/jobs/325245853
+-        retry(lambda: check_contents(system_log_file, expected_message, True))
+-
+-    def test_syslog_shortcut_simple(self):
+-        """Make sure that ``coloredlogs.install(syslog=True)`` works."""
+-        system_log_file = self.find_system_log()
+-        expected_message = random_string(50)
+-        with cleanup_handlers():
+-            # See test_system_logging() for the importance of this log level.
+-            coloredlogs.install(syslog=True)
+-            logging.error("%s", expected_message)
+-        # See the comments in test_system_logging() on why this is retried.
+-        retry(lambda: check_contents(system_log_file, expected_message, True))
+-
+-    def test_syslog_shortcut_enhanced(self):
+-        """Make sure that ``coloredlogs.install(syslog='warning')`` works."""
+-        system_log_file = self.find_system_log()
+-        the_expected_message = random_string(50)
+-        not_an_expected_message = random_string(50)
+-        with cleanup_handlers():
+-            # See test_system_logging() for the importance of these log levels.
+-            coloredlogs.install(syslog='error')
+-            logging.warning("%s", not_an_expected_message)
+-            logging.error("%s", the_expected_message)
+-        # See the comments in test_system_logging() on why this is retried.
+-        retry(lambda: check_contents(system_log_file, the_expected_message, True))
+-        retry(lambda: check_contents(system_log_file, not_an_expected_message, False))
+ 
+     def test_name_normalization(self):
+         """Make sure :class:`~coloredlogs.NameNormalizer` works as intended."""
+@@ -369,34 +327,6 @@ class ColoredLogsTestCase(TestCase):
+         logging.info("This should be timestamped according to #45.")
+         assert re.match(r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}\+\d{4}\s', stream.getvalue())
+ 
+-    def test_plain_text_output_format(self):
+-        """Inspect the plain text output of coloredlogs."""
+-        logger = VerboseLogger(random_string(25))
+-        stream = StringIO()
+-        install(level=logging.NOTSET, logger=logger, stream=stream)
+-        # Test that filtering on severity works.
+-        logger.setLevel(logging.INFO)
+-        logger.debug("No one should see this message.")
+-        assert len(stream.getvalue().strip()) == 0
+-        # Test that the default output format looks okay in plain text.
+-        logger.setLevel(logging.NOTSET)
+-        for method, severity in ((logger.debug, 'DEBUG'),
+-                                 (logger.info, 'INFO'),
+-                                 (logger.verbose, 'VERBOSE'),
+-                                 (logger.warning, 'WARNING'),
+-                                 (logger.error, 'ERROR'),
+-                                 (logger.critical, 'CRITICAL')):
+-            # Prepare the text.
+-            text = "This is a message with severity %r." % severity.lower()
+-            # Log the message with the given severity.
+-            method(text)
+-            # Get the line of output generated by the handler.
+-            output = stream.getvalue()
+-            lines = output.splitlines()
+-            last_line = lines[-1]
+-            assert text in last_line
+-            assert severity in last_line
+-            assert PLAIN_TEXT_PATTERN.match(last_line)
+ 
+     def test_html_conversion(self):
+         """Check the conversion from ANSI escape sequences to HTML."""
+@@ -503,12 +433,6 @@ class ColoredLogsTestCase(TestCase):
+         for name in 'debug', 'info', 'warning', 'error', 'critical':
+             assert name.upper() in output
+ 
+-    def test_cli_conversion(self):
+-        """Test the command line HTML conversion."""
+-        output = main('coloredlogs', '--convert', 'coloredlogs', '--demo', capture=True)
+-        # Make sure the output is encoded as HTML.
+-        assert '<span' in output
+-
+     def test_empty_conversion(self):
+         """
+         Test that conversion of empty output produces no HTML.


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/coloredlogs/, dev-python/coloredlogs/files/
@ 2020-09-28 17:03 Louis Sautier
  0 siblings, 0 replies; 3+ messages in thread
From: Louis Sautier @ 2020-09-28 17:03 UTC (permalink / raw
  To: gentoo-commits

commit:     3201627b559b469bc9d1f88140a08586a6f16384
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 16:29:50 2020 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Mon Sep 28 17:03:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3201627b

dev-python/coloredlogs: bump to 14.0, add PyPy3+Python 3.9 support

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>

 dev-python/coloredlogs/Manifest                    |  1 +
 dev-python/coloredlogs/coloredlogs-14.0.ebuild     | 46 ++++++++++++++++++++++
 .../coloredlogs-14.0-fix-install-prefix.patch      | 35 ++++++++++++++++
 3 files changed, 82 insertions(+)

diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index ed2a550127e..7e04c31b3a2 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1 +1,2 @@
 DIST coloredlogs-10.0.tar.gz 273273 BLAKE2B 775b12718d780da396d74c7f960cdbbd4858c793bf3eefb53d29e9f6b415f682110ae2c7ac631be230578946a2fab8d75e0c3aa487ccd952bb05443f0a85700c SHA512 f4a51fd8fa92ea4e2ef0b58305dcc4bbe12851e722fc85cfd4f48a9388002efced52bcf027f6dc4c525b095f3f953970e73928fdce3245ab4f9d13ae36b9d498
+DIST coloredlogs-14.0.tar.gz 275863 BLAKE2B 0a8c026220955397378ad2b43a69c89c5710a09e2d9ed81a3f25408c60e171f4b8f78239696a0bc1b51fc3dd9bfca80df63e1f1d7afb6bee0046209a089e0d6d SHA512 3434a95f3216d19af5d7a48324e5afd5e975f92d9f6b99f40df2c0a635f1738e0bc6d7277a549a42a0fec5a8601f82908c4b0205ceeb3666f49210f66fe58671

diff --git a/dev-python/coloredlogs/coloredlogs-14.0.ebuild b/dev-python/coloredlogs/coloredlogs-14.0.ebuild
new file mode 100644
index 00000000000..89c3d911e9f
--- /dev/null
+++ b/dev-python/coloredlogs/coloredlogs-14.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Colored stream handler for the logging module"
+HOMEPAGE="
+	https://pypi.org/project/coloredlogs/
+	https://github.com/xolox/python-coloredlogs
+	https://coloredlogs.readthedocs.io/en/latest/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/verboselogs[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-install-prefix.patch" )
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	# test_cli_conversion requires the package to be installed
+	distutils_install_for_testing
+	# test_auto_install fails because the pth file isn't being loaded
+	pytest -vv ${PN}/tests.py \
+		--deselect ${PN}/tests.py::ColoredLogsTestCase::test_auto_install \
+		|| die "Tests fail with ${EPYTHON}"
+}

diff --git a/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch b/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch
new file mode 100644
index 00000000000..d6b60c3bdf5
--- /dev/null
+++ b/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch
@@ -0,0 +1,35 @@
+commit 6f566c799323feb3b8dc2b82e62953040a6a5129
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Sat Sep 26 10:30:37 2020 +0200
+
+    setup.py: use absolute paths for pth files
+    
+    On some systems (such as PyPy3 on Gentoo), distutils' `data` path is not
+    `sys.prefix`, which means that we cannot rely on relative paths.
+
+diff --git a/setup.py b/setup.py
+index 057dd80..7674adc 100755
+--- a/setup.py
++++ b/setup.py
+@@ -66,9 +66,9 @@ def find_pth_directory():
+     Determine the correct directory pathname for installing ``*.pth`` files.
+ 
+     To install a ``*.pth`` file using a source distribution archive (created
+-    when ``python setup.py sdist`` is called) the relative directory pathname
+-    ``lib/pythonX.Y/site-packages`` needs to be passed to the ``data_files``
+-    option to ``setup()``.
++    when ``python setup.py sdist`` is called) the directory pathname
++    ``/usr/lib/pythonX.Y/site-packages`` needs to be passed to the ``data_files``
++    option of ``setup()``.
+ 
+     Unfortunately this breaks universal wheel archives (created when ``python
+     setup.py bdist_wheel --universal`` is called) because a specific Python
+@@ -81,7 +81,7 @@ def find_pth_directory():
+     directory without hard coding its location.
+     """
+     return ('/' if 'bdist_wheel' in sys.argv
+-            else os.path.relpath(distutils.sysconfig.get_python_lib(), sys.prefix))
++            else distutils.sysconfig.get_python_lib())
+ 
+ 
+ setup(name='coloredlogs',


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-09-28 17:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-23  9:53 [gentoo-commits] repo/gentoo:master commit in: dev-python/coloredlogs/, dev-python/coloredlogs/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2020-09-28 17:03 Louis Sautier
2015-10-15  8:18 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox