cloudinit: remove six from packaging/tooling (#253)

canonical · Mar 17, 2020 · b9ff0dc · b9ff0dc
1 parent 309e9a3
commit b9ff0dc
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 10 deletions.
diff --git a/.pylintrc b/.pylintrc
@@ -50,7 +50,6 @@ ignored-modules=
  http.client,
  httplib,
  pkg_resources,
- six.moves,
  # cloud_tests requirements.
  boto3,
  botocore,

diff --git a/packages/pkg-deps.json b/packages/pkg-deps.json
@@ -50,9 +50,6 @@
          },
          "requests" : {
             "3" : "python36-requests"
-         },
-         "six" : {
-            "3" : "python36-six"
          }
       },
       "requires" : [

diff --git a/requirements.txt b/requirements.txt
@@ -32,6 +32,3 @@ jsonpatch
 
 # For validating cloud-config sections per schema definitions
 jsonschema
-
-# For Python 2/3 compatibility
-six
diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd
@@ -29,7 +29,6 @@ pkgs="
     $py_prefix-oauthlib
     $py_prefix-requests
     $py_prefix-serial
-    $py_prefix-six
     $py_prefix-yaml
     sudo
 "

diff --git a/tools/build-on-netbsd b/tools/build-on-netbsd
@@ -12,7 +12,6 @@ pkgs="
    py37-oauthlib
    py37-requests
    py37-setuptools
-   py37-six
    py37-yaml
    sudo
 "

diff --git a/tox.ini b/tox.ini
@@ -72,7 +72,6 @@ deps =
     pyserial==3.0.1
     configobj==5.0.6
     requests==2.9.1
-    six==1.10.0
     # test-requirements
     httpretty==0.9.6
     mock==1.3.0