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

Document nginx plugin #57

Merged
merged 5 commits into from
Nov 9, 2015
Merged

Conversation

justinvdm
Copy link
Contributor

No description provided.

@@ -16,7 +16,7 @@


def resource_path(filename):
return resource_filename('junebug.plugins.nginx', filename)
return path.join(path.dirname(__file__), filename)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Building the docs wasn't working with pkg_resources.resource_filename, was getting:

  File "/.../junebug/ve/lib/python2.6/site-packages/pkg_resources.py", line 1547, in _extract_resource
    timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
KeyError: 'junebug/plugins/nginx/vhost.template'

Guessing resource_filename wasn't happy with junebug being installed as an egg, but really not too sure.

Copy link
Contributor

Choose a reason for hiding this comment

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

We probably also want to remove the import for resource_filename then.

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. I thought the reason we used pkg_resources.resource_filename was because the __file__ approach wouldn't work in a zip, though.

@justinvdm
Copy link
Contributor Author

Ready for review.

@justinvdm
Copy link
Contributor Author

Ready for re-review.

@rudigiesler
Copy link
Contributor

👍 from me

@hodgestar
Copy link
Contributor

👍

@justinvdm justinvdm merged commit f6c2374 into develop Nov 9, 2015
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.

3 participants