summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2020-11-28 11:52:35 +0100
committerRonny Pfannschmidt <ronny.pfannschmidt@redhat.com>2020-11-28 11:52:35 +0100
commit7204399f20c634f7d1315e33b9dca7aa566c0ecd (patch)
tree358875bb27faf8a61d79971af04b8f451805235c
parent073e56beb56a9d011eee84974ac8ffb72a5b0f13 (diff)
downloadsetuptools-scm-7204399f20c634f7d1315e33b9dca7aa566c0ecd.tar.gz
add python 3.9 to tox and drop six
-rw-r--r--testing/conftest.py7
-rw-r--r--tox.ini2
2 files changed, 4 insertions, 5 deletions
diff --git a/testing/conftest.py b/testing/conftest.py
index 38e358c..5f6cdd5 100644
--- a/testing/conftest.py
+++ b/testing/conftest.py
@@ -1,7 +1,6 @@
import os
import itertools
import pytest
-import six
# 2009-02-13T23:31:30+00:00
os.environ["SOURCE_DATE_EPOCH"] = "1234567890"
@@ -42,10 +41,10 @@ class Wd(object):
filename = self.cwd / name
if kw:
value = value.format(**kw)
- if isinstance(value, six.text_type):
- filename.write_text(value)
- else:
+ if isinstance(value, bytes):
filename.write_bytes(value)
+ else:
+ filename.write_text(value)
return filename
def _reason(self, given_reason):
diff --git a/tox.ini b/tox.ini
index 8b27a88..4e38757 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist=py{27,34,35,36,37,38}-test,flake8,check_readme,py{27,37}-selfcheck
+envlist=py{27,34,35,36,37,38,39}-test,flake8,check_readme,py{27,37}-selfcheck
[pytest]
testpaths=testing