Reorganize source.

Author: bd808

.gitignore

@@ -3,5 +3,5 @@
 build
 dist
 extras
+iptools.egg-info
 setuptools-*.egg
-src/iptools.egg-info

.travis.yml

@@ -1,18 +1,18 @@
 language: python
-
 python:
   - "2.5"
   - "2.6"
   - "2.7"
   - "3.2"
   - "3.3"
   - "pypy"
-
-script: "./runtests"
-
-# nothing to install, but this will squelch a warning
-install: "true"
-
+install:
+  - pip install . --use-mirrors
+  - pip install -r tests/requirements.txt --use-mirrors
+script:
+  - flake8 iptools
+  - flake8 tests
+  - nosetests
 notifications:
   email:
       - travis-ci+python-iptools@bd808.com

docs/conf.py

@@ -2,17 +2,17 @@
 
 import sys
 import os
-import datetime
+from datetime import date
 
-sys.path.append(os.path.abspath('../src'))
+sys.path.insert(0, os.path.abspath(os.path.join(os.getcwd(), '..')))
 import iptools
 
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
 templates_path = ['_templates']
 source_suffix = '.rst'
 master_doc = 'index'
-project = 'python-iptools'
-copyright = '%s, Bryan Davis. All Rights Reserved' % datetime.date.today().year
+project = 'iptools'
+copyright = '%s, Bryan Davis. All Rights Reserved' % date.today().year
 version = iptools.__version__
 release = version
 exclude_patterns = ['_build']

docs/requirements.txt

@@ -1,45 +1,36 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
-try:
-  from setuptools import setup
-except ImportError:
-  from distutils.core import setup
-
-# get version from package
-import os
-here = os.path.dirname(__file__)
-version_file = os.path.join(here, 'src/iptools/__init__.py')
-d = {}
-execfile(version_file, d)
-version = d['__version__']
+from iptools import __version__
+from setuptools import setup, find_packages
 
 setup(
     name = 'iptools',
-    version = version,
+    version = __version__,
     description = 'Python utilites for manipulating IPv4 addresses',
-    long_description = "Utilities for manipulating IPv4 addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting.",
-    url = 'https://github.com/bd808/python-iptools',
-    download_url = 'http://pypi.python.org/packages/source/i/iptools/',
     author = 'Bryan Davis',
     author_email = 'bd808@bd808.com',
+    url = 'https://github.com/bd808/python-iptools',
+    download_url = 'http://pypi.python.org/packages/source/i/iptools/',
     license = 'BSD',
     platforms = ['any',],
-    package_dir = {'': 'src'},
-    packages = ['iptools'],
+    packages = find_packages(),
     include_package_data = True,
-    test_suite='iptools.test_iptools',
+    test_suite='tests',
     classifiers = [
       'Development Status :: 4 - Beta',
       'Environment :: Web Environment',
       'Intended Audience :: Developers',
       'License :: OSI Approved :: BSD License',
       'Operating System :: OS Independent',
       'Programming Language :: Python',
-      'Programming Language :: Python :: 2',
-      'Programming Language :: Python :: 3',
+      'Programming Language :: Python :: 2.5',
+      'Programming Language :: Python :: 2.6',
+      'Programming Language :: Python :: 2.7',
+      'Programming Language :: Python :: 3.2',
+      'Programming Language :: Python :: 3.3',
       'Topic :: Utilities',
       'Topic :: Internet',
     ],
+    long_description = "Utilities for manipulating IPv4 addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting.",
     zip_safe=False,
 )