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

Fix PyInstaller builds #482

Merged
merged 2 commits into from
Mar 29, 2018
Merged

Fix PyInstaller builds #482

merged 2 commits into from
Mar 29, 2018

Conversation

crwood
Copy link
Member

@crwood crwood commented Mar 29, 2018

Here's a cleaner version of #471 :)

This commit contains a few small changes to fix PyInstaller frozen
builds (which were recently broken in a few ways by changes introduced
with `tahoe invite`, `tahoe daemonize`, and the addition of "setuptools
>= 28.8.0" to setup_requires) and removes a couple of hacks that are no
longer necessary to create working frozen tahoe executables with
PyInstaller.
@crwood crwood mentioned this pull request Mar 29, 2018
@warner
Copy link
Member

warner commented Mar 29, 2018

Cool, thanks. The "can we remove the deps = ." question still applies, but once we resolve that I'm happy to land this.

@codecov-io
Copy link

codecov-io commented Mar 29, 2018

Codecov Report

Merging #482 into master will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #482      +/-   ##
==========================================
+ Coverage   90.21%   90.22%   +<.01%     
==========================================
  Files         144      144              
  Lines       27446    27443       -3     
  Branches     3935     3934       -1     
==========================================
  Hits        24761    24761              
+ Misses       1946     1945       -1     
+ Partials      739      737       -2
Impacted Files Coverage Δ
src/allmydata/_auto_deps.py 100% <ø> (+8.33%) ⬆️
src/allmydata/scripts/tahoe_start.py 84.33% <100%> (ø) ⬆️
src/allmydata/mutable/publish.py 95.65% <0%> (-1.02%) ⬇️
src/allmydata/mutable/servermap.py 93.7% <0%> (-0.49%) ⬇️
src/allmydata/web/status.py 82.86% <0%> (+0.11%) ⬆️
src/allmydata/immutable/downloader/share.py 95.29% <0%> (+2.46%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d395a11...8c81ca7. Read the comment docs.

@crwood
Copy link
Member Author

crwood commented Mar 29, 2018

Okay, it looks like we can indeed remove 'deps = .' now.. I was just able to create a working build without it (which was not the case a couple of weeks back). Should be good to go!

@warner warner merged commit 8c81ca7 into tahoe-lafs:master Mar 29, 2018
crwood added a commit to crwood/tahoe-lafs that referenced this pull request Jul 25, 2018
PR tahoe-lafs#482 (c850638) added setuptools to
package_imports unconditionally; there is no need to append it (again)
for frozen builds.
crwood added a commit to crwood/tahoe-lafs that referenced this pull request Jul 26, 2018
PR tahoe-lafs#482 (c850638) added setuptools to
package_imports unconditionally; there is no need to append it (again)
for frozen builds.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants