Merge branch 'add-egg-to-req-txt' into 'master'

Add #egg= markers to requirements.txt

See merge request !77

.github/workflows/ci.yml

@@ -31,8 +31,9 @@ jobs:
         -   uses: actions/checkout@v2
         -   name: "Main Script"
             run: |
-                grep -v mpi4py .test-conda-env-py3.yml > .test-conda-env.yml
-                CONDA_ENVIRONMENT=.test-conda-env.yml
+                sudo apt-get update
+                sudo apt-get install openmpi-bin libopenmpi-dev
+                CONDA_ENVIRONMENT=.test-conda-env-py3.yml
                 curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
                 . ./build-and-test-py-project-within-miniconda.sh
 
@@ -45,12 +46,11 @@ jobs:
             run: |
                 sudo apt-get update
                 sudo apt-get install openmpi-bin libopenmpi-dev
-                grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml
-                CONDA_ENVIRONMENT=.test-conda-env.yml
-                curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-py-project-within-miniconda.sh
-                . ./build-py-project-within-miniconda.sh
-                curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/run-examples.sh
-                . ./run-examples.sh
+                CONDA_ENVIRONMENT=.test-conda-env-py3.yml
+                curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh
+                . ci-support.sh
+                build_py_project_in_conda_env
+                run_examples
 
 # vim: sw=4
 

.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

requirements.txt

 numpy
-git+https://github.com/inducer/pytools.git
-git+https://github.com/inducer/pymbolic.git
-git+https://github.com/inducer/islpy.git
-git+https://github.com/inducer/pyopencl.git
-git+https://github.com/inducer/loopy.git
-git+https://gitlab.tiker.net/inducer/dagrt.git
-git+https://gitlab.tiker.net/inducer/leap.git
-git+https://github.com/inducer/meshpy.git
-git+https://github.com/inducer/modepy.git
-git+https://github.com/inducer/meshmode.git
+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://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