From owner-svn-ports-all@freebsd.org Mon Dec 28 10:14:39 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0F7C04D6E83; Mon, 28 Dec 2020 10:14:39 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D4D1V71vSz3DH1; Mon, 28 Dec 2020 10:14:38 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3F8517CA1; Mon, 28 Dec 2020 10:14:38 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BSAEcMp054473; Mon, 28 Dec 2020 10:14:38 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BSAEbWD054461; Mon, 28 Dec 2020 10:14:37 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <202012281014.0BSAEbWD054461@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Mon, 28 Dec 2020 10:14:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559453 - in head/devel/py-cookiecutter: . files X-SVN-Group: ports-head X-SVN-Commit-Author: matthew X-SVN-Commit-Paths: in head/devel/py-cookiecutter: . files X-SVN-Commit-Revision: 559453 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Dec 2020 10:14:39 -0000 Author: matthew Date: Mon Dec 28 10:14:37 2020 New Revision: 559453 URL: https://svnweb.freebsd.org/changeset/ports/559453 Log: Fix `make test` to achieve 100% pass rate by converting entirely unnecessary references to '/bin/bash' to use '/bin/sh' instead. Update dependency versions to match 'setup.cfg' _except_ for py-requests, where the ports currently has only 2.22.0 available, but upstream is requiring at least 2.23.0. (Waiting on PR 250941) [1] PR: 252180 Submitted by: Charlie Li Added: head/devel/py-cookiecutter/files/ head/devel/py-cookiecutter/files/patch-tests_test-generate-files-permissions_input{{cookiecutter.permissions}}_script.sh (contents, props changed) head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_post__gen__project.sh (contents, props changed) head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_pre__gen__project.sh (contents, props changed) head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_post__gen__project.sh (contents, props changed) head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_pre__gen__project.sh (contents, props changed) head/devel/py-cookiecutter/files/patch-tests_test__hooks.py (contents, props changed) Modified: head/devel/py-cookiecutter/Makefile Modified: head/devel/py-cookiecutter/Makefile ============================================================================== --- head/devel/py-cookiecutter/Makefile Mon Dec 28 09:52:58 2020 (r559452) +++ head/devel/py-cookiecutter/Makefile Mon Dec 28 10:14:37 2020 (r559453) @@ -2,6 +2,7 @@ PORTNAME= cookiecutter PORTVERSION= 1.7.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,19 +13,19 @@ COMMENT= Create projects from cookiecutters (project t LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}binaryornot>=0.2.0:devel/py-binaryornot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}binaryornot>=0.4.4:devel/py-binaryornot@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}whichcraft>=0.4.0:devel/py-whichcraft@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}poyo>=0.1.0:devel/py-poyo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jinja2-time>=0.1.0:devel/py-jinja2-time@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.18.0:www/py-requests@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}poyo>=0.5.0:devel/py-poyo@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jinja2-time>=0.2.0:devel/py-jinja2-time@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-slugify>=4.0.0:textproc/py-python-slugify@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markupsafe>0:textproc/py-markupsafe@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}flake8>0:devel/py-flake8@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils @@ -33,10 +34,7 @@ NO_ARCH= yes # pytest needs a UTF-8 environment, and it will try and write outside -# ${WRKDIR} unless told not to. Even so, these tests have failures: -# -# cookiecutter/utils.py 50 3 94% -# cookiecutter/zipfile.py 61 2 97% +# ${WRKDIR} unless told not to. TEST_ENV= TMPDIR=${WRKDIR} HOME=${WRKDIR} LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 Added: head/devel/py-cookiecutter/files/patch-tests_test-generate-files-permissions_input{{cookiecutter.permissions}}_script.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-cookiecutter/files/patch-tests_test-generate-files-permissions_input{{cookiecutter.permissions}}_script.sh Mon Dec 28 10:14:37 2020 (r559453) @@ -0,0 +1,8 @@ +--- tests/test-generate-files-permissions/input{{cookiecutter.permissions}}/script.sh.orig 2020-12-28 09:56:38 UTC ++++ tests/test-generate-files-permissions/input{{cookiecutter.permissions}}/script.sh +@@ -1,3 +1,3 @@ +-#!/bin/bash ++#!/bin/sh + +-# some bash script ++# some shell script Added: head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_post__gen__project.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_post__gen__project.sh Mon Dec 28 10:14:37 2020 (r559453) @@ -0,0 +1,8 @@ +--- tests/test-pyshellhooks/hooks/post_gen_project.sh.orig 2020-12-28 09:59:20 UTC ++++ tests/test-pyshellhooks/hooks/post_gen_project.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + echo 'post generation hook'; + touch 'shell_post.txt' Added: head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_pre__gen__project.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-cookiecutter/files/patch-tests_test-pyshellhooks_hooks_pre__gen__project.sh Mon Dec 28 10:14:37 2020 (r559453) @@ -0,0 +1,8 @@ +--- tests/test-pyshellhooks/hooks/pre_gen_project.sh.orig 2020-12-28 10:00:09 UTC ++++ tests/test-pyshellhooks/hooks/pre_gen_project.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + echo 'post generation hook'; + touch 'shell_pre.txt' Added: head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_post__gen__project.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_post__gen__project.sh Mon Dec 28 10:14:37 2020 (r559453) @@ -0,0 +1,8 @@ +--- tests/test-shellhooks/hooks/post_gen_project.sh.orig 2020-12-28 09:54:42 UTC ++++ tests/test-shellhooks/hooks/post_gen_project.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + echo 'post generation hook'; + touch 'shell_post.txt' Added: head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_pre__gen__project.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-cookiecutter/files/patch-tests_test-shellhooks_hooks_pre__gen__project.sh Mon Dec 28 10:14:37 2020 (r559453) @@ -0,0 +1,8 @@ +--- tests/test-shellhooks/hooks/pre_gen_project.sh.orig 2020-12-28 09:55:19 UTC ++++ tests/test-shellhooks/hooks/pre_gen_project.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + echo 'pre generation hook'; + touch 'shell_pre.txt' Added: head/devel/py-cookiecutter/files/patch-tests_test__hooks.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-cookiecutter/files/patch-tests_test__hooks.py Mon Dec 28 10:14:37 2020 (r559453) @@ -0,0 +1,20 @@ +--- tests/test_hooks.py.orig 2020-12-28 09:57:55 UTC ++++ tests/test_hooks.py +@@ -42,7 +42,7 @@ def make_test_repo(name): + post = 'post_gen_project.sh' + filename = os.path.join(hook_dir, post) + with open(filename, 'w') as f: +- f.write("#!/bin/bash\n") ++ f.write("#!/bin/sh\n") + f.write("\n") + f.write("echo 'post generation hook';\n") + f.write("touch 'shell_post.txt'\n") +@@ -143,7 +143,7 @@ class TestExternalHooks(object): + f.write("echo. >{{cookiecutter.file}}\n") + else: + with open(hook_path, 'w') as fh: +- fh.write("#!/bin/bash\n") ++ fh.write("#!/bin/sh\n") + fh.write("\n") + fh.write("echo 'post generation hook';\n") + fh.write("touch 'shell_post.txt'\n")