From 8e814e3bbd5ba203f69c3e95b3ba2c560dc92de8 Mon Sep 17 00:00:00 2001 From: gregoryross Date: Thu, 5 Oct 2017 19:11:55 +0100 Subject: [PATCH 1/3] Update version name and package name. --- devtools/conda-recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml index cb98a45..9b390e4 100644 --- a/devtools/conda-recipe/meta.yaml +++ b/devtools/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ package: - name: saltswap-dev - version: 0.5 + name: saltswap + version: 0.5.1 source: path: ../../ From ca5a83e59329b8e1e55905b07e5ebc04afc84213 Mon Sep 17 00:00:00 2001 From: gregoryross Date: Thu, 5 Oct 2017 19:51:15 +0100 Subject: [PATCH 2/3] Fixed dependency syntax. --- devtools/conda-recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml index 9b390e4..cad8422 100644 --- a/devtools/conda-recipe/meta.yaml +++ b/devtools/conda-recipe/meta.yaml @@ -16,8 +16,8 @@ requirements: - numpy - scipy - setuptools - - openmm >= 7.1 - - openmmtools >= 0.9.4 + - openmm >=7.1 + - openmmtools >=0.9.4 - netcdf4 - pytest @@ -27,8 +27,8 @@ requirements: - numpy - scipy - setuptools - - openmm >= 7.1 - - openmmtools >= 0.9.4 + - openmm >=7.1 + - openmmtools >=0.9.4 - netcdf4 test: From bc0ad25e048e6d12428fb82ff6c0b4dd21bf40ad Mon Sep 17 00:00:00 2001 From: gregoryross Date: Thu, 5 Oct 2017 20:02:11 +0100 Subject: [PATCH 3/3] Fixing name of package to install. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eabda1d..d537648 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: # Build the recipe - conda build devtools/conda-recipe # Install the package - - conda install --yes --use-local ${PACKAGENAME}-dev + - conda install --yes --use-local ${PACKAGENAME} # Install testing dependencies. Without specifying the numpy version, numpy # is downgraded to 1.9 and we get a "libgfortran not found" issue. #- conda install --yes --quiet nose nose-timer pymbar "numpy>=1.11"