Permalink
Browse files

Merge branch 'dev_3.7'

  • Loading branch information...
ndjensen committed Nov 21, 2017
2 parents f8fa67a + 7fc93a6 commit e3d094da198fe3a8f5123cab550a6f96bd5d436d
Showing with 8,941 additions and 1,819 deletions.
  1. +32 −6 .travis.yml
  2. +2 −0 commands/java.py
  3. +6 −4 javadoc/allclasses-frame.html
  4. +6 −4 javadoc/allclasses-noframe.html
  5. +24 −15 javadoc/constant-values.html
  6. +23 −14 javadoc/deprecated-list.html
  7. +24 −15 javadoc/help-doc.html
  8. +267 −222 javadoc/index-all.html
  9. +7 −6 javadoc/index.html
  10. +86 −55 javadoc/jep/ClassEnquirer.html
  11. +94 −64 javadoc/jep/ClassList.html
  12. +541 −0 javadoc/jep/DirectNDArray.html
  13. +81 −54 javadoc/jep/InvocationHandler.html
  14. +484 −295 javadoc/jep/Jep.html
  15. +151 −94 javadoc/jep/JepConfig.html
  16. +134 −49 javadoc/jep/JepException.html
  17. +224 −150 javadoc/jep/JepScriptEngine.html
  18. +148 −103 javadoc/jep/JepScriptEngineFactory.html
  19. +180 −99 javadoc/jep/NDArray.html
  20. +125 −87 javadoc/jep/NamingConventionClassEnquirer.html
  21. +84 −56 javadoc/jep/Proxy.html
  22. +133 −86 javadoc/jep/PyConfig.html
  23. +55 −37 javadoc/jep/Run.html
  24. +133 −71 javadoc/jep/Util.html
  25. +5 −3 javadoc/jep/package-frame.html
  26. +49 −31 javadoc/jep/package-summary.html
  27. +38 −28 javadoc/jep/package-tree.html
  28. +39 −29 javadoc/overview-tree.html
  29. BIN javadoc/resources/background.gif
  30. BIN javadoc/resources/tab.gif
  31. BIN javadoc/resources/titlebar.gif
  32. BIN javadoc/resources/titlebar_end.gif
  33. +41 −14 javadoc/serialized-form.html
  34. +221 −121 javadoc/stylesheet.css
  35. +1 −1 jep/version.py
  36. +2 −1 setup.py
  37. +3 −1 src/jep/ClassList.java
  38. +5 −4 src/jep/Jep.java
  39. +5,477 −0 src/jep/classlist_9.txt
  40. +10 −0 src/jep/pyembed.c
  41. +6 −0 src/jep/test/TestSharedModulesThreads.java
