From 3918263e7d751b5af2a0b0d46ec1ca7fc0cbc119 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Tue, 14 Jul 2020 18:09:31 -0500
Subject: [PATCH] Delete pip packages from conda env

---
 .test-conda-env-py3.yml | 12 ------------
 requirements.txt        |  7 +++++--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.test-conda-env-py3.yml b/.test-conda-env-py3.yml
index c95608f4..31c74378 100644
--- a/.test-conda-env-py3.yml
+++ b/.test-conda-env-py3.yml
@@ -14,15 +14,3 @@ dependencies:
 - pyopencl
 - python=3
 - gmsh
-
-- pip
-- pip:
-    - git+https://github.com/inducer/pytools
-    - git+https://github.com/inducer/pymbolic
-    - git+https://github.com/inducer/loopy
-    - git+https://github.com/inducer/meshmode
-    - git+https://github.com/inducer/dagrt
-    - git+https://github.com/inducer/leap
-    - git+https://github.com/inducer/pyvisfile
-    - mpi4py
-    - pymetis
diff --git a/requirements.txt b/requirements.txt
index cf903183..650f0b79 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,14 @@
 numpy
+mpi4py
 git+https://github.com/inducer/pytools.git#egg=pytools
 git+https://github.com/inducer/pymbolic.git#egg=pymbolic
 git+https://github.com/inducer/islpy.git#egg=islpy
 git+https://github.com/inducer/pyopencl.git#egg=pyopencl
 git+https://github.com/inducer/loopy.git#egg=loo.py
-git+https://gitlab.tiker.net/inducer/dagrt.git#egg=dagrt
-git+https://gitlab.tiker.net/inducer/leap.git#egg=leap
+git+https://github.com/inducer/dagrt.git#egg=dagrt
+git+https://github.com/inducer/leap.git#egg=leap
 git+https://github.com/inducer/meshpy.git#egg=meshpy
 git+https://github.com/inducer/modepy.git#egg=modepy
 git+https://github.com/inducer/meshmode.git#egg=meshmode
+git+https://github.com/inducer/pyvisfile.git#egg=pyvisfile
+git+https://github.com/inducer/pymetis.git#egg=pymetis
-- 
GitLab