From d0608697bb762bf3442f472f94fd3184be9ec9cc Mon Sep 17 00:00:00 2001
From: Olivier Mangin <olivier@mangin.com>
Date: Sat, 7 Nov 2020 16:45:47 -0800
Subject: [PATCH 1/3] Add pytest to test requirements as none optional.

---
 dev_requirements.txt | 2 +-
 setup.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev_requirements.txt b/dev_requirements.txt
index f6555a6..b9879c5 100644
--- a/dev_requirements.txt
+++ b/dev_requirements.txt
@@ -24,4 +24,4 @@ certifi
 #        (also remove in setup.py)
 ddt==1.3.1
 mock
-pytest # optional (python setup.py test works without it), but possible nonetheless
+pytest
diff --git a/setup.py b/setup.py
index a8eb7de..18c64cf 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ setup(
     ],
 
     test_suite='tests',
-    tests_require=['pyfakefs>=3.4', 'mock', 'ddt==1.3.1', 'certifi'],
+    tests_require=['pyfakefs>=3.4', 'mock', 'ddt==1.3.1', 'certifi', 'pytest'],
 
     # in order to avoid 'zipimport.ZipImportError: bad local file header'
     zip_safe=False,

From c21659eb98418d7cbc89849b2347218d9f0dd9d7 Mon Sep 17 00:00:00 2001
From: Olivier Mangin <olivier@mangin.com>
Date: Sat, 7 Nov 2020 17:27:58 -0800
Subject: [PATCH 2/3] Update dependencies and test to drop python 3.5 support.

The reason for dropping python 3.5 support is that it is not compatible
with the feedparser dependency. The version is anyway not supported any
more (security fixes stopped on 2020/09).
---
 .travis.yml | 5 -----
 setup.py    | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9f84fc9..3792177 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,11 +21,6 @@ matrix:
         - source env/bin/activate
 
     # Mock tests (with mock API)
-    - os: linux
-      language: python
-      python: 3.5
-      env:
-        - TO_TEST=TEST_MOCK
     - os: linux
       language: python
       python: 3.6
diff --git a/setup.py b/setup.py
index 18c64cf..f5e45d2 100644
--- a/setup.py
+++ b/setup.py
@@ -45,16 +45,15 @@ setup(
         },
 
     include_package_data=True,
-
     install_requires=['pyyaml', 'bibtexparser>=1.0', 'python-dateutil', 'six',
                       'requests', 'configobj', 'beautifulsoup4', 'feedparser'],
     extras_require={'autocompletion': ['argcomplete'],
                     },
 
+    python_requires='>=3.6',
     classifiers=[
         'Development Status :: 4 - Beta',
         'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',

From f1fd60679bddf94ad5ad48cb2cc83bac3f140526 Mon Sep 17 00:00:00 2001
From: Olivier Mangin <olivier@mangin.com>
Date: Sat, 7 Nov 2020 17:30:21 -0800
Subject: [PATCH 3/3] Adds python 3.9 to build matrix.

---
 .travis.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3792177..a03b5d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
     # Full tests (with online API)
     - os: linux
       language: python
-      python: 3.7
+      python: 3.9
       dist: xenial
       sudo: true
       env:
@@ -40,6 +40,13 @@ matrix:
       sudo: true
       env:
         - TO_TEST=TEST_MOCK
+    - os: linux
+      language: python
+      dist: xenial
+      python: 3.9
+      sudo: true
+      env:
+        - TO_TEST=TEST_MOCK
 
 
     # Install tests
@@ -53,7 +60,7 @@ matrix:
       language: python
       dist: xenial
       sudo: true
-      python: 3.8
+      python: 3.9
       env:
         - TO_TEST=INSTALL
       if: type = cron