Merge pull request #1087 from woutdenolf/src_layout

Src layout

.gitignore

@@ -60,8 +60,8 @@ coverage.xml
 docs/_build/
 
 # cython generated files
-PyMca5/PyMcaGraph/ctools/_ctools/cython/*.c
-PyMca5/PyMcaPhysics/xas/_xas/cython/*.c
+src/PyMca5/PyMcaGraph/ctools/_ctools/cython/*.c
+src/PyMca5/PyMcaPhysics/xas/_xas/cython/*.c
 
 # PyCharm meta data
 .idea/

CONTRIBUTING.rst

@@ -0,0 +1,28 @@
+Contributing
+============
+
+Developers installation
+-----------------------
+
+Editable install with all requirements
+
+.. code:: bash
+
+    pip install -r requirements.txt -e .
+
+Start the main application
+
+.. code:: bash
+
+    pymca
+
+or using the module directly
+
+.. code:: bash
+
+    python -m PyMca5.PyMcaGui.pymca.PyMcaMain
+
+Deployment
+----------
+
+TODO

MANIFEST.in

@@ -15,26 +15,26 @@ include requirements.txt
 recursive-include doc *.py *.rst *.html *.ico *.png *.jpg
 recursive-include doc/man *.1
 recursive-include icons *.icns *.ico *_256x256.png
-recursive-include PyMca5/EPDL97 *.DAT
-include PyMca5/EPDL97/LICENSE
-recursive-include PyMca5/PyMca *.py
-recursive-include PyMca5/PyMcaCore *.py
-recursive-include PyMca5/PyMcaData *.dict *.dat *.cfg *.png *.mat *.html *.pdf *.xml *.gif *.wmz *.mso *.DICT *.TXT *.lib *.mca *.spe
-recursive-include PyMca5/PyMcaGraph *.py *.pyx *.pxd *.c *.h
-recursive-include PyMca5/PyMcaGui *.py
-recursive-include PyMca5/PyMcaIO *.py *.c *.h *.in
-include PyMca5/PyMcaIO/sps/LICENSE
-recursive-include PyMca5/PyMcaMath *.py *.c *.cl
-include PyMca5/PyMcaMath/mva/py_nnma/LICENSE
-include PyMca5/PyMcaMath/mva/py_nnma/README
-include PyMca5/PyMcaMath/mva/_cython_kmeans/kmeans.pyx
-include PyMca5/PyMcaMath/mva/_cython_kmeans/default/kmeans.c
-include PyMca5/PyMcaMath/PyMcaSciPy/signal/LICENSE.txt
-recursive-include PyMca5/PyMcaMisc *.py
-recursive-include PyMca5/PyMcaPhysics *.py
-recursive-include PyMca5/PyMcaPhysics/xas *.pyx *.pxd *.c *.h
-recursive-include PyMca5/PyMcaPlugins *.py
-recursive-include PyMca5/scripts *
-recursive-include PyMca5/tests *.py
+recursive-include src/PyMca5/EPDL97 *.DAT
+include src/PyMca5/EPDL97/LICENSE
+recursive-include src/PyMca5/PyMca *.py
+recursive-include src/PyMca5/PyMcaCore *.py
+recursive-include src/PyMca5/PyMcaData *.dict *.dat *.cfg *.png *.mat *.html *.pdf *.xml *.gif *.wmz *.mso *.DICT *.TXT *.lib *.mca *.spe
+recursive-include src/PyMca5/PyMcaGraph *.py *.pyx *.pxd *.c *.h
+recursive-include src/PyMca5/PyMcaGui *.py
+recursive-include src/PyMca5/PyMcaIO *.py *.c *.h *.in
+include src/PyMca5/PyMcaIO/sps/LICENSE
+recursive-include src/PyMca5/PyMcaMath *.py *.c *.cl
+include src/PyMca5/PyMcaMath/mva/py_nnma/LICENSE
+include src/PyMca5/PyMcaMath/mva/py_nnma/README
+include src/PyMca5/PyMcaMath/mva/_cython_kmeans/kmeans.pyx
+include src/PyMca5/PyMcaMath/mva/_cython_kmeans/default/kmeans.c
+include src/PyMca5/PyMcaMath/PyMcaSciPy/signal/LICENSE.txt
+recursive-include src/PyMca5/PyMcaMisc *.py
+recursive-include src/PyMca5/PyMcaPhysics *.py
+recursive-include src/PyMca5/PyMcaPhysics/xas *.pyx *.pxd *.c *.h
+recursive-include src/PyMca5/PyMcaPlugins *.py
+recursive-include src/PyMca5/scripts *
+recursive-include src/PyMca5/tests *.py
 recursive-include scripts *.py *.bat
 recursive-include package *

package/py2app/py2app_setup.py

@@ -41,7 +41,7 @@
 BUNDLE_ICON = os.path.join(os.path.abspath('icons'), 'PyMca.icns')
 
 #obtain the current PyMca version from the source file
-ffile = open(os.path.join('PyMca5', '__init__.py'), 'r').readlines()
+ffile = open(os.path.join('src', 'PyMca5', '__init__.py'), 'r').readlines()
 for line in ffile:
     if line.startswith('__version__'):
         #remove spaces and split