MAINT: move package files to the src directory.

Avoid overriding package installation when Python
is started from the project directory.

Author: pavoljuhas

.gitignore

@@ -44,5 +44,5 @@ nosetests.xml
 .pydevproject
 setup.cfg
 .gdb_history
-/pyobjcryst/version.cfg
+/src/pyobjcryst/version.cfg
 /.settings/*

MANIFEST.in

@@ -1,6 +1,5 @@
-recursive-include pyobjcryst *
-recursive-include extensions *
+recursive-include src *
 include SConstruct
 include AUTHORS.txt LICENSE*.txt README.rst
-recursive-exclude pyobjcryst *.pyc *.so
+recursive-exclude src *.pyc *.so
 recursive-exclude * .gitattributes .gitignore .DS_Store

SConstruct

@@ -148,6 +148,6 @@ Export('env', 'pyconfigvar', 'pyoutput')
 if os.path.isfile('sconscript.local'):
     env.SConscript('sconscript.local')
 
-env.SConscript('extensions/SConscript', variant_dir=builddir)
+env.SConscript('src/extensions/SConscript', variant_dir=builddir)
 
 # vim: ft=python

setup.py

@@ -65,15 +65,15 @@ def create_extensions():
             if not n in ext_kws['libraries']]
     ext_kws['libraries'] += blibs
     ext = Extension('pyobjcryst._pyobjcryst',
-            glob.glob("extensions/*.cpp"),
-            **ext_kws)
+                    glob.glob("src/extensions/*.cpp"),
+                    **ext_kws)
     return [ext]
 
 
 # versioncfgfile holds version data for git commit hash and date.
 # It must reside in the same directory as version.py.
 MYDIR = os.path.dirname(os.path.abspath(__file__))
-versioncfgfile = os.path.join(MYDIR, 'pyobjcryst/version.cfg')
+versioncfgfile = os.path.join(MYDIR, 'src/pyobjcryst/version.cfg')
 gitarchivecfgfile = versioncfgfile.replace('version.cfg', 'gitarchive.cfg')
 
 def gitinfo():
@@ -139,6 +139,7 @@ def getversioncfg():
 
     # What we're installing
     packages = ['pyobjcryst', 'pyobjcryst.tests'],
+    package_dir = {'' : 'src'},
     test_suite = 'pyobjcryst.tests',
     include_package_data = True,
     zip_safe = False,

extensions/SConscript src/extensions/SConscript

@@ -22,9 +22,9 @@ Alias('module', module)
 # install in a development mode
 gitdir = env['ENV'].get('GIT_DIR', '#/.git')
 gheads = Glob(gitdir + '/HEAD') + Glob(gitdir + '/refs/heads/*')
-egginfo = env.Command(NoCache('#/pyobjcryst.egg-info/PKG-INFO'), gheads,
-        '$python setup.py egg_info')
-develop = Alias('develop', [egginfo, Install('#/pyobjcryst', module)])
+egginfo = env.Command(NoCache('#/src/pyobjcryst.egg-info/PKG-INFO'), gheads,
+                      '$python setup.py egg_info')
+develop = Alias('develop', [egginfo, Install('#/src/pyobjcryst', module)])
 
 test = env.Alias('test', develop,
         '$python -m pyobjcryst.tests.run')