From 1cddae4133b67eac6e3955184c41cb251d1ea60c Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Mon, 5 Apr 2021 18:34:33 -0400 Subject: [PATCH 1/4] Add newsfragment --- newsfragments/3669.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3669.minor diff --git a/newsfragments/3669.minor b/newsfragments/3669.minor new file mode 100644 index 000000000..e69de29bb From 5f7c6e4552c75f9989c87423803137c387733649 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Mon, 5 Apr 2021 18:34:48 -0400 Subject: [PATCH 2/4] Remove Windows exclusion --- .github/workflows/ci.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e029104b3..c45ceaa63 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,15 +24,6 @@ jobs: python-version: - 2.7 - 3.6 - exclude: - # Do not run coverage tests with Python 3.6 on Windows for - # now. They will fail. Dealing with them separately would - # be simpler. - # - # XXX: https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3669 - # should track the effort to add Windows to the test matrix. - - python-version: 3.6 - os: windows-latest steps: From d9446f9f06e8efdddce2774e979eab5b2b685905 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Mon, 5 Apr 2021 18:57:47 -0400 Subject: [PATCH 3/4] Remove deprecated `U` mode from open() call Under the right conditions (with newer Python 3.x versions), we will see this warning: setup.py:360: DeprecationWarning: 'U' mode is deprecated `U` is for `universal newline mode`. Docs for open() says this: 'U' mode is deprecated and will raise an exception in future versions of Python. It has no effect in Python 3. Use newline to control universal newlines mode. Off it goes. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index df770fadc..308ac0334 100644 --- a/setup.py +++ b/setup.py @@ -357,7 +357,7 @@ if version: setup(name="tahoe-lafs", # also set in __init__.py description='secure, decentralized, fault-tolerant file store', - long_description=open('README.rst', 'rU').read(), + long_description=open('README.rst', 'r').read(), author='the Tahoe-LAFS project', author_email='tahoe-dev@tahoe-lafs.org', url='https://tahoe-lafs.org/', From ae6e1e9e2fde6d8029e7c7e02d3973e345708254 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Mon, 5 Apr 2021 19:11:58 -0400 Subject: [PATCH 4/4] Use io.open() instead of builtin open() Windows does not like when we open README.rst using builtin open(): Traceback (most recent call last): File "setup.py", line 360, in long_description=open('README.rst', 'rU').read(), File "c:\hostedtoolcache\windows\python\3.6.8\x64\lib\encodings\cp1252.py", line 23, in decode return codecs.charmap_decode(input,self.errors,decoding_table)[0] UnicodeDecodeError: 'charmap' codec can't decode byte 0x9d in position 1720: character maps to --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 308ac0334..df917eb40 100644 --- a/setup.py +++ b/setup.py @@ -11,6 +11,7 @@ import sys # See the docs/about.rst file for licensing information. import os, subprocess, re +from io import open basedir = os.path.dirname(os.path.abspath(__file__)) @@ -357,7 +358,7 @@ if version: setup(name="tahoe-lafs", # also set in __init__.py description='secure, decentralized, fault-tolerant file store', - long_description=open('README.rst', 'r').read(), + long_description=open('README.rst', 'r', encoding='utf-8').read(), author='the Tahoe-LAFS project', author_email='tahoe-dev@tahoe-lafs.org', url='https://tahoe-lafs.org/',