mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

sysutils/py-scandir: update to 1.6

Browse source 
Add a patch to somewhat deal with Unicode tests, they still fail but
this might be unrelated to the port itself.

Sort USES before USE_*

Submitted by:	portscout
This commit is contained in:
Rene Ladan 2017-09-30 14:45:58 +00:00
parent 05950f1046
commit 8650ee2be0
3 changed files with 76 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sysutils/py-scandir/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= scandir
PORTVERSION= 1.5
PORTVERSION= 1.6
DISTVERSIONPREFIX= v
CATEGORIES= sysutils python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -12,12 +12,12 @@ COMMENT= Fast and featureful directory iterator
LICENSE= BSD3CLAUSE
USE_GITHUB= yes
GH_ACCOUNT= benhoyt
USES= python
USE_PYTHON= autoplist distutils
USE_GITHUB= yes
GH_ACCOUNT= benhoyt
do-test:
${PYTHON_CMD} ${WRKSRC}/test/run_tests.py

6
sysutils/py-scandir/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1487840889
SHA256 (benhoyt-scandir-v1.5_GH0.tar.gz) = 3b2be74e0be665d22adaf841d1cadab7ed4aa2001a9bb81452e0f498cd0780d8
SIZE (benhoyt-scandir-v1.5_GH0.tar.gz) = 28100
TIMESTAMP = 1506772140
SHA256 (benhoyt-scandir-v1.6_GH0.tar.gz) = 4a84e86c1d1632a8960c3db8686296de048337263406d12e66145e753e078798
SIZE (benhoyt-scandir-v1.6_GH0.tar.gz) = 29401

69
sysutils/py-scandir/files/patch-test_test__scandir.py Normal file
View file

@ -0,0 +1,69 @@
--- test/test_scandir.py.orig 2017-09-29 12:38:51 UTC
+++ test/test_scandir.py
@@ -14,6 +14,9 @@ try:
except ImportError:
has_scandir = False
+reload(sys)
+sys.setdefaultencoding('utf8')
+
FILE_ATTRIBUTE_DIRECTORY = 16
TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), 'testdir'))
@@ -48,24 +51,24 @@ def create_file(path, contents='1234'):
def setup_main():
join = os.path.join
- os.mkdir(TEST_PATH)
- os.mkdir(join(TEST_PATH, 'subdir'))
+ os.makedirs(TEST_PATH)
+ os.makedirs(join(TEST_PATH, 'subdir'))
create_file(join(TEST_PATH, 'file1.txt'))
create_file(join(TEST_PATH, 'file2.txt'), contents='12345678')
- os.mkdir(join(TEST_PATH, 'subdir', 'unidir\u018F'))
+ os.makedirs(join(TEST_PATH, 'subdir', u'unidir\u018F'))
create_file(join(TEST_PATH, 'subdir', 'file1.txt'))
- create_file(join(TEST_PATH, 'subdir', 'unicod\u018F.txt'))
+ create_file(join(TEST_PATH, 'subdir', u'unicod\u018F.txt'))
- create_file(join(TEST_PATH, 'subdir', 'unidir\u018F', 'file1.txt'))
+ create_file(join(TEST_PATH, 'subdir', u'unidir\u018F', 'file1.txt'))
- os.mkdir(join(TEST_PATH, 'linkdir'))
+ os.makedirs(join(TEST_PATH, 'linkdir'))
def setup_symlinks():
join = os.path.join
- os.mkdir(join(TEST_PATH, 'linkdir', 'linksubdir'))
+ os.makedirs(join(TEST_PATH, 'linkdir', 'linksubdir'))
create_file(join(TEST_PATH, 'linkdir', 'file1.txt'))
os.symlink(os.path.abspath(join(TEST_PATH, 'linkdir', 'file1.txt')),
@@ -217,7 +220,7 @@ class TestMixin(object):
self.assertTrue(isinstance(entry.path, bytes))
# b'unicod?.txt' on Windows, b'unicod\xc6\x8f.txt' (UTF-8) or similar on POSIX
- entry_name = 'unicod\u018f.txt'.encode(sys.getfilesystemencoding(), 'replace')
+ entry_name = u'unicod\u018f.txt'.encode(sys.getfilesystemencoding(), 'replace')
self.assertEqual(entry.name, entry_name)
self.assertEqual(entry.path, os.path.join(path, entry_name))
@@ -234,12 +237,12 @@ class TestMixin(object):
self.assertTrue(isinstance(entry.name, str))
self.assertTrue(isinstance(entry.path, str))
- entry_name = 'unicod\u018f.txt'
+ entry_name = u'unicod\u018f.txt'
self.assertEqual(entry.name, entry_name)
- self.assertEqual(entry.path, os.path.join(path, 'unicod\u018f.txt'))
+ self.assertEqual(entry.path, os.path.join(path, u'unicod\u018f.txt'))
# Check that it handles unicode input properly
- path = os.path.join(TEST_PATH, 'subdir', 'unidir\u018f')
+ path = os.path.join(TEST_PATH, 'subdir', u'unidir\u018f')
self.assertTrue(isinstance(path, str))
entries = list(self.scandir_func(path))
self.assertEqual(len(entries), 1)