diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-03-17 15:48:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 15:48:51 -0400 |
| commit | b9ff0dc950558ecd2a8469eded26bd6ae4082771 (patch) | |
| tree | 0d411916b0fc90475bf9fd6d00dcef5c8426c2b4 | |
| parent | 309e9a3cb33a16721d87650f9c1b50709e507356 (diff) | |
| download | vyos-cloud-init-b9ff0dc950558ecd2a8469eded26bd6ae4082771.tar.gz vyos-cloud-init-b9ff0dc950558ecd2a8469eded26bd6ae4082771.zip | |
cloudinit: remove six from packaging/tooling (#253)
| -rw-r--r-- | .pylintrc | 1 | ||||
| -rw-r--r-- | packages/pkg-deps.json | 3 | ||||
| -rw-r--r-- | requirements.txt | 3 | ||||
| -rwxr-xr-x | tools/build-on-freebsd | 1 | ||||
| -rwxr-xr-x | tools/build-on-netbsd | 1 | ||||
| -rw-r--r-- | tox.ini | 1 |
6 files changed, 0 insertions, 10 deletions
@@ -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 index 64d6d78d..d09ec33f 100644 --- 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 index dd10d85d..5817da3b 100644 --- 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 index 876368a9..60beeee0 100755 --- 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 index 1e2b9cff..d2a7067d 100755 --- 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 " @@ -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 |