moving library sources to an src subdir and excluding the tests packa…

…ge from the installation.
pasztorpisti · Apr 12, 2016 · c9030b6 · c9030b6
1 parent 9d4c8bb
commit c9030b6
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,33 +1,10 @@
-# Byte-compiled / optimized / DLL files
-/__pycache__/
-*.py[cod]
-
-# PyCharm
+/.eggs/
 /.idea/
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-/env/
 /build/
-/develop-eggs/
 /dist/
-/downloads/
-/eggs/
-/.eggs/
-/lib/
-/lib64/
-/parts/
-/sdist/
-/var/
-/*.egg-info/
-/.installed.cfg
-*.egg
+/src/json_cfg.egg-info/
 
 /README.html
+/CHANGES.html
 
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.py[cod]
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -9,6 +9,7 @@ Recent changes
 *Release date: future*
 
 - Adding this CHANGES.rst file.
+- Moving library sources to an ``src`` subdir and excluding the ``tests`` package from the installation.
 
 
 v0.4.0-beta

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,4 @@
 include README.rst
 include CHANGES.rst
 include LICENSE.txt
+recursive-include tests *.py
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 import os
 import re
 import codecs
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -31,7 +31,7 @@ def find_version(*path):
 
 setup(
     name='json-cfg',
-    version=find_version('jsoncfg', '__init__.py'),
+    version=find_version('src', 'jsoncfg', '__init__.py'),
     description='JSON config file parser with extended syntax (e.g.: comments), '
                 'line/column numbers in error messages, etc...',
     keywords='json config file parser configuration comment',
@@ -62,7 +62,8 @@ def find_version(*path):
     ],
 
     install_requires=['kwonly-args>=1.0.7'],
-    packages=['jsoncfg', 'tests'],
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
 
     test_suite= 'tests',
     tests_require=['mock'],

diff --git a/jsoncfg/__init__.py → src/jsoncfg/__init__.py b/jsoncfg/__init__.py → src/jsoncfg/__init__.py
diff --git a/jsoncfg/compatibility.py → src/jsoncfg/compatibility.py b/jsoncfg/compatibility.py → src/jsoncfg/compatibility.py
diff --git a/jsoncfg/config_classes.py → src/jsoncfg/config_classes.py b/jsoncfg/config_classes.py → src/jsoncfg/config_classes.py
diff --git a/jsoncfg/exceptions.py → src/jsoncfg/exceptions.py b/jsoncfg/exceptions.py → src/jsoncfg/exceptions.py
diff --git a/jsoncfg/functions.py → src/jsoncfg/functions.py b/jsoncfg/functions.py → src/jsoncfg/functions.py
diff --git a/jsoncfg/parser.py → src/jsoncfg/parser.py b/jsoncfg/parser.py → src/jsoncfg/parser.py
diff --git a/jsoncfg/parser_listener.py → src/jsoncfg/parser_listener.py b/jsoncfg/parser_listener.py → src/jsoncfg/parser_listener.py
diff --git a/jsoncfg/text_encoding.py → src/jsoncfg/text_encoding.py b/jsoncfg/text_encoding.py → src/jsoncfg/text_encoding.py
diff --git a/jsoncfg/tree_config.py → src/jsoncfg/tree_config.py b/jsoncfg/tree_config.py → src/jsoncfg/tree_config.py
diff --git a/jsoncfg/tree_python.py → src/jsoncfg/tree_python.py b/jsoncfg/tree_python.py → src/jsoncfg/tree_python.py
diff --git a/jsoncfg/value_mappers.py → src/jsoncfg/value_mappers.py b/jsoncfg/value_mappers.py → src/jsoncfg/value_mappers.py