From fa8843cb5ee2d56e767e3f134e779b79ca1e518e Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Thu, 18 Oct 2018 09:51:33 -0700 Subject: [PATCH] porechop: Use the standard release A special tag of Porechop was made to support older versions of GCC. Use the standard release with a recent version of GCC. --- recipes/porechop/build.sh | 4 ---- recipes/porechop/conda_build_config.yaml | 6 ++++++ recipes/porechop/meta.yaml | 17 +++++++---------- 3 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 recipes/porechop/build.sh create mode 100644 recipes/porechop/conda_build_config.yaml diff --git a/recipes/porechop/build.sh b/recipes/porechop/build.sh deleted file mode 100644 index d8745e0526ed6..0000000000000 --- a/recipes/porechop/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -$PYTHON setup.py install --single-version-externally-managed --record=record.txt -$PYTHON -m unittest diff --git a/recipes/porechop/conda_build_config.yaml b/recipes/porechop/conda_build_config.yaml new file mode 100644 index 0000000000000..a864705eed8d4 --- /dev/null +++ b/recipes/porechop/conda_build_config.yaml @@ -0,0 +1,6 @@ +c_compiler: + - gcc # [linux] + - clang # [osx] +cxx_compiler: + - gxx # [linux] + - clangxx # [osx] diff --git a/recipes/porechop/meta.yaml b/recipes/porechop/meta.yaml index 483ac63952ba6..2fe51be699e62 100644 --- a/recipes/porechop/meta.yaml +++ b/recipes/porechop/meta.yaml @@ -1,24 +1,21 @@ -# NOTE: Currently we require a modified version of Porechop with downgraded -# SeqAn to compile with the latest GCC available in conda (4.8). -# -# When GCC 4.9 or later is available on conda, the source metadata should be -# updated to point to the latest mainstream Porechop release. - -{% set version = "0.2.3_seqan2.1.1" %} +{% set version = "0.2.3" %} package: name: porechop version: {{ version }} source: - url: https://github.com/rrwick/Porechop/archive/v0.2.3-C++11.tar.gz - sha256: 817371dceed77e583e387e9ca7c10214c0faff7c0a89320d60a66efdc6c0d35a + url: https://github.com/rrwick/Porechop/archive/v0.2.3.tar.gz + sha256: bfed39f82abc54f44fffd9b13d2121868084da7ac3d158ac9b9aa6fa0257f0f4 build: - number: 3 + number: 4 skip: True # [py27] entry_points: - porechop = porechop.porechop:main + script: | + {{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv + {{ PYTHON }} -m unittest requirements: build: