Ensure CI environment has pip

usnistgov · Dec 11, 2023 · 4f75df0 · 4f75df0
1 parent 048f33c
commit 4f75df0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/.azure/pipelines.yml b/.azure/pipelines.yml
@@ -152,7 +152,6 @@ stages:
       - bash: |
           source activate myEnvironment
           # OK if this fails
-          conda install --channel conda-forge pip
           pip install scikit-fmm || true
         displayName: Install pip packages
 
@@ -195,7 +194,6 @@ stages:
 
       - bash: |
           source activate myEnvironment
-          conda install --solver classic --channel conda-forge pip
           python -m pip install --upgrade setuptools wheel
           python setup.py bdist_wheel
           python3 -m pip install check-wheel-contents

diff --git a/.azure/templates/install.yml b/.azure/templates/install.yml
@@ -71,7 +71,6 @@ steps:
   - bash: |
       if [[ "${{ parameters.pip_packages }}" != "" ]]; then
         source activate myEnvironment
-        conda install --solver classic --channel conda-forge pip
         python -m pip install ${{ parameters.pip_packages }}
       fi
     displayName: Install Pip packages

diff --git a/environments/base-environment.yml b/environments/base-environment.yml
@@ -9,3 +9,4 @@ dependencies:
   - packaging
   - mayavi
   - gmsh <4.0|>=4.5.2
+  - pip