retest and rebuild

JohnMount · JohnMount · commit 1c23e58fbb4d · 2021-12-16T11:30:51.000-08:00
diff --git a/Examples/Database/large_example.ipynb b/Examples/Database/large_example.ipynb
@@ -98,8 +98,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "2021-12-16 10:27:57.488079\n",
-      "2021-12-16 10:28:04.934592\n"
+      "2021-12-16 11:24:06.452428\n",
+      "2021-12-16 11:24:14.182734\n"
      ]
     }
    ],
@@ -127,9 +127,9 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "2021-12-16 10:28:04.938398\n",
-      "1189598\n",
-      "2021-12-16 10:28:16.759611\n"
+      "2021-12-16 11:24:14.186599\n",
+      "1191091\n",
+      "2021-12-16 11:24:26.104339\n"
      ]
     }
    ],
@@ -155,9 +155,9 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "2021-12-16 10:28:16.764426\n",
-      "62734179\n",
-      "2021-12-16 10:33:22.756291\n"
+      "2021-12-16 11:24:26.108886\n",
+      "62877328\n",
+      "2021-12-16 11:29:41.264248\n"
      ]
     }
    ],
diff --git a/Examples/Database/update_joins.ipynb b/Examples/Database/update_joins.ipynb
diff --git a/Examples/Database/vtreat_db_adapter.ipynb b/Examples/Database/vtreat_db_adapter.ipynb
@@ -370,8 +370,8 @@
    "outputs": [
     {
      "data": {
-      "text/plain": "   encounter_id  weight_is_bad  patient_nbr  readmitted  orig_index  \\\n0       8860284            1.0     94419315           0         995   \n1       8860944            1.0       338247           0         996   \n2       8864718            1.0       695439           0         997   \n3       8866632            0.0    103586670           0         998   \n4       8867106            1.0      4988970           0         999   \n\n   weight_lev__NA_  weight_logit_code  weight_prevalence_code  \\\n0              1.0           0.005825                 0.99397   \n1              1.0           0.005825                 0.99397   \n2              1.0           0.005825                 0.99397   \n3              0.0           0.000000                 0.00000   \n4              1.0           0.005825                 0.99397   \n\n   time_in_hospital  \n0                 3  \n1                 4  \n2                 1  \n3                 6  \n4                 9  ",
-      "text/html": "<div>\n<style scoped>\n    .dataframe tbody tr th:only-of-type {\n        vertical-align: middle;\n    }\n\n    .dataframe tbody tr th {\n        vertical-align: top;\n    }\n\n    .dataframe thead th {\n        text-align: right;\n    }\n</style>\n<table border=\"1\" class=\"dataframe\">\n  <thead>\n    <tr style=\"text-align: right;\">\n      <th></th>\n      <th>encounter_id</th>\n      <th>weight_is_bad</th>\n      <th>patient_nbr</th>\n      <th>readmitted</th>\n      <th>orig_index</th>\n      <th>weight_lev__NA_</th>\n      <th>weight_logit_code</th>\n      <th>weight_prevalence_code</th>\n      <th>time_in_hospital</th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr>\n      <th>0</th>\n      <td>8860284</td>\n      <td>1.0</td>\n      <td>94419315</td>\n      <td>0</td>\n      <td>995</td>\n      <td>1.0</td>\n      <td>0.005825</td>\n      <td>0.99397</td>\n      <td>3</td>\n    </tr>\n    <tr>\n      <th>1</th>\n      <td>8860944</td>\n      <td>1.0</td>\n      <td>338247</td>\n      <td>0</td>\n      <td>996</td>\n      <td>1.0</td>\n      <td>0.005825</td>\n      <td>0.99397</td>\n      <td>4</td>\n    </tr>\n    <tr>\n      <th>2</th>\n      <td>8864718</td>\n      <td>1.0</td>\n      <td>695439</td>\n      <td>0</td>\n      <td>997</td>\n      <td>1.0</td>\n      <td>0.005825</td>\n      <td>0.99397</td>\n      <td>1</td>\n    </tr>\n    <tr>\n      <th>3</th>\n      <td>8866632</td>\n      <td>0.0</td>\n      <td>103586670</td>\n      <td>0</td>\n      <td>998</td>\n      <td>0.0</td>\n      <td>0.000000</td>\n      <td>0.00000</td>\n      <td>6</td>\n    </tr>\n    <tr>\n      <th>4</th>\n      <td>8867106</td>\n      <td>1.0</td>\n      <td>4988970</td>\n      <td>0</td>\n      <td>999</td>\n      <td>1.0</td>\n      <td>0.005825</td>\n      <td>0.99397</td>\n      <td>9</td>\n    </tr>\n  </tbody>\n</table>\n</div>"
+      "text/plain": "   patient_nbr  weight_is_bad  orig_index  weight_lev__NA_  readmitted  \\\n0     94419315            1.0         995              1.0           0   \n1       338247            1.0         996              1.0           0   \n2       695439            1.0         997              1.0           0   \n3    103586670            0.0         998              0.0           0   \n4      4988970            1.0         999              1.0           0   \n\n   encounter_id  weight_logit_code  weight_prevalence_code  time_in_hospital  \n0       8860284           0.005825                 0.99397                 3  \n1       8860944           0.005825                 0.99397                 4  \n2       8864718           0.005825                 0.99397                 1  \n3       8866632           0.000000                 0.00000                 6  \n4       8867106           0.005825                 0.99397                 9  ",
+      "text/html": "<div>\n<style scoped>\n    .dataframe tbody tr th:only-of-type {\n        vertical-align: middle;\n    }\n\n    .dataframe tbody tr th {\n        vertical-align: top;\n    }\n\n    .dataframe thead th {\n        text-align: right;\n    }\n</style>\n<table border=\"1\" class=\"dataframe\">\n  <thead>\n    <tr style=\"text-align: right;\">\n      <th></th>\n      <th>patient_nbr</th>\n      <th>weight_is_bad</th>\n      <th>orig_index</th>\n      <th>weight_lev__NA_</th>\n      <th>readmitted</th>\n      <th>encounter_id</th>\n      <th>weight_logit_code</th>\n      <th>weight_prevalence_code</th>\n      <th>time_in_hospital</th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr>\n      <th>0</th>\n      <td>94419315</td>\n      <td>1.0</td>\n      <td>995</td>\n      <td>1.0</td>\n      <td>0</td>\n      <td>8860284</td>\n      <td>0.005825</td>\n      <td>0.99397</td>\n      <td>3</td>\n    </tr>\n    <tr>\n      <th>1</th>\n      <td>338247</td>\n      <td>1.0</td>\n      <td>996</td>\n      <td>1.0</td>\n      <td>0</td>\n      <td>8860944</td>\n      <td>0.005825</td>\n      <td>0.99397</td>\n      <td>4</td>\n    </tr>\n    <tr>\n      <th>2</th>\n      <td>695439</td>\n      <td>1.0</td>\n      <td>997</td>\n      <td>1.0</td>\n      <td>0</td>\n      <td>8864718</td>\n      <td>0.005825</td>\n      <td>0.99397</td>\n      <td>1</td>\n    </tr>\n    <tr>\n      <th>3</th>\n      <td>103586670</td>\n      <td>0.0</td>\n      <td>998</td>\n      <td>0.0</td>\n      <td>0</td>\n      <td>8866632</td>\n      <td>0.000000</td>\n      <td>0.00000</td>\n      <td>6</td>\n    </tr>\n    <tr>\n      <th>4</th>\n      <td>4988970</td>\n      <td>1.0</td>\n      <td>999</td>\n      <td>1.0</td>\n      <td>0</td>\n      <td>8867106</td>\n      <td>0.005825</td>\n      <td>0.99397</td>\n      <td>9</td>\n    </tr>\n  </tbody>\n</table>\n</div>"
      },
      "execution_count": 11,
      "metadata": {},
@@ -520,12 +520,12 @@
       "   \"extend_1\"\n",
       " )\n",
       "SELECT  -- .extend({ 'weight_logit_code': 'weight_logit_code.coalesce(0.0)', 'weight_prevalence_code': 'weight_prevalence_code.coalesce(0.0)', 'time_in_hospital': 'time_in_hospital.coalesce(4.8030150753768845)'})\n",
-      " \"encounter_id\" ,\n",
-      " \"weight_is_bad\" ,\n",
       " \"patient_nbr\" ,\n",
-      " \"readmitted\" ,\n",
+      " \"weight_is_bad\" ,\n",
       " \"orig_index\" ,\n",
       " \"weight_lev__NA_\" ,\n",
+      " \"readmitted\" ,\n",
+      " \"encounter_id\" ,\n",
       " COALESCE(\"weight_logit_code\", 0.0) AS \"weight_logit_code\" ,\n",
       " COALESCE(\"weight_prevalence_code\", 0.0) AS \"weight_prevalence_code\" ,\n",
       " COALESCE(\"time_in_hospital\", 4.8030150753768845) AS \"time_in_hospital\"\n",
diff --git a/coverage.txt b/coverage.txt
@@ -41,4 +41,4 @@ pkg/vtreat/vtreat_impl.py           658     74    89%
 TOTAL                              1362    150    89%
 
 
-============================= 32 passed in 21.10s ==============================
+============================= 32 passed in 21.98s ==============================
diff --git a/docs/vtreat.html b/docs/vtreat.html
@@ -122,7 +122,7 @@ <h1 class="modulename">
 <span class="kn">from</span> <span class="nn">vtreat.vtreat_api</span> <span class="kn">import</span> <span class="o">*</span>
 
 <span class="n">__docformat__</span> <span class="o">=</span> <span class="s2">&quot;restructuredtext&quot;</span>
-<span class="n">__version__</span> <span class="o">=</span> <span class="s2">&quot;1.0.2&quot;</span>
+<span class="n">__version__</span> <span class="o">=</span> <span class="s2">&quot;1.1.0&quot;</span>
 
 <span class="vm">__doc__</span> <span class="o">=</span> <span class="s2">&quot;&quot;&quot;</span>
 <span class="s2">This&lt;https://github.com/WinVector/pyvtreat&gt; is the Python version of the vtreat data preparation system</span>
@@ -194,7 +194,7 @@ <h1 class="modulename">
 <span class="kn">from</span> <span class="nn">vtreat.vtreat_api</span> <span class="kn">import</span> <span class="o">*</span>
 
 <span class="n">__docformat__</span> <span class="o">=</span> <span class="s2">&quot;restructuredtext&quot;</span>
-<span class="n">__version__</span> <span class="o">=</span> <span class="s2">&quot;1.0.2&quot;</span>
+<span class="n">__version__</span> <span class="o">=</span> <span class="s2">&quot;1.1.0&quot;</span>
 
 <span class="vm">__doc__</span> <span class="o">=</span> <span class="s2">&quot;&quot;&quot;</span>
 <span class="s2">This&lt;https://github.com/WinVector/pyvtreat&gt; is the Python version of the vtreat data preparation system</span>
diff --git a/pkg/build/lib/vtreat/__init__.py b/pkg/build/lib/vtreat/__init__.py
@@ -11,7 +11,7 @@
 from vtreat.vtreat_api import *
 
 __docformat__ = "restructuredtext"
-__version__ = "1.0.2"
+__version__ = "1.1.0"
 
 __doc__ = """
 This<https://github.com/WinVector/pyvtreat> is the Python version of the vtreat data preparation system
diff --git a/pkg/dist/vtreat-1.0.2.tar.gz b/pkg/dist/vtreat-1.0.2.tar.gz
diff --git a/pkg/dist/vtreat-1.1.0-py3-none-any.whl b/pkg/dist/vtreat-1.1.0-py3-none-any.whl
diff --git a/pkg/dist/vtreat-1.1.0.tar.gz b/pkg/dist/vtreat-1.1.0.tar.gz
diff --git a/pkg/setup.py b/pkg/setup.py
@@ -60,7 +60,7 @@
 
 setuptools.setup(
     name='vtreat',
-    version='1.0.2',
+    version='1.1.0',
     author='John Mount, Nina Zumel',
     author_email='jmount@win-vector.com',
     url='https://github.com/WinVector/pyvtreat',
diff --git a/pkg/vtreat.egg-info/PKG-INFO b/pkg/vtreat.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vtreat
-Version: 1.0.2
+Version: 1.1.0
 Summary: vtreat is a pandas.DataFrame processor/conditioner that prepares real-world data for predictive modeling in a statistically sound manner. 
 Home-page: https://github.com/WinVector/pyvtreat
 Author: John Mount, Nina Zumel
diff --git a/pkg/vtreat/__init__.py b/pkg/vtreat/__init__.py
@@ -11,7 +11,7 @@
 from vtreat.vtreat_api import *
 
 __docformat__ = "restructuredtext"
-__version__ = "1.0.2"
+__version__ = "1.1.0"
 
 __doc__ = """
 This<https://github.com/WinVector/pyvtreat> is the Python version of the vtreat data preparation system

Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,4 @@ pkg/vtreat/vtreat_impl.py 658 74 89%`
`41`	`41`	`TOTAL 1362 150 89%`
`42`	`42`
`43`	`43`
`44`		`-============================= 32 passed in 21.10s ==============================`
	`44`	`+============================= 32 passed in 21.98s ==============================`