From c43d45ce218f06813a258aaa98bc8ee79422dd5f Mon Sep 17 00:00:00 2001
From: yuvipanda <yuvipanda@gmail.com>
Date: Thu, 30 Nov 2017 00:11:36 -0800
Subject: [PATCH] Move conda support files next to the code

Better than in a separate files dir IMO
---
 MANIFEST.in                                                    | 2 +-
 repo2docker/buildpacks/base.py                                 | 2 +-
 repo2docker/buildpacks/{conda.py => conda/__init__.py}         | 2 +-
 repo2docker/{files => buildpacks}/conda/environment.yml        | 0
 repo2docker/{files => buildpacks}/conda/install-miniconda.bash | 0
 repo2docker/buildpacks/{python.py => python/__init__.py}       | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename repo2docker/buildpacks/{conda.py => conda/__init__.py} (97%)
 rename repo2docker/{files => buildpacks}/conda/environment.yml (100%)
 rename repo2docker/{files => buildpacks}/conda/install-miniconda.bash (100%)
 rename repo2docker/buildpacks/{python.py => python/__init__.py} (99%)

diff --git a/MANIFEST.in b/MANIFEST.in
index 7fbb6741..02bf47a3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include *.md
 include LICENSE
 include setup.cfg
-recursive-include repo2docker/files *
+recursive-include repo2docker/buildpacks *
diff --git a/repo2docker/buildpacks/base.py b/repo2docker/buildpacks/base.py
index 0fdedcfd..45b78892 100644
--- a/repo2docker/buildpacks/base.py
+++ b/repo2docker/buildpacks/base.py
@@ -381,7 +381,7 @@ class BuildPack(LoggingConfigurable):
 
         for src in sorted(self.build_script_files):
             src_parts = src.split('/')
-            src_path = os.path.join(os.path.dirname(__file__), '..', 'files', *src_parts)
+            src_path = os.path.join(os.path.dirname(__file__), *src_parts)
             tar.add(src_path, src, filter=_filter_tar)
 
         tar.add('.', 'src/', filter=_filter_tar)
diff --git a/repo2docker/buildpacks/conda.py b/repo2docker/buildpacks/conda/__init__.py
similarity index 97%
rename from repo2docker/buildpacks/conda.py
rename to repo2docker/buildpacks/conda/__init__.py
index 0c17a86c..56e525e6 100644
--- a/repo2docker/buildpacks/conda.py
+++ b/repo2docker/buildpacks/conda/__init__.py
@@ -3,7 +3,7 @@ Generates a variety of Dockerfiles based on an input matrix
 """
 from traitlets import default
 import os
-from .base import BuildPack
+from ..base import BuildPack
 
 
 class CondaBuildPack(BuildPack):
diff --git a/repo2docker/files/conda/environment.yml b/repo2docker/buildpacks/conda/environment.yml
similarity index 100%
rename from repo2docker/files/conda/environment.yml
rename to repo2docker/buildpacks/conda/environment.yml
diff --git a/repo2docker/files/conda/install-miniconda.bash b/repo2docker/buildpacks/conda/install-miniconda.bash
similarity index 100%
rename from repo2docker/files/conda/install-miniconda.bash
rename to repo2docker/buildpacks/conda/install-miniconda.bash
diff --git a/repo2docker/buildpacks/python.py b/repo2docker/buildpacks/python/__init__.py
similarity index 99%
rename from repo2docker/buildpacks/python.py
rename to repo2docker/buildpacks/python/__init__.py
index 6c5abef6..10bee9a6 100644
--- a/repo2docker/buildpacks/python.py
+++ b/repo2docker/buildpacks/python/__init__.py
@@ -3,7 +3,7 @@ Generates a variety of Dockerfiles based on an input matrix
 """
 from traitlets import default
 import os
-from .base import BuildPack
+from ..base import BuildPack
 
 
 class PythonBuildPack(BuildPack):