From c11a754ec7bd43440cf06e922f8dbf44269bb9b0 Mon Sep 17 00:00:00 2001
From: Andrew Port <andyaport@gmail.com>
Date: Mon, 18 Oct 2021 21:31:17 -0700
Subject: [PATCH] add all python 2 and 3 versions and continue-on-error

---
 .github/workflows/github-ci.yml |  4 ++--
 setup.py                        | 38 +++++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
index a5943dc..d2ab972 100644
--- a/.github/workflows/github-ci.yml
+++ b/.github/workflows/github-ci.yml
@@ -2,17 +2,17 @@ name: Github CI Unit Testing
 
 on:
   push:
-    branches: [ master ]
   pull_request:
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
+    continue-on-error: true
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [2.7, 3.6, 3.7, 3.8, 3.9]
+        python-version: [2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11]
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
diff --git a/setup.py b/setup.py
index ebec0fc..9eba6b7 100644
--- a/setup.py
+++ b/setup.py
@@ -8,14 +8,12 @@ AUTHOR_NAME = 'Andy Port'
 AUTHOR_EMAIL = 'AndyAPort@gmail.com'
 GITHUB = 'https://github.com/mathandy/svgpathtools'
 
+_here = os.path.abspath(os.path.dirname(__file__))
 
-def read(*parts):
-    """
-    Build an absolute path from *parts* and and return the contents of the
-    resulting file.  Assume UTF-8 encoding.
-    """
-    HERE = os.path.abspath(os.path.dirname(__file__))
-    with codecs.open(os.path.join(HERE, *parts), "rb", "utf-8") as f:
+
+def read(relative_path):
+    """Reads file at relative path, returning contents as string."""
+    with codecs.open(os.path.join(_here, relative_path), "rb", "utf-8") as f:
         return f.read()
 
 
@@ -32,17 +30,35 @@ setup(name='svgpathtools',
       download_url='{}/releases/download/{}/svgpathtools-{}-py2.py3-none-any.whl'
                    ''.format(GITHUB, VERSION, VERSION),
       license='MIT',
-      install_requires=['numpy', 'svgwrite'],
+      install_requires=['numpy', 'svgwrite', 'defusedxml'],
       platforms="OS Independent",
-      requires=['numpy', 'svgwrite'],
+      requires=['numpy', 'svgwrite', 'defusedxml'],
       keywords=['svg', 'svg path', 'svg.path', 'bezier', 'parse svg path', 'display svg'],
       classifiers=[
             "Development Status :: 4 - Beta",
             "Intended Audience :: Developers",
             "License :: OSI Approved :: MIT License",
             "Operating System :: OS Independent",
-            "Programming Language :: Python :: 2",
-            "Programming Language :: Python :: 3",
+            "Programming Language :: Python :: 2.0",
+            "Programming Language :: Python :: 2.1",
+            "Programming Language :: Python :: 2.2",
+            "Programming Language :: Python :: 2.3",
+            "Programming Language :: Python :: 2.4",
+            "Programming Language :: Python :: 2.5",
+            "Programming Language :: Python :: 2.6",
+            "Programming Language :: Python :: 2.7",
+            "Programming Language :: Python :: 3.0",
+            "Programming Language :: Python :: 3.1",
+            "Programming Language :: Python :: 3.2",
+            "Programming Language :: Python :: 3.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 :: 3.9",
+            "Programming Language :: Python :: 3.10",
+            "Programming Language :: Python :: 3.11",
             "Topic :: Multimedia :: Graphics :: Editors :: Vector-Based",
             "Topic :: Scientific/Engineering",
             "Topic :: Scientific/Engineering :: Image Recognition",