From daec13c0f76abed4d8817c27025a1b454ae29de2 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sun, 7 Feb 2021 00:48:10 +0000 Subject: Updating liguros repo --- dev-python/amodem/amodem-1.15.1-r1.ebuild | 25 +++++ dev-python/amodem/amodem-1.15.1.ebuild | 20 ---- dev-python/ipython/ipython-7.19.0-r1.ebuild | 1 + dev-python/ipython/ipython-7.20.0.ebuild | 1 + dev-python/lxml/metadata.xml | 1 + .../pytest-salt/pytest-salt-2020.1.27-r1.ebuild | 39 +++++++ .../pytest-salt/pytest-salt-2020.1.27.ebuild | 38 ------- dev-python/recommonmark/Manifest | 1 + .../files/recommonmark-0.6.0-sphinx3-1.patch | 122 +++++++++++++++++++++ .../files/recommonmark-0.6.0-sphinx3-2.patch | 63 +++++++++++ .../recommonmark/recommonmark-0.6.0-r1.ebuild | 30 +++++ dev-python/recommonmark/recommonmark-0.7.1.ebuild | 30 +++++ 12 files changed, 313 insertions(+), 58 deletions(-) create mode 100644 dev-python/amodem/amodem-1.15.1-r1.ebuild delete mode 100644 dev-python/amodem/amodem-1.15.1.ebuild create mode 100644 dev-python/pytest-salt/pytest-salt-2020.1.27-r1.ebuild delete mode 100644 dev-python/pytest-salt/pytest-salt-2020.1.27.ebuild create mode 100644 dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-1.patch create mode 100644 dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-2.patch create mode 100644 dev-python/recommonmark/recommonmark-0.6.0-r1.ebuild create mode 100644 dev-python/recommonmark/recommonmark-0.7.1.ebuild (limited to 'dev-python') diff --git a/dev-python/amodem/amodem-1.15.1-r1.ebuild b/dev-python/amodem/amodem-1.15.1-r1.ebuild new file mode 100644 index 000000000000..a418b3f10e9c --- /dev/null +++ b/dev-python/amodem/amodem-1.15.1-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Transmit data between two computers using audio" +HOMEPAGE="https://github.com/romanz/amodem" +SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz + mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest diff --git a/dev-python/amodem/amodem-1.15.1.ebuild b/dev-python/amodem/amodem-1.15.1.ebuild deleted file mode 100644 index 5acab7a3478a..000000000000 --- a/dev-python/amodem/amodem-1.15.1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="Transmit data between two computers using audio" -HOMEPAGE="https://github.com/romanz/amodem" -SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz - mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -distutils_enable_tests pytest diff --git a/dev-python/ipython/ipython-7.19.0-r1.ebuild b/dev-python/ipython/ipython-7.19.0-r1.ebuild index 43c5bd279fbc..207fcfeb4865 100644 --- a/dev-python/ipython/ipython-7.19.0-r1.ebuild +++ b/dev-python/ipython/ipython-7.19.0-r1.ebuild @@ -50,6 +50,7 @@ BDEPEND=" >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/sphinx-2[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )" PDEPEND=" diff --git a/dev-python/ipython/ipython-7.20.0.ebuild b/dev-python/ipython/ipython-7.20.0.ebuild index 984b4b7a0aef..3268cbddefca 100644 --- a/dev-python/ipython/ipython-7.20.0.ebuild +++ b/dev-python/ipython/ipython-7.20.0.ebuild @@ -50,6 +50,7 @@ BDEPEND=" >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}] dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/sphinx-2[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )" PDEPEND=" diff --git a/dev-python/lxml/metadata.xml b/dev-python/lxml/metadata.xml index bcdb2832ce50..c10264d40e8c 100644 --- a/dev-python/lxml/metadata.xml +++ b/dev-python/lxml/metadata.xml @@ -8,6 +8,7 @@ lxml lxml/lxml + https://bugs.launchpad.net/lxml gentoo-staging \ No newline at end of file diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27-r1.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27-r1.ebuild new file mode 100644 index 000000000000..f4121676b7c2 --- /dev/null +++ b/dev-python/pytest-salt/pytest-salt-2020.1.27-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +inherit distutils-r1 + +MY_PV="${PV/_p/.post}" +DESCRIPTION="PyTest Salt Plugin" +HOMEPAGE="https://github.com/saltstack/pytest-salt" +SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm x86" +IUSE="test" + +RDEPEND=" + >=dev-python/pytest-2.8.1[${PYTHON_USEDEP}] + >=dev-python/psutil-4.2.0[${PYTHON_USEDEP}] + dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] + dev-python/pytest-tempdir[${PYTHON_USEDEP}] + dev-python/msgpack[${PYTHON_USEDEP}] +" +#BDEPEND=" +# test? ( app-admin/salt[${PYTHON_USEDEP}] ) +#" + +# tests need network access +RESTRICT="test" + +distutils_enable_tests pytest + +python_test() { + distutils_install_for_testing + pytest -vv || die "Tests failed with ${EPYTHON}" +} diff --git a/dev-python/pytest-salt/pytest-salt-2020.1.27.ebuild b/dev-python/pytest-salt/pytest-salt-2020.1.27.ebuild deleted file mode 100644 index 42e9ed121780..000000000000 --- a/dev-python/pytest-salt/pytest-salt-2020.1.27.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit distutils-r1 - -MY_PV="${PV/_p/.post}" -DESCRIPTION="PyTest Salt Plugin" -HOMEPAGE="https://github.com/saltstack/pytest-salt" -SRC_URI="https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="test" - -RDEPEND=" - >=dev-python/pytest-2.8.1[${PYTHON_USEDEP}] - >=dev-python/psutil-4.2.0[${PYTHON_USEDEP}] - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}] - dev-python/pytest-tempdir[${PYTHON_USEDEP}] -" -#BDEPEND=" -# test? ( app-admin/salt[${PYTHON_USEDEP}] ) -#" - -# tests need network access -RESTRICT="test" - -distutils_enable_tests pytest - -python_test() { - distutils_install_for_testing - pytest -vv || die "Tests failed with ${EPYTHON}" -} diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest index 8403f7f1de48..48f48612b255 100644 --- a/dev-python/recommonmark/Manifest +++ b/dev-python/recommonmark/Manifest @@ -1 +1,2 @@ DIST recommonmark-0.6.0.tar.gz 24537 BLAKE2B 47f667ca0799394dc88964709efc59d1e2a68973b1c00fb41abfb514166e939b8dd0b6a0827285cfa1bb60669e08868b7a0993b6a32880fc0dd22cfefa6cf273 SHA512 44005b3fd0052cd8d4fce8a64f9d66a1ac75dc3041a28c115e922254956b2143296cbfbc0a2396b9f95691145645c4242e3be68e695b2c62ae37964014511679 +DIST recommonmark-0.7.1.tar.gz 24720 BLAKE2B 6543a23bd262be0ff6847fc1eb1bd3dad433606aa1adb52162cab2e0c4dd2265ac41b3816bbe1994c4f6ca732105712dbc9cd295d5cfd93061ad83520b8f449c SHA512 3e03440d606ea6247df9bd122a6fa2dccf01c0c315eeace046d5cd336657e26bbd1c6b7ad4ba46f344215905128b72508c036cc57bbe4b5e27df50c55371fe01 diff --git a/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-1.patch b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-1.patch new file mode 100644 index 000000000000..f628630c2009 --- /dev/null +++ b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-1.patch @@ -0,0 +1,122 @@ +https://bugs.gentoo.org/723468#c4 +By Anon Emuss +---- +Update tests for sphinx-3 + +The deprecated source_parsers no longer works with sphinx-3. Modify +conf.py files to use the recommonmark extension, which sphinx supports. + +Tested and appears to work with sphinx-2.4.4 and sphinx-3.2.1. + +diff --git a/tests/sphinx_code_block/conf.py b/tests/sphinx_code_block/conf.py +index 6b0140e..ddfafd5 100644 +--- a/tests/sphinx_code_block/conf.py ++++ b/tests/sphinx_code_block/conf.py +@@ -1,11 +1,9 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser +- + templates_path = ['_templates'] +-source_suffix = '.md' +-source_parsers = { '.md': CommonMarkParser } ++extensions = ['recommonmark'] ++source_suffix = { '.md': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' +diff --git a/tests/sphinx_custom_md/conf.py b/tests/sphinx_custom_md/conf.py +index b29157b..9073346 100644 +--- a/tests/sphinx_custom_md/conf.py ++++ b/tests/sphinx_custom_md/conf.py +@@ -1,12 +1,11 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser + from recommonmark.transform import AutoStructify + + templates_path = ['_templates'] +-source_suffix = '.markdown' +-source_parsers = { '.markdown': CommonMarkParser } ++extensions = ['recommonmark'] ++source_suffix = { '.markdown': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' +diff --git a/tests/sphinx_generic/conf.py b/tests/sphinx_generic/conf.py +index 6b0140e..ddfafd5 100644 +--- a/tests/sphinx_generic/conf.py ++++ b/tests/sphinx_generic/conf.py +@@ -1,11 +1,9 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser +- + templates_path = ['_templates'] +-source_suffix = '.md' +-source_parsers = { '.md': CommonMarkParser } ++extensions = ['recommonmark'] ++source_suffix = { '.md': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' +diff --git a/tests/sphinx_indented_code/conf.py b/tests/sphinx_indented_code/conf.py +index f441071..90c5692 100644 +--- a/tests/sphinx_indented_code/conf.py ++++ b/tests/sphinx_indented_code/conf.py +@@ -1,11 +1,9 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser +- + templates_path = ['_templates'] +-source_suffix = '.md' +-source_parsers = { '.md': CommonMarkParser } ++extensions = ['recommonmark'] ++source_suffix = { '.md': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' +diff --git a/tests/sphinx_nested_header_block/conf.py b/tests/sphinx_nested_header_block/conf.py +index 6b0140e..ddfafd5 100644 +--- a/tests/sphinx_nested_header_block/conf.py ++++ b/tests/sphinx_nested_header_block/conf.py +@@ -1,11 +1,9 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser +- + templates_path = ['_templates'] +-source_suffix = '.md' +-source_parsers = { '.md': CommonMarkParser } ++extensions = ['recommonmark'] ++source_suffix = { '.md': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' +diff --git a/tests/sphinx_xref/conf.py b/tests/sphinx_xref/conf.py +index 443a026..acd840b 100644 +--- a/tests/sphinx_xref/conf.py ++++ b/tests/sphinx_xref/conf.py +@@ -1,14 +1,11 @@ + + # -*- coding: utf-8 -*- + +-from recommonmark.parser import CommonMarkParser +- +-extensions = 'sphinx.ext.autosectionlabel'] ++extensions = ['sphinx.ext.autosectionlabel', 'recommonmark'] + autosectionlabel_prefix_document = True + + templates_path = ['_templates'] +-source_suffix = '.md' +-source_parsers = { '.md': CommonMarkParser } ++source_suffix = { '.md': 'markdown' } + master_doc = 'index' + project = u'sphinxproj' + copyright = u'2015, rtfd' diff --git a/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-2.patch b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-2.patch new file mode 100644 index 000000000000..75d9b1c961cb --- /dev/null +++ b/dev-python/recommonmark/files/recommonmark-0.6.0-sphinx3-2.patch @@ -0,0 +1,63 @@ +https://bugs.gentoo.org/723468#c5 +By Anon Emuss +---- +Fix minor HTML changes in tests + +Newer versions of sphinx now put

tags around various elements. +Update the test_lists and CustomExtensionTests tests to expect that. +Also do not expect a class="first" for the Contents in the +CustomExtensionTests. + +Tested and appears to work with sphinx-2.4.4 and sphinx-3.2.1. + +diff --git a/tests/test_sphinx.py b/tests/test_sphinx.py +index 06078b1..8f4acb2 100644 +--- a/tests/test_sphinx.py ++++ b/tests/test_sphinx.py +@@ -142,17 +142,17 @@ class GenericTests(SphinxIntegrationTests): + output = self.read_file('index.html') + self.assertIn( + ('

    \n' +- '
  • Item A
    • \n' +- '
  • Item B
    • \n' +- '
  • Item C
    • \n' ++ '

  • Item A

    • \n' ++ '

  • Item B

    • \n' ++ '

  • Item C

    • \n' + '
'), + output + ) + self.assertIn( + ('
    \n' +- '
  1. Item 1
    2. \n' +- '
  2. Item 2
    3. \n' +- '
  3. Item 3
    4. \n' ++ '

  4. Item 1

    5. \n' ++ '

  5. Item 2

    6. \n' ++ '

  6. Item 3

    7. \n' + '
'), + output + ) +@@ -207,16 +207,17 @@ class CustomExtensionTests(SphinxIntegrationTests): + def test_integration(self): + output = self.read_file('index.html') + self.assertIn('abc', output) +- self.assertIn('', output) ++ self.assertIn('', output) ++ self.assertIn('', output) + self.assertIn('
data

abc

data

', output) + + self.assertIn( + ('
\n' +- '

Contents

\n' ++ '

Contents

\n' + '
    \n' +- '
  • Header'), + output + ) diff --git a/dev-python/recommonmark/recommonmark-0.6.0-r1.ebuild b/dev-python/recommonmark/recommonmark-0.6.0-r1.ebuild new file mode 100644 index 000000000000..2ead7f8a0956 --- /dev/null +++ b/dev-python/recommonmark/recommonmark-0.6.0-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 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,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="Python docutils-compatibility bridge to CommonMark" +HOMEPAGE="https://recommonmark.readthedocs.io/" +SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + >=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}] + >=dev-python/docutils-0.14[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] +" + +PATCHES=( + "${FILESDIR}/${PN}-0.6.0-sphinx3-1.patch" + "${FILESDIR}/${PN}-0.6.0-sphinx3-2.patch" +) + +distutils_enable_tests pytest diff --git a/dev-python/recommonmark/recommonmark-0.7.1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1.ebuild new file mode 100644 index 000000000000..2ead7f8a0956 --- /dev/null +++ b/dev-python/recommonmark/recommonmark-0.7.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 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,9,10} ) + +inherit distutils-r1 + +DESCRIPTION="Python docutils-compatibility bridge to CommonMark" +HOMEPAGE="https://recommonmark.readthedocs.io/" +SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + >=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}] + >=dev-python/docutils-0.14[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] +" + +PATCHES=( + "${FILESDIR}/${PN}-0.6.0-sphinx3-1.patch" + "${FILESDIR}/${PN}-0.6.0-sphinx3-2.patch" +) + +distutils_enable_tests pytest -- cgit v1.3