protool 1.1.1__tar.gz → 2.0.0__tar.gz

{protool-1.1.1 → protool-2.0.0}/PKG-INFO

@@ -1,26 +1,26 @@
 Metadata-Version: 2.1
 Name: protool
-Version: 1.1.1
+Version: 2.0.0
 Summary: A tool for dealing with provisioning profiles
 Home-page: https://github.com/Microsoft/protool
 License: MIT
 Keywords: provisioning,profiles,apple,ios,xcode,mobileprovision
 Author: Dale Myers
 Author-email: dalemy@microsoft.com
-Requires-Python: >=3.6.2,<4.0.0
+Requires-Python: >=3.8,<4.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Environment :: MacOS X
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development
 Classifier: Topic :: Utilities
-Requires-Dist: pyOpenSSL (>=19.0.0,<20.0.0)
+Requires-Dist: pyOpenSSL (>=23.2.0,<24.0.0)
 Project-URL: Repository, https://github.com/Microsoft/protool
 Description-Content-Type: text/markdown
 

{protool-1.1.1 → protool-2.0.0}/protool/__init__.py

@@ -12,8 +12,8 @@ import shutil
 import subprocess
 import sys
 import tempfile
-from typing import Any, cast, Dict, Iterable, List, Optional
-import OpenSSL
+from typing import Any, cast, Dict, List, Optional
+from OpenSSL import crypto
 
 
 class ProvisioningType(Enum):
@@ -66,16 +66,16 @@ class ProvisioningProfile:
 
         raise Exception("Unable to determine provisioning profile type")
 
-    def developer_certificates(self) -> List[OpenSSL.crypto.X509]:
+    def developer_certificates(self) -> List[crypto.X509]:
         """Returns developer certificates as a list of PyOpenSSL X509."""
-        dev_certs: List[OpenSSL.crypto.X509] = []
+        dev_certs: List[crypto.X509] = []
         raw_cert_items: List[str] = cast(
             List[str], self._contents.get("DeveloperCertificates", [])
         )
 
         for cert_item in raw_cert_items:
-            loaded_cert: OpenSSL.crypto.X509 = OpenSSL.crypto.load_certificate(
-                OpenSSL.crypto.FILETYPE_ASN1, cert_item
+            loaded_cert: crypto.X509 = crypto.load_certificate(
+                crypto.FILETYPE_ASN1, cert_item.encode()
             )
             dev_certs.append(loaded_cert)
 
@@ -199,14 +199,14 @@ def diff(
     a_temp_path = os.path.join(temp_dir, profile_a.file_name)
     b_temp_path = os.path.join(temp_dir, profile_b.file_name)
 
-    with open(a_temp_path, "w") as temp_profile:
+    with open(a_temp_path, "w", encoding="utf-8") as temp_profile:
         temp_profile.write(a_xml)
 
-    with open(b_temp_path, "w") as temp_profile:
+    with open(b_temp_path, "w", encoding="utf-8") as temp_profile:
         temp_profile.write(b_xml)
 
     # We deliberately don't wrap the tool so that arguments work as well
-    diff_command = '%s "%s" "%s"' % (diff_tool, a_temp_path, b_temp_path)
+    diff_command = f'{diff_tool} "{a_temp_path}" "{b_temp_path}"'
 
     try:
         diff_contents = subprocess.check_output(

{protool-1.1.1 → protool-2.0.0}/protool/command_line.py

@@ -81,10 +81,11 @@ def _handle_read(args: argparse.Namespace) -> int:
 
     try:
         result = json.dumps(value)
+        print(result)
         return 0
-    except Exception:
+    except Exception as ex:
         print(
-            f"Unable to serialize values. Raw result: {result}",
+            f"Unable to serialize values: {ex}",
             file=sys.stderr,
         )
         return 1

{protool-1.1.1 → protool-2.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "protool"
-version = "1.1.1"
+version = "2.0.0"
 description = "A tool for dealing with provisioning profiles"
 
 license = "MIT"
@@ -22,7 +22,10 @@ classifiers = [
     'Environment :: MacOS X',
     'Intended Audience :: Developers',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
     'Topic :: Software Development',
     'Topic :: Utilities'
 ]
@@ -31,16 +34,17 @@ classifiers = [
 protool = 'protool:command_line.run'
 
 [tool.poetry.dependencies]
-python = "^3.6.2"
-pyOpenSSL ="^19.0.0"
+python = "^3.8"
+pyOpenSSL ="^23.2.0"
 
 [tool.poetry.dev-dependencies]
-black = "=21.5b2"
-mypy = "=0.812"
-pylint = "=2.8.3"
-pytest = "=6.2.4"
-pytest-cov = "=2.12.1"
+black = "^23.7.0"
+mypy = "^1.4.1"
+pylint = "^2.17.5"
+pytest = "^7.4.0"
+pytest-cov = "^4.1.0"
+types-pyOpenSSL = "^23.2.0.2"
 
 [build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

protool-1.1.1/setup.py

@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['protool']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['pyOpenSSL>=19.0.0,<20.0.0']
-
-entry_points = \
-{'console_scripts': ['protool = protool:command_line.run']}
-
-setup_kwargs = {
-    'name': 'protool',
-    'version': '1.1.1',
-    'description': 'A tool for dealing with provisioning profiles',
-    'long_description': '# protool \n\n[![PyPi Version](https://img.shields.io/pypi/v/protool.svg)](https://pypi.org/project/protool/)\n[![License](https://img.shields.io/pypi/l/protool.svg)](https://github.com/Microsoft/protool/blob/master/LICENSE)\n\nA tool for dealing with provisioning profiles.\n\nWhat can it do? \n\n* Read profiles as XML or as a dictionary\n* Read the values from the profile\n* Diff two profiles to see what has changed\n\n### Installation\n\n    pip install protool\n\n### Examples:\n\n    import protool\n    profile = protool.ProvisioningProfile("/path/to/profile")\n\n    # Get the diff of two profiles\n    diff = protool.diff("/path/to/first", "/path/to/second", tool_override="diff")\n\n    # Get the UUID of a profile\n    print profile.uuid\n\n    # Get the full XML of the profile\n    print profile.xml\n\n    # Get the parsed contents of the profile as a dictionary\n    print profile.contents()\n\n\nAlternatively, from the command line:\n\n    # Get the diff\n    protool diff --profiles /path/to/profile1 /path/to/profile2 --tool diff\n\n    # Get the UUID of a profile\n    protool read --profile /path/to/profile --key UUID\n\n    # Get the raw XML (identical to using `security cms -D -i /path/to/profile`)\n    protool decode --profile /path/to/profile\n\n\n# Contributing\n\nThis project welcomes contributions and suggestions.  Most contributions require you to agree to a\nContributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us\nthe rights to use your contribution. For details, visit https://cla.microsoft.com.\n\nWhen you submit a pull request, a CLA-bot will automatically determine whether you need to provide\na CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions\nprovided by the bot. You will only need to do this once across all repos using our CLA.\n\nThis project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).\nFor more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or\ncontact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.\n',
-    'author': 'Dale Myers',
-    'author_email': 'dalemy@microsoft.com',
-    'maintainer': None,
-    'maintainer_email': None,
-    'url': 'https://github.com/Microsoft/protool',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'entry_points': entry_points,
-    'python_requires': '>=3.6.2,<4.0.0',
-}
-
-
-setup(**setup_kwargs)