Merge release branch back to master (onnx#512)

bddppq · web-flow · commit 8d0e3d588289 · 2018-02-06T16:17:55.000-08:00
* Revised Installation.md (onnx#304) * Revised CONTRIBUTING.md (onnx#303) * Revised CONTRIBUTING.md * Bump version to 1.0.0 * Include VERSION_NUMBER file into distribution * Remove the negative pad test case (onnx#350) * Updating error handling to properly handle the case where git is not installed * Version bump * Bump conda version number to 1.0.1
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,3 +2,4 @@ recursive-include onnx *.h *.cc *.proto
 recursive-include third_party *
 include LICENSE
 recursive-include onnx/backend/test/data *
+include VERSION_NUMBER
diff --git a/VERSION_NUMBER b/VERSION_NUMBER
@@ -1 +1 @@
-0.2.1
+1.0.1
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "0.2.1" %}
+{% set version = "1.0.1" %}
 
 package:
   name: onnx

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% set version = "0.2.1" %}`
	`1`	`+{% set version = "1.0.1" %}`
`2`	`2`
`3`	`3`	`package:`
`4`	`4`	`name: onnx`