Skip to content

Attempt 2: Include mpy-cross '__init__.py' In Packages; Restructure Package Bundling #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 15, 2019

Conversation

sommersoft
Copy link
Collaborator

Attempt number 2; original attempt was in #31.

This version defaults package_folder_prefix to adafruit_, so that every .travis.yml doesn't need to be updated.

@sommersoft sommersoft requested review from tannewt and kattni May 11, 2019 15:15
@tannewt tannewt removed their request for review May 13, 2019 19:54
Copy link
Contributor

@kattni kattni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this! Two suggestions below.

@@ -48,7 +48,7 @@ def add_file(bundle, src_file, zip_name):
return file_sector_size


def build_bundle(libs, bundle_version, output_filename,
def build_bundle(libs, bundle_version, output_filename, pkg_folder_prefix,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's rename this to package_folder_prefix.

@@ -69,8 +69,8 @@ def build_bundle(libs, bundle_version, output_filename,
success = True
for library_path in libs:
try:
build.library(library_path, build_lib_dir, mpy_cross=mpy_cross,
example_bundle=example_bundle)
build.library(library_path, build_lib_dir, pkg_folder_prefix,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same.

Copy link
Contributor

@kattni kattni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this! 🌮

@kattni kattni merged commit fbb43bd into adafruit:master May 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants