partage Eric (rebase)

diff --git a/setup.py b/setup.py
index eecde223244468b897eb8a662d6302c537df7b49..7d39f975867fbb3041f1de8fd29187c081ba186e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -8,31 +8,18 @@
 from setuptools import setup, find_packages
 from sphinx.setup_command import BuildDoc
 from InterfaceQT4 import getVersion
-from pyqt_distutils.build_ui import build_ui
 
-import os
-import pathlib
+#try:
+#    from pyqt_distutils.build_ui import build_ui
+#    cmdclass = {'build_ui': build_ui}
+#except ImportError:
+#   build_ui = None  # user won't have pyqt_distutils when deploying
+#    cmdclass = {}
 
 maVersion = getVersion.getEficasVersion()
-cmdclass = {'build_sphinx': BuildDoc }
-#            'build_ui': build_ui}
+mesPackages=find_packages(exclude=('convert','generator'))
 
-def package_files(directory,extension=None):
-    paths = []
-    for (path, directories, filenames) in os.walk(directory):
-        for filename in filenames:
-            if extension==None : paths.append(os.path.join('..', path, filename))
-            elif pathlib.Path(filename).suffix == extension : paths.append(os.path.join('..', path, filename))
-    return paths
-
-doc_files   = package_files('Doc')
-aide_files  = package_files('Aide')
-rn_files    = package_files('ReacteurNumerique')
-#ui_files   = package_files('UiQT5', '.ui')
-pyui_files  = package_files('UiQT5', '.py')
-icons_files = package_files('Editeur/icons')
-
-packages_data_files = doc_files + aide_files + rn_files + pyui_files + icons_files
+print (mesPackages)
 
 setup(
     name="eficas_RN",
@@ -42,28 +29,22 @@ setup(
     description=(
         "Tool used by the Réacteur Numérique project to "
         "check data validity. also provides an GUI for setting up cases"),
-
-    packages = find_packages(
-        include=['Accas','Editeur', 'Efi2Xsd', 'Extensions', 'Ihm', 'InterfaceQT4', 'Noyau',  'Validation'],
-        exclude=['convert', 'generator'],
+    packages=find_packages(
+        where='.',
+        include=['Accas'],
+        exclude=['convert','generator'],
     ),
-    data_files=[('convert',['convert/parseur_python.py', 'convert/__init__.py', 'convert/convert_pyth.py','convert/convert_python.py', 'convert/autre_parseur.py']),
-       ('generator',['generator/Formatage.py', 'generator/generator_aplat.py', 'generator/generator_python.py', 'generator/generator_XML.py', 'generator/__init__.py']),
-               ],
+    #packages=find_packages(exclude=['convert']),
+    #package_dir = {'': eficas},
+    #packages=["Accas",],
     
-    package_data = {'': packages_data_files ,},
-
-    cmdclass=cmdclass,
-    command_options={
-      'build_sphinx': {
-        'project': ('setup.py', u'Eficas IHM'),
-        'version': ('setup.py', maVersion),
-        'source_dir': ('setup.py', 'Doc')},
-      'build_ui': {
-        'source_dir': ('setup.py', 'UiQT5')}
-     },
-    install_requires=[
-      "sphinx>=1.0.1",
-    ],
-    python_requires=">=3.1"
-)
+    #install_requires=[
+    #  "sphinx>=1.0.1",
+    #],
+    #command_options={
+    #  'build_sphinx': {
+    #    'project': ('setup.py', u'Eficas IHM'),
+    #    'version': ('setup.py', maVersion),
+    #    'source_dir': ('setup.py', 'doc')}
+    # },
+    python_requires=">=3.1")