Commit 3fa47d1f by Timothée Peignier

Revert "Use new subprocess32 when possible"

This reverts commit 7520777f.
parent 42babfbc
from __future__ import unicode_literals from __future__ import unicode_literals
import os import os
import sys import subprocess
if os.name == 'posix' and sys.version_info[0] < 3:
import subprocess32 as subprocess
else:
import subprocess
from tempfile import NamedTemporaryFile from tempfile import NamedTemporaryFile
from django.contrib.staticfiles import finders from django.contrib.staticfiles import finders
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import io import io
import os
import sys
from setuptools import setup, find_packages from setuptools import setup, find_packages
import sys
install_requires = [] install_requires = []
if (sys.version_info[0], sys.version_info[1]) < (3, 2): if (sys.version_info[0], sys.version_info[1]) < (3, 2):
install_requires.append('futures>=2.1.3') install_requires.append('futures>=2.1.3')
if os.name == 'posix' and sys.version_info[0] < 3:
install_requires.append('subprocess32>=3.2.7')
setup( setup(
name='django-pipeline', name='django-pipeline',
......
...@@ -7,6 +7,7 @@ from django.test import TestCase ...@@ -7,6 +7,7 @@ from django.test import TestCase
from pipeline.collector import default_collector from pipeline.collector import default_collector
from pipeline.compilers import Compiler, CompilerBase, SubProcessCompiler from pipeline.compilers import Compiler, CompilerBase, SubProcessCompiler
from pipeline.conf import settings
from pipeline.exceptions import CompilerError from pipeline.exceptions import CompilerError
from tests.utils import _, pipeline_settings from tests.utils import _, pipeline_settings
......
...@@ -13,7 +13,6 @@ basepython = ...@@ -13,7 +13,6 @@ basepython =
deps = deps =
py{27,py}: mock py{27,py}: mock
py{27,py}: futures py{27,py}: futures
py{27,py}: subprocess32
django18: Django>=1.8,<1.9 django18: Django>=1.8,<1.9
django19: Django>=1.9,<1.10 django19: Django>=1.9,<1.10
jinja2 jinja2
......
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