From 248910daf2da468c4c11b8edbf7cfdf0725918b2 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 11 Nov 2014 15:35:32 +0000 Subject: Fix some file locating and move data/ inside the baserockimport package Now data/ actually gets installed too. --- baserockimport/data/omnibus.yaml | 7 ++++++ baserockimport/data/rubygems.yaml | 49 +++++++++++++++++++++++++++++++++++++++ baserockimport/mainloop.py | 2 +- data/omnibus.yaml | 7 ------ data/rubygems.yaml | 49 --------------------------------------- setup.py | 1 + 6 files changed, 58 insertions(+), 57 deletions(-) create mode 100644 baserockimport/data/omnibus.yaml create mode 100644 baserockimport/data/rubygems.yaml delete mode 100644 data/omnibus.yaml delete mode 100644 data/rubygems.yaml diff --git a/baserockimport/data/omnibus.yaml b/baserockimport/data/omnibus.yaml new file mode 100644 index 0000000..2116f2a --- /dev/null +++ b/baserockimport/data/omnibus.yaml @@ -0,0 +1,7 @@ +--- + +dependency-blacklist: + # This is provided as a single downloadable .pem file, which isn't something + # Lorry can understand. Also, it's provided by the 'ca-certificates' chunk in + # Baserock already. + - cacerts diff --git a/baserockimport/data/rubygems.yaml b/baserockimport/data/rubygems.yaml new file mode 100644 index 0000000..e1e6fcc --- /dev/null +++ b/baserockimport/data/rubygems.yaml @@ -0,0 +1,49 @@ +--- + +lorry-prefix: ruby-gems/ + +# The :development dependency set is way too broad for our needs: for most Gems, +# it includes test tools and development aids that aren't necessary for just +# building the Gem. It's hard to even get a stratum if we include all these +# tools because of the number of circular dependencies. Instead, only those +# tools which are known to be required at Gem build time are listed as +# build-dependencies, and any other :development dependencies are ignored. +build-dependency-whitelist: + - hoe + # rake is bundled with Ruby, so it is not included in the whitelist. + +# The following Gems don't provide a source_code_uri in their Gem metadata. +# Ideally ... they would do. +known-source-uris: + appbundler: https://github.com/opscode/appbundler + ast: https://github.com/openSUSE/ast + brass: https://github.com/rubyworks/brass + coveralls: https://github.com/lemurheavy/coveralls-ruby + dep-selector-libgecode: https://github.com/opscode/dep-selector-libgecode + diff-lcs: https://github.com/halostatue/diff-lcs + erubis: https://github.com/kwatch/erubis + fog-brightbox: https://github.com/brightbox/fog-brightbox + highline: https://github.com/JEG2/highline + hoe: https://github.com/seattlerb/hoe + indexer: https://github.com/rubyworks/indexer + json: https://github.com/flori/json + method_source: https://github.com/banister/method_source + mixlib-authentication: https://github.com/opscode/mixlib-authentication + mixlib-cli: https://github.com/opscode/mixlib-cli + mixlib-log: https://github.com/opscode/mixlib-log + mixlib-shellout: http://github.com/opscode/mixlib-shellout + ohai: http://github.com/opscode/ohai + rack-cache: https://github.com/rtomayko/rack-cache + actionmailer: https://github.com/rails/rails + actionpack: https://github.com/rails/rails + actionview: https://github.com/rails/rails + activejob: https://github.com/rails/rails + activemodel: https://github.com/rails/rails + activerecord: https://github.com/rails/rails + activesupport: https://github.com/rails/rails + rails: https://github.com/rails/rails + railties: https://github.com/rails/rails + pg: https://github.com/ged/ruby-pg + sigar: https://github.com/hyperic/sigar + sprockets: https://github.com/sstephenson/sprockets + tins: https://github.com/flori/tins diff --git a/baserockimport/mainloop.py b/baserockimport/mainloop.py index ddcd480..345e45e 100644 --- a/baserockimport/mainloop.py +++ b/baserockimport/mainloop.py @@ -71,7 +71,7 @@ def run_extension(filename, args): def extensions_dir(): module_dir = os.path.dirname(baserockimport.__file__) - return os.path.join(module_dir, '..', 'exts') + return os.path.join(module_dir, 'exts') extension_path = os.path.join(extensions_dir(), filename) diff --git a/data/omnibus.yaml b/data/omnibus.yaml deleted file mode 100644 index 2116f2a..0000000 --- a/data/omnibus.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -dependency-blacklist: - # This is provided as a single downloadable .pem file, which isn't something - # Lorry can understand. Also, it's provided by the 'ca-certificates' chunk in - # Baserock already. - - cacerts diff --git a/data/rubygems.yaml b/data/rubygems.yaml deleted file mode 100644 index e1e6fcc..0000000 --- a/data/rubygems.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- - -lorry-prefix: ruby-gems/ - -# The :development dependency set is way too broad for our needs: for most Gems, -# it includes test tools and development aids that aren't necessary for just -# building the Gem. It's hard to even get a stratum if we include all these -# tools because of the number of circular dependencies. Instead, only those -# tools which are known to be required at Gem build time are listed as -# build-dependencies, and any other :development dependencies are ignored. -build-dependency-whitelist: - - hoe - # rake is bundled with Ruby, so it is not included in the whitelist. - -# The following Gems don't provide a source_code_uri in their Gem metadata. -# Ideally ... they would do. -known-source-uris: - appbundler: https://github.com/opscode/appbundler - ast: https://github.com/openSUSE/ast - brass: https://github.com/rubyworks/brass - coveralls: https://github.com/lemurheavy/coveralls-ruby - dep-selector-libgecode: https://github.com/opscode/dep-selector-libgecode - diff-lcs: https://github.com/halostatue/diff-lcs - erubis: https://github.com/kwatch/erubis - fog-brightbox: https://github.com/brightbox/fog-brightbox - highline: https://github.com/JEG2/highline - hoe: https://github.com/seattlerb/hoe - indexer: https://github.com/rubyworks/indexer - json: https://github.com/flori/json - method_source: https://github.com/banister/method_source - mixlib-authentication: https://github.com/opscode/mixlib-authentication - mixlib-cli: https://github.com/opscode/mixlib-cli - mixlib-log: https://github.com/opscode/mixlib-log - mixlib-shellout: http://github.com/opscode/mixlib-shellout - ohai: http://github.com/opscode/ohai - rack-cache: https://github.com/rtomayko/rack-cache - actionmailer: https://github.com/rails/rails - actionpack: https://github.com/rails/rails - actionview: https://github.com/rails/rails - activejob: https://github.com/rails/rails - activemodel: https://github.com/rails/rails - activerecord: https://github.com/rails/rails - activesupport: https://github.com/rails/rails - rails: https://github.com/rails/rails - railties: https://github.com/rails/rails - pg: https://github.com/ged/ruby-pg - sigar: https://github.com/hyperic/sigar - sprockets: https://github.com/sstephenson/sprockets - tins: https://github.com/flori/tins diff --git a/setup.py b/setup.py index 052c701..f8396ef 100644 --- a/setup.py +++ b/setup.py @@ -40,6 +40,7 @@ setup(name='baserockimport', packages=['baserockimport'], package_data={ 'baserockimport': [ + 'data/*', 'exts/*', ] }, -- cgit v1.2.1