From b468b645a5efbae70db61bc86cc0f466fb35b199 Mon Sep 17 00:00:00 2001
From: Martin Blech <78768+martinblech@users.noreply.github.com>
Date: Sat, 7 May 2022 21:55:02 -0700
Subject: [PATCH] Drop Jython/Python 2 and add Python 3.9/3.10

---
 .travis.yml | 21 +++++----------------
 setup.py    |  9 ++++-----
 tox.ini     |  6 +++---
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02efc14..d975a86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,15 @@
 language: python
 
 python:
-  - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
+  - "3.9"
+  - "3.10-dev"
   - "pypy"
 
-script: nosetests -vv --with-coverage --cover-package=xmltodict
+install: pip install nose2
 
-jobs:
-  include:
-    - python: "3.8"
-      dist: bionic
-    - name: "Jython"
-      python: "pypy"
-      env: JYTHON_VERSION="2.7.0"
-      before_install:
-        - export JYTHON_URL="http://search.maven.org/remotecontent?filepath=org/python/jython-installer/${JYTHON_VERSION}/jython-installer-${JYTHON_VERSION}.jar"
-        - wget $JYTHON_URL -O jython_installer.jar
-        - java -jar jython_installer.jar -s -d $HOME/jython
-        - export PATH="$HOME/jython:$PATH"
-        - $HOME/jython/bin/easy_install nose
-      script: $HOME/jython/bin/nosetests
+script: nose2 -vv --coverage=xmltodict.py
diff --git a/setup.py b/setup.py
index 74f8623..b4edafb 100755
--- a/setup.py
+++ b/setup.py
@@ -22,24 +22,23 @@
       url='https://github.com/martinblech/xmltodict',
       license=xmltodict.__license__,
       platforms=['all'],
-      python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+      python_requires='>=3.4',
       classifiers=[
           'Intended Audience :: Developers',
           'License :: OSI Approved :: MIT License',
           'Operating System :: OS Independent',
           'Programming Language :: Python',
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
-          'Programming Language :: Python :: Implementation :: Jython',
+          'Programming Language :: Python :: 3.9',
+          'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Topic :: Text Processing :: Markup :: XML',
       ],
       py_modules=['xmltodict'],
-      tests_require=['nose>=1.0', 'coverage'],
+      tests_require=['nose2', 'coverage'],
       )
diff --git a/tox.ini b/tox.ini
index 8c390f9..c1cad67 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
-envlist = py27, py34, py35, py36, py37, py38, pypy
+envlist = py34, py35, py36, py37, py38, py39, py310, pypy
 [testenv]
 deps =
   coverage
-  nose
-commands=nosetests --with-coverage --cover-package=xmltodict
+  nose2
+commands=nose2 --coverage=xmltodict.py