[gentoo-commits] repo/gentoo:master commit in: app-emacs/elpy/

2024-04-13 Thread Maciej Barć
commit: de2d3b0c5f990d885aa2247aacd776393b203586
Author: Maciej Barć  gentoo  org>
AuthorDate: Sat Apr 13 22:06:07 2024 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Sat Apr 13 22:55:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2d3b0c

app-emacs/elpy: enable py3.12 compat

Closes: https://bugs.gentoo.org/929303
Closes: https://bugs.gentoo.org/885897
Signed-off-by: Maciej Barć  gentoo.org>

 ...0627.ebuild => elpy-1.35.0_p20220627-r1.ebuild} | 47 +++---
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild 
b/app-emacs/elpy/elpy-1.35.0_p20220627-r1.ebuild
similarity index 52%
rename from app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
rename to app-emacs/elpy/elpy-1.35.0_p20220627-r1.ebuild
index eab92e1f5156..dbb7bd8ac1ba 100644
--- a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
+++ b/app-emacs/elpy/elpy-1.35.0_p20220627-r1.ebuild
@@ -1,25 +1,33 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-[[ ${PV} == *_p20220627 ]] && COMMIT=de31d30003c515c25ff7bfd3a361c70c298f78bb
-
 DISTUTILS_SINGLE_IMPL=ON
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 elisp
 
 DESCRIPTION="Emacs Python Development Environment"
 HOMEPAGE="https://github.com/jorgenschaefer/elpy/;
-SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz
-   -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${COMMIT}
+
+if [[ "${PV}" == ** ]] ; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://github.com/jorgenschaefer/${PN}.git;
+else
+   [[ "${PV}" == *_p20220627 ]] && 
COMMIT=de31d30003c515c25ff7bfd3a361c70c298f78bb
+
+   
SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz
+   -> ${P}.tar.gz"
+   S="${WORKDIR}/${PN}-${COMMIT}"
+
+   KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -29,7 +37,9 @@ RDEPEND="
app-emacs/pyvenv
app-emacs/s
app-emacs/yasnippet
-   $(python_gen_cond_dep 'dev-python/flake8[${PYTHON_USEDEP}]')
+   $(python_gen_cond_dep '
+   dev-python/flake8[${PYTHON_USEDEP}]
+   ')
 "
 BDEPEND="
${RDEPEND}
@@ -42,9 +52,13 @@ BDEPEND="
)
 "
 
+ELISP_REMOVE="
+   elpy/tests/test_black.py
+   elpy/tests/test_yapf.py
+"
 PATCHES=(
-   "${FILESDIR}"/${PN}-elpy.el-yas-snippet-dirs.patch
-   "${FILESDIR}"/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch
+   "${FILESDIR}/${PN}-elpy.el-yas-snippet-dirs.patch"
+   "${FILESDIR}/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch"
 )
 
 DOCS=( CONTRIBUTING.rst README.rst )
@@ -60,10 +74,13 @@ pkg_setup() {
 
 src_prepare() {
distutils-r1_src_prepare
-   rm elpy/tests/test_black.py || die
 
-   sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" ${PN}.el || die
-   sed -i "s|@PYTHONLIB@|${EPREFIX}/usr/lib/${EPYTHON}|" ${PN}-rpc.el || 
die
+   sed -i "${PN}.el" -e "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" || die
+   sed -i "${PN}-rpc.el" -e "s|@PYTHONLIB@|${EPREFIX}/usr/lib/${EPYTHON}|" 
|| die
+
+   rm ${ELISP_REMOVE} || die
+   sed -i elpy/tests/support.py \
+   -e 
"s|test_should_get_oneline_docstring_for_modules|disabled_&|" || die
 }
 
 src_compile() {
@@ -79,6 +96,6 @@ src_install() {
distutils-r1_src_install
 
elisp_src_install
-   insinto ${SITEETC}/${PN}
+   insinto "${SITEETC}/${PN}"
doins -r snippets
 }



[gentoo-commits] repo/gentoo:master commit in: app-emacs/elpy/

2023-02-26 Thread Maciej Barć
commit: d0b80cf50497186677d6725b1984ad7d2f9723ac
Author: Maciej Barć  gentoo  org>
AuthorDate: Sun Feb 26 23:51:26 2023 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Mon Feb 27 00:05:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b80cf5

app-emacs/elpy: enable python 3.11

Closes: https://bugs.gentoo.org/896532
Signed-off-by: Maciej Barć  gentoo.org>

 app-emacs/elpy/elpy-1.35.0_p20220321.ebuild | 9 +
 app-emacs/elpy/elpy-1.35.0_p20220627.ebuild | 9 +
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild 
b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
index dc6a90317b97..efe3533b8b1b 100644
--- a/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
+++ b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-COMMIT=1746e7009000b7635c0ea6f1559018143aa61642
+[[ ${PV} == *_p20220321 ]] && COMMIT=1746e7009000b7635c0ea6f1559018143aa61642
 
 DISTUTILS_SINGLE_IMPL=ON
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 NEED_EMACS=24.4
 
@@ -16,7 +16,7 @@ inherit distutils-r1 elisp
 DESCRIPTION="Emacs Python Development Environment"
 HOMEPAGE="https://github.com/jorgenschaefer/elpy/;
 SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz
-   -> ${P}.tar.gz"
+   -> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
@@ -44,11 +44,12 @@ BDEPEND="
)
 "
 
-DOCS=( CONTRIBUTING.rst README.rst )
 PATCHES=(
"${FILESDIR}"/${PN}-elpy.el-yas-snippet-dirs.patch
"${FILESDIR}"/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch
 )
+
+DOCS=( CONTRIBUTING.rst README.rst )
 SITEFILE="50${PN}-gentoo.el"
 
 distutils_enable_sphinx docs --no-autodoc

diff --git a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild 
b/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
index be51e73e3a83..df58b81f475a 100644
--- a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
+++ b/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=8
 
-COMMIT=de31d30003c515c25ff7bfd3a361c70c298f78bb
+[[ ${PV} == *_p20220627 ]] && COMMIT=de31d30003c515c25ff7bfd3a361c70c298f78bb
 
 DISTUTILS_SINGLE_IMPL=ON
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 NEED_EMACS=24.4
 
@@ -16,7 +16,7 @@ inherit distutils-r1 elisp
 DESCRIPTION="Emacs Python Development Environment"
 HOMEPAGE="https://github.com/jorgenschaefer/elpy/;
 SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${COMMIT}.tar.gz
-   -> ${P}.tar.gz"
+   -> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
@@ -44,11 +44,12 @@ BDEPEND="
)
 "
 
-DOCS=( CONTRIBUTING.rst README.rst )
 PATCHES=(
"${FILESDIR}"/${PN}-elpy.el-yas-snippet-dirs.patch
"${FILESDIR}"/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch
 )
+
+DOCS=( CONTRIBUTING.rst README.rst )
 SITEFILE="50${PN}-gentoo.el"
 
 distutils_enable_sphinx docs --no-autodoc



[gentoo-commits] repo/gentoo:master commit in: app-emacs/elpy/

2022-08-31 Thread Maciej Barć
commit: a6a19b5bc222be2cc70ba3238337c0db1ff8f253
Author: Maciej Barć  gentoo  org>
AuthorDate: Wed Aug 31 19:23:09 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Wed Aug 31 19:26:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a19b5b

app-emacs/elpy: bump to 1.35.0_p20220627

Signed-off-by: Maciej Barć  gentoo.org>

 app-emacs/elpy/Manifest |  1 +
 app-emacs/elpy/elpy-1.35.0_p20220627.ebuild | 85 +
 2 files changed, 86 insertions(+)

diff --git a/app-emacs/elpy/Manifest b/app-emacs/elpy/Manifest
index 281c4c88caff..81e5ebbc78e0 100644
--- a/app-emacs/elpy/Manifest
+++ b/app-emacs/elpy/Manifest
@@ -1 +1,2 @@
 DIST elpy-1.35.0_p20220321.tar.gz 177145 BLAKE2B 
6362a68efc5997c3d0e26e22c6fe563e1fdba5e6f3a9e1e3c1b53bef8320cc4ac0f929edd177b492a5f2e622c265aeb23d34df8db8ae67bd9a2e48e00adc7c25
 SHA512 
e8cf579effa0a0bc8f3c05001341b96fd134f8f08c16d95d83200ad94a942e3f60ef4ee4186758a2810de2ca58ee41e7119bc84a7535f28665ec7dad29b07db0
+DIST elpy-1.35.0_p20220627.tar.gz 177246 BLAKE2B 
ded88f89949683000c9be606f3b5d2fc65a943c97e0369505713ecbd4f595a43a7ce560b699ebbdfd4a756703c5fa8fb21af5b4e8a1aa6dbb8a55fe4b7dcc468
 SHA512 
