Python 2->3 Conversion.

.github/workflows/on_push_testing.yml

@@ -6,51 +6,85 @@ jobs:
 
   lint:
     runs-on: ubuntu-latest
+    container:
+      image: centos:8
     steps:
       - uses: actions/checkout@v1
+      - name: Install EPEL
+        run: dnf install -y epel-release
       - name: Install dependencies
-        run: sudo apt-get install python python-pip python-virtualenv python-m2crypto
+        run: dnf install -y python3 python3-m2crypto
       - name: Setup virtualenv
         run: |
-          virtualenv --system-site-packages venv
+          python3 -m venv --system-site-packages venv
           (. venv/bin/activate && pip install --upgrade pip wheel setuptools)
       - name: Install pdm from push
-        run: (. venv/bin/activate && pip install --user -e .)
+        run: (. venv/bin/activate && pip install -e .)
       - name: Install Tox and dependencies (for testing)
         run: (. venv/bin/activate && pip install tox)
       - name: Run tox testing
-        run: (. venv/bin/activate && tox -e lint test)    
+        run: (. venv/bin/activate && tox -e lint test)
+      - name: Upload output artifact
+        if: failure()
+        uses: actions/upload-artifact@v1
+        with:
+          name: lint_output
+          path: .tox/lint
 
   unit:
     runs-on: ubuntu-latest
+    container:
+      image: centos:8
     steps:
       - uses: actions/checkout@v1
+      - name: Install EPEL
+        run: dnf install -y epel-release
       - name: Install dependencies
-        run: sudo apt-get install python python-pip python-virtualenv python-m2crypto
+        run: dnf install -y python3 python3-m2crypto
       - name: Setup virtualenv
         run: |
-          virtualenv --system-site-packages venv
+          python3 -m venv --system-site-packages venv
           (. venv/bin/activate && pip install --upgrade pip wheel setuptools)
       - name: Install pdm from push
-        run: (. venv/bin/activate && pip install --user -e .)
+        run: (. venv/bin/activate && pip install -e .)
       - name: Install Tox and dependencies (for testing)
         run: (. venv/bin/activate && pip install tox)
       - name: Run tox testing
         run: (. venv/bin/activate && tox -e unit test)
+      - name: Upload output artifact
+        if: failure()
+        uses: actions/upload-artifact@v1
+        with:
+          name: unit_output
+          path: .tox/unit
 
   full:
     runs-on: ubuntu-latest
+    container:
+      image: centos:8
     steps:
       - uses: actions/checkout@v1
+      - name: Install EPEL
+        run: dnf install -y epel-release
       - name: Install dependencies
-        run: sudo apt-get install python python-pip python-virtualenv python-m2crypto
+        run: dnf install -y openssl python3 python3-m2crypto python3-pyOpenSSL
       - name: Setup virtualenv
         run: |
-          virtualenv --system-site-packages venv
+          python3 -m venv --system-site-packages venv
           (. venv/bin/activate && pip install --upgrade pip wheel setuptools)
       - name: Install pdm from push
-        run: (. venv/bin/activate && pip install --user -e .)
+        run: (. venv/bin/activate && pip install -e .)
+##Fixes ERROR: virtualenv 20.0.3 has requirement six<2,>=1.12.0, but you'll have six 1.11.0 which is incompatible.
+## This virtualenv is used by the tox (3.14.3) system.
+## The old version of six must come from the distribution (system-site-package) of python3-pyOpenSSL which is only
+## installed for full testing
       - name: Install Tox and dependencies (for testing)
-        run: (. venv/bin/activate && pip install tox)
+        run: (. venv/bin/activate && pip install 'six>=1.12.0,<2' tox==3.14.3)
       - name: Run tox testing
         run: (. venv/bin/activate && tox -e full test)
+      - name: Upload output artifact
+        if: failure()
+        uses: actions/upload-artifact@v1
+        with:
+          name: full_output
+          path: .tox/full

bin/test_demo.py

@@ -11,14 +11,14 @@
 
 def show_turtles(client):
     turtles = client.get_turtles()
-    print "Server Turtles: %s" % ', '.join(turtles.values())
+    print("Server Turtles: %s" % ', '.join(turtles.values()))
 
 def main():
 
     return_code = 0
 
     if len(sys.argv) != 2:
-        print "Usage: test_demo.py <conf_file>"
+        print("Usage: test_demo.py <conf_file>")
         sys.exit(1)
 
     # We load a config so that the client can find the server
@@ -28,50 +28,50 @@ def main():
     os.chdir(os.path.dirname(conf_file))
     # Create a client and run the hello function
     client = DemoClient()
-    print "Hello Returned: %s" % client.hello().strip()
+    print("Hello Returned: %s" % client.hello().strip())
 
     # Now do Turtle stuff
     show_turtles(client)
-    print "Adding Turtle..."
+    print("Adding Turtle...")
     my_id = client.add_turtle("New Turtle")['id']
-    print "New turtle is ID: %u" % my_id
+    print("New turtle is ID: %u" % my_id)
     show_turtles(client)
-    print "Modifying turtle with ID %u..." % my_id
+    print("Modifying turtle with ID %u..." % my_id)
     mod_turtle = client.modify_turtle(my_id, "My Lovely Turtle")
-    print "Modified turtle: %s" % mod_turtle
+    print("Modified turtle: %s" % mod_turtle)
     show_turtles(client)
 
-    print "Deleting new turtle."""
+    print("Deleting new turtle.""")
     client.del_turtle(my_id)
     show_turtles(client)
 
 
     # Do Token Demo
-    print "\n\nTOKEN DEMO\n"
+    print("\n\nTOKEN DEMO\n")
     token = client.get('get_token')
-    print "Got Token: %s" % token
+    print("Got Token: %s" % token)
 
     # Try a request without a token
     try:
         res = client.get('verify_token')
-        print "Tokenless request accepted!!! %s" % res
+        print("Tokenless request accepted!!! %s" % res)
         return_code += 1
     except:
-        print "No token request rejected as expected. :-)"
+        print("No token request rejected as expected. :-)")
 
     # Try a request with the wrong token
     try:
         client.set_token('WRONGTOKEN')
         res = client.get('verify_token')
-        print "Invalid token accepted!!! %s" % res
+        print("Invalid token accepted!!! %s" % res)
         return_code += 1
     except:
-        print "Wrong token rejected, as expected. :-)"
+        print("Wrong token rejected, as expected. :-)")
 
     # Try a request with the correct token
     client.set_token(token)
     res = client.get('verify_token')
-    print "Verify real token: %s" % res
+    print("Verify real token: %s" % res)
 
     sys.exit(return_code)
 

setup.py

@@ -8,14 +8,14 @@
       package_dir={'': 'src'},
       packages=find_packages('src'),
       install_requires=['m2crypto',
-                        'flask==0.10.1',
-                        'flask-sqlalchemy==2.0',
+                        'flask',
+                        'flask-sqlalchemy',
                         'pyOpenSSL', # ==0.13.1 on RHEL7
-                        'requests==2.6.0',
-                        'sqlalchemy==0.9.8',
-                        'twisted==12.1.0',
-                        'enum34==1.0.4',
-                        'python-dateutil==1.5'],
+                        'requests',
+                        'sqlalchemy',
+                        'twisted',
+                        'python-dateutil',
+                        'service_identity'],  # See commit notes: Needed by Twisted.
       include_package_data=True,
       scripts=['src/pdm/bin/pdm'],
      )