Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
krak3n committed Jul 7, 2014
2 parents 86dedc3 + afb5646 commit 731411a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
2 changes: 0 additions & 2 deletions flask_via/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,5 @@ def init_app(
# Get the routes
routes = self.include(routes_module, routes_name)

print routes

# Load the routes
self.load(app, routes, **kwargs)
17 changes: 13 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ def read_requirements(filename):
# Include the Change Log on PyPi

long_description = open('README.rst').read()
changelog = open('CHANGELOG.rst').read()
long_description += '\n' + changelog

# Setup

Expand All @@ -89,9 +91,11 @@ def read_requirements(filename):
version=open('VERSION').read().strip(),
author='SOON_',
author_email='dorks@thisissoon.com',
url='http://flask-via.thisissoon.com',
description='Flask-Via adds a cleaner method for defining routes '
'to your Flask views, inspired by Django urls.',
maintainer='Chris Reeves',
maintainer_email='hello@chris.reeves.io',
url='http://flask-via.soon.build',
description='Provides a clean, simple URL routing framework for '
'growing Flask Applications.',
long_description=long_description,
packages=find_packages(
exclude=[
Expand All @@ -114,6 +118,7 @@ def read_requirements(filename):
# Classifiers for Package Indexing
# Entry points, for example Flask-Script
entry_points={},
# Meta
classifiers=[
'Framework :: Flask',
'Environment :: Web Environment',
Expand All @@ -122,9 +127,13 @@ def read_requirements(filename):
'Development Status :: 5 - Production/Stable',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Topic :: Software Development',
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content'])
'Topic :: Internet :: WWW/HTTP :: Dynamic Content'],
license='MIT',
keywords=['Flask', 'Routing', 'Routes', 'URLs', 'Views'])

0 comments on commit 731411a

Please sign in to comment.