Move package to src/natsort.

This makes it more clear during testing that the actual code that is
installed is being tested, and not the package in the development area.

19 files changed, 15 insertions, 33 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 270eb70..f8a611d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,16 +1,14 @@
 include README.rst
 include LICENSE
 include *.md
-include *requirements.txt
-recursive-include natsort *.py
-recursive-include test_natsort *.py
+include Pipfile
 include setup.py
 include setup.cfg
 include tox.ini
 include .travis.yml
 include .coveragerc
 include .gitignore
-include .hgignore
-prune natsort/__pycache__
-prune test_natsort/__pycache__
-graft docs/source
+graft docs
+graft src
+graft test_natsort
+global-exclude *.py[cod] __pycache__ *.so
diff --git a/Pipfile b/Pipfile
index 3581a56..d8b814d 100644
--- a/Pipfile
+++ b/Pipfile
@@ -1,7 +1,6 @@
 [dev-packages]
 coverage      = "*"
 pytest        = "*"
-pytest-cache  = "*"
 pytest-cov    = "*"
 pytest-flakes = "*"
 pytest-pep8   = "*"
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 3406b28..c907ef3 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -13,20 +13,6 @@
 # serve to show the default.
 
 import os
-import re
-
-def current_version():
-    # Read the _version.py file for the module version number
-    VERSIONFILE = os.path.join('..', '..', 'natsort', '_version.py')
-    versionsearch = re.compile(r"^__version__ = ['\"]([^'\"]*)['\"]")
-    with open(VERSIONFILE, "rt") as fl:
-        for line in fl:
-            m = versionsearch.search(line)
-            if m:
-                return m.group(1)
-        else:
-            s = "Unable to locate version string in {0}"
-            raise RuntimeError(s.format(VERSIONFILE))
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -70,7 +56,7 @@ copyright = u'2014, Seth M. Morton'
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = current_version()
+release = '5.3.0'
 # The short X.Y version.
 version = '.'.join(release.split('.')[0:2])
 
diff --git a/setup.cfg b/setup.cfg
index e66895f..d44277f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,13 +30,9 @@ classifiers =
     Topic :: Text Processing
 
 [options]
-packages = find:
 install_requires =
    argparse; python_version < '2.7'
 
-[options.packages.find]
-exclude = test_*
-
 [options.entry_points]
 console_scripts =
     natsort = natsort.__main__:main
diff --git a/setup.py b/setup.py
index 6f70e3e..81bd74a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,7 @@
 #! /usr/bin/env python
 
-from setuptools import setup
-setup()
+from setuptools import setup, find_packages
+setup(
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
+)
diff --git a/natsort/__init__.py b/src/natsort/__init__.py
index 45ede6e..45ede6e 100644
--- a/natsort/__init__.py
+++ b/src/natsort/__init__.py
diff --git a/natsort/__main__.py b/src/natsort/__main__.py
index f2b4e29..f2b4e29 100644
--- a/natsort/__main__.py
+++ b/src/natsort/__main__.py
diff --git a/natsort/_version.py b/src/natsort/_version.py
index 858acd4..858acd4 100644
--- a/natsort/_version.py
+++ b/src/natsort/_version.py
diff --git a/natsort/compat/__init__.py b/src/natsort/compat/__init__.py
index e69de29..e69de29 100644
--- a/natsort/compat/__init__.py
+++ b/src/natsort/compat/__init__.py
diff --git a/natsort/compat/fake_fastnumbers.py b/src/natsort/compat/fake_fastnumbers.py
index 6eee532..6eee532 100644
--- a/natsort/compat/fake_fastnumbers.py
+++ b/src/natsort/compat/fake_fastnumbers.py
diff --git a/natsort/compat/fastnumbers.py b/src/natsort/compat/fastnumbers.py
index 787b553..787b553 100644
--- a/natsort/compat/fastnumbers.py
+++ b/src/natsort/compat/fastnumbers.py
diff --git a/natsort/compat/locale.py b/src/natsort/compat/locale.py
index ab392ee..ab392ee 100644
--- a/natsort/compat/locale.py
+++ b/src/natsort/compat/locale.py
diff --git a/natsort/compat/pathlib.py b/src/natsort/compat/pathlib.py
index f0ab7eb..f0ab7eb 100644
--- a/natsort/compat/pathlib.py
+++ b/src/natsort/compat/pathlib.py
diff --git a/natsort/compat/py23.py b/src/natsort/compat/py23.py
index fa56b06..fa56b06 100644
--- a/natsort/compat/py23.py
+++ b/src/natsort/compat/py23.py
diff --git a/natsort/natsort.py b/src/natsort/natsort.py
index 557e07b..557e07b 100644
--- a/natsort/natsort.py
+++ b/src/natsort/natsort.py
diff --git a/natsort/ns_enum.py b/src/natsort/ns_enum.py
index b3aa917..b3aa917 100644
--- a/natsort/ns_enum.py
+++ b/src/natsort/ns_enum.py
diff --git a/natsort/unicode_numbers.py b/src/natsort/unicode_numbers.py
index e87654f..e87654f 100644
--- a/natsort/unicode_numbers.py
+++ b/src/natsort/unicode_numbers.py
diff --git a/natsort/utils.py b/src/natsort/utils.py
index 306762a..306762a 100644
--- a/natsort/utils.py
+++ b/src/natsort/utils.py
diff --git a/tox.ini b/tox.ini
index a14785e..e03f236 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,16 +19,16 @@ extras =
     {env:WITH_OPTIONS:}
 commands =
     pipenv install --dev --skip-lock
-    pytest --doctest-modules natsort
+    pytest --doctest-modules {envsitepackagesdir}/natsort
     pytest README.rst docs/source/intro.rst docs/source/examples.rst docs/source/howitworks.rst
-    pytest --flakes --pep8 --cov {envsitepackagesdir}/natsort --cov-report term-missing --tb=short
+    pytest --flakes --pep8 --tb=short --cov {envsitepackagesdir}/natsort --cov-report term-missing
 
 [testenv:py27]
 commands =
     pipenv install --dev --skip-lock
-    pytest --doctest-modules natsort
+    pytest --doctest-modules {envsitepackagesdir}/natsort
     pytest README.rst docs/source/intro.rst docs/source/examples.rst
-    pytest --flakes --pep8 --cov {envsitepackagesdir}/natsort --cov-report term-missing --tb=short
+    pytest --flakes --pep8 --tb=short --cov {envsitepackagesdir}/natsort --cov-report term-missing
 
 [testenv:pypy]
 commands = {[testenv:py27]commands}