From c7bc4785c97343491c799bfbcd1e9348bb7f8fa8 Mon Sep 17 00:00:00 2001 From: "cornelius.hairston@gmail.com" Date: Fri, 12 Jun 2020 18:31:37 -0400 Subject: [PATCH 1/4] bump versions --- {{cookiecutter.repo_name}}/Pipfile | 32 +++++++++---------- {{cookiecutter.repo_name}}/README.md | 2 +- {{cookiecutter.repo_name}}/banner.txt | 12 ------- {{cookiecutter.repo_name}}/gulp/production.js | 9 +----- {{cookiecutter.repo_name}}/runtime.txt | 2 +- 5 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 {{cookiecutter.repo_name}}/banner.txt diff --git a/{{cookiecutter.repo_name}}/Pipfile b/{{cookiecutter.repo_name}}/Pipfile index df6666c..5d4ea98 100644 --- a/{{cookiecutter.repo_name}}/Pipfile +++ b/{{cookiecutter.repo_name}}/Pipfile @@ -3,21 +3,21 @@ url = "https://pypi.python.org/simple" verify_ssl = true [packages] -django = "<2.2" +django = "<=3.1" boto = "< 2.50.0,>= 2.49.0" dj-database-url = "==0.5.0" -django-debug-toolbar = "<1.12,>=1.11" -django-redis = "<4.11.0,>=4.10.0" -django-rq = "<1.4.0,>=1.3.0" -django-rq-wrapper = "<2.2,>=2.1" -django-storages = "<1.8,>=1.7" -psycopg2 = "<2.8,>=2.7" -python-decouple = "==3.0" -pytz = "==2018.7" -raven = "<7.00,>=6.00" -redis = "<3.1,>=3.0" -rq = "<0.14.0,>=0.13.0" -sqlparse = "<0.3,>=0.2" -waitress = "<1.2,>=1.1" -whitenoise = "<4.2,>=4.1" -pillow = "==5.3.0" +django-debug-toolbar = "<2.3,>=2.2" +django-redis = "<4.13,>=4.12" +django-rq = "<2.4,>=2.3" +django-rq-wrapper = "<3.2,>=3.1" +django-storages = "<2.0,>=1.9.1" +psycopg2-binary = "==2.8.5" +python-decouple = "==3.3" +pytz = "==2020.1" +raven = "<7.00,>=6.10.0" +redis = "<3.6,>=3.5" +rq = "<1.5,>=1.4.2" +sqlparse = "<0.4,>=0.3" +waitress = "<1.5,>=1.4" +whitenoise = "<5.2,>=5.1" +pillow = "==7.1.2" diff --git a/{{cookiecutter.repo_name}}/README.md b/{{cookiecutter.repo_name}}/README.md index 93f3938..f548e78 100644 --- a/{{cookiecutter.repo_name}}/README.md +++ b/{{cookiecutter.repo_name}}/README.md @@ -39,7 +39,7 @@ of loading these values into the environment when you execute a command. Next, create a Python 3 virtual environment and install the requirements: ``` -pipenv install --dev --python 3.7 +pipenv install --dev --python 3.8 pipenv shell ``` diff --git a/{{cookiecutter.repo_name}}/banner.txt b/{{cookiecutter.repo_name}}/banner.txt deleted file mode 100644 index c288522..0000000 --- a/{{cookiecutter.repo_name}}/banner.txt +++ /dev/null @@ -1,12 +0,0 @@ -/*! - _____ _____ _ ______ _ _ -|_ _|/ ____| | | ____| (_) (_) - | | | (___ | | | |__ _ __ __ _ _ _ __ ___ ___ _ __ _ _ __ __ _ - | | \___ \| | | __| | '_ \ / _` | | '_ \ / _ \/ _ \ '__| | '_ \ / _` | - _| |_ ____) | |____ | |____| | | | (_| | | | | | __/ __/ | | | | | | (_| | -|_____|_____/|______| |______|_| |_|\__, |_|_| |_|\___|\___|_| |_|_| |_|\__, | - __/ | __/ | - |___/ |___/ -Made with <3 in DC by https://isl.co -@date -*/ diff --git a/{{cookiecutter.repo_name}}/gulp/production.js b/{{cookiecutter.repo_name}}/gulp/production.js index 5fab8f6..b24cd7f 100644 --- a/{{cookiecutter.repo_name}}/gulp/production.js +++ b/{{cookiecutter.repo_name}}/gulp/production.js @@ -6,8 +6,6 @@ import uglify from 'gulp-uglify' import revReplace from 'gulp-rev-replace' import header from 'gulp-header' -const BANNER = fs.readFileSync('banner.txt', 'utf8').replace('@date', (new Date())) - const MANIFEST_PATH = './{{ cookiecutter.package_name }}/static/rev-manifest.json' gulp.task('rev', () => @@ -28,14 +26,9 @@ gulp.task('rev:replace', () => gulp.task('minify:css', () => gulp.src('./{{ cookiecutter.package_name }}/static/**/*.css') .pipe(cleancss()) - .pipe(header(BANNER)) .pipe(gulp.dest('./{{ cookiecutter.package_name }}/static/'))) gulp.task('minify:js', () => gulp.src('./{{ cookiecutter.package_name }}/static/**/*.js') - .pipe(uglify({ - output: { - preamble: BANNER, - }, - })) + .pipe(uglify()) .pipe(gulp.dest('./{{ cookiecutter.package_name }}/static/'))) diff --git a/{{cookiecutter.repo_name}}/runtime.txt b/{{cookiecutter.repo_name}}/runtime.txt index 881a2db..73b1cf8 100644 --- a/{{cookiecutter.repo_name}}/runtime.txt +++ b/{{cookiecutter.repo_name}}/runtime.txt @@ -1 +1 @@ -python-3.7.0 +python-3.8.0 From 4400b3d16457e09f0b0a4c7c82ebc7e41cc6f50b Mon Sep 17 00:00:00 2001 From: "cornelius.hairston@gmail.com" Date: Wed, 22 Jul 2020 15:49:44 -0400 Subject: [PATCH 2/4] this should be boto3 --- {{cookiecutter.repo_name}}/Pipfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.repo_name}}/Pipfile b/{{cookiecutter.repo_name}}/Pipfile index 5d4ea98..edbedfe 100644 --- a/{{cookiecutter.repo_name}}/Pipfile +++ b/{{cookiecutter.repo_name}}/Pipfile @@ -3,8 +3,8 @@ url = "https://pypi.python.org/simple" verify_ssl = true [packages] -django = "<=3.1" -boto = "< 2.50.0,>= 2.49.0" +django = "<3.1,>=3.0" +boto3 = "< 1.15, >= 1.14.26" dj-database-url = "==0.5.0" django-debug-toolbar = "<2.3,>=2.2" django-redis = "<4.13,>=4.12" From 2b6e17a452881d3c2dd39fc894a6f14f5187a9bf Mon Sep 17 00:00:00 2001 From: "cornelius.hairston@gmail.com" Date: Wed, 22 Jul 2020 17:15:03 -0400 Subject: [PATCH 3/4] DEFAULT_FILE_STORAGE has changed --- .../{{cookiecutter.package_name}}/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/settings.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/settings.py index 3e7c17d..2bd3ff7 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/settings.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/settings.py @@ -140,7 +140,7 @@ AWS_S3_FILE_OVERWRITE = False AWS_LOCATION = 'media' - DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage' + DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage' # SSL From 65c49f698662d231eb04c1c820b15e2a0fa0145a Mon Sep 17 00:00:00 2001 From: "cornelius.hairston@gmail.com" Date: Mon, 17 Jan 2022 14:30:01 -0500 Subject: [PATCH 4/4] upgrade to latest version django --- {{cookiecutter.repo_name}}/Pipfile | 27 +++++++++---------- {{cookiecutter.repo_name}}/Procfile | 2 +- {{cookiecutter.repo_name}}/Procfile.dev | 2 +- {{cookiecutter.repo_name}}/README.md | 2 +- .../{{cookiecutter.package_name}}/settings.py | 16 ++--------- .../{{cookiecutter.package_name}}/urls.py | 4 +-- .../users/apps.py | 2 +- 7 files changed, 20 insertions(+), 35 deletions(-) diff --git a/{{cookiecutter.repo_name}}/Pipfile b/{{cookiecutter.repo_name}}/Pipfile index edbedfe..c97e08f 100644 --- a/{{cookiecutter.repo_name}}/Pipfile +++ b/{{cookiecutter.repo_name}}/Pipfile @@ -3,21 +3,18 @@ url = "https://pypi.python.org/simple" verify_ssl = true [packages] -django = "<3.1,>=3.0" -boto3 = "< 1.15, >= 1.14.26" +django = "<4.1,>=4.0" +boto3 = "< 1.21, >= 1.20.26" dj-database-url = "==0.5.0" -django-debug-toolbar = "<2.3,>=2.2" -django-redis = "<4.13,>=4.12" -django-rq = "<2.4,>=2.3" -django-rq-wrapper = "<3.2,>=3.1" -django-storages = "<2.0,>=1.9.1" -psycopg2-binary = "==2.8.5" +django-debug-toolbar = "<3.3,>=3.2.4" +django-redis = "<5.3,>=5.2.0" +django-rq = "<2.6,>=2.5.1" +django-storages = "<2.0,>=1.12.3" +psycopg2-binary = "==2.8.6" python-decouple = "==3.3" pytz = "==2020.1" -raven = "<7.00,>=6.10.0" -redis = "<3.6,>=3.5" -rq = "<1.5,>=1.4.2" -sqlparse = "<0.4,>=0.3" -waitress = "<1.5,>=1.4" -whitenoise = "<5.2,>=5.1" -pillow = "==7.1.2" +redis = "<4.2,>=4.1.0" +rq = "<2.0>=1.10.1" +waitress = "<2.1,>=2.0.0" +whitenoise = "<5.4,>=5.3.0" +pillow = "==9.0.0" diff --git a/{{cookiecutter.repo_name}}/Procfile b/{{cookiecutter.repo_name}}/Procfile index 40701bc..33c4ee6 100644 --- a/{{cookiecutter.repo_name}}/Procfile +++ b/{{cookiecutter.repo_name}}/Procfile @@ -1,2 +1,2 @@ web: waitress-serve --port=$PORT {{ cookiecutter.package_name }}.wsgi:application -rqworker: python manage.py rqworkers high default low +rqworker: python manage.py rqworker high default low diff --git a/{{cookiecutter.repo_name}}/Procfile.dev b/{{cookiecutter.repo_name}}/Procfile.dev index 870c1ea..9bb9c59 100644 --- a/{{cookiecutter.repo_name}}/Procfile.dev +++ b/{{cookiecutter.repo_name}}/Procfile.dev @@ -1,3 +1,3 @@ web: PYTHONUNBUFFERED=True python manage.py runserver 0.0.0.0:$PORT static: npm run dev -rqworker: PYTHONUNBUFFERED=True python manage.py rqworkers high default low --autoreload +rqworker: PYTHONUNBUFFERED=True python manage.py rqworker high default low diff --git a/{{cookiecutter.repo_name}}/README.md b/{{cookiecutter.repo_name}}/README.md index f548e78..82c0656 100644 --- a/{{cookiecutter.repo_name}}/README.md +++ b/{{cookiecutter.repo_name}}/README.md @@ -39,7 +39,7 @@ of loading these values into the environment when you execute a command. Next, create a Python 3 virtual environment and install the requirements: ``` -pipenv install --dev --python 3.8 +pipenv install --dev --python 3.9 pipenv shell ``` diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/settings.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/settings.py index 2bd3ff7..ee1bae2 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/settings.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/settings.py @@ -42,7 +42,6 @@ 'django.contrib.messages', 'django.contrib.staticfiles', 'django_rq', - 'django_rq_wrapper', ] MIDDLEWARE = [ @@ -94,6 +93,8 @@ 'default': dj_database_url.config(conn_max_age=600), } +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' + # Internationalization # https://docs.djangoproject.com/en/1.7/topics/i18n/ @@ -220,16 +221,3 @@ } RQ_SHOW_ADMIN_LINK = True - - -# Sentry - -SENTRY_DSN = config('SENTRY_DSN', default=None) - -if SENTRY_DSN: - INSTALLED_APPS.extend([ - 'raven.contrib.django.raven_compat', - ]) - RAVEN_CONFIG = { - 'dsn': SENTRY_DSN, - } diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/urls.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/urls.py index b191c07..1b54d28 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/urls.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/urls.py @@ -1,5 +1,5 @@ from django.conf import settings -from django.conf.urls import include, url +from django.urls import include, re_path from django.urls import path from django.contrib import admin @@ -20,6 +20,6 @@ from django.conf.urls.static import static urlpatterns = [ - url(r'^__debug__/', include(debug_toolbar.urls)), + re_path(r'^__debug__/', include(debug_toolbar.urls)), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + \ urlpatterns diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/apps.py b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/apps.py index 4ce1fab..05b4044 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/apps.py +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.package_name}}/users/apps.py @@ -2,4 +2,4 @@ class UsersConfig(AppConfig): - name = 'users' + name = '{{ cookiecutter.package_name }}.users'