Merge branch 'master' into velocity_hourly

mhidas · mhidas · commit fef25081fbda · 2020-04-02T17:23:35.000+11:00
diff --git a/constraints.txt b/constraints.txt
@@ -0,0 +1,3 @@
+cftime<1.1.1;python_version=='3.5'
+pandas<0.25.0;python_version=='3.5'
+xarray<0.14.0;python_version=='3.5'
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 --index-url https://pypi.python.org/simple/
+-c constraints.txt
 -e .

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`--index-url https://pypi.python.org/simple/`
	`2`	`+-c constraints.txt`
`2`	`3`	`-e .`