various fidgeting around the rename and release

njsmith · njsmith · commit 2bfb3e40d0e4 · 2012-07-10T14:48:31.000+01:00
diff --git a/COPYING b/COPYING
@@ -1,6 +1,6 @@
 The bulk of Patsy is distributed under a simple 2-clause BSD license:
 
-    Copyright (C) 2011, Patsy Developers. All rights reserved.
+    Copyright (C) 2011-2012, Patsy Developers. All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
diff --git a/README b/README
@@ -1,5 +1,5 @@
 This is patsy, a Python library for describing statistical models
-and for building design matrices.
+and building design matrices.
 
 Dependencies:
   numpy
diff --git a/doc/conf.py b/doc/conf.py
@@ -9,7 +9,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.01'
+import patsy
+version = patsy.__version__
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/doc/overview.rst b/doc/overview.rst
@@ -1,22 +1,24 @@
 Overview
 ========
 
-  *"It's only a model."* -- `Patsy <https://en.wikipedia.org/wiki/Patsy_%28Monty_Python%29>`_
-
-:mod:`patsy` is a Python package for describing statistical models
-and building design matrices. It is closely inspired by the 'formula'
-mini-language used in `R <http://www.r-project.org/>`_ and `S
-<https://secure.wikimedia.org/wikipedia/en/wiki/S_programming_language>`_. The
-name is in honor of `Val Patsy
-<http://www.wimbledon.arts.ac.uk/35174.htm>`_, who `built models
-<http://www.imdb.com/name/nm0153313/>`_ for Monty Python.
-
-For instance, if we have some variable ``y``, and we want to regress it
-against some other variables ``x``, ``a``, ``b``, and the `interaction
+  |epigraph|_
+
+  .. |epigraph| replace:: *"It's only a model."*
+
+  .. _epigraph: https://en.wikipedia.org/wiki/Patsy_%28Monty_Python%29
+
+:mod:`patsy` is a Python package for describing statistical models and
+building design matrices. It is closely inspired by and compatible
+with the 'formula' mini-language used in `R
+<http://www.r-project.org/>`_ and `S
+<https://secure.wikimedia.org/wikipedia/en/wiki/S_programming_language>`_.
+
+For instance, if we have some variable `y`, and we want to regress it
+against some other variables `x`, `a`, `b`, and the `interaction
 <https://secure.wikimedia.org/wikipedia/en/wiki/Interaction_%28statistics%29>`_
-of ``a`` and ``b``, then we simply write::
+of `a` and `b`, then we simply write::
 
-  y ~ x + a + b + a:b
+  patsy.dmatrices("y ~ x + a + b + a:b", data)
 
 and Patsy takes care of building appropriate matrices. Furthermore,
 it:
@@ -61,9 +63,9 @@ The current release may be downloaded from the Python Package index at
   http://pypi.python.org/pypi/patsy/
 
 Or the latest *development version* may be found in our `Git
-repository <https://github.com/patsy/patsy>`_::
+repository <https://github.com/pydata/patsy>`_::
 
-  git clone git://github.com/patsy/patsy.git
+  git clone git://github.com/pydata/patsy.git
 
 Requirements
 ------------
@@ -91,9 +93,16 @@ Contact
 
 Post your suggestions and questions directly to the `pydata mailing
 list <https://groups.google.com/group/pydata>`_
-(pydata@googlegroups.com), or to our `bug tracker
-<https://github.com/patsy/patsy/issues>`_. You could also
+(pydata@googlegroups.com, `gmane archive
+<http://news.gmane.org/gmane.comp.python.pydata>`_), or to our `bug
+tracker <https://github.com/pydata/patsy/issues>`_. You could also
 contact `Nathaniel J. Smith <mailto:njs@pobox.com>`_ directly, but
 really the mailing list is almost always a better bet, because more
 people will see your query and others will be able to benefit from any
 answers you get.
+
+License
+-------
+
+2-clause BSD. See the file `COPYING
+<https://github.com/pydata/patsy/blob/master/COPYING>`_ for details.
diff --git a/patsy/__init__.py b/patsy/__init__.py
@@ -8,6 +8,8 @@
 
 import sys
 
+__version__ = "0.1.0"
+
 # Do this first, to make it easy to check for warnings while testing:
 import os
 if os.environ.get("PATSY_FORCE_NO_WARNINGS"):
diff --git a/patsy/constraint.py b/patsy/constraint.py
@@ -334,6 +334,8 @@ def eval(self, tree, constraint=False):
             return val
 
 def linear_constraint(constraint_like, variable_names):
+    """This is the internal interface implementing
+    DesignInfo.linear_constraint, see there for docs."""
     if isinstance(constraint_like, LinearConstraint):
         if constraint_like.variable_names != variable_names:
             raise ValueError("LinearConstraint has wrong variable_names "
diff --git a/patsy/design_info.py b/patsy/design_info.py
@@ -213,6 +213,9 @@ def linear_constraint(self, constraint_likes):
           di.linear_constraint(["x1", "x3 = 0"])  # list of strings
           di.linear_constraint("x1 = 0, x3 - 10 = x1")
           di.linear_constraint([[1, 0, 0], [0, 0, 1]], [0, 10])
+
+          # You can also chain together equalities, just like Python:
+          di.linear_constraint("x1 = x2 = 3")
         """
         return linear_constraint(constraint_likes, self.column_names)
 
diff --git a/patsy/test_build.py b/patsy/test_build.py
@@ -162,6 +162,7 @@ def all_subsets(l):
                  [("b", "x2"), ("a", "x1")],
                  [("a", "b", "x2"), ("a", "b", "x1")],
                  [("b", "x1", "x2"), ("a", "x1", "x2")]]
+    count = 0
     for termlist_template in all_termlist_templates:
         termlist_set = set(termlist_template)
         for dispreferred, preferred in redundant:
@@ -178,6 +179,8 @@ def all_subsets(l):
             # term corresponds to 1 unique dimension of variation
             expected_rank = len(expanded_terms)
             make_matrix(data, expected_rank, termlist_template)
+            count += 1
+    print count
 
 test_redundancy_thoroughly.slow = 1
     
diff --git a/release-checklist.txt b/release-checklist.txt
@@ -1,22 +1,14 @@
-1) run tests
-2) run tests with Python 2.4
-2) update doc/changes.rst
-3) make sure docs are up to date
-3.5) check MANIFEST.in
-4) update version in doc/changes.rst, setup.py, doc/conf.py
-5) make a clean checkout
-6) python setup.py sdist
-7) cd dist; unpack; run tests on sdist
-8) tag
-9) upload source dist to google code and pypi
-10) build and upload docs
-  python setup.py build && (cd doc && PYTHONPATH=../build/lib.linux-x86_64-2.6/ make html)
-  cd doc/_build/html
-  zip -r doc .
-  (upload doc.zip to pypi)
-11) announce release on:
-  web page
-  mailing list
+* update doc/changes.rst
+* make sure docs are up to date
+* check MANIFEST.in
+* update version in doc/changes.rst, setup.py, patsy/__init__.py
+* make a clean checkout
+* run tox tests
+* tag
+* upload source dist to pypi
+* build and upload docs
+* announce release on:
+  py
   scipy-dev?
   pypi
-12) update version in setup.py and doc/conf.py again (add "+dev")
+* update version in setup.py, patsy/__init__.py again (add "+dev")
diff --git a/setup.py b/setup.py
@@ -14,11 +14,12 @@
 
 setup(
     name="patsy",
-    version="0.0+dev",
+    version="0.1.0",
     description=DESC,
     author="Nathaniel J. Smith",
     author_email="njs@pobox.com",
     license="2-clause BSD",
     packages=["patsy"],
     url="https://github.com/patsy/patsy",
+    install_requires=["numpy"],
     **extra)

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`# built documents.`
`10`	`10`	`#`
`11`	`11`	`# The short X.Y version.`
`12`		`-version = '0.01'`
	`12`	`+import patsy`
	`13`	`+version = patsy.__version__`
`13`	`14`	`# The full version, including alpha/beta/rc tags.`
`14`	`15`	`release = version`
`15`	`16`