update to py3-terminado-0.16.0

This commit is contained in:
sthen 2022-10-03 22:12:35 +00:00
parent 0f0f43dbd6
commit 03445a8f9e
5 changed files with 34 additions and 37 deletions

View File

@ -1,9 +1,8 @@
COMMENT = terminals served to term.js using Tornado websockets
MODPY_EGG_VERSION = 0.8.3
MODPY_EGG_VERSION = 0.16.0
DISTNAME = terminado-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
REVISION = 1
CATEGORIES = www
@ -16,8 +15,8 @@ FIX_CRLF_FILES = terminado/tests/basic_test.py
MODULES = lang/python
MODPY_PI = Yes
MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS = terminado
MODPY_PYBUILD = hatchling
#MODPY_PYTEST_ARGS = terminado
RUN_DEPENDS += devel/py-ptyprocess${MODPY_FLAVOR} \
www/py-tornado${MODPY_FLAVOR}>=4

View File

@ -1,2 +1,2 @@
SHA256 (terminado-0.8.3.tar.gz) = SASndPgCMGp9mvcyIZPFOQ8doKu0KeCCoQ7x1G5vssI=
SIZE (terminado-0.8.3.tar.gz) = 21165
SHA256 (terminado-0.16.0.tar.gz) = +sFDdOtUmL3BV+0y5RCx9g1cPHmBqfW6AYu5pkzsDCU=
SIZE (terminado-0.16.0.tar.gz) = 28839

View File

@ -1,16 +0,0 @@
Don't call getpgid() when killing a test. Taken from
https://github.com/jupyter/terminado/pull/72.
Index: terminado/management.py
--- terminado/management.py.orig
+++ terminado/management.py
@@ -70,8 +70,7 @@ class PtyWithClients(object):
"""Send a signal to the process group of the process in the pty"""
if os.name == 'nt':
return self.ptyproc.kill(sig)
- pgid = os.getpgid(self.ptyproc.pid)
- os.killpg(pgid, sig)
+ os.killpg(self.ptyproc.pid, sig)
@gen.coroutine
def terminate(self, force=False):

View File

@ -3,19 +3,21 @@ Eliminate need for bash
Index: terminado/tests/basic_test.py
--- terminado/tests/basic_test.py.orig
+++ terminado/tests/basic_test.py
@@ -124,12 +124,12 @@ class TermTestCase(tornado.testing.AsyncHTTPTestCase):
raise tornado.gen.Return(pids)
@@ -158,14 +158,14 @@ class TermTestCase(tornado.testing.AsyncHTTPTestCase):
def get_app(self):
- self.named_tm = NamedTermManager(shell_command=['bash'],
+ self.named_tm = NamedTermManager(shell_command=['ksh'],
max_terminals=MAX_TERMS,
ioloop=self.io_loop)
- self.single_tm = SingleTermManager(shell_command=['bash'],
+ self.single_tm = SingleTermManager(shell_command=['ksh'],
ioloop=self.io_loop)
- self.unique_tm = UniqueTermManager(shell_command=['bash'],
+ self.unique_tm = UniqueTermManager(shell_command=['ksh'],
max_terminals=MAX_TERMS,
ioloop=self.io_loop)
self.named_tm = NamedTermManager(
- shell_command=["bash"],
+ shell_command=["ksh"],
max_terminals=MAX_TERMS,
)
- self.single_tm = SingleTermManager(shell_command=["bash"])
+ self.single_tm = SingleTermManager(shell_command=["ksh"])
self.unique_tm = UniqueTermManager(
- shell_command=["bash"],
+ shell_command=["ksh"],
max_terminals=MAX_TERMS,
)

View File

@ -1,20 +1,32 @@
@conflict py-terminado-*
@pkgpath www/py-terminado
lib/python${MODPY_VERSION}/site-packages/terminado/
lib/python${MODPY_VERSION}/site-packages/terminado-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/terminado-${MODPY_EGG_VERSION}.dist-info/
lib/python${MODPY_VERSION}/site-packages/terminado-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/terminado-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/terminado-${MODPY_EGG_VERSION}.dist-info/WHEEL
lib/python${MODPY_VERSION}/site-packages/terminado-${MODPY_EGG_VERSION}.dist-info/licenses/
lib/python${MODPY_VERSION}/site-packages/terminado-${MODPY_EGG_VERSION}.dist-info/licenses/LICENSE
lib/python${MODPY_VERSION}/site-packages/terminado/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/terminado/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/terminado/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminado/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminado/${MODPY_PYCACHE}management.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminado/${MODPY_PYCACHE}management.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminado/${MODPY_PYCACHE}uimodule.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminado/${MODPY_PYCACHE}uimodule.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminado/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminado/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminado/_static/
lib/python${MODPY_VERSION}/site-packages/terminado/_static/terminado.js
lib/python${MODPY_VERSION}/site-packages/terminado/management.py
lib/python${MODPY_VERSION}/site-packages/terminado/py.typed
lib/python${MODPY_VERSION}/site-packages/terminado/tests/
lib/python${MODPY_VERSION}/site-packages/terminado/tests/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/terminado/tests/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/terminado/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminado/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminado/tests/${MODPY_PYCACHE}basic_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/terminado/tests/${MODPY_PYCACHE}basic_test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/terminado/tests/basic_test.py
lib/python${MODPY_VERSION}/site-packages/terminado/uimod_embed.js