Skip to content
This repository was archived by the owner on Mar 24, 2026. It is now read-only.

Fix web2py compile and race condition bugs#2272

Merged
knewmanTE merged 3 commits intoTechEmpower:masterfrom
abastardi:master
Sep 16, 2016
Merged

Fix web2py compile and race condition bugs#2272
knewmanTE merged 3 commits intoTechEmpower:masterfrom
abastardi:master

Conversation

@abastardi
Copy link
Copy Markdown
Contributor

Ensure web2py applications are compiled with the same version of Python used to execute the tests. Also, update web2py to a more recent commit from "master" in order to take advantage of a fix for a possible framework-level race condition (which occurred once during a test run of the benchmarks).

Also includes some clarifying comments in the code.

cp app/routes.py web2py/
touch web2py/__init__.py
python compile_apps.py
$PY2_ROOT/bin/python compile_apps.py
Copy link
Copy Markdown
Member

@msmith-techempower msmith-techempower Sep 14, 2016

Choose a reason for hiding this comment

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

This line, while correct, should be unnecessary. The fw_depends python2 above executes this file which ensures that $PY2_ROOT/bin is the first entry on the PATH, which should mean that python is functionally equivalent to $PY2_ROOT/bin/python under these conditions.

If this is not the case, then we have a bigger bug at play that needs to be addressed.

Specifically, I expect this change to have no effect.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good point. I suppose that line isn't really necessary. I guess I was just thinking better safe (and explicit) than sorry. Do you want to revert that change or just leave it as is?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think that it would be better to revert.

My only reason for this is to maintain the same simple code across the python codebases for when contributors pick one at random to reference.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

OK, done. Thanks.

It is not necessary to specify the Python version in setup.sh, as this is handled
earlier via `fw_depends python2`
@knewmanTE knewmanTE added this to the Round 13 milestone Sep 15, 2016
@knewmanTE knewmanTE merged commit beb9b3e into TechEmpower:master Sep 16, 2016
NateBrady23 pushed a commit to NateBrady23/FrameworkBenchmarks that referenced this pull request Sep 23, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants