Skip to content
Snippets Groups Projects
Commit 97d947af authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into 'master'

remove usage of six

See merge request !9
parents 93af2839 b2b59bef
No related branches found
No related tags found
1 merge request!9remove usage of six
Pipeline #164863 failed
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os.path import os.path
import json import json
import six
from django.conf import settings from django.conf import settings
from django.utils.datastructures import OrderedSet from django.utils.datastructures import OrderedSet
......
from django.core.management import call_command from django.core.management import call_command
from django.conf import settings from django.conf import settings
from django.test import TestCase from django.test import TestCase
from six import StringIO from io import StringIO
from mock import MagicMock from mock import MagicMock
from ..yarn import yarn_adapter, YarnAdapter from ..yarn import yarn_adapter, YarnAdapter
from .. import conf from .. import conf
......
...@@ -23,7 +23,6 @@ setup( ...@@ -23,7 +23,6 @@ setup(
zip_safe=True, zip_safe=True,
install_requires=[ install_requires=[
'django', 'django',
'six',
], ],
entry_points=""" entry_points="""
# -*- Entry points: -*- # -*- Entry points: -*-
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment