Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael L 2020-11-24 20:28:52 -06:00
commit 081a1e2664
No known key found for this signature in database
GPG key ID: FE8D405276AFE995
16 changed files with 254 additions and 45 deletions

View file

@ -1,41 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Library for providing a basic file input/output abstraction layer"
HOMEPAGE="https://github.com/libyal/libbfio"
SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="nls unicode"
DEPEND="dev-libs/libcerror
dev-libs/libcthreads
dev-libs/libcdata
dev-libs/libclocale
dev-libs/libcnotify
dev-libs/libcsplit
dev-libs/libuna
dev-libs/libcfile
dev-libs/libcpath
"
RDEPEND="${DEPEND}"
src_configure() {
econf $(use_enable nls) \
$(use_with nls libiconv-prefix) \
$(use_with nls libintl-prefix) \
$(use_enable unicode wide-character-type)
# --with-libcerror \
# --with-libcthreads \
# --with-libcdata \
# --with-libclocale \
# --with-libcnotify \
# --with-libcsplit \
# --with-libuna \
# --with-libcfile \
# --with-libcpath
}

View file

@ -5,7 +5,9 @@ EAPI=7
DESCRIPTION="Library for providing a basic file input/output abstraction layer"
HOMEPAGE="https://github.com/libyal/libbfio"
SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
#upstream removed the release
#SRC_URI="https://github.com/libyal/${PN}/releases/download/${PV}/${PN}-alpha-${PV}.tar.gz"
SRC_URI="https://pentoo.org/~zero/distfiles/${PN}-alpha-${PV}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"

View file

@ -1,2 +1,3 @@
DIST impacket-0.9.21.tar.gz 1269120 BLAKE2B 2f1bd11fb12b995d5c64f55151859296c55e5c2b27bfbcdea852972da3581959d5b4ef108891ac408f669f03d5f1a2d34f801fce2244d8dc2fedae89ce84dfe3 SHA512 9602019461cc07c2fc1e1a7baf40da0558a6cea4f6086e3c4ee16562cf0298c099c88f32ff7842ba403fc1560ccf29c1b3e9671cddcacb3ff6473d95dc11df2a
DIST impacket-0.9.21_p20201015.tar.gz 1364508 BLAKE2B 1cbf258da080847c8d884898f26a6fd3a4805da4cf57101c138771439b85745d1c4c6495e5894e0d10c76901102f8e4fb613e7f57cda3969275476736c144eb2 SHA512 4cb3c823fc27fd386002c390060af40a178e73029010e916a391c80970e5fc6735c273503c0cb67d605547195386d29a8c76906f8e9579db048297b06eb28b01
DIST impacket-0.9.22.tar.gz 1373065 BLAKE2B a457420176987794bdb25521600873384bff72818f44e9a05c2b4078c2001e23bc053a5c35fa0f58763cca4810366c6c171e2c509046d328e0e2672bde59ba1d SHA512 ff007f4570d875951615120cc5211ca4841e33e65a6508ba1a08c69dbf3d14c093a777c9d8489588ff5083db3045d919807b0288c6792ef7464810684eaa1e75

View file

@ -0,0 +1 @@
impacket-9999.ebuild

View file

@ -0,0 +1 @@
DIST manuel-1.9.0.tar.gz 39640 BLAKE2B 1b699b92816297fee13a65ed2c4fc9ee3683f8e47e7fbf06178c97167ae29cabcedc48edec48b053f725889b39111b3634f0305ac651b5674292d046434fd134 SHA512 519b0fd1bd7ef3414dec69f721a6f1265603d28e3b61681acf46e9fba6fdc66efb6c0a82d814af8348bb7c07c3c4c299ae94ea7d6415436592ac37fccaacf18a

View file

@ -0,0 +1,120 @@
setup.py | 6 ------
src/manuel/index.txt | 26 ++++++++------------------
src/manuel/tests.py | 13 +++++++++----
3 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/setup.py b/setup.py
index 4561779..b6730c8 100644
--- a/setup.py
+++ b/setup.py
@@ -20,8 +20,6 @@ with open('README.rst') as readme:
with open('CHANGES.rst') as changes:
long_description = readme.read() + '\n\n' + changes.read()
-tests_require = ['zope.testing']
-
setup(
name='manuel',
version='1.8.0',
@@ -44,10 +42,6 @@ setup(
'License :: OSI Approved :: Apache Software License',
],
license='Apache Software License, Version 2.0',
- extras_require={
- 'tests': tests_require,
- },
- tests_require=tests_require,
test_suite='manuel.tests.test_suite',
install_requires=[
'setuptools',
diff --git a/src/manuel/index.txt b/src/manuel/index.txt
index c1d85f3..a315317 100644
--- a/src/manuel/index.txt
+++ b/src/manuel/index.txt
@@ -166,16 +166,16 @@ can pass in your own class to `TestSuite`.
.. code-block:: python
- import os.path
- import manuel.testing
+ import os.path
+ import manuel.testing
- class StripDirsTestCase(manuel.testing.TestCase):
- def shortDescription(self):
- return os.path.basename(str(self))
- suite = manuel.testing.TestSuite(
- m, path_to_test, TestCase=StripDirsTestCase)
+ class StripDirsTestCase(manuel.testing.TestCase):
+ def shortDescription(self):
+ return os.path.basename(str(self))
+ suite = manuel.testing.TestSuite(
+ m, path_to_test, TestCase=StripDirsTestCase)
- >>> list(suite)[0].shortDescription()
+ list(suite)[0].shortDescription()
'bugs.txt'
@@ -236,16 +236,6 @@ checkers <http://docs.python.org/library/doctest.html#outputchecker-objects>`_
smoothes over the differences between CPython's and PyPy's NameError
messages:
-.. code-block:: python
-
- import re
- import zope.testing.renormalizing
- checker = zope.testing.renormalizing.RENormalizing([
- (re.compile(r"NameError: global name '([a-zA-Z0-9_]+)' is not defined"),
- r"NameError: name '\1' is not defined"),
- ])
-
-
.. reset-globs
.. _capture:
diff --git a/src/manuel/tests.py b/src/manuel/tests.py
index 07723a6..b1a3a76 100644
--- a/src/manuel/tests.py
+++ b/src/manuel/tests.py
@@ -11,11 +11,12 @@ import manuel.testing
import os.path
import re
import unittest
-import zope.testing.renormalizing
here = os.path.dirname(os.path.abspath(__file__))
-checker = zope.testing.renormalizing.RENormalizing([
+try:
+ import zope.testing.renormalizing
+ checker = zope.testing.renormalizing.RENormalizing([
(re.compile(r"<unittest\.result\.TestResult"), '<unittest.TestResult'),
# PyPy spells some error messages differently
(re.compile(r"NameError: global name '([a-zA-Z0-9_]+)' is not defined"),
@@ -25,7 +26,9 @@ checker = zope.testing.renormalizing.RENormalizing([
r"<\1 object"),
(re.compile(r"<SRE_Match object"),
r"<_sre.SRE_Match object"),
-])
+ ])
+except ImportError:
+ pass
def turtle_on_the_bottom_test():
@@ -59,7 +62,6 @@ def test_suite():
optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
m = manuel.ignore.Manuel()
- m += manuel.doctest.Manuel(optionflags=optionflags, checker=checker)
m += manuel.codeblock.Manuel()
m += manuel.capture.Manuel()
m += manuel.testcase.SectionManuel()
@@ -73,3 +75,6 @@ def test_suite():
suite,
doctest.DocTestSuite(),
))
+
+if __name__ == '__main__':
+ unittest.TextTestRunner().run(test_suite())

View file

@ -0,0 +1,31 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
DESCRIPTION="Manuel lets you build tested documentation"
HOMEPAGE="https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]"
# Required to run tests
DISTUTILS_IN_SOURCE_BUILD=1
#DOCS=( CHANGES.rst )
#PATCHES=( "${FILESDIR}"/${P}-rm_zope_test.patch )
#python_test() {
# PYTHONPATH=src/:${PYTHONPATH} esetup.py test
#}

View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Zero_Chaos</name>
</maintainer>
<upstream>
<remote-id type="github">benji-york/manuel</remote-id>
<remote-id type="pypi">manuel</remote-id>
</upstream>
</pkgmetadata>

View file

@ -0,0 +1 @@
DIST xlutils-2.0.0.tar.gz 61614 BLAKE2B 51fde8ef1a0a88ecccfb3cfb332fe8a31101d29865cfa6201001d272db34a5f210e988ccb99ba00344f80dd457a5c91866af12061af9342d556953700cf02916 SHA512 7b6c39912a2b23d718b1aaac2f21770f1e5b156fdc7416f11d4a7e6b52195ffffb982aecb52b5571599eb4928c7e09bbfb20fdf2554f0c49c286b243e2fb3ea9

View file

@ -0,0 +1,23 @@
From e9edf279ba2e699be92da7611368cf92b4d87cec Mon Sep 17 00:00:00 2001
From: Chris Withers <chris@simplistix.co.uk>
Date: Wed, 4 Apr 2018 08:05:06 +0100
Subject: [PATCH] fix test expectations
---
xlutils/tests/test_view.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/xlutils/tests/test_view.py b/xlutils/tests/test_view.py
index 7b32892..5b4aa2b 100644
--- a/xlutils/tests/test_view.py
+++ b/xlutils/tests/test_view.py
@@ -219,6 +219,8 @@ def test_does_not_match(self):
('XX',)
actual:
-(u'',)'''
+(u'',)
+
+While comparing [5][1]: 'XX' (expected) != u'' (actual)'''
compare(expected, actual=str(s.raised))

View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Zero_Chaos</name>
</maintainer>
<upstream>
<remote-id type="pypi">xlutils</remote-id>
</upstream>
</pkgmetadata>

View file

@ -0,0 +1,44 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
DESCRIPTION="provides a collection of utilities for working with Excel files"
HOMEPAGE="https://pypi.org/project/xlutils/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
LICENSE="MIT"
SLOT="0"
RDEPEND="
>=dev-python/xlwt-1.3[${PYTHON_USEDEP}]
>=dev-python/xlrd-1.2[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? (
>=dev-python/errorhandler-2[${PYTHON_USEDEP}]
>=dev-python/manuel-1.9[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/testfixtures[${PYTHON_USEDEP}]
)"
PATCHES=(
"${FILESDIR}/${PN}-2.0.0-fix-tests.patch"
)
python_test() {
# upstream runs its tests with nose, but the suite actually runs better
# when ran through pytest...
pytest -vv || die "Tests fail with ${EPYTHON}"
}

View file

@ -1,11 +1,13 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="An efficient SNMP scanner"
HOMEPAGE="https://labs.portcullis.co.uk/application/onesixtyone/"
SRC_URI="https://labs.portcullis.co.uk/download/${P}.tar.gz"
#Upstream seems dead
#SRC_URI="https://labs.portcullis.co.uk/download/${P}.tar.gz"
SRC_URI="https://pentoo.org/~zero/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"

View file

@ -16,6 +16,5 @@ PDEPEND="
dev-db/sqlitebrowser
pentoo-full? (
net-analyzer/sqlninja
dev-db/mssqlscan
)
"

View file

@ -3,3 +3,4 @@
#empire
=dev-python/xlutils-2.0* amd64 x86
=dev-python/errorhandler-2.0* amd64 x86

View file

@ -5,6 +5,7 @@ virtual/jre:11
#gentoo is removing this but we aren't
net-proxy/mitmproxy
net-wireless/rfcat
dev-python/xlutils
#https://bugs.gentoo.org/735216
app-forensics/openscap