CAD submodule, optional test, update config

Author: ndem0

.gitignore

@@ -2,4 +2,8 @@
 .DS_Store
 
 # compiled python codes
-*.pyc
+*.pyc
+
+build/
+dist/
+pygem.egg-info/

pygem/__init__.py

@@ -7,6 +7,19 @@
 #     'igeshandler', 'utils', 'gui', 'khandler', 'idw'
 # ]
 
+def get_current_year():
+    from datetime import datetime
+    return datetime.now().year
+
+__title__ = "pygem"
+__author__ = "Marco Tezzele, Nicola Demo"
+__copyright__ = "Copyright 2017-{}, PyGeM contributors".format(get_current_year())
+__license__ = "MIT"
+__version__ = "2.0.0"
+__mail__ = '[email protected], [email protected]'
+__maintainer__ = __author__
+__status__ = "Stable"
+
 from .affine import *
 from .freeform import FFD
 from .radial import RBF
@@ -16,9 +29,6 @@
 from .stlhandler import StlHandler
 from .unvhandler import UnvHandler
 from .vtkhandler import VtkHandler
-from .nurbshandler import NurbsHandler
-from .stephandler import StepHandler
-from .igeshandler import IgesHandler
 from .khandler import KHandler
 from .mdpahandler import MdpaHandler
 from .params import *

pygem/cad/__init__.py

@@ -0,0 +1,11 @@
+
+try:
+    from .nurbshandler import NurbsHandler
+    from .stephandler import StepHandler
+    from .igeshandler import IgesHandler
+except ModuleNotFoundError as e:
+    print('\nOCC not found, but required to deal with CAD files')
+    print('Install it using:')
+    print('\tconda install -c conda-forge pythonocc-core=7.4.0')
+    print('or visit https://github.com/tpaviot/pythonocc-core for more info\n')
+    raise e

pygem/igeshandler.py pygem/cad/igeshandler.pypygem/igeshandler.py renamed to pygem/cad/igeshandler.py

@@ -4,7 +4,7 @@
 from OCC.Core.IGESControl import (IGESControl_Reader, IGESControl_Writer,
                              IGESControl_Controller_Init)
 from OCC.Core.IFSelect import IFSelect_RetDone
-from pygem.nurbshandler import NurbsHandler
+from pygem.cad import NurbsHandler
 
 
 class IgesHandler(NurbsHandler):

pygem/nurbshandler.py pygem/cad/nurbshandler.pypygem/nurbshandler.py renamed to pygem/cad/nurbshandler.py

@@ -5,7 +5,7 @@
 from OCC.Core.Interface import Interface_Static_SetCVal
 from OCC.Core.STEPControl import STEPControl_Writer, STEPControl_Reader
 from OCC.Core.STEPControl import STEPControl_AsIs
-from pygem.nurbshandler import NurbsHandler
+from pygem.cad import NurbsHandler
 
 
 class StepHandler(NurbsHandler):

pygem/stephandler.py pygem/cad/stephandler.pypygem/stephandler.py renamed to pygem/cad/stephandler.py

@@ -1,37 +1,104 @@
-from setuptools import setup, find_packages
+from setuptools import setup, find_packages, Command
+import os
+import sys
+import pygem
 
+# Package meta-data.
+NAME = pygem.__title__
+DESCRIPTION = 'Python Geometrical Morphing.'
+URL = 'https://github.com/mathLab/PyGeM'
+MAIL = pygem.__mail__
+AUTHOR = pygem.__author__
+VERSION = pygem.__version__
+KEYWORDS='dimension_reduction mathematics ffd morphing iges stl vtk openfoam'
 
-def readme():
-    """
-    This function just return the content of README.md
-    """
-    with open('README.md') as f:
-        return f.read()
+REQUIRED = [
+    'future', 'numpy', 'scipy',	'matplotlib',
+]
 
