Merge pull request #3067 from bjlittle/minor-requirements-tidy

minor requirements tidy
SciTools · Oct 3, 2018 · 2b02967 · 2b02967
2 parents e7e3c53 + ddff1e7
commit 2b02967
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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: