From b09baab52f1261135172d179adeceee3c893c088 Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Sun, 18 Oct 2020 13:23:02 +0200
Subject: [PATCH] meta
---
conda/meta.yaml | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/conda/meta.yaml b/conda/meta.yaml
index bb774dc..8a67c40 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -32,15 +32,15 @@ requirements:
- pkg-config # [not win]
- jom # [win]
- make # [unix]
- - python [win]
- - python =3.6 [not win]
+ - python # [win]
+ - python =3.6 # [not win]
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- cmake >=3.14
- - xorg-libxcursor
- - xorg-libx11
- - xorg-libxrandr
- - xorg-libxinerama
+ - xorg-libxcursor # [linux]
+ - xorg-libx11 # [linux]
+ - xorg-libxrandr # [linux]
+ - xorg-libxinerama # [linux]
- {{ cdt('mesa-libgl-devel') }} # [linux]
- {{ cdt('mesa-dri-drivers') }} # [linux]
- {{ cdt('libselinux') }} # [linux]
@@ -68,22 +68,22 @@ requirements:
host:
- pthread-stubs # [linux]
- - ffmpeg [win]
- - python [win]
- - ffmpeg ==4.0 [not win]
- - python =3.6 [not win]
- - nomkl [osx]
+ - ffmpeg # [win]
+ - python # [win]
+ - ffmpeg ==4.0 # [not win]
+ - python =3.6 # [not win]
+ - nomkl # [osx]
run:
- - tensorflow-gpu ==1.13.* [not osx]
- - tensorflow ==1.13.* [osx]
+ - tensorflow-gpu ==1.13.* # [not osx]
+ - tensorflow ==1.13.* # [osx]
- keras
- - ffmpeg [win]
- - python [win]
- - ffmpeg ==4.0 [not win]
- - python =3.6 [not win]
- - nomkl [osx]
- - xorg-libx11 [linux]
+ - ffmpeg # [win]
+ - python # [win]
+ - ffmpeg ==4.0 # [not win]
+ - python =3.6 # [not win]
+ - nomkl # [osx]
+ - xorg-libx11 # [linux]
about:
home: https://trex.run
--
GitLab