Skip to content
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

Improve build-wheel.py for plugin building (add-version-suffix, ignore-unclean) #3232

Merged
merged 4 commits into from Feb 9, 2018

Conversation

driehle
Copy link
Contributor

@driehle driehle commented Feb 8, 2018

This pull request does two things:

  • Add support for the add-version-sufix flag to plugin and all-plugins build method
  • Add support for a new ignore-unclean flag for all build methods to ignore unclean working trees

"""Builds a plugin wheel.

PLUGIN_DIR is the path to the folder containing the plugin's setup.py
"""
target_dir = obj['target_dir']
os.chdir(plugin_dir)
clean, output = git_is_clean_plugin()
if not clean:
if not clean and ignore_unclean:
warn('working tree is not clearn, but ignored')
Copy link
Member

Choose a reason for hiding this comment

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

typo -> clean

@@ -174,6 +174,28 @@ def patch_indico_version(add_version_suffix):
f.write(old_content)


@contextmanager
def patch_plugin_version(add_version_suffix):
Copy link
Member

Choose a reason for hiding this comment

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

Any chance we can avoid duplicating so much code? I guess the changes between the two version patching functions are minimal...

@ThiefMaster ThiefMaster changed the base branch from 2.0-maintenance to master February 9, 2018 10:47
@ThiefMaster
Copy link
Member

I rebased this against master since it's unlikely that there will be another 2.0.x release unless we find any bug important enough to fix it before 2.1,.

@ThiefMaster ThiefMaster merged commit bb32a81 into indico:master Feb 9, 2018
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.

None yet

2 participants