Skip to content

Commit

Permalink
Revert install to pip opencv
Browse files Browse the repository at this point in the history
  • Loading branch information
torzdf committed Jul 27, 2019
1 parent c3adc93 commit 3f20b79
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@
TENSORFLOW_REQUIREMENTS = {"==1.12.0": ["9.0", "7.2"],
">=1.13.1,<1.14": ["10.0", "7.4"]} # TF 1.14+ Not currently supported
# Mapping of Python packages to their conda names if different from pypi or in non-default channel
CONDA_MAPPING = {"opencv-python": ("opencv", "conda-forge"),
"fastcluster": ("fastcluster", "conda-forge"),
"toposort": ("toposort", "conda-forge"),
"imageio-ffmpeg": ("imageio-ffmpeg", "conda-forge")}
CONDA_MAPPING = {
# "opencv-python": ("opencv", "conda-forge"), # Periodic issues with conda-forge opencv
"fastcluster": ("fastcluster", "conda-forge"),
"toposort": ("toposort", "conda-forge"),
"imageio-ffmpeg": ("imageio-ffmpeg", "conda-forge")}


class Environment():
Expand Down

0 comments on commit 3f20b79

Please sign in to comment.