+EXTRAS = {
+    'docs': ['Sphinx==1.4', 'sphinx_rtd_theme'],
+}
+
+LDESCRIPTION = (
+    "PyGeM is a python package using Free Form Deformation, Radial Basis "
+    "Functions and Inverse Distance Weighting to parametrize and morph complex "
+    "geometries. It is ideally suited for actual industrial problems, since it "
+    "allows to handle:\n"
+    "1) Computer Aided Design files (in .iges, .step, and .stl formats) Mesh "
+    "files (in .unv and OpenFOAM formats)\n"
+    "2) Output files (in .vtk format)\n"
+    "3) LS-Dyna Keyword files (.k format).\n"
+    "\n"
+    "By now, it has been used with meshes with up to 14 milions of cells. Try "
+    "with more and more complicated input files! See the Examples section "
+    "below and the Tutorials to have an idea of the potential of this package."
+)
+
+here = os.path.abspath(os.path.dirname(__file__))
+class UploadCommand(Command):
+    """Support setup.py upload."""
+
+    description = 'Build and publish the package.'
+    user_options = []
+
+    @staticmethod
+    def status(s):
+        """Prints things in bold."""
+        print('\033[1m{0}\033[0m'.format(s))
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        try:
+            self.status('Removing previous builds...')
+            rmtree(os.path.join(here, 'dist'))
+        except OSError:
+            pass
+
+        self.status('Building Source and Wheel (universal) distribution...')
+        os.system('{0} setup.py sdist bdist_wheel --universal'.format(sys.executable))
+
+        self.status('Uploading the package to PyPI via Twine...')
+        os.system('twine upload dist/*')
+
+        self.status('Pushing git tags...')
+        os.system('git tag v{0}'.format(VERSION))
+        os.system('git push --tags')
+
+        sys.exit()
 
 setup(
-    name='pygem',
-    version='1.1',
-    description='Tools for gemetrical morphing.',
-    long_description=readme(),
-    classifiers=[
+    name=NAME,
+    version=VERSION,
+    description=DESCRIPTION,
+    long_description=LDESCRIPTION,
+    author=AUTHOR,
+    author_email=MAIL,
+	classifiers=[
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.7',
         'Intended Audience :: Science/Research',
         'Topic :: Scientific/Engineering :: Mathematics'
-    ],
-    keywords='dimension_reduction mathematics ffd morphing iges stl vtk openfoam',
-    url='https://github.com/mathLab/PyGeM',
-    author='Marco Tezzele, Nicola Demo',
-    author_email='[email protected], [email protected]',
+	],
+    keywords=KEYWORDS,
+    url=URL,
     license='MIT',
-    packages=find_packages(),
-    install_requires=[
-        'numpy', 'numpy-stl', 'enum34', 'scipy', 'matplotlib', 'vtk',
-        'Sphinx==1.4', 'sphinx_rtd_theme'
-    ],
+    packages=[NAME],
+    install_requires=REQUIRED,
+    extras_require=EXTRAS,
     test_suite='nose.collector',
     tests_require=['nose'],
     include_package_data=True,
-    zip_safe=False)
+    zip_safe=False,
+
+    # $ setup.py publish support.
+    cmdclass={
+        'upload': UploadCommand,
+    },)

setup.py

@@ -1,7 +1,43 @@
-
 import matplotlib
+matplotlib.use('agg')
+
 import nose
 
-matplotlib.use('agg')
+test_defaults = [
+    'tests/test_freeform.py',
+    'tests/test_idwparams.py',
+    'tests/test_affine.py',
+    'tests/test_idw.py',
+    'tests/test_khandler.py',
+    'tests/test_mdpahandler.py',
+    'tests/test_openfhandler.py',
+    'tests/test_package.py',
+    'tests/test_radial.py',
+    'tests/test_rbfparams.py',
+    'tests/test_stlhandler.py',
+    'tests/test_unvhandler.py',
+    'tests/test_vtkhandler.py',
+]
+
+
+test_cad = [
+    'tests/test_igeshandler.py',
+    'tests/test_nurbshandler.py',
+    'tests/test_stephandler.py',
+]
+
+default_argv = ['--tests'] + test_defaults
+cad_argv = ['--tests'] + test_cad
+
+try:
+    import pygem.cad
+    nose.run(argv=cad_argv)
+except:
+    print('module OCC not found, skip tests for CAD')
+
+nose.run(argv=default_argv)
+
+
+
+
 
-nose.main()