Merge branch 'master' into redo-compat

5 files changed, 20 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 251f782..688c07d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ python:
   - "3.6"
   - "3.7"
   - "3.8"
+  - "3.9"
 
 install:
   - pip install coverage coveralls codecov
diff --git a/README.md b/README.md
index 044752c..6f1c8dc 100644
--- a/README.md
+++ b/README.md
@@ -57,13 +57,17 @@ that must be installed as well:
 
 ### Debian/Ubuntu
 
-  $ sudo apt-get install libmagic1
+```
+sudo apt-get install libmagic1
+```
 
 ### Windows
 
 You'll need DLLs for libmagic.  @julian-r maintains a pypi package with the DLLs, you can fetch it with:
 
-  $ pip install python-magic-bin
+```
+pip install python-magic-bin
+```
 
 ### OSX
 
@@ -99,15 +103,21 @@ triage it.
 
 To run the tests across 3 recent Ubuntu LTS releases (depends on Docker):
 
-  $ ./test_docker.sh
+```
+./test_docker.sh
+```
 
 To run tests locally across all available python versions:
 
-  $ ./test/run.py
+```
+./test/run.py
+```
 
 To run against a specific python version:
 
-  $ LC_ALL=en_US.UTF-8 python3 test/test.py
+```
+LC_ALL=en_US.UTF-8 python3 test/test.py
+```
 
 ## Versioning
 
diff --git a/setup.py b/setup.py
index 234c8a3..edf0aea 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,6 @@ def read(file_name):
                  encoding='utf-8') as f:
         return f.read()
 
-
 setup(
     name='python-magic',
     description='File type identification using libmagic',
@@ -35,6 +34,8 @@ setup(
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
     ],
 )
+
diff --git a/test/run.py b/test/run.py
index 48203df..733db4d 100644
--- a/test/run.py
+++ b/test/run.py
@@ -29,5 +29,4 @@ def run_test(versions):
     if not found:
         sys.exit("No versions found: " + str(versions))
 
-
-run_test(["python3.5", "python3.6", "python3.7", "python3.8"])
+run_test(["python3.5", "python3.6", "python3.7", "python3.8", "python3.9"])
diff --git a/tox.ini b/tox.ini
index 94a5b4f..0f0ca13 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@ envlist =
     py36,
     py37,
     py38,
+    py39,
     coverage-report,
     mypy