Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Babak Farrokhi 2016-05-01 10:07:26 +04:30
commit 71348bba99
3 changed files with 10 additions and 7 deletions

View File

@ -1,5 +1,5 @@
language: python language: python
python: "3.3" python: "3.4"
install: pip install dnsdiag install: pip install --process-dependency-links dnsdiag
script: nosetests script: nosetests

View File

@ -1,2 +1 @@
include LICENSE README.md TODO.md include LICENSE README.md TODO.md public-servers.txt
include *.txt

View File

@ -1,8 +1,13 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
setup( setup(
name = "dnsdiag", name = "dnsdiag",
version = "1.2.1", version = "1.2.2",
packages = find_packages(), packages = find_packages(),
install_requires = ['cymruwhois==1.4'],
dependency_links = [
"https://github.com/JustinAzoff/python-cymruwhois/archive/a34543335cbef02b1b615e774ce5b6187afb0cc2.zip#egg=cymruwhois-1.4"
],
scripts = ['dnsping.py', 'dnstraceroute.py', 'dnseval.py'], scripts = ['dnsping.py', 'dnstraceroute.py', 'dnseval.py'],
classifiers=[ classifiers=[
"Topic :: System :: Networking", "Topic :: System :: Networking",
@ -13,7 +18,6 @@ setup(
"Development Status :: 5 - Production/Stable", "Development Status :: 5 - Production/Stable",
], ],
install_requires = ['cymruwhois>=1.4'],
author = "Babak Farrokhi", author = "Babak Farrokhi",
author_email = "babak@farrokhi.net", author_email = "babak@farrokhi.net",
description = "DNS Diagnostics and measurement tools (ping, traceroute)", description = "DNS Diagnostics and measurement tools (ping, traceroute)",