From c63ce77d3905d72c4d01ad508d2b5b63180f0232 Mon Sep 17 00:00:00 2001
From: Gregor von Laszewski <laszewski@gmail.com>
Date: Sat, 16 Dec 2023 02:03:52 -0500
Subject: [PATCH] 3.11

---
 cloudmesh/common/ssh/authorized_keys.py | 8 +-------
 environment.yml                         | 1 -
 pyproject.toml                          | 3 +--
 requirements.txt                        | 1 -
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/cloudmesh/common/ssh/authorized_keys.py b/cloudmesh/common/ssh/authorized_keys.py
index 6fd45408..f5ad1039 100644
--- a/cloudmesh/common/ssh/authorized_keys.py
+++ b/cloudmesh/common/ssh/authorized_keys.py
@@ -6,8 +6,6 @@
 import itertools
 import os.path
 
-from six import itervalues
-
 from cloudmesh.common.Shell import Subprocess
 from cloudmesh.common.util import tempdir
 
@@ -87,13 +85,9 @@ def remove(self, pubkey):
         raise NotImplementedError()
 
     def __str__(self):
-
         sio = io.StringIO()
 
-        # TODO: make python 2 and 3 compatible
-        # old: for fingerprint in self._order.itervalues():
-
-        for fingerprint in itervalues(self._order):
+        for fingerprint in self._order.values():
             key = self._keys[fingerprint]
             sio.write(key)
             sio.write('\n')
diff --git a/environment.yml b/environment.yml
index bdc7be77..ce15c1c0 100644
--- a/environment.yml
+++ b/environment.yml
@@ -10,6 +10,5 @@ dependencies:
   - pytz
   - requests
   - simplejson
-  - six
   - tabulate
   - tqdm
diff --git a/pyproject.toml b/pyproject.toml
index 34d859ea..76c355fb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ name = "cloudmesh-common"
 version = "5.0.20"
 description = "A set of useful APIs for cloudmesh"
 readme = "README.md"
-requires-python = ">=3.12"
+requires-python = ">=3.11"
 license = {file = "LICENSE"}
 authors = [
   {name = "Gregor von Laszewski", email = "laszewski@gmail.com"}
@@ -57,7 +57,6 @@ dependencies = [
     "python-hostlist",
     "requests",
     "simplejson",
-    "six",
     "tabulate",
     "tqdm",
     "pyyaml",
diff --git a/requirements.txt b/requirements.txt
index a49b4618..a0133ac7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,6 @@ pyfiglet
 python-hostlist
 requests
 simplejson
-six
 tabulate
 tqdm
 pyyaml