summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth M Morton <seth.m.morton@gmail.com>2018-05-17 22:55:02 -0400
committerSeth M Morton <seth.m.morton@gmail.com>2018-05-17 22:55:02 -0400
commita0485bd7d805137bc2730b70c7ad11d1bd80f15f (patch)
tree86caca424ef40352d4622fe7eea48baef0ede709
parent0c2d3af59c9738aca03e9ab89591b1d026c03d39 (diff)
downloadnatsort-a0485bd7d805137bc2730b70c7ad11d1bd80f15f.tar.gz
src/natsort -> natsort/
The decision to move to src/natsort was motivated by the desire to force testing on what is actually installed, not on what is currently being developed - users would be required to use virtual environments. For users that did not do this already it was unexpected at the least. It also turns out that by default, tox tests against the installed location instead of the development location, so there was no reason to have made this change in the first place - I had been using tox incorrectly previously.
-rw-r--r--MANIFEST.in2
-rw-r--r--natsort/__init__.py (renamed from src/natsort/__init__.py)0
-rw-r--r--natsort/__main__.py (renamed from src/natsort/__main__.py)0
-rw-r--r--natsort/_version.py (renamed from src/natsort/_version.py)0
-rw-r--r--natsort/compat/__init__.py (renamed from src/natsort/compat/__init__.py)0
-rw-r--r--natsort/compat/fake_fastnumbers.py (renamed from src/natsort/compat/fake_fastnumbers.py)0
-rw-r--r--natsort/compat/fastnumbers.py (renamed from src/natsort/compat/fastnumbers.py)0
-rw-r--r--natsort/compat/locale.py (renamed from src/natsort/compat/locale.py)0
-rw-r--r--natsort/compat/pathlib.py (renamed from src/natsort/compat/pathlib.py)0
-rw-r--r--natsort/compat/py23.py (renamed from src/natsort/compat/py23.py)0
-rw-r--r--natsort/natsort.py (renamed from src/natsort/natsort.py)0
-rw-r--r--natsort/ns_enum.py (renamed from src/natsort/ns_enum.py)0
-rw-r--r--natsort/unicode_numbers.py (renamed from src/natsort/unicode_numbers.py)0
-rw-r--r--natsort/utils.py (renamed from src/natsort/utils.py)0
-rw-r--r--setup.cfg2
-rw-r--r--setup.py3
16 files changed, 3 insertions, 4 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index c3f224d..6994794 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -10,6 +10,6 @@ include .coveragerc
include .gitignore
include .bumpversion.cfg
graft docs
-graft src
+graft natsort
graft test_natsort
global-exclude *.py[cod] __pycache__ *.so
diff --git a/src/natsort/__init__.py b/natsort/__init__.py
index 45ede6e..45ede6e 100644
--- a/src/natsort/__init__.py
+++ b/natsort/__init__.py
diff --git a/src/natsort/__main__.py b/natsort/__main__.py
index f2b4e29..f2b4e29 100644
--- a/src/natsort/__main__.py
+++ b/natsort/__main__.py
diff --git a/src/natsort/_version.py b/natsort/_version.py
index ddd231b..ddd231b 100644
--- a/src/natsort/_version.py
+++ b/natsort/_version.py
diff --git a/src/natsort/compat/__init__.py b/natsort/compat/__init__.py
index e69de29..e69de29 100644
--- a/src/natsort/compat/__init__.py
+++ b/natsort/compat/__init__.py
diff --git a/src/natsort/compat/fake_fastnumbers.py b/natsort/compat/fake_fastnumbers.py
index 6eee532..6eee532 100644
--- a/src/natsort/compat/fake_fastnumbers.py
+++ b/natsort/compat/fake_fastnumbers.py
diff --git a/src/natsort/compat/fastnumbers.py b/natsort/compat/fastnumbers.py
index 787b553..787b553 100644
--- a/src/natsort/compat/fastnumbers.py
+++ b/natsort/compat/fastnumbers.py
diff --git a/src/natsort/compat/locale.py b/natsort/compat/locale.py
index ab392ee..ab392ee 100644
--- a/src/natsort/compat/locale.py
+++ b/natsort/compat/locale.py
diff --git a/src/natsort/compat/pathlib.py b/natsort/compat/pathlib.py
index f0ab7eb..f0ab7eb 100644
--- a/src/natsort/compat/pathlib.py
+++ b/natsort/compat/pathlib.py
diff --git a/src/natsort/compat/py23.py b/natsort/compat/py23.py
index fa56b06..fa56b06 100644
--- a/src/natsort/compat/py23.py
+++ b/natsort/compat/py23.py
diff --git a/src/natsort/natsort.py b/natsort/natsort.py
index 557e07b..557e07b 100644
--- a/src/natsort/natsort.py
+++ b/natsort/natsort.py
diff --git a/src/natsort/ns_enum.py b/natsort/ns_enum.py
index b3aa917..b3aa917 100644
--- a/src/natsort/ns_enum.py
+++ b/natsort/ns_enum.py
diff --git a/src/natsort/unicode_numbers.py b/natsort/unicode_numbers.py
index e87654f..e87654f 100644
--- a/src/natsort/unicode_numbers.py
+++ b/natsort/unicode_numbers.py
diff --git a/src/natsort/utils.py b/natsort/utils.py
index 306762a..306762a 100644
--- a/src/natsort/utils.py
+++ b/natsort/utils.py
diff --git a/setup.cfg b/setup.cfg
index e6c024e..e91267b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -41,7 +41,7 @@ tag_name = {new_version}
[bumpversion:file:setup.py]
-[bumpversion:file:src/natsort/_version.py]
+[bumpversion:file:natsort/_version.py]
[bumpversion:file:docs/source/conf.py]
diff --git a/setup.py b/setup.py
index 70671ea..e50690d 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,7 @@ from setuptools import setup, find_packages
setup(
name='natsort',
version='5.3.1',
- packages=find_packages('src'),
- package_dir={'': 'src'},
+ packages=find_packages(),
install_requires=["argparse; python_version < '2.7'"],
entry_points={'console_scripts': ['natsort = natsort.__main__:main']},
extras_require={