Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
sudo: required
dist: trusty
dist: xenial
language: python
python:
- "2.7"
- "3.4"
- "3.5"
- "3.6"
- "3.7"
- "3.8"
env:
- TASKWARRIOR=v2.5.0
- TASKWARRIOR=v2.5.1
Expand All @@ -21,7 +23,7 @@ before_install:
- task --version
- cd ../
install: python setup.py install
script: python setup.py test
script: python setup.py nosetests
notifications:
email: true
irc:
Expand Down
4 changes: 3 additions & 1 deletion taskw/warrior.py
Original file line number Diff line number Diff line change
Expand Up @@ -447,11 +447,12 @@ def _execute(self, *args):
command = (
[
'task',
'rc:%s' % self.config_filename,
]
+ self.get_configuration_override_args()
+ [six.text_type(arg) for arg in args]
)
env = os.environ.copy()
env['TASKRC'] = self.config_filename

# subprocess is expecting bytestrings only, so nuke unicode if present
# and remove control characters
Expand All @@ -463,6 +464,7 @@ def _execute(self, *args):
try:
proc = subprocess.Popen(
command,
env=env,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
)
Expand Down
4 changes: 2 additions & 2 deletions test_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
nose>=1.3.4,<2
tox>=1.8.1,<2
nose
tox<3
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{27,34,35,36}-tw{250,251}
envlist = py{27,34,35,36,37,38}-tw{250,251}
downloadcache = {toxworkdir}/_download/

[testenv]
Expand All @@ -8,6 +8,8 @@ basepython =
py34: python3.4
py35: python3.5
py36: python3.6
py37: python3.7
py38: python3.8
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test_requirements.txt
Expand Down