Skip to content

Commit 24841cf

Browse files
committed
BLD: Update build config to include Python 3.7
Include test config with Python 3.7 Test compat version of concat
1 parent 7f5f5ac commit 24841cf

File tree

5 files changed

+44
-9
lines changed

5 files changed

+44
-9
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env:
2424
matrix:
2525
fast_finish: true
2626
include:
27-
- python: 3.6
27+
- python: 3.5
2828
env:
2929
- PYTHON=3.5
3030
- NUMPY=1.12
@@ -42,15 +42,15 @@ matrix:
4242
- python: 3.6
4343
env:
4444
- PYTHON=3.6
45-
- NUMPY=1.15
46-
- SCIPY=1.1
45+
- NUMPY=1.14
46+
- SCIPY=1
4747
- PANDAS=0.22
4848
- XARRAY=0.10
4949
- DOCBUILD=true
5050
- STATAMODELS=0.9
5151
- python: 3.6
5252
env:
53-
- PYTHON=3.6
53+
- PYTHON=3.7
5454
- NUMPY=1.14
5555
- SCIPY=1.1
5656
- PANDAS=0.23

README.rst

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
Linear Models
22
=============
33

4-
`Build Status <https://travis-ci.org/bashtage/linearmodels>`__
5-
`codecov <https://codecov.io/gh/bashtage/linearmodels>`__
4+
|Build Status| |codecov| |Codacy Badge| |codebeat badge|
65

76
Linear (regression) models for Python. Extends
87
`statsmodels <http://www.statsmodels.org>`__ with Panel regression,
@@ -161,3 +160,12 @@ Documentation
161160
- nbformat
162161
- ipython
163162
- jupyter
163+
164+
.. |Build Status| image:: https://travis-ci.org/bashtage/linearmodels.svg?branch=master
165+
:target: https://travis-ci.org/bashtage/linearmodels
166+
.. |codecov| image:: https://codecov.io/gh/bashtage/linearmodels/branch/master/graph/badge.svg
167+
:target: https://codecov.io/gh/bashtage/linearmodels
168+
.. |Codacy Badge| image:: https://api.codacy.com/project/badge/Grade/c771bce50a164b6fa71c344b374f140d
169+
:target: https://www.codacy.com/app/bashtage/linearmodels?utm_source=github.com&utm_medium=referral&utm_content=bashtage/linearmodels&utm_campaign=Badge_Grade
170+
.. |codebeat badge| image:: https://codebeat.co/badges/aaae2fb4-72b5-4a66-97cd-77b93488f243
171+
:target: https://codebeat.co/projects/github-com-bashtage-linearmodels-master

linearmodels/compat/pandas.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ def concat(*args, **kwargs):
1414
if PD_LT_023 and 'sort' in kwargs:
1515
kwargs = kwargs.copy()
1616
del kwargs['sort']
17-
else:
17+
elif not PD_LT_023:
1818
if 'sort' not in kwargs:
1919
kwargs = kwargs.copy()
20-
kwargs['sort'] = True
20+
kwargs['sort'] = False
2121

2222
return pd.concat(*args, **kwargs)
2323

linearmodels/tests/test_compat.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import numpy as np
2+
import pytest
3+
from pandas import DataFrame, Series, date_range
4+
5+
from linearmodels.compat.pandas import concat
6+
from linearmodels.utility import AttrDict
7+
8+
9+
@pytest.fixture('module')
10+
def data():
11+
idx = date_range('2000-01-01', periods=100)
12+
df1 = DataFrame(np.arange(100)[:, None], columns=['A'], index=idx)
13+
x = np.reshape(np.arange(200), (100, 2))
14+
df2 = DataFrame(x, columns=['B', 'C'], index=idx[::-1])
15+
s = Series(300 + np.arange(100), index=idx, name='D')
16+
return AttrDict(df1=df1, df2=df2, s=s)
17+
18+
19+
def test_concat_sort(data):
20+
a = concat([data.df1, data.df2], 1)
21+
b = concat([data.df1, data.df2, data.s], 1)
22+
c = concat([data.df1, data.df2, data.s], 1, sort=True)
23+
d = concat([data.df2, data.df1, data.s], 1, sort=False)
24+
assert list(a.columns) == ['A', 'B', 'C']
25+
assert list(b.columns) == ['A', 'B', 'C', 'D']
26+
assert list(c.columns) == ['A', 'B', 'C', 'D']
27+
assert list(d.columns) == ['B', 'C', 'A', 'D']

linearmodels/utility.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ def __init__(self, results):
439439
def _get_series_property(self, name):
440440
out = ([(k, getattr(v, name)) for k, v in self._results.items()])
441441
cols = [v[0] for v in out]
442-
values = concat([v[1] for v in out], 1, sort=True)
442+
values = concat([v[1] for v in out], 1)
443443
values.columns = cols
444444
return values
445445

0 commit comments

Comments
 (0)