revert

Unidata · Nov 13, 2022 · c5b630a · c5b630a
1 parent e0fed04
commit c5b630a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 26 deletions.
diff --git a/.github/workflows/build_latest.yml b/.github/workflows/build_latest.yml
@@ -94,12 +94,11 @@ jobs:
           echo "pnetcdf mpi test passed!"
         fi
 
-    - name: Tarball
-      run: |
-        export PATH=${NETCDF_DIR}/bin:${PATH} 
-        python setup.py --version  
-        check-manifest --version
-        check-manifest --verbose 
-        export MPI4PY_INCLUDE=`python -c 'import mpi4py; print(mpi4py.get_include())'`
-        pip wheel . -w dist --no-deps 
-        twine check dist/* 
+#   - name: Tarball
+#     run: |
+#       export PATH=${NETCDF_DIR}/bin:${PATH} 
+#       python setup.py --version  
+#       check-manifest --version
+#       check-manifest --verbose 
+#       pip wheel . -w dist --no-deps 
+#       twine check dist/* 
diff --git a/.github/workflows/build_old.yml b/.github/workflows/build_old.yml
@@ -94,12 +94,11 @@ jobs:
           echo "pnetcdf mpi test passed!"
         fi
 
-    - name: Tarball
-      run: |
-        export PATH=${NETCDF_DIR}/bin:${PATH} 
-        python setup.py --version  
-        check-manifest --version
-        check-manifest --verbose 
-        export MPI4PY_INCLUDE=`python -c 'import mpi4py; print(mpi4py.get_include())'`
-        pip wheel . -w dist --no-deps 
-        twine check dist/* 
+#   - name: Tarball
+#     run: |
+#       export PATH=${NETCDF_DIR}/bin:${PATH} 
+#       python setup.py --version  
+#       check-manifest --version
+#       check-manifest --verbose 
+#       pip wheel . -w dist --no-deps 
+#       twine check dist/* 
diff --git a/.github/workflows/miniconda.yml b/.github/workflows/miniconda.yml
@@ -71,9 +71,7 @@ jobs:
         micromamba activate TEST
         export PATH="${CONDA_PREFIX}/bin:${CONDA_PREFIX}/Library/bin:$PATH" # so setup.py finds nc-config
         nc-config --all
-        #pip install -v -e . --no-build-isolation --no-deps --force-reinstall
-        export MPI4PY_INCLUDE=`python -c 'import mpi4py; print(mpi4py.get_include())'`
-        pip install -v -e . --no-deps --force-reinstall
+        pip install -v -e . --no-build-isolation --no-deps --force-reinstall
 
     - name: Debug conda
       shell: bash -l {0}

diff --git a/setup.py b/setup.py
@@ -685,11 +685,8 @@ def _populate_hdf5_info(dirstosearch, inc_dirs, libs, lib_dirs):
     f.close()
 
     if has_parallel4_support or has_pnetcdf_support:
-        if os.environ.get('MPI4PY_INCLUDE'):
-            inc_dirs.append(os.environ.get('MPI4PY_INCLUDE'))
-        else:
-            import mpi4py
-            inc_dirs.append(mpi4py.get_include())
+        import mpi4py
+        inc_dirs.append(mpi4py.get_include())
         # mpi_incdir should not be needed if using nc-config
         # (should be included in nc-config --cflags)
         if mpi_incdir is not None: inc_dirs.append(mpi_incdir)