Renaming root project configuration file from project.yaml to project.conf for extra clarity

12 files changed, 4 insertions, 4 deletions

diff --git a/buildstream/project.py b/buildstream/project.py
index b9c181b7c..1853b0256 100644
--- a/buildstream/project.py
+++ b/buildstream/project.py
@@ -24,7 +24,7 @@ The :class:`.Project` object holds all of the project settings from
 the project configuration file including the project directory it
 was loaded from.
 
-The project configuration file should be named ``project.yaml`` and
+The project configuration file should be named ``project.conf`` and
 be located at the project root. It holds information such as Source
 aliases relevant for the sources used in the given project as well as
 overrides for the configuration of element types used in the project.
@@ -96,7 +96,7 @@ class Project():
 
     def _load(self):
 
-        projectfile = os.path.join(self.directory, "project.yaml")
+        projectfile = os.path.join(self.directory, "project.conf")
 
         config = _yaml.load(_site.default_project_config)
         project_conf = _yaml.load(projectfile)
diff --git a/doc/source/format.rst b/doc/source/format.rst
index 239dbbb24..e9911a58a 100644
--- a/doc/source/format.rst
+++ b/doc/source/format.rst
@@ -19,7 +19,7 @@ A BuildStream project is a directory consisting of:
 
 A typical project structure may look like this::
 
-  myproject/project.yaml
+  myproject/project.conf
   myproject/elements/element1.bst
   myproject/elements/element2.bst
   myproject/elements/...
@@ -169,7 +169,7 @@ Config
 
 Here we configure the element itself. The autotools element provides sane defaults for
 building sources which use autotools. Element default configurations can be overridden
-in the ``project.yaml`` file and additionally overridden in the declaration of an element.
+in the ``project.conf`` file and additionally overridden in the declaration of an element.
 
 For meaningful documentation on what can be specified in the ``config`` section for a given
 element ``kind``, refer to the element specific documentation. 
diff --git a/tests/pipeline/load/iterate/project.yaml b/tests/pipeline/load/iterate/project.conf
index 2027cc27a..2027cc27a 100644
--- a/tests/pipeline/load/iterate/project.yaml
+++ b/tests/pipeline/load/iterate/project.conf
diff --git a/tests/pipeline/load/simple/project.yaml b/tests/pipeline/load/simple/project.conf
index 2027cc27a..2027cc27a 100644
--- a/tests/pipeline/load/simple/project.yaml
+++ b/tests/pipeline/load/simple/project.conf
diff --git a/tests/project/data/alias/project.yaml b/tests/project/data/alias/project.conf
index 1ef4bba09..1ef4bba09 100644
--- a/tests/project/data/alias/project.yaml
+++ b/tests/project/data/alias/project.conf
diff --git a/tests/project/data/basic/project.yaml b/tests/project/data/basic/project.conf
index fd3134c58..fd3134c58 100644
--- a/tests/project/data/basic/project.yaml
+++ b/tests/project/data/basic/project.conf
diff --git a/tests/project/data/missingname/project.yaml b/tests/project/data/missingname/project.conf
index 07d0cf26e..07d0cf26e 100644
--- a/tests/project/data/missingname/project.yaml
+++ b/tests/project/data/missingname/project.conf
diff --git a/tests/project/data/overridepath/project.yaml b/tests/project/data/overridepath/project.conf
index 8d781ea93..8d781ea93 100644
--- a/tests/project/data/overridepath/project.yaml
+++ b/tests/project/data/overridepath/project.conf
diff --git a/tests/sources/git/basic/project.yaml b/tests/sources/git/basic/project.conf
index afa0f5475..afa0f5475 100644
--- a/tests/sources/git/basic/project.yaml
+++ b/tests/sources/git/basic/project.conf
diff --git a/tests/sources/git/template/project.yaml b/tests/sources/git/template/project.conf
index afa0f5475..afa0f5475 100644
--- a/tests/sources/git/template/project.yaml
+++ b/tests/sources/git/template/project.conf
diff --git a/tests/sources/local/basic/project.yaml b/tests/sources/local/basic/project.conf
index afa0f5475..afa0f5475 100644
--- a/tests/sources/local/basic/project.yaml
+++ b/tests/sources/local/basic/project.conf
diff --git a/tests/sources/local/directory/project.yaml b/tests/sources/local/directory/project.conf
index afa0f5475..afa0f5475 100644
--- a/tests/sources/local/directory/project.yaml
+++ b/tests/sources/local/directory/project.conf