Skip to content

Commit a686ed8

Browse files
authored
Merge pull request #502 from bashtage/update-formulaic
MAINT: Update formulaic
2 parents f83d8d9 + 862ec9a commit a686ed8

25 files changed

+1183
-1180
lines changed

ci/azure_template_posix.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
PANDAS: 1.0.0
2424
STATSMODELS: 0.11.0
2525
XARRAY: 0.15.1
26+
FORMULAIC: 0.3.2
2627
test.install: true
2728
python39_mid:
2829
python.version: '3.9'
@@ -32,6 +33,7 @@ jobs:
3233
STATSMODELS: 0.12.0
3334
XARRAY: 0.16.0
3435
XXHASH: true
36+
FORMULAIC: 0.4.0
3537
test.install: true
3638
python39_recent:
3739
python.version: '3.9'
@@ -54,6 +56,9 @@ jobs:
5456
python310_latest:
5557
python.version: '3.10'
5658
XXHASH: true
59+
python311_latest:
60+
python.version: '3.11'
61+
XXHASH: true
5762
maxParallel: 10
5863

5964
steps:

ci/azure_template_windows.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
python.version: '3.9'
2323
python310_win_latest:
2424
python.version: '3.10'
25+
python311_win_latest:
26+
python.version: '3.11'
2527
maxParallel: 10
2628

2729
steps:

ci/install-posix.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ if [[ -n ${PANDAS} ]]; then CMD="$CMD~=${PANDAS}"; fi;
99
CMD="$CMD statsmodels"
1010
if [[ -n ${STATSMODELS} ]]; then CMD="$CMD~=${STATSMODELS}"; fi
1111
if [[ -n ${XARRAY} ]]; then CMD="$CMD xarray~=${XARRAY}"; fi
12+
if [[ -n ${FORMULAIC} ]]; then CMD="$CMD formulaic~=${FORMULAIC}"; fi
1213
if [[ -n ${XXHASH} ]]; then CMD="$CMD xxhash"; fi
1314
echo "$CMD"
1415
eval "$CMD"

examples/iv_advanced-examples.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@
364364
"\n",
365365
"step1 = IV2SLS(data.hi_empunion, data[[\"ssiratio\"] + controls], None, None).fit()\n",
366366
"resids = step1.resids\n",
367-
"exog = pd.concat([data[[\"hi_empunion\"] + controls], resids], 1)\n",
367+
"exog = pd.concat([data[[\"hi_empunion\"] + controls], resids], axis=1)\n",
368368
"step2 = IV2SLS(data.ldrugexp, exog, None, None).fit(cov_type=\"unadjusted\")\n",
369369
"print(step2.tstats.residual**2)"
370370
]
@@ -552,7 +552,7 @@
552552
"res_ivols = ivolsmod.fit()\n",
553553
"sm_ols = res_ols.params\n",
554554
"sm_ols.name = \"sm\"\n",
555-
"print(pd.concat([res_ivols.params, sm_ols], 1))"
555+
"print(pd.concat([res_ivols.params, sm_ols], axis=1))"
556556
]
557557
}
558558
],
@@ -572,7 +572,7 @@
572572
"name": "python",
573573
"nbconvert_exporter": "python",
574574
"pygments_lexer": "ipython3",
575-
"version": "3.8.12"
575+
"version": "3.9.16"
576576
},
577577
"nbsphinx": {
578578
"allow_errors": true

0 commit comments

Comments
 (0)