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

Create a local_wheels parameter to include wheel files matching one or more glob paths #164

Merged
merged 13 commits into from Oct 2, 2018

Conversation

@adferrand
Copy link
Contributor

@adferrand adferrand commented Oct 1, 2018

Following #163 where we specified a mechanism to include local wheel files matching a path pattern.

Here is the PR to include all wheel files matching a list of glob paths specified in the local_wheels parameter, located under the [Include] section.

Matching wheel files will be processed into the installer the same way than wheels found from wheels_pypi.

Furthermore, any of the following situation will raise an error:

  • two wheels to be included for the same distribution name
  • a wheel to be included not compatible with the python version in the installer, or not compatible with Windows platforms.
doc/cfgfile.rst Outdated Show resolved Hide resolved
nsist/__init__.py Outdated Show resolved Hide resolved
nsist/pypi.py Outdated Show resolved Hide resolved
nsist/pypi.py Show resolved Hide resolved
nsist/pypi.py Show resolved Hide resolved
nsist/pypi.py Outdated Show resolved Hide resolved
Adrien Ferrand and others added 6 commits Oct 1, 2018
Adrien Ferrand
Adrien Ferrand
@adferrand
Copy link
Contributor Author

@adferrand adferrand commented Oct 1, 2018

All settled !

Copy link
Owner

@takluyver takluyver left a comment

Looking good, just a couple of minor things I spotted.

nsist/tests/test_local_wheels.py Show resolved Hide resolved
nsist/pypi.py Outdated Show resolved Hide resolved
@takluyver
Copy link
Owner

@takluyver takluyver commented Oct 2, 2018

@adferrand I'm a bit confused by your latest comments. I'm currently assuming you have made some further changes and I'm waiting for you to push them. Just letting you know in case you're waiting for me. 🙂

@adferrand
Copy link
Contributor Author

@adferrand adferrand commented Oct 2, 2018

Yes sorry I wrote the comments and I was stopped before pushing the commit. You will get them soon.

@takluyver
Copy link
Owner

@takluyver takluyver commented Oct 2, 2018

No problem, I just wanted to make sure we weren't deadlocked.

Adrien Ferrand
@takluyver takluyver merged commit 14a88ff into takluyver:master Oct 2, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@takluyver
Copy link
Owner

@takluyver takluyver commented Oct 2, 2018

Thank-you 👍

@adferrand adferrand deleted the adferrand:include_local_wheels branch Oct 2, 2018
@takluyver
Copy link
Owner

@takluyver takluyver commented Oct 5, 2018

@adferrand I released Pynsist 2.2 earlier today, including this and the other changes you've contributed. Thanks for your contributions. :-)

@adferrand
Copy link
Contributor Author

@adferrand adferrand commented Oct 5, 2018

You are welcome ^^

And thanks for your project that, I think, offers the most elegant way to package pythons apps for Windozs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants