Remove ordereddict support from py26

python 2.6 is no longer supported and adding a marker
to requirements.txt for installing ordereddict only in py2.6
envs was not an option because markers are not supported in
older pip versions.
So remove python 2.6 support completly.

Change-Id: Iebdd999b469c9a9681b0d7e9f50cc488a8820953
changes/38/240438/3
Thomas Bechtold 7 years ago
parent bd1c93199a
commit 389afe422c

@ -102,10 +102,7 @@ import yaml
from yaml.constructor import BaseConstructor
from yaml import YAMLObject
try:
from collections import OrderedDict
except ImportError:
from ordereddict import OrderedDict
from collections import OrderedDict
logger = logging.getLogger(__name__)

@ -29,6 +29,7 @@ Example::
- timed: '@daily'
"""
from collections import OrderedDict
import logging
import re
import xml.etree.ElementTree as XML
@ -41,11 +42,6 @@ from jenkins_jobs.errors import MissingAttributeError
import jenkins_jobs.modules.base
from jenkins_jobs.modules import hudson_model
try:
from collections import OrderedDict
except ImportError:
from ordereddict import OrderedDict
logger = logging.getLogger(str(__name__))

@ -1,4 +1,3 @@
ordereddict
six>=1.5.2
PyYAML
python-jenkins>=0.4.8

Loading…
Cancel
Save