cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py-pexpect: move to py3 only (py2 not used in tree and has dep on py2-sphinx)

Browse Source
This commit is contained in:
sthen 2021-02-18 20:42:26 +00:00
parent 26bb131cae
commit 9674cadf12
5 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2067 2021/02/18 13:23:38 sthen Exp $
# $OpenBSD: Makefile,v 1.2068 2021/02/18 20:42:26 sthen Exp $
SUBDIR =
SUBDIR += 64tass
@ -1611,7 +1611,6 @@
SUBDIR += py-pbr
SUBDIR += py-pbr,python3
SUBDIR += py-pebble,python3
SUBDIR += py-pexpect
SUBDIR += py-pexpect,python3
SUBDIR += py-pip
SUBDIR += py-pip,python3

11
devel/py-pexpect/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2020/12/10 02:20:30 daniel Exp $
# $OpenBSD: Makefile,v 1.36 2021/02/18 20:42:26 sthen Exp $
COMMENT= pure Python Expect-like module
@ -6,7 +6,7 @@ MODPY_EGG_VERSION= 4.7.0
DISTNAME= pexpect-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= devel
REVISION= 3
REVISION= 4
HOMEPAGE= https://pexpect.readthedocs.io/
@ -24,7 +24,7 @@ BUILD_DEPENDS = ${RUN_DEPENDS} \
TEST_DEPENDS = shells/bash
FLAVORS = python3
FLAVOR ?=
FLAVOR = python3
MODPY_ADJ_FILES = tests/fakessh/ssh
@ -44,11 +44,6 @@ post-build:
cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html \
SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
# py2: pexpect/_async.py doesn't compile on py2, however it is not used there
# either. upstream won't fix (https://github.com/pexpect/pexpect/issues/290)
# so MODPY_COMMENT is used in the PLIST to avoid installing this file (and
# especially the related pyc file which is not produced due to the failure).
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}

4
devel/py-pexpect/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2020/12/10 02:20:30 daniel Exp $
@comment $OpenBSD: PLIST,v 1.14 2021/02/18 20:42:26 sthen Exp $
lib/python${MODPY_VERSION}/site-packages/pexpect/
lib/python${MODPY_VERSION}/site-packages/pexpect-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/pexpect/ANSI.py
@ -20,7 +20,7 @@ lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}run.${MODPY_PYC
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}screen.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}spawnbase.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pexpect/_async.py
lib/python${MODPY_VERSION}/site-packages/pexpect/_async.py
lib/python${MODPY_VERSION}/site-packages/pexpect/bashrc.sh
lib/python${MODPY_VERSION}/site-packages/pexpect/exceptions.py
lib/python${MODPY_VERSION}/site-packages/pexpect/expect.py

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1169 2021/02/16 23:02:08 sthen Exp $
# $OpenBSD: Makefile,v 1.1170 2021/02/18 20:42:26 sthen Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-3.557
PKGNAME = quirks-3.558
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

3
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.1185 2021/02/16 23:02:08 sthen Exp $
# $OpenBSD: Quirks.pm,v 1.1186 2021/02/18 20:42:26 sthen Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -563,6 +563,7 @@ my $stem_extensions = {
'py-asn1-modules' => 'py3-asn1-modules',
'py-ldap' => 'py3-ldap',
'py-ldap-examples' => 'py3-ldap-examples',
'py-pexpect' => 'py3-pexpect',
};
my $obsolete_reason = {