zuul
/
zuul
Code Issues Proposed changes

requirements: remove ordereddict 

OrderedDict is included in python3 collections module.

Change-Id: I63c91e22a8f03a5e2598a224f0b1018c2951d67b
This commit is contained in:
Tristan Cacqueray 2017-06-19 04:32:08 +00:00
parent 9eea582723
commit e7410af051
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -8,7 +8,6 @@ Paste
WebOb>=1.2.3 WebOb>=1.2.3
paramiko>=1.8.0,<2.0.0 paramiko>=1.8.0,<2.0.0
GitPython>=0.3.3,<2.1.2 GitPython>=0.3.3,<2.1.2
ordereddict
python-daemon>=2.0.4,<2.1.0 python-daemon>=2.0.4,<2.1.0
extras extras
statsd>=1.0.0,<3.0 statsd>=1.0.0,<3.0

6
zuul/lib/clonemapper.py
View File

@ -14,7 +14,7 @@
# under the License. # under the License.
from collections import defaultdict from collections import defaultdict
import extras from collections import OrderedDict
import logging import logging
import os import os
import re import re
@ -22,10 +22,6 @@ import re
import six import six
OrderedDict = extras.try_imports(['collections.OrderedDict',
'ordereddict.OrderedDict'])
class CloneMapper(object): class CloneMapper(object):
log = logging.getLogger("zuul.CloneMapper") log = logging.getLogger("zuul.CloneMapper")

5
zuul/model.py
View File

@ -13,19 +13,16 @@
# under the License. # under the License.
import abc import abc
from collections import OrderedDict
import copy import copy
import logging import logging
import os import os
import struct import struct
import time import time
from uuid import uuid4 from uuid import uuid4
import extras
import six import six
OrderedDict = extras.try_imports(['collections.OrderedDict',
'ordereddict.OrderedDict'])
MERGER_MERGE = 1 # "git merge" MERGER_MERGE = 1 # "git merge"
MERGER_MERGE_RESOLVE = 2 # "git merge -s resolve" MERGER_MERGE_RESOLVE = 2 # "git merge -s resolve"