diff options
| -rwxr-xr-x | cbcbuild.py | 8 | ||||
| -rw-r--r-- | tests/test.py | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/cbcbuild.py b/cbcbuild.py index 92d3646..52672b4 100755 --- a/cbcbuild.py +++ b/cbcbuild.py @@ -8,7 +8,7 @@ import conda_build.metadata -os.environ['CBC_HOME'] = 'tests/data/build' +os.environ['CBC_HOME'] = os.path.abspath(os.path.join(os.path.dirname(cbc.__file__), 'tests/data/build')) #sys.argv.append('--force-rebuild') #sys.argv.append('tests/data/aprio.ini') @@ -18,6 +18,9 @@ if __name__ == '__main__': parser.add_argument('--force-rebuild', action='store_true', help='Do not stop if package already installed') + parser.add_argument('--no-build', + action='store_true', + help='Generate metadata from cbc configuration (useful for manual building)') parser.add_argument('cbcfile', nargs='+', help='CBC metadata') @@ -48,6 +51,9 @@ if __name__ == '__main__': metadata.env.mkpkgdir(metadata.local['package']['name']) metadata.render_scripts() + if args.no_build: + continue + conda_metadata = conda_build.metadata.MetaData(env.pkgdir) if not args.force_rebuild: diff --git a/tests/test.py b/tests/test.py index 8203636..4bb76ae 100644 --- a/tests/test.py +++ b/tests/test.py @@ -55,12 +55,13 @@ class TestCBC(object): def test_spec_outputs_valid_conda_metadata(self):
import conda_build.metadata
cbc_meta = cbc.meta.MetaData(self.ini, self.env)
- #cbc_meta.conda_write_meta()
+ cbc_meta.env.mkpkgdir(cbc_meta.local['package']['name'])
+ cbc_meta.render_scripts()
# Test against conda's build system
- conda_meta = conda_build.metadata.MetaData(self.env.cbchome)
+ conda_meta = conda_build.metadata.MetaData(self.env.pkgdir)
nose.tools.assert_is_instance(conda_meta, conda_build.metadata.MetaData)
- nose.tools.assert_equal(conda_meta.dist(), 'test-1.0.0-1')
+ nose.tools.assert_equal(conda_meta.dist(), 'test-1.0.0-py34_1')
|