Skip to content

Commit 85d8f75

Browse files
committed
Update various to reflect new migrations folders
1 parent afa300f commit 85d8f75

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
include LICENSE.txt
22
include README.md
3+
recursive-include djangocms_file/migrations *
4+
recursive-include djangocms_file/south_migrations *
35
recursive-include djangocms_file/locale *
46
recursive-include djangocms_file/templates *
57
recursive-exclude * *.py[co]

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ Installation
99

1010
This plugin requires `django CMS` 3.0 or higher to be properly installed.
1111

12-
* In your projects `virtualenv`_, run ``pip install djangocms-file``.
12+
* In your projects `virtualenv`, run ``pip install djangocms-file``.
1313
* Add ``'djangocms_file'`` to your ``INSTALLED_APPS`` setting.
14-
* If using Django 1.7 add ``'djangocms_file': 'djangocms_file.migrations_django',``
15-
to ``MIGRATION_MODULES`` (or define ``MIGRATION_MODULES`` if it does not exists);
16-
when django CMS 3.1 will be released, migrations for Django 1.7 will be moved
17-
to the standard location and the south-style ones to ``south_migrations``.
14+
* If using Django 1.6 and South < 1.0.2 add ``'djangocms_file': 'djangocms_file.south_migrations',``
15+
to ``SOUTH_MIGRATION_MODULES`` (or define ``SOUTH_MIGRATION_MODULES`` if it
16+
does not exists);
1817
* Run ``manage.py migrate djangocms_file``.
1918

2019

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
packages=[
2929
'djangocms_file',
3030
'djangocms_file.migrations',
31-
'djangocms_file.migrations_django'
31+
'djangocms_file.south_migrations'
3232
],
3333
license='LICENSE.txt',
3434
platforms=['OS Independent'],

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ commands = flake8
88

99
[flake8]
1010
ignore = E251,E128
11-
exclude = djangocms_file/migrations/*,djangocms_file/migrations_django/*
11+
exclude = djangocms_file/migrations/*,djangocms_file/south_migrations/*
1212
max-line-length = 80

0 commit comments

Comments
 (0)