Switch to .cget extension

Author: pfultz2

cget/cli.py

@@ -4,6 +4,7 @@
 from cget import display
 from cget.prefix import CGetPrefix
 from cget.prefix import PackageBuild
+from cget.prefix import find_requirements_file
 import cget.util as util
 
 
@@ -113,8 +114,9 @@ def install_command(prefix, pkgs, define, file, test, test_all, update, generato
     """ Install packages """
     variant = get_build_type(debug, release, build_type)
     if not file and not pkgs:
-        if os.path.exists('dev-requirements.txt'): file = 'dev-requirements.txt'
-        else: file = 'requirements.txt'
+        dev_req = find_requirements_file('.', 'dev-requirements')
+        if dev_req is not None: file = dev_req
+        else: file = find_requirements_file('.') or 'requirements.cget'
     pbs = [PackageBuild(pkg, cmake=cmake, variant=variant) for pkg in pkgs]
     for pbu in util.flat([prefix.from_file(file), pbs]):
         pb = pbu.merge_defines(define)

cget/prefix.py

@@ -13,6 +13,16 @@
 __CGET_DIR__ = os.path.dirname(os.path.realpath(__file__))
 __CGET_CMAKE_DIR__ = os.path.join(__CGET_DIR__, 'cmake')
 
+def find_requirements_file(directory, name='requirements'):
+    cget_file = os.path.join(directory, name + '.cget')
+    if os.path.exists(cget_file):
+        return cget_file
+    txt_file = os.path.join(directory, name + '.txt')
+    if os.path.exists(txt_file):
+        display.warning("Using '{}' is deprecated. Rename to '{}'.".format(name + '.txt', name + '.cget'))
+        return txt_file
+    return None
+
 @params(s=six.string_types)
 def parse_deprecated_alias(s):
     i = s.find(':', 0, max(s.find('://'), s.find(':\\')))
@@ -258,8 +268,8 @@ def from_recipe(self, recipe, pkg=None, name=None):
         util.ensure_exists(recipe_pkg)
         p = next(iter(self.from_file(recipe_pkg, no_recipe=True)))
         self.check(lambda:p.pkg_src is not None)
-        requirements = os.path.join(recipe, "requirements.txt")
-        if os.path.exists(requirements): p.requirements = requirements
+        requirements = find_requirements_file(recipe)
+        if requirements is not None: p.requirements = requirements
         p.pkg_src.recipe = None
         # Use original name
         if pkg: p.pkg_src.name = pkg.pkg_src.name
@@ -290,7 +300,7 @@ def write_parent(self, pb, track=True):
         if track and pb.parent is not None: util.mkfile(self.get_deps_directory(pb.to_fname()), pb.parent, pb.parent)
 
     def install_deps(self, pb, d, test=False, test_all=False, generator=None, insecure=False, ignore_requirements=False):
-        req_txt = os.path.join(d, 'requirements.txt') if not ignore_requirements else None
+        req_txt = find_requirements_file(d) if not ignore_requirements else None
         for dependent in self.from_file(pb.requirements or req_txt, pb.pkg_src.url):
             transient = dependent.test or dependent.build
             testing = test or test_all
@@ -355,10 +365,13 @@ def ignore(self, pb):
     def build(self, pb, test=False, target=None, generator=None):
         pb = self.parse_pkg_build(pb)
         src_dir = pb.pkg_src.get_src_dir()
-        if os.path.exists(os.path.join(src_dir, 'dev-requirements.txt')):
-            pb.requirements = os.path.join(src_dir, 'dev-requirements.txt')
-        elif os.path.exists(os.path.join(src_dir, 'requirements.txt')):
-            pb.requirements = os.path.join(src_dir, 'requirements.txt')
+        dev_req = find_requirements_file(src_dir, 'dev-requirements')
+        if dev_req is not None:
+            pb.requirements = dev_req
+        else:
+            req = find_requirements_file(src_dir)
+            if req is not None:
+                pb.requirements = req
         with self.create_builder(pb.to_fname()) as builder:
             # Install any dependencies first
             self.install_deps(pb, src_dir, generator=generator, test=test)

test/basicapp-dev/dev-requirements.txt test/basicapp-dev/dev-requirements.cgettest/basicapp-dev/dev-requirements.txt renamed to test/basicapp-dev/dev-requirements.cget

@@ -0,0 +1 @@
+-f requirements2.cget