wow, so i had managed to goof up the original merge from master. recreating setup.py from an older copy and keeping the version and some other slight changes from upstream.

Author: voutilad

setup.py

@@ -13,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-
 import sys
 import os
 import os.path
@@ -33,18 +31,15 @@
 
 import jpyutil
 
-base_dir = os.path.dirname(os.path.abspath(__file__))
-src_main_c_dir = os.path.join(base_dir, 'src', 'main', 'c')
-src_test_py_dir = os.path.join(base_dir, 'src', 'test', 'python')
-
-import jpyutil
-
 __author__ = jpyutil.__author__
 __copyright__ = jpyutil.__copyright__
 __license__ = jpyutil.__license__
 __version__ = jpyutil.__version__
 
-print('Using ' + jpyutil.__file__)
+base_dir = os.path.dirname(os.path.abspath(__file__))
+src_main_c_dir = os.path.join(base_dir, 'src', 'main', 'c')
+src_test_py_dir = os.path.join(base_dir, 'src', 'test', 'python')
+
 
 do_maven = False
 if '--maven' in sys.argv:
@@ -142,128 +137,14 @@
     library_dirs += [os.path.join(sys.exec_prefix, 'lib')]
     extra_link_args += ['-Xlinker', '-rpath', jvm_dll_dir]
 
-with open('README.md') as file:
-    long_description = file.read()
-
-with open('CHANGES.md') as file:
-    changelog = file.read()
-
-dist = setup(name='jpy',
-             description='Bi-directional Python-Java bridge',
-             long_description=long_description + '\n\n' + changelog,
-             version=__version__,
-             platforms='Windows, Linux, Darwin',
-             author=__author__,
-             author_email='[email protected]',
-             maintainer='Brockmann Consult GmbH',
-             maintainer_email='[email protected]',
-             license=__license__,
-             url='https://github.com/bcdev/jpy',
-             download_url='https://pypi.python.org/pypi/jpy/' + __version__,
-             py_modules=['jpyutil'],
-             package_data={'': [jpy_jar_file]},
-             ext_modules=[Extension('jpy',
-                                    sources=sources,
-                                    depends=headers,
-                                    include_dirs=include_dirs,
-                                    library_dirs=library_dirs,
-                                    libraries=libraries,
-                                    extra_link_args=extra_link_args,
-                                    extra_compile_args=extra_compile_args,
-                                    define_macros=define_macros),
-                          Extension('jdl',
-                                    sources=[os.path.join(src_main_c_dir, 'jni/org_jpy_DL.c')],
-                                    depends=[os.path.join(src_main_c_dir, 'jni/org_jpy_DL.h')],
-                                    include_dirs=include_dirs,
-                                    library_dirs=library_dirs,
-                                    libraries=libraries,
-                                    extra_link_args=extra_link_args,
-                                    extra_compile_args=extra_compile_args,
-                                    define_macros=define_macros),
-                          ],
-             classifiers=[
-                 # How mature is this project? Common values are
-                 #   3 - Alpha
-                 #   4 - Beta
-                 #   5 - Production/Stable
-                 'Development Status :: 4 - Beta',
-
-                 # Indicate who your project is intended for
-                 'Intended Audience :: Developers',
-
-                 # Pick your license as you wish (should match "license" above)
-                 'License :: OSI Approved :: Apache 2 License',
-
-                 # Specify the Python versions you support here. In particular, ensure
-                 # that you indicate whether you support Python 2, Python 3 or both.
-                 'Programming Language :: Python :: 2',
-                 'Programming Language :: Python :: 2.7',
-                 'Programming Language :: Python :: 3',
-                 'Programming Language :: Python :: 3.3',
-                 'Programming Language :: Python :: 3.4',
-                 'Programming Language :: Python :: 3.5',
-             ]
-             )
-
-#import pprint
-#pprint.pprint(dist)
-#pprint.pprint(dist.__dict__)
-#pprint.pprint(dist.commands)
-#pprint.pprint(dist.command_obj)
-#pprint.pprint(dist.command_obj['build'].__dict__)
-#pprint.pprint(dist.command_obj['install'].__dict__)
-#pprint.pprint(dist.command_obj['install_lib'].__dict__)
-#pprint.pprint(dist.command_obj['bdist_egg'].__dict__)
-#pprint.pprint(dist.command_obj['egg_info'].__dict__)
-
+# ----------- Functions -------------
 
-#
-# Continue with custom setup if 'build' step is included in commands
-#
-
-def _build_dir():
-    # TODO: figure out logic for dynamically getting this at runtime
-    return os.path.join(base_dir, 'build/lib.macosx-10.12-x86_64-3.6')
-
-if dist.commands and len(dist.commands) > 0 \
-        and dist.command_obj and len(dist.command_obj) > 0 \
-        and 'clean' not in dist.command_obj \
-        and 'build' in dist.command_obj:
-
-    #
-    # Get build directory (whose content we'll zip and in which we test)
-    #
-
-    # build_dir = dist.command_obj['build'].build_lib
-    # if not os.path.exists(build_dir):
-        # log.error("Missing build directory '" + build_dir + "'")
-        # exit(1)
-
-    build_dir = _build_dir()
-    #
-    # Get install directory
-    #
-
-    install_dir = None
-    if 'install' in dist.command_obj:
-        install_dir = dist.command_obj['install'].install_lib
-        if not os.path.exists(install_dir):
-            log.warn("Missing install directory '" + install_dir + "'")
-            install_dir = None
-
-    #
-    # Get egg (archive/directory) name
-    #
-
-    egg_name = None
-    if 'bdist_egg' in dist.command_obj:
-        egg_output = dist.command_obj['bdist_egg'].egg_output
-        if egg_output:
-            egg_name = os.path.basename(dist.command_obj['bdist_egg'].egg_output)
-
-    #
-    # Write jpy configuration files to target directories
-    #
+def package_maven():
+    """ Run maven package lifecycle """
+    if not os.getenv('JAVA_HOME'):
+        # make sure Maven uses the same JDK which we have used to compile
+        # and link the C-code
+        os.environ['JAVA_HOME'] = jdk_home_dir
 
     mvn_goal = 'package'
     log.info("Executing Maven goal '" + mvn_goal + "'")
@@ -296,6 +177,10 @@ def _read(filename):
     with open(filename) as file:
         return file.read()
 
+def _build_dir():
+    # TODO: figure out logic for dynamically getting this at runtime
+    return os.path.join(base_dir, 'build/lib.macosx-10.12-x86_64-3.6')
+
 def test_python_java_rt():
     """ Run Python test cases against Java runtime classes. """
     sub_env = {'PYTHONPATH': _build_dir()}
@@ -342,7 +227,7 @@ def _copy_jpyutil():
     shutil.copy(src, dest)
 
 def _build_jpy():
-    #package_maven()
+    package_maven()
     _copy_jpyutil()
     _write_jpy_config()
 
@@ -414,8 +299,6 @@ def run(self):
       download_url='https://pypi.python.org/pypi/jpy/' + __version__,
       py_modules=['jpyutil'],
       package_data={'': [jpy_jar_file]},
-      package_dir={'jpy': 'src/main/c'},
-      zip_safe=False,
       ext_modules=[Extension('jpy',
                              sources=sources,
                              depends=headers,
@@ -455,4 +338,3 @@ def run(self):
                    'Programming Language :: Python :: 3',
                    'Programming Language :: Python :: 3.3',
                    'Programming Language :: Python :: 3.4'])
-