Skip to content

Commit

Permalink
Merge branch 'feature/update-eggs' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Fantomas42 committed Jul 19, 2014
2 parents dfe67c1 + b3efcf1 commit f0dc32c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion app_namespace/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def load_template_source(self, template_name, template_dirs=None):
is the name of the application and the last item is the true
value of 'template_name' provided by the specified application.
"""
if not ':' in template_name:
if ':' not in template_name:
raise TemplateDoesNotExist(template_name)

app, template_path = template_name.split(':')
Expand Down
28 changes: 14 additions & 14 deletions versions.cfg
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[versions]
Django = 1.6
Django = 1.6.5
blessings = 1.5.1
buildout-versions-checker = 1.1
flake8 = 2.1.0
futures = 2.1.4
buildout-versions-checker = 1.5.1
flake8 = 2.2.2
futures = 2.1.6
mccabe = 0.2.1
nose-progressive = 1.5
nose-sfd = 0.1
nose-progressive = 1.5.1
nose-sfd = 0.3
pbp.recipe.noserunner = 0.2.6
pep8 = 1.4.6
pyflakes = 0.7.3
python-coveralls = 2.4.0
pep8 = 1.5.7
pyflakes = 0.8.1
python-coveralls = 2.4.2
zc.buildout = 2.2.1
zc.recipe.egg = 2.0.1
PyYAML = 3.10
PyYAML = 3.11
argparse = 1.2.1
coverage = 3.7
nose = 1.3.0
requests = 2.0.1
coverage = 3.7.1
nose = 1.3.3
requests = 2.3.0
sh = 1.09
six = 1.4.1
six = 1.7.3

0 comments on commit f0dc32c

Please sign in to comment.