Unverified Commit 6afeef92 authored Jul 07, 2020 by Kaitlyn Lee Committed by GitHub Jul 07, 2020

Restricted opencv to 3.2 (#3943)

* Updated meta.yml and CMakeList.txt for 4.2 RC

* Removed nn label.

* Updated environment.yml file

* Change opencv to be constrained to 3.2

* Removed extra 0

parent 92bd905f

environment.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ dependencies:
		- nlohmann_json
		- ninja==1.7.2
		- nn
		- opencv>=3.0.0,<=4.0.0
		- opencv=3.2
		- openssl>=1.0.0,<1.1.0
		- pcl
		- protobuf=3.9.1

recipe/meta.yaml

+2 −2

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ requirements:
		- nlohmann_json
		- ninja==1.7.2
		- nn
		- opencv>=3.0.0,<=4.0.0
		- opencv=3.2
		- openssl>=1.0.0,<1.1.0
		- pcl
		- protobuf=3.9.1
		@@ -132,7 +132,7 @@ requirements:
		- nanoflann
		- nlohmann_json
		- nn
		- opencv>=3.0.0,<=4.0.0
		- opencv=3.2
		- openssl>=1.0.0,<1.1.0
		- pcl
		- protobuf=3.9.1