Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump versions #105

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions {{cookiecutter.repo_name}}/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,18 @@ url = "https://pypi.python.org/simple"
verify_ssl = true

[packages]
django = "<2.2"
boto = "< 2.50.0,>= 2.49.0"
django = "<4.1,>=4.0"
boto3 = "< 1.21, >= 1.20.26"
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 = "<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"
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"
2 changes: 1 addition & 1 deletion {{cookiecutter.repo_name}}/Procfile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion {{cookiecutter.repo_name}}/Procfile.dev
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh no! you removed django-rqworker. I suppose it probably doesn't work with django 4.0 (I'm not sure it worked with 2 or 3 either)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joesolly I forgot I had this PR open. I really was just updating my repo. Don't want to merge this in repo.... at least not yet.
But yeah RQ worker stopped working in 3.0 I think. Maybe we could get a few people together to see if there is any interests in fixing and maintaining. I know we talked about once.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CorneliusIV Maybe, unfortunately, I currently only work in celery or RMQ, so I don't have any work motivation to fix this. Hackathon? Pizza and Rosé?

rqworker: PYTHONUNBUFFERED=True python manage.py rqworker high default low
2 changes: 1 addition & 1 deletion {{cookiecutter.repo_name}}/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.9
pipenv shell
```

Expand Down
12 changes: 0 additions & 12 deletions {{cookiecutter.repo_name}}/banner.txt

This file was deleted.

9 changes: 1 addition & 8 deletions {{cookiecutter.repo_name}}/gulp/production.js
Original file line number Diff line number Diff line change
Expand Up @@ -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', () =>
Expand All @@ -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/')))
2 changes: 1 addition & 1 deletion {{cookiecutter.repo_name}}/runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.7.0
python-3.8.0
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
'django.contrib.messages',
'django.contrib.staticfiles',
'django_rq',
'django_rq_wrapper',
]

MIDDLEWARE = [
Expand Down Expand Up @@ -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/

Expand Down Expand Up @@ -140,7 +141,7 @@
AWS_S3_FILE_OVERWRITE = False
AWS_LOCATION = 'media'

DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'


# SSL
Expand Down Expand Up @@ -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,
}
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@


class UsersConfig(AppConfig):
name = 'users'
name = '{{ cookiecutter.package_name }}.users'