mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-08-07 13:34:53 +03:00
Merge 56a73310f3
into e363d7c84a
This commit is contained in:
commit
54d74f2b63
|
@ -34,7 +34,7 @@ production-ready Django projects quickly.
|
||||||
Features
|
Features
|
||||||
---------
|
---------
|
||||||
|
|
||||||
* For Django 1.10
|
* For Django 1.11.6
|
||||||
* Works with Python 3.4.x or 3.5.x. Python 3.6 is experimental
|
* Works with Python 3.4.x or 3.5.x. Python 3.6 is experimental
|
||||||
* Renders Django projects with 100% starting test coverage
|
* Renders Django projects with 100% starting test coverage
|
||||||
* Twitter Bootstrap_ v4.0.0 - beta 1 (`maintained Foundation fork`_ also available)
|
* Twitter Bootstrap_ v4.0.0 - beta 1 (`maintained Foundation fork`_ also available)
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
"use_heroku": "n",
|
"use_heroku": "n",
|
||||||
"use_elasticbeanstalk_experimental": "n",
|
"use_elasticbeanstalk_experimental": "n",
|
||||||
"use_compressor": "n",
|
"use_compressor": "n",
|
||||||
"postgresql_version": ["9.6", "9.5", "9.4", "9.3", "9.2"],
|
"postgresql_version": ["10.0", "9.6", "9.5", "9.4", "9.3", "9.2"],
|
||||||
"js_task_runner": ["Gulp", "Grunt", "None"],
|
"js_task_runner": ["Gulp", "Grunt", "None"],
|
||||||
"custom_bootstrap_compilation": "n",
|
"custom_bootstrap_compilation": "n",
|
||||||
"open_source_license": ["MIT", "BSD", "GPLv3", "Apache Software License 2.0", "Not open source"]
|
"open_source_license": ["MIT", "BSD", "GPLv3", "Apache Software License 2.0", "Not open source"]
|
||||||
|
|
4
setup.py
4
setup.py
|
@ -10,7 +10,7 @@ except ImportError:
|
||||||
|
|
||||||
# Our version ALWAYS matches the version of Django we support
|
# Our version ALWAYS matches the version of Django we support
|
||||||
# If Django has a new release, we branch, tag, then update this setting after the tag.
|
# If Django has a new release, we branch, tag, then update this setting after the tag.
|
||||||
version = '1.10.7'
|
version = '1.11.6'
|
||||||
|
|
||||||
if sys.argv[-1] == 'tag':
|
if sys.argv[-1] == 'tag':
|
||||||
os.system('git tag -a %s -m "version %s"' % (version, version))
|
os.system('git tag -a %s -m "version %s"' % (version, version))
|
||||||
|
@ -34,7 +34,7 @@ setup(
|
||||||
classifiers=[
|
classifiers=[
|
||||||
'Development Status :: 4 - Beta',
|
'Development Status :: 4 - Beta',
|
||||||
'Environment :: Console',
|
'Environment :: Console',
|
||||||
'Framework :: Django :: 1.10',
|
'Framework :: Django :: 1.11.6',
|
||||||
'Intended Audience :: Developers',
|
'Intended Audience :: Developers',
|
||||||
'Natural Language :: English',
|
'Natural Language :: English',
|
||||||
'License :: OSI Approved :: BSD License',
|
'License :: OSI Approved :: BSD License',
|
||||||
|
|
|
@ -6,7 +6,7 @@ wheel==0.30.0
|
||||||
|
|
||||||
|
|
||||||
# Bleeding edge Django
|
# Bleeding edge Django
|
||||||
django==1.10.8 # pyup: >=1.10,<1.11
|
django==1.11.6 # pyup: <=1.11.6
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
django-environ==0.4.4
|
django-environ==0.4.4
|
||||||
|
|
Loading…
Reference in New Issue
Block a user