Commit 749f7ba4 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Update Requiremets.txt, README.md and travis.yml

parent e2c451e0

.travis.yml

+5 −5
Original line number Diff line number Diff line
@@ -3,15 +3,15 @@ python: 
    - 3.3

    - 3.4

    - 3.5

    - 3.6



install:

    - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then travis_retry pip install -r requirements-p33.txt; fi

    - if [[ $TRAVIS_PYTHON_VERSION == '3.4' || $TRAVIS_PYTHON_VERSION == '3.5' ]]; then travis_retry pip install -r requirements.txt; fi

    - travis_retry pip install -r requirements.txt



script:

    - python manage.py test



branches:

    only:

        - master

#branches:

#    only:

#        - master

README.md

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
Для работы проекта необходимо установить указанные  зависимости: 



	yum install python3                    # команда установки для RedHad, Fedora, CentOS

	pip3 install -r requirements.txt       # для Python 3.4 и выше

	pip3 install -r requirements-p33.txt   # для Python 3.3

	pip3 install -r requirements.txt



1.3 Настраиваем ./sopds/settings.py (настройки в конце файла)

requirements-p33.txt

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
Django==1.8

Pillow>=2.9.0

apscheduler>=3.3.0
 
 No newline at end of file

requirements.txt

+2 −1
Original line number Diff line number Diff line 
Django>=1.8

Django==1.8 ; python_version == '3.3'

Django>=1.8 ; python_version >= '3.4'

Pillow>=2.9.0

apscheduler>=3.3.0
 
 No newline at end of file