- Updated dependencies for python 3.9

- Removed "future" dependencies from samples

Author: rvelaVenafi

examples/get_cert.py

@@ -14,10 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-from __future__ import print_function
-from vcert import (CertificateRequest, Connection, CloudConnection,
-                   FakeConnection, TPPConnection, RevocationRequest, KeyType)
+from vcert import (CertificateRequest, Connection, CloudConnection, FakeConnection, TPPConnection, RevocationRequest,
+                   KeyType)
 import string
 import random
 import logging
@@ -48,7 +46,7 @@ def main():
                           http_request_kwargs={"verify": False})
         # If your TPP server certificate signed with your own CA, or available only via proxy, you can specify
         # a trust bundle using requests vars:
-        #conn = Connection(url=url, token=token, user=user, password=password,
+        # conn = Connection(url=url, token=token, user=user, password=password,
         #                  http_request_kwargs={"verify": "/path-to/bundle.pem"})
 
     request = CertificateRequest(common_name=randomword(10) + ".venafi.example.com")
@@ -62,11 +60,11 @@ def main():
         # Specify ordering certificates in chain. Root can be "first" or "last". By default it last. You also can
         # specify "ignore" to ignore chain (supported only for Platform).
         # To set Custom Fields for the certificate, specify an array of CustomField objects as name-value pairs
-        #request.custom_fields = [
+        # request.custom_fields = [
         #    CustomField(name="Cost Center", value="ABC123"),
         #    CustomField(name="Environment", value="Production"),
         #    CustomField(name="Environment", value="Staging")
-        #]
+        # ]
 
     # configure key type, RSA example
     request.key_type = KeyType(KeyType.RSA, 2048)
@@ -96,7 +94,7 @@ def main():
     f.close()
 
     if not isinstance(conn, FakeConnection):
-        # fake connection doesn`t support certificate renewing
+        # fake connection doesn't support certificate renewing
         print("Trying to renew certificate")
         new_request = CertificateRequest(
             cert_id=request.id,
@@ -141,6 +139,7 @@ def main():
     f.write(cert.full_chain)
     f.close()
 
+
 def randomword(length):
     letters = string.ascii_lowercase
     return ''.join(random.choice(letters) for i in range(length))

examples/get_cert27.py

@@ -14,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-from __future__ import print_function
 from vcert import (CertificateRequest, Connection, FakeConnection, TPPConnection, RevocationRequest, KeyType,
                    TPPTokenConnection, venafi_connection)
 import string

examples/tpp/get_cert_tpp_token.py

@@ -14,9 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-from __future__ import print_function
-
 from vcert import (CertificateRequest, venafi_connection, CSR_ORIGIN_SERVICE, CHAIN_OPTION_FIRST)
 import string
 import random

examples/tpp/get_service_gen_cert_tpp.py

@@ -18,8 +18,8 @@
 
 from parser import json_parser, yaml_parser
 from parser.utils import parse_policy_spec
-from policy.policy_spec import PolicySpecification, Policy, Subject, KeyPair, SubjectAltNames, Defaults, \
-    DefaultSubject, DefaultKeyPair
+from policy.policy_spec import (PolicySpecification, Policy, Subject, KeyPair, SubjectAltNames, Defaults,
+                                DefaultSubject, DefaultKeyPair)
 from vcert import venafi_connection
 from vcert.common import Authentication, SCOPE_PM
 import logging

examples/tpp/set_policy_tpp_token.py

@@ -14,9 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-from __future__ import print_function
-
 from vcert import (CertificateRequest, venafi_connection, CSR_ORIGIN_SERVICE, CHAIN_OPTION_FIRST)
 import string
 import random

examples/vaas/get_service_gen_cert_vaas.py

@@ -18,8 +18,8 @@
 
 from parser import json_parser, yaml_parser
 from parser.utils import parse_policy_spec
-from policy.policy_spec import PolicySpecification, Policy, Subject, KeyPair, SubjectAltNames, Defaults, \
-    DefaultSubject, DefaultKeyPair
+from policy.policy_spec import (PolicySpecification, Policy, Subject, KeyPair, SubjectAltNames, Defaults,
+                                DefaultSubject, DefaultKeyPair)
 from vcert import venafi_connection
 import logging
 from os import environ

examples/vaas/set_policy_vaas.py

@@ -1,3 +1,3 @@
-pytest
-safety
-bandit<=1.6.2
+pytest==6.2.5
+safety==1.10.3
+bandit==1.7.1

requirements-build.txt

@@ -1,9 +1,6 @@
-requests
-python-dateutil>=2.6.1
-cryptography>=3.0
-six
-ipaddress;python_version<'3.3'
-enum34;python_version<'3.4'
-future
-ruamel.yaml<0.17
-pynacl>=1.4.0
+requests==2.27.1
+python-dateutil==2.8.2
+cryptography==36.0.1
+six==1.16.0
+ruamel.yaml==0.17.20
+pynacl==1.5.0

requirements.txt

@@ -9,28 +9,22 @@
 # The text of the README file
 with open(os.path.join(base_dir, "README.md")) as f:
     long_description = f.read()
-# README = (HERE / "README.md").read_text()
 
 setup(name='vcert',
-      version='0.13.2',
+      version='0.14.0',
       url="https://github.com/Venafi/vcert-python",
       packages=['vcert', 'vcert.parser', 'vcert.policy'],
-      install_requires=['requests<=2.25.1', 'python-dateutil<=2.8.1', 'certvalidator<=0.11.1', 'six<=1.15.0',
-                        'enum34;python_version<"3.4"', 'ipaddress;python_version<"3.3"',
-                        'cryptography<=3.3.2', 'future;python_version<"3"', 'ruamel.yaml<0.17', 'pynacl>=1.4.0'],
+      install_requires=['requests==2.27.1', 'python-dateutil==2.8.2', 'certvalidator<=0.11.1', 'six==1.16.0',
+                        'cryptography==36.0.1', 'ruamel.yaml==0.17.20', 'pynacl==1.5.0'],
       description='Python client library for Venafi Trust Protection Platform and Venafi Cloud.',
       long_description=long_description,
       long_description_content_type="text/markdown",
       author='Venafi, Inc.',
       author_email='opensource@venafi.com',
       license='ASL',
       classifiers=[
-          'Programming Language :: Python :: 2',
-          'Programming Language :: Python :: 2.7',
-          'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.4',
-          'Programming Language :: Python :: 3.5',
-          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.9',
+          'Programming Language :: Python :: 3.10',
           'Operating System :: OS Independent',
           "License :: OSI Approved :: Apache Software License",
       ])