- Fixed #102 and moved tests back under the netaddr directory (and included them in the release archives)

35 files changed, 15 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 38e846a..0228c62 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,9 @@ Changes since 0.7.15
 Specific bug fixes addressed in this release
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+FIXED Issue 102: https://github.com/drkjam/netaddr/issues/102
+    - 0.7.15 tarball is missing tests.
+
 FIXED Issue 96: https://github.com/drkjam/netaddr/issues/96
     - Wrong hosts and broadcasts for /31 and /32 networks.
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 782ffec..4ed1799 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -12,6 +12,7 @@ include release.py
 include setup.cfg
 include setup.py
 include setup_egg.py
+include runtests.py
 
 recursive-include docs/source *
 
@@ -26,6 +27,12 @@ recursive-include netaddr/ip *.py *.xml
 
 recursive-include netaddr/strategy *.py
 
+include netaddr/tests/__init__.py
+recursive-include netaddr/tests/core *.py
+recursive-include netaddr/tests/eui *.py *.txt
+recursive-include netaddr/tests/ip *.py
+recursive-include netaddr/tests/strategy *.py
+
 include netaddr/tools/netaddr
 
 global-exclude *.svn*
diff --git a/Makefile b/Makefile
index 8763117..f32f70c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 #
 SHELL = /bin/bash
 
-.PHONY = all clean dist doc download
+.PHONY = all clean dist doc download test
 
 all:
 	@echo 'default target does nothing. try clean'
@@ -22,7 +22,7 @@ clean:
 	find . -name '*.pyc' -exec rm -f {} ';'
 	find . -name '*.pyo' -exec rm -f {} ';'
 
-dist: clean download doc
+dist: clean doc
 	@echo 'building netaddr release'
 	python setup_egg.py develop
 	@echo 'building source distributions'
@@ -60,7 +60,7 @@ push_tags:
 	@echo 'syncing tags'
 	git push --tags
 
-runtests:
+test:
 	@echo 'running test suite'
 	python setup.py test
 	@echo 'running doc tests (tutorials)'
