heroku · CaseyFaist · Oct 18, 2018 · Aug 16, 2018 · Aug 16, 2018 · Aug 16, 2018
diff --git a/.github/PULL_REQUEST_TEMPLATE.MD b/.github/PULL_REQUEST_TEMPLATE.MD
@@ -0,0 +1,10 @@
+<!-- Hi and welcome to the Heroku Python Getting Started repository!
+
+This Django project is meant to be a starting point for other projects.
+
+If you meant to open a PR against a fork instead of upstream, please adjust the base branch:
+https://help.github.com/articles/changing-the-base-branch-of-a-pull-request/
+
+Otherwise thank you in advance for your Pull Request - just remember to
+include as much information as possible to help the reviewers :-)
+-->
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ venv
 staticfiles
 .env
 db.sqlite3
+getting-started/*
diff --git a/Pipfile b/Pipfile
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: gunicorn gettingstarted.wsgi
+web: gunicorn gettingstarted.wsgi --log-file -
diff --git a/README.md b/README.md
@@ -6,13 +6,14 @@ This application supports the [Getting Started with Python on Heroku](https://de
 
 ## Running Locally
 
-Make sure you have Python [installed properly](http://install.python-guide.org). Also, install the [Heroku CLI](https://devcenter.heroku.com/articles/heroku-cli) and [Postgres](https://devcenter.heroku.com/articles/heroku-postgresql#local-setup).
+Make sure you have Python 3.7 [installed locally](http://install.python-guide.org). To push to Heroku, you'll need to install the [Heroku CLI](https://devcenter.heroku.com/articles/heroku-cli), as well as [Postgres](https://devcenter.heroku.com/articles/heroku-postgresql#local-setup).
 
 ```sh
-$ git clone git@github.com:heroku/python-getting-started.git
+$ git clone https://github.com/heroku/python-getting-started.git
 $ cd python-getting-started
 
-$ pipenv install
+$ python3 -m venv getting-started
+$ pip install -r requirements.txt
 
 $ createdb python_getting_started
 

diff --git a/gettingstarted/settings.py b/gettingstarted/settings.py
@@ -22,7 +22,7 @@
 # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'CHANGE_ME!!!! (P.S. the SECRET_KEY environment variable will be used, if set, instead).'
+SECRET_KEY = "CHANGE_ME!!!! (P.S. the SECRET_KEY environment variable will be used, if set, instead)."
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
@@ -33,78 +33,75 @@
 # Application definition
 
 INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.gis',
-    'hello'
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    "hello",
 ]
 
 MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = 'gettingstarted.urls'
+ROOT_URLCONF = "gettingstarted.urls"
 
 TEMPLATES = [
     {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-            ],
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
+            ]
         },
-    },
+    }
 ]
 
-WSGI_APPLICATION = 'gettingstarted.wsgi.application'
+WSGI_APPLICATION = "gettingstarted.wsgi.application"
 
 
 # Database
 # https://docs.djangoproject.com/en/2.0/ref/settings/#databases
 
-import dj_database_url
-DATABASES = {'default': dj_database_url.config(engine='django.contrib.gis.db.backends.postgis')}
+DATABASES = {
+    "default": {
+        "ENGINE" : "django.db.backends.sqlite3",
+        "NAME": os.path.join(BASE_DIR, "db.sqlite3")
+    }
+}
 
 # Password validation
 # https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"
     },
+    {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"},
+    {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},
+    {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
 ]
 
 
 # Internationalization
 # https://docs.djangoproject.com/en/2.0/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = "en-us"
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = "UTC"
 
 USE_I18N = True
 
@@ -116,6 +113,7 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
 
-STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
+STATIC_URL = "/static/"
 
 django_heroku.settings(locals())
diff --git a/gettingstarted/urls.py b/gettingstarted/urls.py
@@ -1,17 +1,21 @@
-from django.conf.urls import include, url
-from django.urls import path
+from django.urls import path, include
 
 from django.contrib import admin
+
 admin.autodiscover()
 
 import hello.views
 
-# Examples:
-# url(r'^$', 'gettingstarted.views.home', name='home'),
-# url(r'^blog/', include('blog.urls')),
+# To add a new path, first import the app:
+# import blog
+#
+# Then add the new path:
+# path('blog/', blog.urls, name="blog")
+#
+# Learn more here: https://docs.djangoproject.com/en/2.1/topics/http/urls/
 
 urlpatterns = [
-    url(r'^$', hello.views.index, name='index'),
-    url(r'^db', hello.views.db, name='db'),
-    path('admin/', admin.site.urls),
+    path("", hello.views.index, name="index"),
+    path("db/", hello.views.db, name="db"),
+    path("admin/", admin.site.urls),
 ]
diff --git a/gettingstarted/wsgi.py b/gettingstarted/wsgi.py
@@ -4,10 +4,11 @@
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/2.1/howto/deployment/wsgi/
 """
 
 import os
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gettingstarted.settings")
 
 from django.core.wsgi import get_wsgi_application

diff --git a/hello/models.py b/hello/models.py
@@ -1,11 +1,5 @@
-from django.contrib.gis.db import models
+from django.db import models
 
 # Create your models here.
 class Greeting(models.Model):
-    when = models.DateTimeField('date created', auto_now_add=True)
-
-
-class TestGeo(models.Model):
-    geometry = models.GeometryField()
-    point = models.PointField()
-    mpoly = models.MultiPolygonField()
+    when = models.DateTimeField("date created", auto_now_add=True)
diff --git a/hello/tests.py b/hello/tests.py
@@ -3,16 +3,17 @@
 
 from .views import index
 
+
 class SimpleTest(TestCase):
     def setUp(self):
         # Every test needs access to the request factory.
         self.factory = RequestFactory()
 
     def test_details(self):
         # Create an instance of a GET request.
-        request = self.factory.get('/')
+        request = self.factory.get("/")
         request.user = AnonymousUser()
 
         # Test my_view() as if it were deployed at /customer/details
         response = index(request)
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.status_code, 200)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		web: gunicorn gettingstarted.wsgi
		web: gunicorn gettingstarted.wsgi --log-file -