uprev

Author: samuelcolvin

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,28 @@
 <!-- Thank you for your contribution! -->
+<!-- Don't worry about making lots of commits on a pull request, they'll be squashed on merge anyway -->
 
-## What do these changes do?
+## Change Summary
 
-<!-- Please give a short summaryof the changes. -->
+<!-- Please give a short summary of the changes. -->
 
 ## Related issue number
 
 <!-- Are there any issues opened that will be resolved by merging this change? -->
 
+## Performance Changes
+
+pydantic cares about performance, if there's any risk performance changed on this PR, 
+please run `make benchmark-pydantic` before and after the change:
+* before: **?**
+* after: **?**
+
 ## Checklist
 
 * [ ] Unit tests for the changes exist
-* [ ] Coverage remains at 100%
+* [ ] Tests pass on CI and coverage remains at 100%
 * [ ] Documentation reflects the changes
+* [ ] No performance deterioration (if applicable)
 * [ ] `HISTORY.rst` has been updated
   * if this is the first change since a release, please add a new section
-  * include the issue number or this pull request number
+  * include the issue number or this pull request number `#<number>`
   * if you're not a regular contributer please include your github username `@whatever`

.travis.yml

@@ -30,7 +30,7 @@ script:
 
 - make mypy
 - make docs
-- BENCHMARK_REPEATS=1 make benchmark
+- BENCHMARK_REPEATS=1 make benchmark-all
 - ./tests/check_tag.py
 
 after_success:

HISTORY.rst

@@ -3,8 +3,8 @@
 History
 -------
 
-v0.13.0 (XXXX-XX-XX)
-....................
+v0.13.0 (20180-08-25)
+.....................
 * raise an exception if a field's name shadows an existing ``BaseModel`` attribute #242
 * add ``UrlStr`` and ``urlstr`` types #236
 * timedelta json encoding ISO8601 and total seconds, custom json encoders #247, by @cfkanesan and @samuelcolvin

Makefile

@@ -41,10 +41,14 @@ testcov:
 .PHONY: all
 all: testcov mypy lint
 
-.PHONY: benchmark
-benchmark:
+.PHONY: benchmark-all
+benchmark-all:
 	python benchmarks/run.py
 
+.PHONY: benchmark-pydantic
+benchmark-pydantic:
+	python benchmarks/run.py pydantic-only
+
 .PHONY: clean
 clean:
 	rm -rf `find . -name __pycache__`

docs/index.rst

@@ -508,6 +508,9 @@ over how non-standard types are encoded to JSON.
 
 (This script is complete, it should run "as is")
 
+By default timedelta's are encoded as a simple float of total seconds. The ``timedelta_isoformat`` is provided
+as an optional alternative which implements ISO 8601 time diff encoding.
+
 Pickle Serialisation
 ~~~~~~~~~~~~~~~~~~~~
 

pydantic/version.py

@@ -2,4 +2,4 @@
 
 __all__ = ['VERSION']
 
-VERSION = StrictVersion('0.13a1')
+VERSION = StrictVersion('0.13')