Permalink
Commits on Dec 3, 2015
  1. Update README to redirect to new repo

    has207 committed Dec 3, 2015
    Project now has a new maintainer, updating README to redirect there instead.
Commits on Dec 2, 2015
  1. Minor fixes and improvements in packaging

    bkabrda committed Dec 2, 2015
    - include docs in sdist
    - remove obsolete Makefile
    - use setuptools instead of distutils when possible
Commits on Dec 1, 2015
  1. Fix pypy test

    has207 committed Dec 1, 2015
  2. Merge pull request #113 from bkabrda/master

    has207 committed Dec 1, 2015
    Add support for mocking functions with keyword-only args, fixes #100
Commits on Jun 7, 2015
  1. Merge pull request #106 from tals/master

    has207 committed Jun 7, 2015
    Improve pypy compatibility.
  2. Improve pypy compatibility.

    tals committed Jun 6, 2015
    PyPy demands keys to be strings (vs unicode).
    This causes issues if your test code has something like: `from __future__ import unicode_literals`, since it will cause the name args to be unicode.
Commits on Sep 24, 2014
  1. Merge pull request #99 from aniederl/master

    has207 committed Sep 24, 2014
    Fixes for teardown in py.test call hook (issue #98)
  2. Fix py.test failing on exceptions raised from a test

    Andreas Niederl
    Andreas Niederl committed Sep 23, 2014
  3. Fix teardown in py.test on exceptions from call phase

    Andreas Niederl
    Andreas Niederl committed Sep 23, 2014
Commits on Jul 30, 2014
  1. Merge pull request #97 from michael-db/master

    has207 committed Jul 30, 2014
    Fix CallOrderError: Y called before Y [fixes issue #96]
  2. Fix CallOrderError: Y called before Y [issue 96]

    michael-db committed Jul 30, 2014
    If I do something like this
    x.should_receive('y').and_return(a).once().ordered()
    x.should_receive('y').and_return(b).once().ordered()
    
    then I expect the mocked method to be called twice with the same arguments
    (none in this case), returning a different value the second time (b).
    Before this fix, it instead resulted in a CallOrderError exception.
Commits on Mar 8, 2014
  1. Merge pull request #93 from aniederl/master

    has207 committed Mar 8, 2014
    execute pytest call hook only in phase 'call' (fixes issue #92)
Commits on Mar 7, 2014
Commits on Nov 19, 2013
  1. Merge pull request #89 from kw/master

    has207 committed Nov 19, 2013
    Make the flexmock module itself callable.
Commits on Nov 1, 2013
  1. Make the flexmock module itself callable, so that you can

    kw committed Nov 1, 2013
    "import flexmock" instead of "from flexmock import flexmock".
    
    Not sure if serious.
Commits on Mar 30, 2013
  1. Update to 0.9.7

    has207 committed Mar 30, 2013
Commits on Mar 3, 2013
  1. Merge pull request #83 from rca/pycharm_fix

    has207 committed Mar 3, 2013
    Added hook for TeamCity / PyCharm.
Commits on Feb 27, 2013
Commits on Jul 28, 2012
  1. Cleanup unused deps

    has207 committed Jul 28, 2012
Commits on Jun 11, 2012
  1. Upgrade to 0.9.6

    has207 committed Jun 11, 2012
Commits on Jun 9, 2012
  1. - Fix staticmethod on instances (for real)

    has207 committed Jun 9, 2012
    - Fix ordering of kwargs comparison issue
    - Ensure ReturnValue can get printed out when not a tuple
Commits on May 31, 2012
Commits on May 22, 2012
  1. Upgrade to 0.9.4

    has207 committed May 22, 2012