Skip to content
Permalink
Browse files

Switch to ~= dependencies, closes #532 (#536)

* Switch to ~= dependencies, closes #532
* Bump click and click-default-group
* imp. is deprecated, use types.ModuleType instead - thanks https://stackoverflow.com/a/32175781
* Upgrade to pytest 5
  • Loading branch information...
simonw committed Jul 3, 2019
1 parent 4d2fdaf commit f0d32da0a9af87bcb15e34e35424f0c0053be83a
Showing with 15 additions and 15 deletions.
  1. +2 −2 datasette/utils/__init__.py
  2. +13 −13 setup.py
@@ -3,14 +3,14 @@
import base64
import click
import hashlib
import imp
import json
import os
import pkg_resources
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)
@@ -41,14 +41,14 @@ def get_version():
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~=7.0",
"click-default-group~=1.2.1",
"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 @@ def get_version():
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~=5.0.0",
"pytest-asyncio~=0.10.0",
"aiohttp~=3.5.3",
"beautifulsoup4~=4.6.1",
"asgiref~=3.1.2",
]
+ maybe_black,
},

0 comments on commit f0d32da

Please sign in to comment.
You can’t perform that action at this time.