Skip to content
Commits on Jan 26, 2016
  1. @Jahaja

    Merge pull request #207 from anthraxx/master

    Jahaja committed
    do not forcefully remove the build directory manually (fix #179)
  2. @anthraxx

    do not forcefully remove the build directory manually

    anthraxx committed
    this fixes issue #179.
    setuptools should itself know when to use cache or create a
    new build... however if someone wants to override that, it's
    still possible but forcefully doing that on whatever
    setuptools target will (and does) introduce problems.
    
    Build directory should be cleaned up via the clean sub-command.
    examples:
    - clean up temp:
      python setup.py clean
    - clean up whole build dir
      python setup.py clean -a
    
    Or if somebody wants to, the build dir could be removed on the
    shell.
Commits on Jan 20, 2016
  1. @Jahaja
Commits on Jan 18, 2016
  1. @Jahaja
  2. @Jahaja
  3. @Jahaja

    Bumping version to 1.35

    Jahaja committed
  4. @Jahaja
  5. @Jahaja

    Merge branch 'ngandhy-master'

    Jahaja committed
  6. @Jahaja

    Merge branch 'master' of https://github.com/ngandhy/ultrajson into ng…

    Jahaja committed
    …andhy-master
    
    Conflicts:
    	tests/tests.py
  7. @Jahaja
  8. @Jahaja
  9. @Jahaja

    Merge branch 'correct_unit_tests_and_benchmarks' of https://github.co…

    Jahaja committed
    …m/timdawborn/ultrajson into timdawborn-correct_unit_tests_and_benchmarks
    
    Conflicts:
    	tests/tests.py
Commits on Jan 15, 2016
  1. @Jahaja

    Merge pull request #157 from wlanslovenija/raw-json

    Jahaja committed
    If an object has a __json__ method, use it when encoding
  2. @Jahaja

    Merge pull request #191 from joshkel/master

    Jahaja committed
    Update tests for floating point inaccuracies
  3. @Jahaja

    Merge pull request #203 from timdawborn/sort_keys_memory_leak

    Jahaja committed
    Corrected memory leak in sort_keys=True
  4. @Jahaja

    Merge pull request #136 from b4hand/fix-typo

    Jahaja committed
    Fix typo.
  5. @Jahaja

    Merge pull request #195 from aebrahim/patch-1

    Jahaja committed
    Test on python 3.5 on travis
  6. @Jahaja

    Merge pull request #186 from shashurup/master

    Jahaja committed
    escape_forward_slashes now only ignores forward slashes, not everythi…
Commits on Dec 29, 2015
  1. @timdawborn
  2. @timdawborn

    * Refactored the unit testing and benchmarking code to work natively …

    timdawborn committed
    …under
    
      both Python 2 and Python 3, removing the need for 2to3 to be run. This
      indirectly fixes #177.
    * Corrected a duplicate-named method in the unit testing code. Corrected the
      now-exposed broken logic that wasn't being tested. This was
      highlighted in #186 but the author did not appear to realise that the
      method name was being masked in the unit test class.
    * Corrected the test case skipping logic to use unittest.skipIf instead
      of just returning from the method upon an ImportError so that the skip
      can actually be registered as a skipped test instead of a passed test.
    * Updated the tests to additionally run on Python 3.5 on Travis. This
      covers #195.
    * Merged the two benchmarking files into one, and modularised the code.
      Also added native RST output so the benchmarking results can be placed
      directly into the README file.
Commits on Dec 28, 2015
  1. @timdawborn
Commits on Dec 1, 2015
  1. @aebrahim

    Test on python 3.5 on travis

    aebrahim committed
Commits on Nov 30, 2015
  1. @Jahaja
Commits on Oct 15, 2015
  1. @joshkel

    Update tests for floating point inaccuracies

    joshkel committed
    Due to floating point differences in i386 versus x86-64, tests were
    failing on i386.
    
    Fixes GitHub issue #178.  As indicated in comments there, the long-term
    plan is to use strtod everywhere, but this fixes the test suite for
    purposes such as Ubuntu packaging that need to build and test the
    current version.
Commits on Sep 29, 2015
  1. Fixed test for escape_forward_slashes=False

    georgy committed
Commits on Sep 8, 2015
  1. escape_forward_slashes now only ignores forward slashes, not everythi…

    Georgy Kibardin committed
    …ng else
Commits on Apr 9, 2015
  1. @Jahaja
  2. @Jahaja
  3. @Jahaja

    Merge branch 'indent'

    Jahaja committed
  4. @Jahaja

    Support for space indent for JSON encoding

    Chris Huang committed with Jahaja
  5. @Jahaja

    Added test for sort keys

    Jahaja committed
Commits on Apr 8, 2015
  1. @Jahaja
  2. @timdawborn @Jahaja
  3. @timdawborn @Jahaja
  4. @Jahaja

    Merge pull request #166 from leplatrem/option_disable_escape_slashes

    Jahaja committed
    Add option to disable forward slash escape
Something went wrong with that request. Please try again.