Commit 1091645b authored by Michal Čihař's avatar Michal Čihař

translate-toolkit 1.14.0 is required on Python 3

- document this requirement
- adjust setup.py to ask for it with Python 3
- use it for testsuite on Travis
- use it on Scrutinizer

Fixes #1018
Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent a644d58c
......@@ -10,7 +10,6 @@ filter:
excluded_paths:
- '*/migrations/*'
before_commands:
- pip3 install https://github.com/translate/translate/zipball/de3f080abf6f2fecfca97d283a58eb6824d8078e
- pip3 install -r ci/requirements-scrutinizer.txt
- pip install -r ci/requirements-scrutinizer.txt
- pip install Django
......@@ -18,7 +17,6 @@ before_commands:
build:
dependencies:
override:
- pip install https://github.com/translate/translate/zipball/de3f080abf6f2fecfca97d283a58eb6824d8078e
- pip install -r ci/requirements-scrutinizer.txt
tests:
override:
......
......@@ -45,13 +45,13 @@ notifications:
matrix:
include:
- python: "3.4"
env: CI_PIP_DEPS="Django>=1.9,<1.10 https://github.com/translate/translate/zipball/de3f080abf6f2fecfca97d283a58eb6824d8078e"
env: CI_PIP_DEPS="Django>=1.9,<1.10 translate-toolkit>=1.14.0rc1"
- python: "3.5"
env: CI_PIP_DEPS="Django>=1.9,<1.10 https://github.com/translate/translate/zipball/de3f080abf6f2fecfca97d283a58eb6824d8078e"
env: CI_PIP_DEPS="Django>=1.9,<1.10 translate-toolkit>=1.14.0rc1"
- python: "3.5"
env: CI_PIP_DEPS="Django>=1.9,<1.10 https://github.com/translate/translate/zipball/de3f080abf6f2fecfca97d283a58eb6824d8078e" CI_MODE=lint
env: CI_PIP_DEPS="Django>=1.9,<1.10 translate-toolkit>=1.14.0rc1" CI_MODE=lint
- python: "3.5"
env: CI_PIP_DEPS="Django>=1.9,<1.10 https://github.com/translate/translate/zipball/de3f080abf6f2fecfca97d283a58eb6824d8078e" CI_MODE=selenium
env: CI_PIP_DEPS="Django>=1.9,<1.10 translate-toolkit>=1.14.0rc1" CI_MODE=selenium
addons:
apt:
packages:
......
Django>=1.8
Whoosh>=2.5.2,!=2.6.0
translate-toolkit>=1.10.0
translate-toolkit>=1.14.0rc1
lxml>=3.1.0
Pillow
six>=1.7.0
......
......@@ -12,7 +12,7 @@ Python (2.7, 3.4 or newer)
https://www.python.org/
Django (>= 1.8)
https://www.djangoproject.com/
Translate-toolkit (>= 1.10.0)
Translate-toolkit (>= 1.10.0, >= 1.14.0 is required for Python 3)
http://toolkit.translatehouse.org/
Six (>= 1.7.0)
https://pypi.python.org/pypi/six
......
......@@ -20,6 +20,7 @@
#
import os
import sys
from setuptools import setup
# allow setup.py to be run from any path
......@@ -31,6 +32,10 @@ with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme:
with open('requirements.txt') as requirements:
REQUIRES = requirements.read().splitlines()
if sys.version_info >= (3, 0):
REQUIRES.remove('translate-toolkit>=1.10.0')
REQUIRES.append('translate-toolkit>=1.14.0rc1')
setup(
name='Weblate',
version='2.6',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment