From 8c09c10f255ba58c9ca2b580d2955ca03d487077 Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Tue, 2 Jul 2019 21:11:59 -0700
Subject: [PATCH 1/4] Switch to ~= dependencies, closes #532

---
 setup.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/setup.py b/setup.py
index fdbb948e..16953a00 100644
--- a/setup.py
+++ b/setup.py
@@ -41,14 +41,14 @@ setup(
     package_data={"datasette": ["templates/*.html"]},
     include_package_data=True,
     install_requires=[
-        "click>=6.7",
-        "click-default-group==1.2",
-        "Jinja2==2.10.1",
-        "hupper==1.0",
-        "pint==0.8.1",
-        "pluggy>=0.12.0",
-        "uvicorn>=0.8.1",
-        "aiofiles==0.4.0",
+        "click~=6.7",
+        "click-default-group~=1.2",
+        "Jinja2~=2.10.1",
+        "hupper~=1.0",
+        "pint~=0.8.1",
+        "pluggy~=0.12.0",
+        "uvicorn~=0.8.1",
+        "aiofiles~=0.4.0",
     ],
     entry_points="""
         [console_scripts]
@@ -58,11 +58,11 @@ setup(
     extras_require={
         "docs": ["sphinx_rtd_theme", "sphinx-autobuild"],
         "test": [
-            "pytest==4.6.1",
-            "pytest-asyncio==0.10.0",
-            "aiohttp==3.5.3",
-            "beautifulsoup4==4.6.1",
-            "asgiref==3.1.2",
+            "pytest~=4.6.1",
+            "pytest-asyncio~=0.10.0",
+            "aiohttp~=3.5.3",
+            "beautifulsoup4~=4.6.1",
+            "asgiref~=3.1.2",
         ]
         + maybe_black,
     },

From dd67c491f351b2ef2e0c3d4577a32d2411cce84a Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Tue, 2 Jul 2019 21:14:56 -0700
Subject: [PATCH 2/4] Bump click and click-default-group

---
 setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 16953a00..6b2f903d 100644
--- a/setup.py
+++ b/setup.py
@@ -41,8 +41,8 @@ setup(
     package_data={"datasette": ["templates/*.html"]},
     include_package_data=True,
     install_requires=[
-        "click~=6.7",
-        "click-default-group~=1.2",
+        "click~=7.0",
+        "click-default-group~=1.2.1",
         "Jinja2~=2.10.1",
         "hupper~=1.0",
         "pint~=0.8.1",

From dc893692fb4d841d233380568a958236b7f99328 Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Tue, 2 Jul 2019 21:22:54 -0700
Subject: [PATCH 3/4] imp. is deprecated, use types.ModuleType instead

Thanks https://stackoverflow.com/a/32175781
---
 datasette/utils/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datasette/utils/__init__.py b/datasette/utils/__init__.py
index 94ccc23e..17a4d595 100644
--- a/datasette/utils/__init__.py
+++ b/datasette/utils/__init__.py
@@ -3,7 +3,6 @@ from collections import OrderedDict
 import base64
 import click
 import hashlib
-import imp
 import json
 import os
 import pkg_resources
@@ -11,6 +10,7 @@ import re
 import shlex
 import tempfile
 import time
+import types
 import shutil
 import urllib
 import numbers
@@ -588,7 +588,7 @@ def link_or_copy_directory(src, dst):
 
 def module_from_path(path, name):
     # Adapted from http://sayspy.blogspot.com/2011/07/how-to-import-module-from-just-file.html
-    mod = imp.new_module(name)
+    mod = types.ModuleType(name)
     mod.__file__ = path
     with open(path, "r") as file:
         code = compile(file.read(), path, "exec", dont_inherit=True)

From 391d109dc3f9230dc4ee4afd20041e480e90e739 Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Tue, 2 Jul 2019 21:23:09 -0700
Subject: [PATCH 4/4] Upgrade to pytest 5

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 6b2f903d..254859b0 100644
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ setup(
     extras_require={
         "docs": ["sphinx_rtd_theme", "sphinx-autobuild"],
         "test": [
-            "pytest~=4.6.1",
+            "pytest~=5.0.0",
             "pytest-asyncio~=0.10.0",
             "aiohttp~=3.5.3",
             "beautifulsoup4~=4.6.1",