diff --git a/test/__init__.py b/netaddr/tests/__init__.py
index e69de29..e69de29 100644
--- a/test/__init__.py
+++ b/netaddr/tests/__init__.py
diff --git a/test/core/__init__.py b/netaddr/tests/core/__init__.py
index e69de29..e69de29 100644
--- a/test/core/__init__.py
+++ b/netaddr/tests/core/__init__.py
diff --git a/test/core/test_compat.py b/netaddr/tests/core/test_compat.py
index 3a97e4c..3a97e4c 100644
--- a/test/core/test_compat.py
+++ b/netaddr/tests/core/test_compat.py
diff --git a/test/core/test_pubsub.py b/netaddr/tests/core/test_pubsub.py
index 1125cc8..1125cc8 100644
--- a/test/core/test_pubsub.py
+++ b/netaddr/tests/core/test_pubsub.py
diff --git a/test/eui/__init__.py b/netaddr/tests/eui/__init__.py
index e69de29..e69de29 100644
--- a/test/eui/__init__.py
+++ b/netaddr/tests/eui/__init__.py
diff --git a/test/eui/sample_iab.txt b/netaddr/tests/eui/sample_iab.txt
index 4742477..4742477 100644
--- a/test/eui/sample_iab.txt
+++ b/netaddr/tests/eui/sample_iab.txt
diff --git a/test/eui/sample_oui.txt b/netaddr/tests/eui/sample_oui.txt
index fd33050..fd33050 100644
--- a/test/eui/sample_oui.txt
+++ b/netaddr/tests/eui/sample_oui.txt
diff --git a/test/eui/test_eui.py b/netaddr/tests/eui/test_eui.py
index 48ef7d2..48ef7d2 100644
--- a/test/eui/test_eui.py
+++ b/netaddr/tests/eui/test_eui.py
diff --git a/test/eui/test_ieee_parsers.py b/netaddr/tests/eui/test_ieee_parsers.py
index 7877f09..7877f09 100644
--- a/test/eui/test_ieee_parsers.py
+++ b/netaddr/tests/eui/test_ieee_parsers.py
diff --git a/test/ip/__init__.py b/netaddr/tests/ip/__init__.py
index e69de29..e69de29 100644
--- a/test/ip/__init__.py
+++ b/netaddr/tests/ip/__init__.py
diff --git a/test/ip/test_cidr_v4.py b/netaddr/tests/ip/test_cidr_v4.py
index 30d7826..30d7826 100644
--- a/test/ip/test_cidr_v4.py
+++ b/netaddr/tests/ip/test_cidr_v4.py
diff --git a/test/ip/test_cidr_v6.py b/netaddr/tests/ip/test_cidr_v6.py
index 449bec7..449bec7 100644
--- a/test/ip/test_cidr_v6.py
+++ b/netaddr/tests/ip/test_cidr_v6.py
diff --git a/test/ip/test_dns.py b/netaddr/tests/ip/test_dns.py
index 700fb66..700fb66 100644
--- a/test/ip/test_dns.py
+++ b/netaddr/tests/ip/test_dns.py
diff --git a/test/ip/test_ip_categories.py b/netaddr/tests/ip/test_ip_categories.py
index 89204fb..89204fb 100644
--- a/test/ip/test_ip_categories.py
+++ b/netaddr/tests/ip/test_ip_categories.py
diff --git a/test/ip/test_ip_comparisons.py b/netaddr/tests/ip/test_ip_comparisons.py
index c7f56cb..c7f56cb 100644
--- a/test/ip/test_ip_comparisons.py
+++ b/netaddr/tests/ip/test_ip_comparisons.py
diff --git a/test/ip/test_ip_globs.py b/netaddr/tests/ip/test_ip_globs.py
index 2cfce49..2cfce49 100644
--- a/test/ip/test_ip_globs.py
+++ b/netaddr/tests/ip/test_ip_globs.py
diff --git a/test/ip/test_ip_ranges.py b/netaddr/tests/ip/test_ip_ranges.py
index b5cfd7f..b5cfd7f 100644
--- a/test/ip/test_ip_ranges.py
+++ b/netaddr/tests/ip/test_ip_ranges.py
diff --git a/test/ip/test_ip_rfc1924.py b/netaddr/tests/ip/test_ip_rfc1924.py
index 8e2761f..8e2761f 100644
--- a/test/ip/test_ip_rfc1924.py
+++ b/netaddr/tests/ip/test_ip_rfc1924.py
diff --git a/test/ip/test_ip_sets.py b/netaddr/tests/ip/test_ip_sets.py
index 32589e1..32589e1 100644
--- a/test/ip/test_ip_sets.py
+++ b/netaddr/tests/ip/test_ip_sets.py
diff --git a/test/ip/test_ip_v4.py b/netaddr/tests/ip/test_ip_v4.py
index 85fcf6a..85fcf6a 100644
--- a/test/ip/test_ip_v4.py
+++ b/netaddr/tests/ip/test_ip_v4.py
diff --git a/test/ip/test_ip_v4_v6_conversions.py b/netaddr/tests/ip/test_ip_v4_v6_conversions.py
index 3ee23cb..3ee23cb 100644
--- a/test/ip/test_ip_v4_v6_conversions.py
+++ b/netaddr/tests/ip/test_ip_v4_v6_conversions.py
diff --git a/test/ip/test_ip_v6.py b/netaddr/tests/ip/test_ip_v6.py
index 2744844..2744844 100644
--- a/test/ip/test_ip_v6.py
+++ b/netaddr/tests/ip/test_ip_v6.py
diff --git a/test/ip/test_network_ops.py b/netaddr/tests/ip/test_network_ops.py
index f682c4f..f682c4f 100644
--- a/test/ip/test_network_ops.py
+++ b/netaddr/tests/ip/test_network_ops.py
diff --git a/test/ip/test_nmap.py b/netaddr/tests/ip/test_nmap.py
index 6d9813b..6d9813b 100644
--- a/test/ip/test_nmap.py
+++ b/netaddr/tests/ip/test_nmap.py
diff --git a/test/ip/test_old_specs.py b/netaddr/tests/ip/test_old_specs.py
index 7f4ebca..7f4ebca 100644
--- a/test/ip/test_old_specs.py
+++ b/netaddr/tests/ip/test_old_specs.py
diff --git a/test/ip/test_platform_osx.py b/netaddr/tests/ip/test_platform_osx.py
index 264005d..264005d 100644
--- a/test/ip/test_platform_osx.py
+++ b/netaddr/tests/ip/test_platform_osx.py
diff --git a/test/ip/test_socket_module_fallback.py b/netaddr/tests/ip/test_socket_module_fallback.py
index 3174972..3174972 100644
--- a/test/ip/test_socket_module_fallback.py
+++ b/netaddr/tests/ip/test_socket_module_fallback.py
diff --git a/test/strategy/__init__.py b/netaddr/tests/strategy/__init__.py
index e69de29..e69de29 100644
--- a/test/strategy/__init__.py
+++ b/netaddr/tests/strategy/__init__.py
diff --git a/test/strategy/test_eui48_strategy.py b/netaddr/tests/strategy/test_eui48_strategy.py
index adea7a9..adea7a9 100644
--- a/test/strategy/test_eui48_strategy.py
+++ b/netaddr/tests/strategy/test_eui48_strategy.py
diff --git a/test/strategy/test_ipv4_strategy.py b/netaddr/tests/strategy/test_ipv4_strategy.py
index 607d816..607d816 100644
--- a/test/strategy/test_ipv4_strategy.py
+++ b/netaddr/tests/strategy/test_ipv4_strategy.py
diff --git a/test/strategy/test_ipv6_strategy.py b/netaddr/tests/strategy/test_ipv6_strategy.py
index 875d583..875d583 100644
--- a/test/strategy/test_ipv6_strategy.py
+++ b/netaddr/tests/strategy/test_ipv6_strategy.py
diff --git a/setup.py b/setup.py
index 4bd1f41..3d32d93 100644
--- a/setup.py
+++ b/setup.py
@@ -30,8 +30,8 @@ class PyTest(Command):
         import os
         saved_cwd = os.getcwd()
         try:
-            os.chdir(os.path.join(os.path.dirname(__file__), 'test'))
-            errno = subprocess.call([sys.executable, '../runtests.py'])
+            os.chdir(os.path.join(os.path.dirname(__file__), 'netaddr', 'tests'))
+            errno = subprocess.call([sys.executable, '../../runtests.py'])
         finally:
             os.chdir(saved_cwd)
         raise SystemExit(errno)