Skip to content

Commit 3cc4ecd

Browse files
authored
Merge pull request #110 from django-ftl/better_fluent_syntax_dep
fluent.runtime - broader dependency range for fluent.syntax
2 parents 84cd3b5 + 71a26a5 commit 3cc4ecd

File tree

5 files changed

+48
-8
lines changed

5 files changed

+48
-8
lines changed

.travis.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,29 @@ python:
99
- "pypy3.5-6.0"
1010
- "nightly"
1111
env:
12-
- PACKAGE=fluent.syntax
13-
- PACKAGE=fluent.runtime
14-
install: pip install tox-travis
15-
script: cd $PACKAGE; tox
12+
global:
13+
- FLUENT_RUNTIME_DEFAULT_DEPS="fluent.syntax==0.13.0 attrs==19.1.0 babel==2.6.0 pytz==2018.9 six==1.12.0"
14+
- FLUENT_SYNTAX_DEFAULT_DEPS="six"
15+
matrix:
16+
- PACKAGE=fluent.syntax
17+
- PACKAGE=fluent.runtime
18+
matrix:
19+
include:
20+
- name: "fluent.runtime w/ fluent.syntax==0.10"
21+
python: "3.6"
22+
env: PACKAGE=fluent.runtime TEST_DEPS="fluent.syntax==0.10.0 attrs==19.1.0 babel==2.6.0 pytz==2018.9 six==1.12.0"
23+
- name: "fluent.runtime with latest everything"
24+
python: "3.6"
25+
# These are copy-pasted from setup.py
26+
env: PACKAGE=fluent.runtime TEST_DEPS="fluent.syntax>=0.10,<=0.13 attrs babel pytz six"
27+
allow_failures:
28+
- python: "3.6"
29+
env: PACKAGE=fluent.runtime TEST_DEPS="fluent.syntax>=0.10,<=0.13 attrs babel pytz six"
30+
31+
install:
32+
- if [ "$PACKAGE" = "fluent.runtime" ]; then TEST_DEPS=${TEST_DEPS:-$FLUENT_RUNTIME_DEFAULT_DEPS}; else TEST_DEPS=${TEST_DEPS:-$FLUENT_SYNTAX_DEFAULT_DEPS}; fi
33+
- pip install $TEST_DEPS
34+
script: cd $PACKAGE; ./runtests.py
1635
notifications:
1736
irc:
1837
channels:

fluent.runtime/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/usr/bin/env python
22
from setuptools import setup
3-
import sys
43

54

65
setup(name='fluent.runtime',
@@ -20,8 +19,9 @@
2019
'Programming Language :: Python :: 3.5',
2120
],
2221
packages=['fluent', 'fluent.runtime'],
22+
# These should also be duplicated in tox.ini and ../.travis.yml
2323
install_requires=[
24-
'fluent.syntax>=0.12,<=0.13',
24+
'fluent.syntax>=0.10,<=0.13',
2525
'attrs',
2626
'babel',
2727
'pytz',

fluent.runtime/tox.ini

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,29 @@
1+
# This config is for local testing. It should be duplicated into .travis.yml
12
[tox]
2-
envlist = py27, py35, py36, py37, pypy, pypy3
3+
envlist = {py27,py35,py36,py37,pypy,pypy3}-syntax0.13, py36-syntax0.10, latest
34
skipsdist=True
45

56
[testenv]
67
setenv =
78
PYTHONPATH = {toxinidir}
89
deps =
9-
.
10+
syntax0.10: fluent.syntax==0.10.0
11+
syntax0.13: fluent.syntax==0.13.0
12+
attrs==19.1.0
13+
babel==2.6.0
14+
pytz==2018.9
15+
six==1.12.0
1016
commands = ./runtests.py
17+
18+
[testenv:latest]
19+
basepython = python3.6
20+
deps =
21+
# Here we try to reproduce what a user gets if they do 'pip install fluent.runtime'
22+
# It's tempting to use '.' here to get 'pip install .'
23+
# Unfortunately it is super slow: https://github.com/pypa/pip/issues/2195
24+
# Instead we copy-paste from setup.py
25+
fluent.syntax>=0.10,<=0.13
26+
attrs
27+
babel
28+
pytz
29+
six

fluent.syntax/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
'Programming Language :: Python :: 3.5',
1919
],
2020
packages=['fluent', 'fluent.syntax'],
21+
# These should also be duplicated in tox.ini and ../.travis.yml
2122
tests_require=['six'],
2223
test_suite='tests.syntax'
2324
)

fluent.syntax/tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# This config is for local testing. It should be duplicated into .travis.yml
12
[tox]
23
envlist = py27, py35, py36, py37, pypy, pypy3
34
skipsdist=True

0 commit comments

Comments
 (0)