Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/vpython/files/, dev-python/vpython/
Date: Mon, 16 May 2022 13:11:22
Message-Id: 1652706646.3a67b4dd11bc45d96b9a4d0baa65420013150a9d.mgorny@gentoo
1 commit: 3a67b4dd11bc45d96b9a4d0baa65420013150a9d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 16 13:10:46 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 16 13:10:46 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a67b4dd
7
8 dev-python/vpython: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/vpython/Manifest | 2 -
13 .../vpython-7.6.2-fix-python310-detection.patch | 56 ----------------------
14 dev-python/vpython/vpython-7.6.1-r3.ebuild | 27 -----------
15 dev-python/vpython/vpython-7.6.2.ebuild | 38 ---------------
16 4 files changed, 123 deletions(-)
17
18 diff --git a/dev-python/vpython/Manifest b/dev-python/vpython/Manifest
19 index b678f2d8af04..34523dd6e181 100644
20 --- a/dev-python/vpython/Manifest
21 +++ b/dev-python/vpython/Manifest
22 @@ -1,3 +1 @@
23 -DIST vpython-7.6.1.tar.gz 3552831 BLAKE2B 78281ebbdae2bf09d139569cd344f32aa77aad59ce988a72c57b9984774bc376348c6e69c9119822fe1fbd5dbe6cecf81f17da3977b257c64321e4d4f2deb755 SHA512 8a06bf41865a6bb61c6616c853889b24128f32a9ce1eb8cd9ff861e4995f700ea24e7ffc04fd1edf9cd823a1a592083202abecb1373d5f544facc8646f0cf30b
24 -DIST vpython-7.6.2.tar.gz 4461606 BLAKE2B 67e59d5ac8e061ffa62433bcc1c3285cf659482e298b706d2b59ef8160c154c42efa8677fce19856a88024af06fb71882ff280ba2e1312a18da272168a4eb1a9 SHA512 fb8f0e9219950cab6d800a44a7fa473bd39e67895170b5cd7636a78cefd83f740d5b4da245b3f252402bfae6e576948b5831d230bf365ac7141ba6bf5f1ef6d6
25 DIST vpython-7.6.3.tar.gz 4461187 BLAKE2B 4698396fb9f846db59233bb6795748cadf7a0c8c4b1969dfe439965fa29db703806197a6e91b5d91935b8fdcf5c626dac6613a73e06b88c899bdddd0b19ef69e SHA512 0270103eb5c67ecbf7461e1821e3502295976f430d290fbefc5281643802963bf6ccd729eb37b19e50b2403f7cf0dc09f869d4cd30726ccd086bacb6180f868e
26
27 diff --git a/dev-python/vpython/files/vpython-7.6.2-fix-python310-detection.patch b/dev-python/vpython/files/vpython-7.6.2-fix-python310-detection.patch
28 deleted file mode 100644
29 index 5cf5b2fe000a..000000000000
30 --- a/dev-python/vpython/files/vpython-7.6.2-fix-python310-detection.patch
31 +++ /dev/null
32 @@ -1,56 +0,0 @@
33 -From 426eeae74eb67934bf7ddcffc07677d93a7ea191 Mon Sep 17 00:00:00 2001
34 -From: Mike <Axe319@×××××.com>
35 -Date: Fri, 8 Oct 2021 17:22:52 -0400
36 -Subject: [PATCH 1/2] Fixed version check to encompass Python 3.10
37 -
38 ----
39 - vpython/__init__.py | 12 ++++++------
40 - 1 file changed, 6 insertions(+), 6 deletions(-)
41 -
42 -diff --git a/vpython/__init__.py b/vpython/__init__.py
43 -index 3fc6ce5..c09f697 100644
44 ---- a/vpython/__init__.py
45 -+++ b/vpython/__init__.py
46 -@@ -10,14 +10,14 @@
47 - # both of those.
48 -
49 - from ._notebook_helpers import _isnotebook, __is_spyder
50 --import platform
51 --__p = platform.python_version()
52 -+import sys
53 -+__v = sys.version_info
54 -
55 --# Delete platform now that we are done with it
56 --del platform
57 -+# Delete sys now that we are done with it
58 -+del sys
59 -
60 --__ispython3 = (__p[0] == '3')
61 --__require_notebook = (not __ispython3) or (__p[2] < '5') # Python 2.7 or 3.4 require Jupyter notebook
62 -+__ispython3 = (__v.major == 3)
63 -+__require_notebook = (not __ispython3) or (__v.minor < 5) # Python 2.7 or 3.4 require Jupyter notebook
64 -
65 - if __require_notebook and (not _isnotebook):
66 - s = "The non-notebook version of vpython requires Python 3.5 or later."
67 -
68 -From 405062dcca5a9a8656b99afb52cd13ce885f8bd1 Mon Sep 17 00:00:00 2001
69 -From: Mike <Axe319@×××××.com>
70 -Date: Mon, 11 Oct 2021 18:16:50 -0400
71 -Subject: [PATCH 2/2] Added username to contributors.md
72 -
73 ----
74 - CONTRIBUTORS.md | 1 +
75 - 1 file changed, 1 insertion(+)
76 -
77 -diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
78 -index 1f627bd..d608966 100644
79 ---- a/CONTRIBUTORS.md
80 -+++ b/CONTRIBUTORS.md
81 -@@ -30,6 +30,7 @@ We are certain the list is incomplete; please let one of us know by opening an [
82 - + Kyle Dunn ([@kdunn926](https://github.com/kdunn926))
83 - + Brian Su ([@brianbbsu](https://github.com/brianbbsu))
84 - + [@0dminnimda](https://github.com/0dminnimda)
85 -++ Mike Miller ([@Axe319](https://github.com/axe319))
86 -
87 - ## Full timeline of vpython development
88 -
89
90 diff --git a/dev-python/vpython/vpython-7.6.1-r3.ebuild b/dev-python/vpython/vpython-7.6.1-r3.ebuild
91 deleted file mode 100644
92 index 1d56387d3f84..000000000000
93 --- a/dev-python/vpython/vpython-7.6.1-r3.ebuild
94 +++ /dev/null
95 @@ -1,27 +0,0 @@
96 -# Copyright 1999-2021 Gentoo Authors
97 -# Distributed under the terms of the GNU General Public License v2
98 -
99 -EAPI=7
100 -
101 -PYTHON_COMPAT=( python3_{7..9} )
102 -
103 -inherit distutils-r1
104 -
105 -DESCRIPTION="VPython for Jupyter notebook"
106 -HOMEPAGE="https://www.vpython.org/ https://pypi.org/project/vpython/"
107 -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
108 -
109 -RDEPEND="
110 - dev-python/autobahn[${PYTHON_USEDEP}]
111 - dev-python/ipykernel[${PYTHON_USEDEP}]
112 - dev-python/jupyter[${PYTHON_USEDEP}]
113 - dev-python/numpy[${PYTHON_USEDEP}]
114 - dev-python/versioneer[${PYTHON_USEDEP}]"
115 -BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
116 -DEPEND="
117 - ${RDEPEND}
118 - ${BDEPEND}"
119 -
120 -LICENSE="BSD-2"
121 -SLOT="0"
122 -KEYWORDS="~amd64 ~x86"
123
124 diff --git a/dev-python/vpython/vpython-7.6.2.ebuild b/dev-python/vpython/vpython-7.6.2.ebuild
125 deleted file mode 100644
126 index cbf767586bd9..000000000000
127 --- a/dev-python/vpython/vpython-7.6.2.ebuild
128 +++ /dev/null
129 @@ -1,38 +0,0 @@
130 -# Copyright 1999-2021 Gentoo Authors
131 -# Distributed under the terms of the GNU General Public License v2
132 -
133 -EAPI=8
134 -
135 -PYTHON_COMPAT=( python3_{8..10} )
136 -
137 -inherit distutils-r1
138 -
139 -DESCRIPTION="VPython for Jupyter notebook"
140 -HOMEPAGE="https://www.vpython.org/ https://pypi.org/project/vpython/"
141 -SRC_URI="https://github.com/${PN}/${PN}-jupyter/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
142 -S="${WORKDIR}/${PN}-jupyter-${PV}"
143 -
144 -RDEPEND="
145 - >=dev-python/autobahn-18.8.2[${PYTHON_USEDEP}]
146 - dev-python/ipykernel[${PYTHON_USEDEP}]
147 - dev-python/jupyter[${PYTHON_USEDEP}]
148 - dev-python/jupyter-server-proxy[${PYTHON_USEDEP}]
149 - dev-python/numpy[${PYTHON_USEDEP}]
150 -"
151 -BDEPEND="
152 - dev-python/cython[${PYTHON_USEDEP}]
153 - dev-python/versioneer[${PYTHON_USEDEP}]
154 -"
155 -DEPEND="
156 - ${RDEPEND}
157 - ${BDEPEND}
158 -"
159 -
160 -LICENSE="BSD-2"
161 -SLOT="0"
162 -KEYWORDS="~amd64"
163 -
164 -RESTRICT="test"
165 -PATCHES="${FILESDIR}/${P}-fix-python310-detection.patch"
166 -
167 -distutils_enable_tests pytest