From 684a499236b8fef2475ba41eb83805080a364ca9 Mon Sep 17 00:00:00 2001 From: Vinit Kumar Date: Wed, 21 Feb 2018 12:34:50 +0530 Subject: [PATCH 1/7] try to fix readme and travis --- .travis.yml | 21 +-------------- README.md | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 README.md diff --git a/.travis.yml b/.travis.yml index 4ee6540..10c735d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,25 +4,6 @@ python: - "3.5" - "3.6" -sudo: false - -env: - - TOX_ENV=flake8 - - TOX_ENV=py27-latest - - TOX_ENV=py35-latest - # Django 1.8 - - TOX_ENV=py27-dj18-cms34 - - TOX_ENV=py27-dj18-cms33 - - TOX_ENV=py35-dj18-cms34 - - TOX_ENV=py35-dj18-cms33 - # Django 1.9 - - TOX_ENV=py27-dj19-cms34 - - TOX_ENV=py27-dj19-cms33 - - TOX_ENV=py35-dj19-cms34 - - TOX_ENV=py35-dj19-cms33 - install: - - pip install tox coverage + - python setup.py install -script: - - tox -e $TOX_ENV diff --git a/README.md b/README.md new file mode 100644 index 0000000..a168ed3 --- /dev/null +++ b/README.md @@ -0,0 +1,74 @@ +# cmsplugin_gallery + +[![Build Status](https://travis-ci.org/centralniak/cmsplugin_gallery.svg?branch=master)](https://travis-ci.org/centralniak/cmsplugin_gallery) + +`cmsplugin_gallery` adds simple gallery plugin to your djangoCMS installation + +Features: + +- Drag & Drop reordering of photos in the plugin admin +- Unlimited, auto-discovered custom templates - you can change template + of given gallery at anytime, use javascript galleries etc. + +There is also a django-filer_ enabled version of this plugin maintained by +Ales Zabala Alava under https://github.com/shagi/cmsplugin_gallery_filer. + +Contributions and comments are welcome using Github at: +http://github.com/centralniak/cmsplugin_gallery + +Please note that cmsplugin_gallery requires: + +- django-inline-ordering http://pypi.python.org/pypi/django-inline-ordering/ +- easy-thumbnails http://pypi.python.org/pypi/easy-thumbnails/ + +Follow individual installation instructions before installing **cmsplugin_gallery**. + +Installation +============ +``` +`pip install cmsplugin_gallery` +Add `'cmsplugin_gallery'` to `INSTALLED_APPS` (if necessary) +Run Migrations +``` + +Configuration +============= + +#. Supports Django version 1.8+ and latest Django CMS version. + +Usage +===== + +The easiest approach is to use a nice feature of cmsplugin_gallery - +the template autodiscovery. In order to take advantage of it, add your custom +templates in the cmsplugin_gallery subdirectory of any of template dirs scanned +by Django. + +If you don't want to use the autodiscovery, you can hardcode available templates +in settings.py using following setting: + +``` +CMSPLUGIN_GALLERY_TEMPLATES = ( + ('app/template.html', 'Template #1', ), + ('app/other_template.html', 'Template #2', ), +) +``` +Embed as a typical plugin. + +Bugs & Contribution +=================== + +Please use Github to report bugs, feature requests and submit your code: +http://github.com/centralniak/cmsplugin_gallery + +``` +author: Piotr Kilczuk +date: 2012/08/01 +``` + +Current Maintainer: + +``` +maintainer: Vinit Kumar +date: 2016/08/23 +``` \ No newline at end of file From 73b823b1b577746eb2bff5d5ab7d66693e45cb60 Mon Sep 17 00:00:00 2001 From: Vinit Kumar Date: Wed, 21 Feb 2018 12:39:07 +0530 Subject: [PATCH 2/7] add only readme in markdown --- README.rst | 82 ------------------------------------------------------ 1 file changed, 82 deletions(-) delete mode 100644 README.rst diff --git a/README.rst b/README.rst deleted file mode 100644 index 78f60b6..0000000 --- a/README.rst +++ /dev/null @@ -1,82 +0,0 @@ -================= -cmsplugin_gallery -================= - -.. image:: https://travis-ci.org/centralniak/cmsplugin_gallery.svg?branch=master - :target: https://travis-ci.org/centralniak/cmsplugin_gallery - -cmsplugin_gallery adds simple gallery plugin to your djangoCMS installation - -Features: - -- Drag&Drop reordering of photos in the plugin admin -- Unlimited, auto-discovered custom templates - you can change template - of given gallery at anytime, use javascript galleries etc. - -There is also a django-filer_ enabled version of this plugin maintained by -Ales Zabala Alava under https://github.com/shagi/cmsplugin_gallery_filer. - -Contributions and comments are welcome using Github at: -http://github.com/centralniak/cmsplugin_gallery - -Please note that cmsplugin_gallery requires: - -- django-inline-ordering http://pypi.python.org/pypi/django-inline-ordering/ -- easy-thumbnails http://pypi.python.org/pypi/easy-thumbnails/ - -Follow individual installation instructions before installing **cmsplugin_gallery**. - -Installation -============ -#. `pip install cmsplugin_gallery` -#. Add `'cmsplugin_gallery'` to `INSTALLED_APPS` (if necessary) -#. Run `syncdb` or `migrate cmsplugin_gallery` if using South - -Configuration -============= - - -#. Supports Django version 1.8+ and latest Django CMS version. -#. Create directory for storing media files - files will be uploaded to - MEDIA_ROOT + 'cmsplugin_gallery/images'. Make sure it is writable especially - when running in embedded mode on production server. - -#. Very simple template is included with the project. To make it work 100%, - install jQueryTOOLS for overlay support using your favorite method - http://flowplayer.org/tools/download/index.html - -Usage -===== - -The easiest approach is to use a nice feature of cmsplugin_gallery - -the template autodiscovery. In order to take advantage of it, add your custom -templates in the cmsplugin_gallery subdirectory of any of template dirs scanned -by Django. - -If you don't want to use the autodiscovery, you can hardcode available templates -in settings.py using following setting: - -:: - - CMSPLUGIN_GALLERY_TEMPLATES = ( - ('app/template.html', 'Template #1', ), - ('app/other_template.html', 'Template #2', ), - ) - -Embed as a typical plugin. - -Bugs & Contribution -=================== - -Please use Github to report bugs, feature requests and submit your code: -http://github.com/centralniak/cmsplugin_gallery - -:author: Piotr Kilczuk -:date: 2012/08/01 - -Current Maintainer: - -:maintainer: Vinit Kumar -:date: 2016/08/23 - -.. _django-filer: https://github.com/stefanfoulis/django-filer/ From 58b773cdff629a5abc1706c33e14628f97f4b5e3 Mon Sep 17 00:00:00 2001 From: Vinit Kumar Date: Wed, 21 Feb 2018 12:45:27 +0530 Subject: [PATCH 3/7] add support for django version greater than 1.8.18 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a05d3d7..4a0bc07 100755 --- a/setup.py +++ b/setup.py @@ -14,5 +14,5 @@ packages=find_packages(), provides=['cmsplugin_gallery', ], include_package_data=True, - install_requires = ['django-inline-ordering>=0.1.1', 'easy-thumbnails',] + install_requires = ['django>==1.8.18', 'django-inline-ordering>=0.1.1', 'easy-thumbnails',] ) From 1e195636ba62430d6b27a56ce1e906ac4af741ce Mon Sep 17 00:00:00 2001 From: Vinit Kumar Date: Wed, 21 Feb 2018 12:47:41 +0530 Subject: [PATCH 4/7] fix typo --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4a0bc07..838d25d 100755 --- a/setup.py +++ b/setup.py @@ -14,5 +14,5 @@ packages=find_packages(), provides=['cmsplugin_gallery', ], include_package_data=True, - install_requires = ['django>==1.8.18', 'django-inline-ordering>=0.1.1', 'easy-thumbnails',] + install_requires = ['django>=1.8.18', 'django-inline-ordering>=0.1.1', 'easy-thumbnails',] ) From ea4c8b61a24fcfe648c12eed3c87242566bf951c Mon Sep 17 00:00:00 2001 From: Vinit Kumar Date: Wed, 21 Feb 2018 12:51:55 +0530 Subject: [PATCH 5/7] try & fix build --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 838d25d..2463f15 100755 --- a/setup.py +++ b/setup.py @@ -14,5 +14,5 @@ packages=find_packages(), provides=['cmsplugin_gallery', ], include_package_data=True, - install_requires = ['django>=1.8.18', 'django-inline-ordering>=0.1.1', 'easy-thumbnails',] + install_requires = ['django-cms>=3.2.0', 'django-inline-ordering>=0.1.1', 'easy-thumbnails',] ) From 34618a59fd1814cbb2da1eeaee677963e41fe354 Mon Sep 17 00:00:00 2001 From: Vinit Kumar Date: Wed, 21 Feb 2018 12:57:13 +0530 Subject: [PATCH 6/7] one more try at travis builds --- .travis.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 10c735d..b5deb5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,21 @@ language: python -python: - - "2.7" - - "3.5" - - "3.6" -install: - - python setup.py install +sudo: false + +env: + - TOX_ENV=flake8 + - TOX_ENV=py27-latest + - TOX_ENV=py34-latest + # Django 1.8 + - TOX_ENV=py27-dj18-cms34 + - TOX_ENV=py27-dj18-cms33 + - TOX_ENV=py34-dj18-cms34 + - TOX_ENV=py34-dj18-cms33 + # Django 1.9 + - TOX_ENV=py27-dj19-cms34 + - TOX_ENV=py27-dj19-cms33 + - TOX_ENV=py34-dj19-cms34 + - TOX_ENV=py34-dj19-cms33 +install: + - pip install tox coverage \ No newline at end of file From b472273762a894558591875a5f5fa7377cfff7aa Mon Sep 17 00:00:00 2001 From: Vinit Kumar Date: Wed, 21 Feb 2018 12:59:05 +0530 Subject: [PATCH 7/7] add missing script --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b5deb5b..afa567b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,4 +18,7 @@ env: - TOX_ENV=py34-dj19-cms33 install: - - pip install tox coverage \ No newline at end of file + - pip install tox coverage + +script: + - tox -e $TOX_ENV \ No newline at end of file