Skip to content

Commit

Permalink
Merge pull request #554 from bashtage/rls-5.3
Browse files Browse the repository at this point in the history
RLS: Release 5.3
  • Loading branch information
bashtage authored Sep 26, 2023
2 parents c181f62 + 40745bd commit 49c93db
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 27 deletions.
6 changes: 3 additions & 3 deletions ci/azure_template_posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
PANDAS: 1.1.0
STATSMODELS: 0.12.0
XARRAY: 0.16.0
FORMULAIC: 0.6.1
FORMULAIC: 0.6.5
test.install: true
python39_mid:
python.version: '3.9'
Expand All @@ -33,7 +33,7 @@ jobs:
STATSMODELS: 0.12.0
XARRAY: 0.18.0
XXHASH: true
FORMULAIC: 0.6.1
FORMULAIC: 0.6.5
test.install: true
python39_recent:
python.version: '3.9'
Expand All @@ -42,7 +42,7 @@ jobs:
PANDAS: 1.3.0
STATSMODELS: 0.13.0
XARRAY: 0.20.0
FORMULAIC: 0.6.1
FORMULAIC: 0.6.5
test.install: true
python310_no_cython:
python.version: '3.10'
Expand Down
9 changes: 4 additions & 5 deletions doc/source/changes/5.0.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
.. warning::

Version 5.0 changes the sorting order for models created using formulas.
Variables will appear in results in the same order they are entered in
the formula string.
Version 5.3
-----------
- Bumped the minimum formulaic to 0.6.5.
- Released wheels for Python 3.12.

Version 5.2
-----------
Expand Down
20 changes: 2 additions & 18 deletions linearmodels/tests/system/test_formulas.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,6 @@
key += " : " + str(m[0].__name__)
ids.append(key)

escape_fmlas = fmlas[:2] + fmlas[3:]
escape_params = list(product(escape_fmlas, models))

escape_ids = []
for f, m in escape_params:
key = "--".join([value for value in f.values()])
key += " : " + str(m[0].__name__)
escape_ids.append(key)


def sigmoid(v):
return np.exp(v) / (1 + np.exp(v))
Expand All @@ -71,13 +62,6 @@ def config(request):
return fmla, model, interface


@pytest.fixture(scope="module", params=escape_params, ids=escape_ids)
def escape_config(request):
fmla, model_interace = request.param
model, interface = model_interace
return fmla, model, interface


def test_formula(config):
fmla, model, interface = config
for key in fmla:
Expand Down Expand Up @@ -198,8 +182,8 @@ def test_parser(config):
assert_frame_equal(eq1[key], eq2[key])


def test_formula_escaped(escape_config):
fmla, model, interface = escape_config
def test_formula_escaped(config):
fmla, model, interface = config
for key in fmla:
if "[" in fmla[key] and model not in (IVSystemGMM, IV3SLS):
return
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ statsmodels>=0.12.0
mypy_extensions>=0.4
Cython>=0.29.34
pyhdfe>=0.1
formulaic>=0.6.1
formulaic>=0.6.5
# versioning
setuptools_scm[toml]>=7.0.0,<8.0.0

1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ def run_setup(binary: bool = True) -> None:
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"License :: OSI Approved :: University of Illinois/NCSA Open Source License",
"Operating System :: MacOS :: MacOS X",
"Operating System :: Microsoft :: Windows",
Expand Down

0 comments on commit 49c93db

Please sign in to comment.