b9a4588eb83edef69661568b936e278621abad316ae160a00737c546b5eb26abd8ac089b369be212abbe16b66b590d9df73986995d36201c1010da7dc9706f79

diff --git a/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild 
b/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
new file mode 100644
index ..7fc19d5e0d3e
--- /dev/null
+++ b/app-emacs/elpy/elpy-1.35.0_p20220627.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=de31d30003c515c25ff7bfd3a361c70c298f78bb
+
+DISTUTILS_SINGLE_IMPL=ON
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+NEED_EMACS=24.4
+
+inherit distutils-r1 elisp
+
+DESCRIPTION="Emacs Python Development Environment"
+HOMEPAGE="https://github.com/jorgenschaefer/elpy/;
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${H}.tar.gz
+   -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   app-emacs/company-mode
+   app-emacs/highlight-indentation
+   app-emacs/pyvenv
+   app-emacs/s
+   app-emacs/yasnippet
+   $(python_gen_cond_dep 'dev-python/flake8[${PYTHON_USEDEP}]')
+"
+BDEPEND="
+   ${RDEPEND}
+   test? (
+   $(python_gen_cond_dep '
+   dev-python/autopep8[${PYTHON_USEDEP}]
+   dev-python/jedi[${PYTHON_USEDEP}]
+   dev-python/yapf[${PYTHON_USEDEP}]
+   ')
+   )
+"
+
+DOCS=( CONTRIBUTING.rst README.rst )
+PATCHES=(
+   "${FILESDIR}"/${PN}-elpy.el-yas-snippet-dirs.patch
+   "${FILESDIR}"/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch
+)
+SITEFILE="50${PN}-gentoo.el"
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests unittest
+
+pkg_setup() {
+   elisp_pkg_setup
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   distutils-r1_src_prepare
+   rm elpy/tests/test_black.py || die
+
+   sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" ${PN}.el || die
+   sed -i "s|@PYTHONLIB@|${EPREFIX}/usr/lib/${EPYTHON}|" ${PN}-rpc.el || 
die
+}
+
+src_compile() {
+   distutils-r1_src_compile
+   elisp_src_compile
+}
+
+src_test() {
+   distutils-r1_src_test
+}
+
+src_install() {
+   distutils-r1_src_install
+
+   elisp_src_install
+   insinto ${SITEETC}/${PN}
+   doins -r snippets
+}



[gentoo-commits] repo/gentoo:master commit in: app-emacs/elpy/

2022-04-08 Thread Maciej Barć
commit: 10a7ae8e53084646a743fc2a68a3be601c34c2d7
Author: Maciej Barć  gentoo  org>
AuthorDate: Fri Apr  8 18:19:18 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Fri Apr  8 18:19:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a7ae8e

app-emacs/elpy: remove python-exec hack

fixed in 3adbe305677

Signed-off-by: Maciej Barć  gentoo.org>

 app-emacs/elpy/elpy-1.35.0_p20220321.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild 
b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
index a74075d632d7..7e7e2ca9a293 100644
--- a/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
+++ b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
@@ -77,7 +77,6 @@ src_test() {
 }
 
 src_install() {
-   mkdir -p "${S}_${EPYTHON}"/install/usr/lib/python-exec/${EPYTHON} || die
distutils-r1_src_install
 
elisp_src_install



[gentoo-commits] repo/gentoo:master commit in: app-emacs/elpy/, app-emacs/elpy/files/

2022-04-08 Thread Maciej Barć
commit: bab7113a6852ac300bee085aee8eb24a231dd482
Author: Maciej Barć  gentoo  org>
AuthorDate: Fri Apr  8 13:59:14 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Fri Apr  8 14:00:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bab7113a

app-emacs/elpy: new package; add version 1.35.0_p20220321

2022.03.21 snapshot

Signed-off-by: Maciej Barć  gentoo.org>

 app-emacs/elpy/Manifest|  1 +
 app-emacs/elpy/elpy-1.35.0_p20220321.ebuild| 86 ++
 app-emacs/elpy/files/50elpy-gentoo.el  |  5 ++
 .../elpy-elpy-rpc.el-elpy-rpc-pythonpath.patch | 12 +++
 .../elpy/files/elpy-elpy.el-yas-snippet-dirs.patch | 14 
 app-emacs/elpy/metadata.xml| 13 
 6 files changed, 131 insertions(+)

diff --git a/app-emacs/elpy/Manifest b/app-emacs/elpy/Manifest
new file mode 100644
index ..281c4c88caff
--- /dev/null
+++ b/app-emacs/elpy/Manifest
@@ -0,0 +1 @@
+DIST elpy-1.35.0_p20220321.tar.gz 177145 BLAKE2B 
6362a68efc5997c3d0e26e22c6fe563e1fdba5e6f3a9e1e3c1b53bef8320cc4ac0f929edd177b492a5f2e622c265aeb23d34df8db8ae67bd9a2e48e00adc7c25
 SHA512 
e8cf579effa0a0bc8f3c05001341b96fd134f8f08c16d95d83200ad94a942e3f60ef4ee4186758a2810de2ca58ee41e7119bc84a7535f28665ec7dad29b07db0

diff --git a/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild 
b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
new file mode 100644
index ..a74075d632d7
--- /dev/null
+++ b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=1746e7009000b7635c0ea6f1559018143aa61642
+
+DISTUTILS_SINGLE_IMPL=ON
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+NEED_EMACS=24.4
+
+inherit distutils-r1 elisp
+
+DESCRIPTION="Emacs Python Development Environment"
+HOMEPAGE="https://github.com/jorgenschaefer/elpy/;
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${H}.tar.gz
+   -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   app-emacs/company-mode
+   app-emacs/highlight-indentation
+   app-emacs/pyvenv
+   app-emacs/s
+   app-emacs/yasnippet
+   $(python_gen_cond_dep 'dev-python/flake8[${PYTHON_USEDEP}]')
+"
+BDEPEND="
+   ${RDEPEND}
+   test? (
+   $(python_gen_cond_dep '
+   dev-python/autopep8[${PYTHON_USEDEP}]
+   dev-python/jedi[${PYTHON_USEDEP}]
+   dev-python/yapf[${PYTHON_USEDEP}]
+   ')
+   )
+"
+
+DOCS=( CONTRIBUTING.rst README.rst )
+PATCHES=(
+   "${FILESDIR}"/${PN}-elpy.el-yas-snippet-dirs.patch
+   "${FILESDIR}"/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch
+)
+SITEFILE="50${PN}-gentoo.el"
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests unittest
+
+pkg_setup() {
+   elisp_pkg_setup
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   distutils-r1_src_prepare
+   rm elpy/tests/test_black.py || die
+
+   sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" ${PN}.el || die
+   sed -i "s|@PYTHONLIB@|${EPREFIX}/usr/lib/${EPYTHON}|" ${PN}-rpc.el || 
die
+}
+
+src_compile() {
+   distutils-r1_src_compile
+   elisp_src_compile
+}
+
+src_test() {
+   distutils-r1_src_test
+}
+
+src_install() {
+   mkdir -p "${S}_${EPYTHON}"/install/usr/lib/python-exec/${EPYTHON} || die
+   distutils-r1_src_install
+
+   elisp_src_install
+   insinto ${SITEETC}/${PN}
+   doins -r snippets
+}

diff --git a/app-emacs/elpy/files/50elpy-gentoo.el 
b/app-emacs/elpy/files/50elpy-gentoo.el
new file mode 100644
index ..2e45a60a76a8
--- /dev/null
+++ b/app-emacs/elpy/files/50elpy-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'elpy-enable "elpy"
+  "Enable Elpy in all future Python buffers." t)
+(autoload 'elpy-mode "elpy"
+  "Minor mode in Python buffers for the Emacs Lisp Python Environment." t)

diff --git a/app-emacs/elpy/files/elpy-elpy-rpc.el-elpy-rpc-pythonpath.patch 
b/app-emacs/elpy/files/elpy-elpy-rpc.el-elpy-rpc-pythonpath.patch
new file mode 100644
index ..f64dfd3f563e
--- /dev/null
+++ b/app-emacs/elpy/files/elpy-elpy-rpc.el-elpy-rpc-pythonpath.patch
@@ -0,0 +1,12 @@
+index b228597..aa5fd12 100644
+--- a/elpy-rpc.el
 b/elpy-rpc.el
+@@ -100,7 +100,7 @@ for example), set this to the full interpreter path."
+(elpy-rpc-restart)))
+   :group 'elpy)
+ 
+-(defcustom elpy-rpc-pythonpath (file-name-directory load-file-name)
++(defcustom elpy-rpc-pythonpath "@PYTHONLIB@/site-packages/"
+   "A directory to add to the PYTHONPATH for the RPC process.
+ 
+ This should be a directory where the elpy module can be found. If

diff --git a/app-emacs/elpy/files/elpy-elpy.el-yas-snippet-dirs.patch