From 61ef81ac16b93ad7a4ba3b1b93437738bcf198c3 Mon Sep 17 00:00:00 2001
From: Craig Anderson <craiga@craiga.id.au>
Date: Fri, 16 Oct 2020 15:10:11 +0100
Subject: [PATCH 1/3] Prefer XLSX plugin when reading XLSX files.

---
 .travis.yml         | 1 +
 pyexcel_io/utils.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 208ab50..6621a9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ language: python
 notifications:
   email: false
 python:
+  - 3.9
   - 3.8
   - 3.7
   - 3.6
diff --git a/pyexcel_io/utils.py b/pyexcel_io/utils.py
index 65477a0..ec5f538 100644
--- a/pyexcel_io/utils.py
+++ b/pyexcel_io/utils.py
@@ -27,8 +27,8 @@
 AVAILABLE_READERS = {
     constants.FILE_FORMAT_CSV: [IO_ITSELF],
     constants.FILE_FORMAT_XLS: [XLS_PLUGIN],
-    constants.FILE_FORMAT_XLSX: [XLS_PLUGIN, XLSX_PLUGIN],
-    constants.FILE_FORMAT_XLSM: [XLS_PLUGIN, XLSX_PLUGIN],
+    constants.FILE_FORMAT_XLSX: [XLSX_PLUGIN, XLS_PLUGIN],
+    constants.FILE_FORMAT_XLSM: [XLSX_PLUGIN, XLS_PLUGIN],
     constants.FILE_FORMAT_ODS: [ODS_PLUGIN, ODS3_PLUGIN, ODSR_PLUGIN],
     constants.FILE_FORMAT_TSV: [IO_ITSELF],
     constants.FILE_FORMAT_CSVZ: [IO_ITSELF],

From 2cc035fd6bc8a04fc8ffc8dcabbbbf3eafd8db2e Mon Sep 17 00:00:00 2001
From: Craig Anderson <craiga@craiga.id.au>
Date: Fri, 16 Oct 2020 15:19:21 +0100
Subject: [PATCH 2/3] Travis doesn't support Python 3.9 properly yet.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6621a9e..00db8e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: python
 notifications:
   email: false
 python:
-  - 3.9
+  - 3.9-dev
   - 3.8
   - 3.7
   - 3.6

From 099c977ff0e5552be0920a9770f3e75a04d23480 Mon Sep 17 00:00:00 2001
From: Craig Anderson <craiga@craiga.id.au>
Date: Sun, 15 Nov 2020 13:10:19 +0000
Subject: [PATCH 3/3] Use Python 3.9 in Travis

---
 .moban.d/custom_travis.yml.jj2 | 1 +
 .travis.yml                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.moban.d/custom_travis.yml.jj2 b/.moban.d/custom_travis.yml.jj2
index 9a18ae8..28d0904 100644
--- a/.moban.d/custom_travis.yml.jj2
+++ b/.moban.d/custom_travis.yml.jj2
@@ -5,6 +5,7 @@ env:
 {%endblock%}
 {%block custom_python_versions%}
 python:
+  - 3.9
   - 3.8
   - 3.7
   - 3.6
diff --git a/.travis.yml b/.travis.yml
index 00db8e2..6621a9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: python
 notifications:
   email: false
 python:
-  - 3.9-dev
+  - 3.9
   - 3.8
   - 3.7
   - 3.6