From ddff1e7b4a980f5027014d459d48ff39b9ac6a29 Mon Sep 17 00:00:00 2001 From: Bill Little Date: Thu, 14 Jun 2018 08:16:02 +0100 Subject: [PATCH] minor requirements tidy --- requirements/all.txt | 2 +- requirements/gen_conda_requirements.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/all.txt b/requirements/all.txt index bf9ba34e4e..657be9ce19 100644 --- a/requirements/all.txt +++ b/requirements/all.txt @@ -5,7 +5,7 @@ #conda: esmpy>=7.0 (only python=2) #gdal : under review -- not tested at present mo_pack -nc-time-axis # conda: nc_time_axis +nc-time-axis pandas stratify #conda: python-stratify pyugrid diff --git a/requirements/gen_conda_requirements.py b/requirements/gen_conda_requirements.py index a6a5fd84aa..e7ad2654d5 100644 --- a/requirements/gen_conda_requirements.py +++ b/requirements/gen_conda_requirements.py @@ -28,7 +28,7 @@ def read_conda_reqs(fname, options): with open(fname, 'r') as fh: for line in fh: line = line.strip() - if '#conda:' in line: + if CONDA_PATTERN in line: line_start = line.index(CONDA_PATTERN) + len(CONDA_PATTERN) line = line[line_start:].strip() if 'only python=2' in line: