Merge pull request #6 from kalefranz/update-conda

update conda to 4.2
conda-forge · Oct 27, 2016 · 7793c86 · 7793c86
2 parents 5e2eecf + 77c1e5d
commit 7793c86
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 29 deletions.
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -21,15 +21,9 @@ set CONDA_DEFAULT_ENV=
 echo %PKG_VERSION% > conda\.version
 
 :: Install the Python code
-%PYTHON% setup.py install --single-version-externally-managed --record=record.txt
+%PYTHON% setup.py install
 if errorlevel 1 exit 1
 
-:: Install the activation scripts.
-copy %SRC_DIR%\bin\activate %PREFIX%\Scripts\activate
-copy %SRC_DIR%\bin\activate.bat %PREFIX%\Scripts\activate.bat
-copy %SRC_DIR%\bin\deactivate %PREFIX%\Scripts\deactivate
-copy %SRC_DIR%\bin\deactivate.bat %PREFIX%\Scripts\deactivate.bat
-
 :: Install fish activation script.
 mkdir %PREFIX%\etc\fish\conf.d
 cp %PREFIX%\shell\conda.fish > %PREFIX%\etc\fish\conf.d\conda.fish

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -10,11 +10,7 @@ export CONDA_DEFAULT_ENV=''
 echo "${PKG_VERSION}" > conda/.version
 
 # Install the Python code
-$PYTHON setup.py install --single-version-externally-managed --record=record.txt
-
-# Install the activation scripts.
-cp $SRC_DIR/bin/activate $PREFIX/bin/activate
-cp $SRC_DIR/bin/deactivate $PREFIX/bin/deactivate
+$PYTHON setup.py install
 
 # Install the fish activation script.
 mkdir -p $PREFIX/etc/fish/conf.d/

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,7 +1,6 @@
 {% set name = "conda" %}
-{% set version = "4.1.12" %}
-{% set checksum = "302c3cdfa05e7a0ca16eb3a568e85079ab8bd98697ca662d0335e622247dcf50" %}
-
+{% set version = "4.2.11" %}
+{% set checksum = "7cc6696aaf50d1ff5ce502f99c7062ce4258dadfb0fb94b01874c999c929f3c2" %}
 
 package:
   name: conda
@@ -43,22 +42,14 @@ build:
 requirements:
   build:
     - python
-    - setuptools
-    - conda-env >=2.5
-    - menuinst                  # [win]
-    - pycosat
-    - pyyaml
-    - requests
-    - ruamel_yaml
-
   run:
     - python
-    - conda-env >=2.5
-    - menuinst                  # [win]
-    - pycosat
-    - pyyaml
-    - requests
-    - ruamel_yaml
+    - conda-env >=2.6
+    - enum34                 # [py<34]
+    - menuinst               # [win]
+    - pycosat >=0.6.1
+    - requests >=2.5.3
+    - ruamel_yaml >=0.11.14
 
 test:
   imports: