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

Minor fixes from #7 #10

Merged
merged 3 commits into from
Feb 22, 2016
Merged

Minor fixes from #7 #10

merged 3 commits into from
Feb 22, 2016

Conversation

vladimir-mencl-eresearch
Copy link
Collaborator

Hi Zenon,

I have cherry-picked the two commits from #7 that are not related to the InstServer M2M change - please let me know if you are happy to merge these two minor fixes.

Cheers,
Vlad

@zmousm
Copy link
Contributor

zmousm commented Feb 18, 2016

Thanks for the template fix.

As for requirements.txt:

  • Indeed PyYAML is missing; but in order to track the versions of other dependencies (still mostly aligned to Debian Wheezy), I would write the version argument as >=3.0.10.
  • Mako is only necessary for (example) templates under extras. As that actually won't typically run in the same system/environment as DjNRO, I would be inclined not to add it in requirements.txt or perhaps to add it in optional_requirements.txt. What do you think?

Also, please rebase this PR on the rewritten master branch.

A missing </div> was at times causing the footer to go out of place and cover
the form contents.
As per discussion in grnet#10:

* Make PyYAML import floating in 3.x (without pinning to 3.0.10)
* Move Mako import to new file requirements-optional.txt
* Update docs/installation/requirements.md to refer to requirements-optional.txt
@vladimir-mencl-eresearch
Copy link
Collaborator Author

Hi Zenon,

Most packages are listed as pinned to exact versions - but I've updated the PR as requested and rebased - can you please merge?

Cheers,
Vlad

zmousm added a commit that referenced this pull request Feb 22, 2016
Minor fixes from #7
- missing tag in servers_edit template
- missing PyYAML dep in requirements.txt
- Mako as an optional requirement
@zmousm zmousm merged commit eba95cd into grnet:master Feb 22, 2016
@vladimir-mencl-eresearch vladimir-mencl-eresearch deleted the minor-fixes-feb16 branch February 22, 2016 20:58
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.

2 participants