Skip to content

Commit 42717b8

Browse files
Merge pull request #268 from gliderlabs/master
release 0.3.30
2 parents 95d5aea + c200318 commit 42717b8

File tree

6 files changed

+15
-12
lines changed

6 files changed

+15
-12
lines changed

CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ All notable changes to this project will be documented in this file.
1414
### Fixed
1515
- @karanthukral Added error handling for when Procfile does not define the process being used
1616

17+
### Changed
18+
- @webknjaz Upgrade python buildpack to v109
19+
- @michaelshobbs fix python tests with new buildpack
20+
1721

1822
## [0.3.29] - 2017-05-03
1923
### Fixed
@@ -358,7 +362,8 @@ All notable changes to this project will be documented in this file.
358362
- User for `buildpack-build` is `$USER` or randomized
359363
- User for `procfile-exec` is `$USER` or detected from `/app`
360364

361-
[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.29...HEAD
365+
[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.30...HEAD
366+
[0.3.30]: https://github.com/gliderlabs/herokuish/compare/v0.3.29...v0.3.30
362367
[0.3.29]: https://github.com/gliderlabs/herokuish/compare/v0.3.28...v0.3.29
363368
[0.3.28]: https://github.com/gliderlabs/herokuish/compare/v0.3.27...v0.3.28
364369
[0.3.27]: https://github.com/gliderlabs/herokuish/compare/v0.3.26...v0.3.27
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==0.9
1+
Flask==0.12.2
22
Jinja2==2.6
33
gunicorn==0.17.2
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v99
1+
v109
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
from django.conf.urls import patterns, include, url
1+
import helloworld.views
2+
from django.conf.urls import *
23

34
from django.contrib import admin
45
admin.autodiscover()
56

6-
urlpatterns = patterns('',
7-
# Examples:
8-
url(r'^$', 'helloworld.views.home', name='home'),
9-
# url(r'^blog/', include('blog.urls')),
10-
7+
urlpatterns = [
8+
url(r'^$', helloworld.views.home, name='home'),
119
url(r'^admin/', include(admin.site.urls)),
12-
)
10+
]
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Django==1.6.5
1+
Django==1.11.2
22
gunicorn==18.0
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Flask==0.9
1+
Flask==0.12.2
22
Jinja2==2.6
33
gunicorn==0.17.2

0 commit comments

Comments
 (0)