Skip to content

Commit

Permalink
Upgrade version to 0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sshwsfc committed Jul 7, 2016
1 parent ddd136d commit d2b1d9f
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 11 deletions.
14 changes: 12 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,14 @@ or Install from github source:
Install Requires
----------------

- `django`_ >=1.4
- `django`_ >=1.9

- `django-crispy-forms`_ >=1.2.3 (For xadmin crispy forms)
- `django-crispy-forms`_ >=1.6.0 (For xadmin crispy forms)

- `django-reversion`_ ([OPTION] For object history and reversion feature, please select right version by your django, see `changelog`_ )

- `django-formtools`_ ([OPTION] For wizward form)

- `xlwt`_ ([OPTION] For export xls files)

- `xlsxwriter`_ ([OPTION] For export xlsx files)
Expand All @@ -82,6 +84,7 @@ Install Requires
.. _django-crispy-forms: http://django-crispy-forms.rtfd.org
.. _django-reversion: https://github.com/etianen/django-reversion
.. _changelog: https://github.com/etianen/django-reversion/blob/master/CHANGELOG.rst
.. _django-formtools: https://github.com/django/django-formtools
.. _xlwt: http://www.python-excel.org/
.. _xlsxwriter: https://github.com/jmcnamara/XlsxWriter

Expand All @@ -96,6 +99,12 @@ Documentation
Changelogs
-------------

0.6.0
^^^^^
- Compact with Django1.9.
- Add Clock Picker widget for timepicker.
- Fixed some userface errors.

0.5.0
^^^^^

Expand Down Expand Up @@ -125,6 +134,7 @@ Run Demo Locally
.. code:: bash
cd demo_app
./manage.py migrate
./manage.py runserver
Open http://127.0.0.1:8000 in your browser, the admin user password is ``admin``
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
django>=1.9.0
django-crispy-forms
django-reversion
django~=1.9.0
django-crispy-forms~=1.6.0
django-reversion~=2.0.0
django-formtools==1.0
httplib2==0.9.2
14 changes: 8 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/env python
from setuptools import setup

# version_tuple = __import__('xadmin.version').VERSION
# version = ".".join([str(v) for v in version_tuple])
version_tuple = __import__('xadmin').VERSION
version = ".".join([str(v) for v in version_tuple])

setup(
name='django-xadmin',
version='0.5.0',
version=version,
description='Drop-in replacement of Django admin comes with lots of goodies, fully extensible with plugin support, pretty UI based on Twitter Bootstrap.',
long_description=open('README.rst').read(),
author='sshwsfc',
Expand All @@ -18,12 +18,14 @@
include_package_data=True,
install_requires=[
'setuptools',
'django>=1.5',
'django-crispy-forms>=1.4.0',
'django>=1.9.0,<2.0.0',
'django-crispy-forms>=1.6.0',
'django-formtools>=1.0',
'httplib2==0.9.2'
],
extras_require={
'Excel': ['xlwt', 'xlsxwriter'],
'Reversion': ['django-reversion'],
'Reversion': ['django-reversion>=2.0.0'],
},
zip_safe=False,
keywords=['admin', 'django', 'xadmin', 'bootstrap'],
Expand Down

0 comments on commit d2b1d9f

Please sign in to comment.