From dd926f4eb3696f6e929af9079473d6aaa0d9281b Mon Sep 17 00:00:00 2001 From: Babak Farrokhi Date: Sat, 30 Apr 2016 21:47:15 +0430 Subject: [PATCH 1/2] fix cymruwhois dependency for setuptools --- MANIFEST.in | 3 +-- setup.py | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index aa02344..427cfae 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1 @@ -include LICENSE README.md TODO.md -include *.txt +include LICENSE README.md TODO.md public-servers.txt diff --git a/setup.py b/setup.py index 3ef68ae..4bc78f2 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,12 @@ from setuptools import setup, find_packages setup( name = "dnsdiag", - version = "1.2.1", - packages = find_packages(), + version = "1.2.2", + 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'], classifiers=[ "Topic :: System :: Networking", @@ -13,7 +17,6 @@ setup( "Development Status :: 5 - Production/Stable", ], - install_requires = ['cymruwhois>=1.4'], author = "Babak Farrokhi", author_email = "babak@farrokhi.net", description = "DNS Diagnostics and measurement tools (ping, traceroute)", From dc4dfc7b6fbf6a2198c1db31cbac33101dd0890d Mon Sep 17 00:00:00 2001 From: Babak Farrokhi Date: Sat, 30 Apr 2016 22:26:00 +0430 Subject: [PATCH 2/2] improving setuptools script --- .travis.yml | 4 ++-- setup.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ab8a7e8..4c271f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: python -python: "3.3" -install: pip install dnsdiag +python: "3.4" +install: pip install --process-dependency-links dnsdiag script: nosetests diff --git a/setup.py b/setup.py index 4bc78f2..d78c515 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,7 @@ from setuptools import setup, find_packages setup( name = "dnsdiag", version = "1.2.2", + packages = find_packages(), install_requires = ['cymruwhois==1.4'], dependency_links = [ "https://github.com/JustinAzoff/python-cymruwhois/archive/a34543335cbef02b1b615e774ce5b6187afb0cc2.zip#egg=cymruwhois-1.4"