Merge pull request #117 from njsmith/release-0.5.0

0.5.0 release engineering

.gitignore

@@ -6,6 +6,7 @@ htmlcov/
 .tox
 # Generated by doc build
 doc/_static/basis-*.png
+doc/savefig/
 
 # Cribbed from numpy's .gitignore:
 

.travis.yml

@@ -3,6 +3,7 @@ python:
   - 2.7
   - 3.4
   - 3.5
+  - 3.6
 matrix:
   include:
     # 0.14.0 is the last version with the old categorical system
@@ -18,7 +19,7 @@ matrix:
     - python: 2.7
       env: PANDAS_VERSION_STR="=0.18.0"
     # make sure it works without pandas
-    - python: 3.5
+    - python: 3.6
       env: PANDAS_VERSION_STR="NONE"
     - python: 2.7
       env: PANDAS_VERSION_STR="NONE"

doc/changes.rst

@@ -4,9 +4,14 @@ Changes
 .. currentmodule:: patsy
 
 v0.5.0 (not yet released)
-------
+-------------------------
 
 * Dropped support for Python 2.6 and 3.3.
+* Update to keep up with ``pandas`` API changes
+* More consistent handling of degenerate linear constraints in
+  :meth:`DesignInfo.linear_constraint` (`#89
+  <https://github.com/pydata/patsy/issues/89>`__)
+* Fix a crash in ``DesignMatrix.__repr__`` when ``shape[0] == 0``
 
 v0.4.1
 ------

doc/conf.py

@@ -58,7 +58,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.pngmath',
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.imgmath',
               'sphinx.ext.intersphinx',
               'IPython.sphinxext.ipython_directive',
               'IPython.sphinxext.ipython_console_highlighting',

patsy/util.py

@@ -109,15 +109,15 @@ def test_asarray_or_pandas():
                               columns=["A", "B", "C"],
                               index=[10])
         df_view1 = asarray_or_pandas(df)
-        df_view1.ix[10, "A"] = 101
+        df_view1.loc[10, "A"] = 101
         assert np.array_equal(df_view1.columns, ["A", "B", "C"])
         assert np.array_equal(df_view1.index, [10])
-        assert df.ix[10, "A"] == 101
+        assert df.loc[10, "A"] == 101
         df_copy = asarray_or_pandas(df, copy=True)
         assert np.array_equal(df_copy, df)
         assert np.array_equal(df_copy.columns, ["A", "B", "C"])
         assert np.array_equal(df_copy.index, [10])
-        df_copy.ix[10, "A"] = 100
+        df_copy.loc[10, "A"] = 100
         assert not np.array_equal(df_copy, df)
         df_converted = asarray_or_pandas(df, dtype=float)
         assert df_converted["A"].dtype == np.dtype(float)

patsy/version.py

@@ -17,4 +17,4 @@
 # want. (Contrast with the special suffix 1.0.0.dev, which sorts *before*
 # 1.0.0.)
 
-__version__ = "0.4.1+dev"
+__version__ = "0.5.0+dev"