Skip to content

Commit d39dd3d

Browse files
committed
fix installation script for newer conda versions
1 parent 9dd62db commit d39dd3d

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Install_or_Update.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ set ENV_NAME=geoapps
1313
set MY_CONDA=!MY_CONDA_EXE:"=!
1414
cd %~dp0
1515
set PYTHONUTF8=1
16+
set CONDA_CHANNEL_PRIORITY=strict
1617

1718
:: all dependencies are installed from conda
1819
set PIP_NO_DEPS=1
@@ -25,7 +26,7 @@ if not exist %MY_CONDA_ENV_FILE% (
2526
)
2627

2728
call "!MY_CONDA!" activate base ^
28-
&& call "!MY_CONDA!" env create --force -n %ENV_NAME% --file %MY_CONDA_ENV_FILE% ^
29+
&& call "!MY_CONDA!" env create -y -n %ENV_NAME% --file %MY_CONDA_ENV_FILE% ^
2930
&& call "!MY_CONDA!" run -n %ENV_NAME% pip install -e .[core,apps]
3031

3132
if !errorlevel! neq 0 (

geoapps/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# geoapps is distributed under the terms and conditions of the MIT License
66
# (see LICENSE file at the root of this source code package).
77

8-
__version__ = "0.11.1-post.1"
8+
__version__ = "0.11.1-post.2"
99

1010
import os
1111
import warnings

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "geoapps"
3-
version = "0.11.1-post.1"
3+
version = "0.11.1-post.2"
44
license = "MIT"
55
description = "Open-sourced Applications in Geoscience"
66
authors = ["Mira Geoscience <dominiquef@mirageoscience.com>"]

0 commit comments

Comments
 (0)