update to py3-logilab-common-1.9.8

This commit is contained in:
sthen 2023-01-06 11:55:15 +00:00
parent bb5b7b0ebf
commit 477405deae
3 changed files with 22 additions and 28 deletions

View File

@ -1,29 +1,23 @@
COMMENT= common low-level libraries for logilab projects COMMENT= common low-level libraries for logilab projects
MODPY_EGG_VERSION = 1.4.0 MODPY_EGG_VERSION= 1.9.8
DISTNAME= logilab-common-${MODPY_EGG_VERSION} DISTNAME= logilab-common-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME} PKGNAME= py-${DISTNAME}
CATEGORIES= devel CATEGORIES= devel
REVISION= 8
HOMEPAGE= https://www.logilab.org/project/logilab-common HOMEPAGE= https://www.logilab.org/project/logilab-common
# LGPLv2.1+ # LGPLv2.1+
PERMIT_PACKAGE= Yes PERMIT_PACKAGE= Yes
MODULES= lang/python MODULES= lang/python
RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} TEST_DEPENDS= devel/py-tz${MODPY_FLAVOR}
TEST_DEPENDS = ${BASE_PKGPATH}=${MODPY_EGG_VERSION} \
devel/py-tz${MODPY_FLAVOR}
MODPY_PI = Yes MODPY_PI= Yes
MODPY_PYBUILD = setuptools MODPY_PYBUILD= setuptools
FLAVORS = python3 FLAVORS= python3
FLAVOR = python3 FLAVOR= python3
do-test:
cd ${WRKSRC} && ${MODPY_BIN} -W once -m logilab.common.pytest
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (logilab-common-1.4.0.tar.gz) = T2/rmE7hqgvvS6nkK80HwglfYx6X/t3CGwu45Mh5IK8= SHA256 (logilab-common-1.9.8.tar.gz) = 9KjSAbbx60aqU2ejw9J0pQ7FDSD1fY/6jUveom7b/ec=
SIZE (logilab-common-1.4.0.tar.gz) = 185740 SIZE (logilab-common-1.9.8.tar.gz) = 206662

View File

@ -1,7 +1,8 @@
OpenBSD doesn't support RLIMIT_AS OpenBSD doesn't support RLIMIT_AS
--- logilab/common/proc.py.orig Mon Oct 12 20:39:18 2015 Index: logilab/common/proc.py
+++ logilab/common/proc.py Sun Oct 18 17:05:28 2015 --- logilab/common/proc.py.orig
+++ logilab/common/proc.py
@@ -30,7 +30,7 @@ __docformat__ = "restructuredtext en" @@ -30,7 +30,7 @@ __docformat__ = "restructuredtext en"
import os import os
@ -11,21 +12,20 @@ OpenBSD doesn't support RLIMIT_AS
from signal import signal, SIGXCPU, SIGKILL, SIGUSR2, SIGUSR1 from signal import signal, SIGXCPU, SIGKILL, SIGUSR2, SIGUSR1
from threading import Timer, currentThread, Thread, Event from threading import Timer, currentThread, Thread, Event
from time import time from time import time
@@ -251,10 +251,10 @@ class ResourceController: @@ -253,10 +253,10 @@ class ResourceController:
setrlimit(RLIMIT_CPU, cpu_limit) setrlimit(RLIMIT_CPU, cpu_limit)
if self.max_memory is not None: if self.max_memory is not None:
self._msentinel = MemorySentinel(1, int(self.max_memory) ) self._msentinel = MemorySentinel(1, int(self.max_memory))
- self._old_max_memory = getrlimit(RLIMIT_AS) - self._old_max_memory = getrlimit(RLIMIT_AS)
+ self._old_max_memory = getrlimit(RLIMIT_DATA) + self._old_max_memory = getrlimit(RLIMIT_DATA)
self._old_usr1_hdlr = signal(SIGUSR1, self._hangle_sig_memory) self._old_usr1_hdlr = signal(SIGUSR1, self._hangle_sig_memory)
- as_limit = (int(self.max_memory), self._old_max_memory[1]) as_limit = (int(self.max_memory), self._old_max_memory[1])
- setrlimit(RLIMIT_AS, as_limit) - setrlimit(RLIMIT_AS, as_limit)
+ data_limit = (int(self.max_memory), self._old_max_memory[1]) + setrlimit(RLIMIT_DATA, as_limit)
+ setrlimit(RLIMIT_DATA, data_limit)
self._msentinel.start() self._msentinel.start()
self._limit_set += 1 self._limit_set += 1
@@ -272,6 +272,6 @@ class ResourceController: @@ -274,6 +274,6 @@ class ResourceController:
if self.max_memory is not None: if self.max_memory is not None:
self._msentinel.stop() self._msentinel.stop()
self._msentinel = None self._msentinel = None