View
@@ -4,47 +4,73 @@ matrix:
include:
- os: linux
python: 2.7
jdk: openjdk7
env: JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
- os: linux
python: 2.7
jdk: oraclejdk8
env: JAVA_HOME=/usr/lib/jvm/java-8-oracle
- os: linux
python: 2.7
jdk: oraclejdk9
env: JAVA_HOME=/usr/lib/jvm/java-9-oracle
- os: linux
python: 3.3
jdk: openjdk7
env: JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
- os: linux
python: 3.3
jdk: oraclejdk8
env: JAVA_HOME=/usr/lib/jvm/java-8-oracle
- os: linux
python: 3.3
jdk: oraclejdk9
env: JAVA_HOME=/usr/lib/jvm/java-9-oracle
- os: linux
python: 3.4
jdk: openjdk7
env: JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
- os: linux
python: 3.4
jdk: oraclejdk8
env: JAVA_HOME=/usr/lib/jvm/java-8-oracle
- os: linux
python: 3.4
jdk: oraclejdk9
env: JAVA_HOME=/usr/lib/jvm/java-9-oracle
- os: linux
python: 3.5
jdk: openjdk7
env: JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
- os: linux
python: 3.5
jdk: oraclejdk8
env: JAVA_HOME=/usr/lib/jvm/java-8-oracle
- os: linux
python: 3.5
jdk: oraclejdk9
env: JAVA_HOME=/usr/lib/jvm/java-9-oracle
- os: linux
python: 3.6
jdk: openjdk7
env: JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
- os: linux
python: 3.6
jdk: oraclejdk8
env: JAVA_HOME=/usr/lib/jvm/java-8-oracle
- os: linux
python: 3.6
jdk: oraclejdk9
env: JAVA_HOME=/usr/lib/jvm/java-9-oracle
# Force error for earlier detection of python 2.7 windows build problems
- os: linux
python: 2.7
jdk: oraclejdk9
env:
- JAVA_HOME=/usr/lib/jvm/java-8-oracle
- JAVA_HOME=/usr/lib/jvm/java-9-oracle
- CFLAGS="-Wdeclaration-after-statement -Werror=declaration-after-statement"
- os: osx
language: generic
addons:
apt:
packages:
- oracle-java8-installer
- openjdk-7-jdk
script: ./setup.py test
View
@@ -132,6 +132,8 @@ def get_java_lib_folders():
jre = os.path.join(get_java_home(), 'lib')
else:
jre = os.path.join(get_java_home(), 'jre', 'lib')
if not os.path.exists(jre):
jre = os.path.join(get_java_home(), 'lib')
folders = []
for root, dirnames, filenames in os.walk(jre):
if is_windows():
@@ -2,17 +2,19 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (version 1.7.0_65) on Thu Aug 25 14:52:38 CDT 2016 -->
<!-- Generated by javadoc (1.8.0_144) on Mon Nov 20 14:51:44 CST 2017 -->
<title>All Classes</title>
<meta name="date" content="2016-08-25">
<meta name="date" content="2017-11-20">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
<body>
<h1 class="bar">All Classes</h1>
<h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<ul>
<li><a href="jep/ClassEnquirer.html" title="interface in jep" target="classFrame"><i>ClassEnquirer</i></a></li>
<li><a href="jep/ClassEnquirer.html" title="interface in jep" target="classFrame"><span class="interfaceName">ClassEnquirer</span></a></li>
<li><a href="jep/ClassList.html" title="class in jep" target="classFrame">ClassList</a></li>
<li><a href="jep/DirectNDArray.html" title="class in jep" target="classFrame">DirectNDArray</a></li>
<li><a href="jep/InvocationHandler.html" title="class in jep" target="classFrame">InvocationHandler</a></li>
<li><a href="jep/Jep.html" title="class in jep" target="classFrame">Jep</a></li>
<li><a href="jep/JepConfig.html" title="class in jep" target="classFrame">JepConfig</a></li>
@@ -2,17 +2,19 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (version 1.7.0_65) on Thu Aug 25 14:52:38 CDT 2016 -->
<!-- Generated by javadoc (1.8.0_144) on Mon Nov 20 14:51:44 CST 2017 -->
<title>All Classes</title>
<meta name="date" content="2016-08-25">
<meta name="date" content="2017-11-20">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
<body>
<h1 class="bar">All Classes</h1>
<h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<ul>
<li><a href="jep/ClassEnquirer.html" title="interface in jep"><i>ClassEnquirer</i></a></li>
<li><a href="jep/ClassEnquirer.html" title="interface in jep"><span class="interfaceName">ClassEnquirer</span></a></li>
<li><a href="jep/ClassList.html" title="class in jep">ClassList</a></li>
<li><a href="jep/DirectNDArray.html" title="class in jep">DirectNDArray</a></li>
<li><a href="jep/InvocationHandler.html" title="class in jep">InvocationHandler</a></li>
<li><a href="jep/Jep.html" title="class in jep">Jep</a></li>
<li><a href="jep/JepConfig.html" title="class in jep">JepConfig</a></li>
@@ -2,25 +2,32 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (version 1.7.0_65) on Thu Aug 25 14:52:38 CDT 2016 -->
<!-- Generated by javadoc (1.8.0_144) on Mon Nov 20 14:51:44 CST 2017 -->
<title>Constant Field Values</title>
<meta name="date" content="2016-08-25">
<meta name="date" content="2017-11-20">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
<body>
<script type="text/javascript"><!--
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="Constant Field Values";
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="Constant Field Values";
}
}
catch(err) {
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
<!-- ========= START OF TOP NAVBAR ======= -->
<div class="topNav"><a name="navbar_top">
<div class="topNav"><a name="navbar.top">
<!-- -->
</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
</a>
<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
<a name="navbar.top.firstrow">
<!-- -->
</a>
<ul class="navList" title="Navigation">
@@ -39,10 +46,10 @@
</ul>
<ul class="navList">
<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
<li><a href="constant-values.html" target="_top">No Frames</a></li>
<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
</ul>
<ul class="navList" id="allclasses_navbar_top">
<li><a href="allclasses-noframe.html">All Classes</a></li>
<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
</ul>
<div>
<script type="text/javascript"><!--
@@ -56,7 +63,7 @@
//-->
</script>
</div>
<a name="skip-navbar_top">
<a name="skip.navbar.top">
<!-- -->
</a></div>
<!-- ========= END OF TOP NAVBAR ========= -->
@@ -73,7 +80,7 @@ <h2 title="Contents">Contents</h2>
<h2 title="jep">jep.*</h2>
<ul class="blockList">
<li class="blockList">
<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
<caption><span>jep.<a href="jep/Util.html" title="class in jep">Util</a></span><span class="tabEnd">&nbsp;</span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
@@ -178,9 +185,11 @@ <h2 title="jep">jep.*</h2>
</ul>
</div>
<!-- ======= START OF BOTTOM NAVBAR ====== -->
<div class="bottomNav"><a name="navbar_bottom">
<div class="bottomNav"><a name="navbar.bottom">
<!-- -->
</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
</a>
<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
<a name="navbar.bottom.firstrow">
<!-- -->
</a>
<ul class="navList" title="Navigation">
@@ -199,10 +208,10 @@ <h2 title="jep">jep.*</h2>
</ul>
<ul class="navList">
<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
<li><a href="constant-values.html" target="_top">No Frames</a></li>
<li><a href="constant-values.html" target="_top">No&nbsp;Frames</a></li>
</ul>
<ul class="navList" id="allclasses_navbar_bottom">
<li><a href="allclasses-noframe.html">All Classes</a></li>
<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
</ul>
<div>
<script type="text/javascript"><!--
@@ -216,7 +225,7 @@ <h2 title="jep">jep.*</h2>
//-->
</script>
</div>
<a name="skip-navbar_bottom">
<a name="skip.navbar.bottom">
<!-- -->
</a></div>
<!-- ======== END OF BOTTOM NAVBAR ======= -->
@@ -2,25 +2,32 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (version 1.7.0_65) on Thu Aug 25 14:52:38 CDT 2016 -->
<!-- Generated by javadoc (1.8.0_144) on Mon Nov 20 14:51:44 CST 2017 -->
<title>Deprecated List</title>
<meta name="date" content="2016-08-25">
<meta name="date" content="2017-11-20">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
<body>
<script type="text/javascript"><!--
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="Deprecated List";
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="Deprecated List";
}
}
catch(err) {
}
//-->
</script>
<noscript>
<div>JavaScript is disabled on your browser.</div>
</noscript>
<!-- ========= START OF TOP NAVBAR ======= -->
<div class="topNav"><a name="navbar_top">
<div class="topNav"><a name="navbar.top">
<!-- -->
</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
</a>
<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
<a name="navbar.top.firstrow">
<!-- -->
</a>
<ul class="navList" title="Navigation">
@@ -39,10 +46,10 @@
</ul>
<ul class="navList">
<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
<li><a href="deprecated-list.html" target="_top">No Frames</a></li>
<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
</ul>
<ul class="navList" id="allclasses_navbar_top">
<li><a href="allclasses-noframe.html">All Classes</a></li>
<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
</ul>
<div>
<script type="text/javascript"><!--
@@ -56,7 +63,7 @@
//-->
</script>
</div>
<a name="skip-navbar_top">
<a name="skip.navbar.top">
<!-- -->
</a></div>
<!-- ========= END OF TOP NAVBAR ========= -->
@@ -65,9 +72,11 @@ <h1 title="Deprecated API" class="title">Deprecated API</h1>
<h2 title="Contents">Contents</h2>
</div>
<!-- ======= START OF BOTTOM NAVBAR ====== -->
<div class="bottomNav"><a name="navbar_bottom">
<div class="bottomNav"><a name="navbar.bottom">
<!-- -->
</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
</a>
<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
<a name="navbar.bottom.firstrow">
<!-- -->
</a>
<ul class="navList" title="Navigation">
@@ -86,10 +95,10 @@ <h2 title="Contents">Contents</h2>
</ul>
<ul class="navList">
<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
<li><a href="deprecated-list.html" target="_top">No Frames</a></li>
<li><a href="deprecated-list.html" target="_top">No&nbsp;Frames</a></li>
</ul>
<ul class="navList" id="allclasses_navbar_bottom">
<li><a href="allclasses-noframe.html">All Classes</a></li>
<li><a href="allclasses-noframe.html">All&nbsp;Classes</a></li>
</ul>
<div>
<script type="text/javascript"><!--
@@ -103,7 +112,7 @@ <h2 title="Contents">Contents</h2>
//-->
</script>
</div>
<a name="skip-navbar_bottom">
<a name="skip.navbar.bottom">
<!-- -->
</a></div>
<!-- ======== END OF BOTTOM NAVBAR ======= -->
Oops, something went wrong.

0 comments on commit e3d094d

Please sign in to comment.