diff --git a/.travis.yml b/.travis.yml index 16357d8..77f3352 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,28 +7,24 @@ services: - mysql env: global: - - DJANGO_SETTINGS_MODULE="test.travis_settings" + - DJANGO_SETTINGS_MODULE="travis_test.travis_settings" matrix: - DJANGO="Django==1.8" - DJANGO="Django==1.9" - DJANGO="Django==1.10" + - DJANGO="Django==1.11" branches: only: - master # command to install dependencies install: - - pip install -r test/requirements.txt + - pip install -r travis_test/requirements.txt - pip install "$DJANGO" - pip install python-coveralls - pip install coverage before_script: - mysql -e 'CREATE DATABASE `djangoblog` /*!40100 DEFAULT CHARACTER SET utf8 */;' - python manage.py makemigrations - - python manage.py makemigrations sites - - python manage.py makemigrations accounts - - python manage.py makemigrations blog - - python manage.py makemigrations comments - - python manage.py makemigrations oauth - python manage.py migrate - python manage.py collectstatic --noinput - python manage.py compress --force diff --git a/requirements.txt b/requirements.txt index de79054..c8fc181 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,26 +1,30 @@ -Django==1.10.5 +appdirs==1.4.3 +Django==1.11.1 django-appconf==1.0.2 django-autoslug==1.9.3 django-compressor==2.1.1 -django-debug-toolbar==1.6 +django-debug-toolbar==1.8 django-haystack==2.6.0 django-ipware==1.1.6 -django-pagedown==0.1.1 +django-pagedown==0.1.3 django-uuslug==1.1.8 jieba==0.38 -markdown2==2.3.2 -mistune==0.7.3 -Pillow==4.0.0 -Pygments==2.1.3 -PyMySQL==0.7.9 +markdown2==2.3.4 +mistune==0.7.4 +olefile==0.44 +packaging==16.8 +Pillow==4.1.1 +Pygments==2.2.0 +PyMySQL==0.7.11 +pyparsing==2.2.0 python-memcached==1.58 -python-slugify==1.2.1 -pytz==2016.10 +python-slugify==1.2.4 +pytz==2017.2 rcssmin==1.0.6 -requests==2.12.4 +requests==2.13.0 rjsmin==1.0.12 six==1.10.0 -sqlparse==0.2.2 +sqlparse==0.2.3 Unidecode==0.4.20 -webencodings==0.5 +webencodings==0.5.1 Whoosh==2.7.4 diff --git a/test/requirements.txt b/test/requirements.txt deleted file mode 100644 index 0646c0a..0000000 --- a/test/requirements.txt +++ /dev/null @@ -1,25 +0,0 @@ -Django==1.10.5 -django-appconf==1.0.2 -django-autoslug==1.9.3 -django-compressor==2.1.1 -django-debug-toolbar==1.6 -django-haystack==2.6.0 -django-ipware==1.1.6 -django-pagedown==0.1.1 -django-uuslug==1.1.8 -jieba==0.38 -markdown2==2.3.2 -mistune==0.7.3 -Pillow==4.0.0 -Pygments==2.1.3 -PyMySQL==0.7.9 -python-slugify==1.2.1 -pytz==2016.10 -rcssmin==1.0.6 -requests==2.12.4 -rjsmin==1.0.12 -six==1.10.0 -sqlparse==0.2.2 -Unidecode==0.4.20 -webencodings==0.5 -Whoosh==2.7.4 diff --git a/test/__init__.py b/travis_test/__init__.py similarity index 100% rename from test/__init__.py rename to travis_test/__init__.py diff --git a/travis_test/requirements.txt b/travis_test/requirements.txt new file mode 100644 index 0000000..785c6c4 --- /dev/null +++ b/travis_test/requirements.txt @@ -0,0 +1,29 @@ +appdirs==1.4.3 +Django==1.11.1 +django-appconf==1.0.2 +django-autoslug==1.9.3 +django-compressor==2.1.1 +django-debug-toolbar==1.8 +django-haystack==2.6.0 +django-ipware==1.1.6 +django-pagedown==0.1.3 +django-uuslug==1.1.8 +jieba==0.38 +markdown2==2.3.4 +mistune==0.7.4 +olefile==0.44 +packaging==16.8 +Pillow==4.1.1 +Pygments==2.2.0 +PyMySQL==0.7.11 +pyparsing==2.2.0 +python-slugify==1.2.4 +pytz==2017.2 +rcssmin==1.0.6 +requests==2.13.0 +rjsmin==1.0.12 +six==1.10.0 +sqlparse==0.2.3 +Unidecode==0.4.20 +webencodings==0.5.1 +Whoosh==2.7.4 diff --git a/test/travis_settings.py b/travis_test/travis_settings.py similarity index 100% rename from test/travis_settings.py rename to travis_test/travis_settings.py