PyPI - ci-helper - Versions diffs - 0.1.0__tar.gz → 0.3.0__tar.gz - Mend

ci-helper 0.1.0tar.gz → 0.3.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

{ci_helper-0.1.0/ci_helper.egg-info → ci_helper-0.3.0}/PKG-INFO RENAMED Viewed

@@ -1,22 +1,43 @@
 Metadata-Version: 2.1
 Name: ci-helper
-Version: 0.1.0
+Version: 0.3.0
 Summary: Get info on how a package should be built on CI
-Home-page: http://github.com/chrisjbillington/ci-helper
-Author: Christopher Billington
-Author-email: chrisjbillington@gmail.com
-License: MIT
-Project-URL: Source Code, https://github.com/chrisjbillington/ci-helper
-Project-URL: Download, https://github.com/chrisjbillington/ci-helper/releases
+Author-email: Christopher Billington <chrisjbillington@gmail.com>
+License: MIT License
+        Copyright (c) 2024 Christopher Billington
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+Project-URL: Homepage, https://github.com/chrisjbillington/ci-helper
+Project-URL: Documentation, https://github.com/chrisjbillington/ci-helper
+Project-URL: Repository, https://github.com/chrisjbillington/ci-helper
+Project-URL: Downloads, https://pypi.org/project/ci-helper/
 Project-URL: Tracker, https://github.com/chrisjbillington/ci-helper/issues
-Keywords: build setuptools conda
-Classifier: License :: OSI Approved :: MIT License
+Keywords: build,setuptools,CI
+Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: setuptools
 Requires-Dist: setuptools_scm
-Requires-Dist: importlib_metadata
 Requires-Dist: toml
 Requires-Dist: requests
@@ -69,11 +90,6 @@ pip install ci-helper
 ## Usage:
 ```bash
-# The second-most recent minor Python release, a good choice for the version to run
-# tools from:
-$ ci-helper defaultpython
-3.12
 # All stable, non-end-of-life Python versions:
 $ ci-helper pythons
 3.9,3.10,3.11,3.12,3.13
@@ -82,11 +98,16 @@ $ ci-helper pythons
 $ ci-helper pythons --cibw
 cp39-* cp310-* cp311-* cp312-* cp313-*
+# The second-most recent minor Python release, a good choice for the version to run
+# tools from:
+$ ci-helper defaultpython
+3.12
 # Info about the source Python project in the current working directory - name, version,
 # whether it's a pure Python package, and whether its build or run requirements contain
 # any # environment markers (that is, whether its requirements vary by platform or
 # Python version):
-$ ci-helper distinfo
+$ ci-helper distinfo .
 {
     "name": "ci-helper",
     "version": "0.1.dev1+g5043fb5.d20241202",
@@ -95,13 +116,13 @@ $ ci-helper distinfo
 }
 # Same but one field at a time, more convenient for assigning to environment variables:
-$ ci-helper distinfo name
+$ ci-helper distinfo name .
 ci-helper
-$ ci-helper distinfo version
+$ ci-helper distinfo version .
 0.1.0
-$ ci-helper distinfo is_pure
+$ ci-helper distinfo is_pure .
 true
-$ ci-helper distinfo has_env_markers
+$ ci-helper distinfo has_env_markers .
 false
 ```
@@ -134,7 +155,7 @@ options:
 ```
 ```shell
-$ ci-helper defaultpython -h
+$ ci-helper default_python -h
 usage: ci-helper defaultpython [-h]
 options:
@@ -143,11 +164,15 @@ options:
 ```shell
 $ ci-helper distinfo -h
-usage: ci-helper distinfo [-h] [{name,version,is_pure,has_env_markers}]
+usage: ci-helper distinfo [-h]
+                          [{name,version,is_pure,has_env_markers}]
+                          project_directory
 positional arguments:
   {name,version,is_pure,has_env_markers}
-                        Name of field to output as a single json value, if not given, all info is output as json
+                        Name of field to output as a single json value, if not
+                        given, all info is output as json
+  project_directory     Directory of Python project
 options:
   -h, --help            show this help message and exit

{ci_helper-0.1.0 → ci_helper-0.3.0}/README.md RENAMED Viewed

@@ -47,11 +47,6 @@ pip install ci-helper
 ## Usage:
 ```bash
-# The second-most recent minor Python release, a good choice for the version to run
-# tools from:
-$ ci-helper defaultpython
-3.12
 # All stable, non-end-of-life Python versions:
 $ ci-helper pythons
 3.9,3.10,3.11,3.12,3.13
@@ -60,11 +55,16 @@ $ ci-helper pythons
 $ ci-helper pythons --cibw
 cp39-* cp310-* cp311-* cp312-* cp313-*
+# The second-most recent minor Python release, a good choice for the version to run
+# tools from:
+$ ci-helper defaultpython
+3.12
 # Info about the source Python project in the current working directory - name, version,
 # whether it's a pure Python package, and whether its build or run requirements contain
 # any # environment markers (that is, whether its requirements vary by platform or
 # Python version):
-$ ci-helper distinfo
+$ ci-helper distinfo .
 {
     "name": "ci-helper",
     "version": "0.1.dev1+g5043fb5.d20241202",
@@ -73,13 +73,13 @@ $ ci-helper distinfo
 }
 # Same but one field at a time, more convenient for assigning to environment variables:
-$ ci-helper distinfo name
+$ ci-helper distinfo name .
 ci-helper
-$ ci-helper distinfo version
+$ ci-helper distinfo version .
 0.1.0
-$ ci-helper distinfo is_pure
+$ ci-helper distinfo is_pure .
 true
-$ ci-helper distinfo has_env_markers
+$ ci-helper distinfo has_env_markers .
 false
 ```
@@ -112,7 +112,7 @@ options:
 ```
 ```shell
-$ ci-helper defaultpython -h
+$ ci-helper default_python -h
 usage: ci-helper defaultpython [-h]
 options:
@@ -121,11 +121,15 @@ options:
 ```shell
 $ ci-helper distinfo -h
-usage: ci-helper distinfo [-h] [{name,version,is_pure,has_env_markers}]
+usage: ci-helper distinfo [-h]
+                          [{name,version,is_pure,has_env_markers}]
+                          project_directory
 positional arguments:
   {name,version,is_pure,has_env_markers}
-                        Name of field to output as a single json value, if not given, all info is output as json
+                        Name of field to output as a single json value, if not
+                        given, all info is output as json
+  project_directory     Directory of Python project
 options:
   -h, --help            show this help message and exit

{ci_helper-0.1.0 → ci_helper-0.3.0}/ci_helper/__main__.py RENAMED Viewed

@@ -87,13 +87,39 @@ def main():
         help="Name of field to output as a single json value, "
         + "if not given, all info is output as json",
     )
+    parser_distinfo.add_argument(
+        'project_directory',
+        help="Directory of Python project",
+    )
     args = parser.parse_args()
-    if args.command == 'distinfo':
-        # distinfo_args = parser_distinfo.parse_args()
-        cmd = [sys.executable, *setup_py('.'), '-q', 'ci_distinfo']
-        result = subprocess.run(cmd, check=True, capture_output=True)
+    if args.command == 'pythons':
+        pythons = get_pythons()
+        if args.cibw:
+            print(' '.join([f"cp{p.replace('.', '')}-*" for p in pythons]))
+        else:
+            print(','.join(pythons))
+    elif args.command == 'defaultpython':
+        pythons = get_pythons()
+        print(pythons[-2])
+    elif args.command == 'distinfo':
+        cmd = [
+            sys.executable,
+            *setup_py('.'),
+            '-q',
+            '--command-packages=ci_helper.command',
+            'ci_distinfo',
+        ]
+        try:
+            result = subprocess.run(
+                cmd, cwd=args.project_directory, check=True, capture_output=True
+            )
+        except subprocess.CalledProcessError as e:
+            sys.stderr.write(e.stderr.decode('utf8'))
+            raise
         info = result.stdout.decode('utf8')
         if args.field is not None:
             info = json.loads(info)
@@ -104,15 +130,7 @@ def main():
                 print(json.dumps(value))
         else:
             print(info)
-    elif args.command == 'pythons':
-        pythons = get_pythons()
-        if args.cibw:
-            print(' '.join([f"cp{p.replace('.', '')}-*" for p in pythons]))
-        else:
-            print(','.join(pythons))
-    elif args.command == 'defaultpython':
-        pythons = get_pythons()
-        print(pythons[-2])
     sys.exit(0)

{ci_helper-0.1.0 → ci_helper-0.3.0}/ci_helper/__version__.py RENAMED Viewed

@@ -1,9 +1,6 @@
 import os
 from pathlib import Path
-try:
-    import importlib.metadata as importlib_metadata
-except ImportError:
-    import importlib_metadata
+import importlib.metadata as importlib_metadata
 VERSION_SCHEME = {
     "version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),

ci_helper-0.3.0/ci_helper/command/__init__.py ADDED Viewed

File without changes

{ci_helper-0.1.0 → ci_helper-0.3.0/ci_helper.egg-info}/PKG-INFO RENAMED Viewed

@@ -1,22 +1,43 @@
 Metadata-Version: 2.1
 Name: ci-helper
-Version: 0.1.0
+Version: 0.3.0
 Summary: Get info on how a package should be built on CI
-Home-page: http://github.com/chrisjbillington/ci-helper
-Author: Christopher Billington
-Author-email: chrisjbillington@gmail.com
-License: MIT
-Project-URL: Source Code, https://github.com/chrisjbillington/ci-helper
-Project-URL: Download, https://github.com/chrisjbillington/ci-helper/releases
+Author-email: Christopher Billington <chrisjbillington@gmail.com>
+License: MIT License
+        Copyright (c) 2024 Christopher Billington
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+Project-URL: Homepage, https://github.com/chrisjbillington/ci-helper
+Project-URL: Documentation, https://github.com/chrisjbillington/ci-helper
+Project-URL: Repository, https://github.com/chrisjbillington/ci-helper
+Project-URL: Downloads, https://pypi.org/project/ci-helper/
 Project-URL: Tracker, https://github.com/chrisjbillington/ci-helper/issues
-Keywords: build setuptools conda
-Classifier: License :: OSI Approved :: MIT License
+Keywords: build,setuptools,CI
+Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Requires-Dist: setuptools
 Requires-Dist: setuptools_scm
-Requires-Dist: importlib_metadata
 Requires-Dist: toml
 Requires-Dist: requests
@@ -69,11 +90,6 @@ pip install ci-helper
 ## Usage:
 ```bash
-# The second-most recent minor Python release, a good choice for the version to run
-# tools from:
-$ ci-helper defaultpython
-3.12
 # All stable, non-end-of-life Python versions:
 $ ci-helper pythons
 3.9,3.10,3.11,3.12,3.13
@@ -82,11 +98,16 @@ $ ci-helper pythons
 $ ci-helper pythons --cibw
 cp39-* cp310-* cp311-* cp312-* cp313-*
+# The second-most recent minor Python release, a good choice for the version to run
+# tools from:
+$ ci-helper defaultpython
+3.12
 # Info about the source Python project in the current working directory - name, version,
 # whether it's a pure Python package, and whether its build or run requirements contain
 # any # environment markers (that is, whether its requirements vary by platform or
 # Python version):
-$ ci-helper distinfo
+$ ci-helper distinfo .
 {
     "name": "ci-helper",
     "version": "0.1.dev1+g5043fb5.d20241202",
@@ -95,13 +116,13 @@ $ ci-helper distinfo
 }
 # Same but one field at a time, more convenient for assigning to environment variables:
-$ ci-helper distinfo name
+$ ci-helper distinfo name .
 ci-helper
-$ ci-helper distinfo version
+$ ci-helper distinfo version .
 0.1.0
-$ ci-helper distinfo is_pure
+$ ci-helper distinfo is_pure .
 true
-$ ci-helper distinfo has_env_markers
+$ ci-helper distinfo has_env_markers .
 false
 ```
@@ -134,7 +155,7 @@ options:
 ```
 ```shell
-$ ci-helper defaultpython -h
+$ ci-helper default_python -h
 usage: ci-helper defaultpython [-h]
 options:
@@ -143,11 +164,15 @@ options:
 ```shell
 $ ci-helper distinfo -h
-usage: ci-helper distinfo [-h] [{name,version,is_pure,has_env_markers}]
+usage: ci-helper distinfo [-h]
+                          [{name,version,is_pure,has_env_markers}]
+                          project_directory
 positional arguments:
   {name,version,is_pure,has_env_markers}
-                        Name of field to output as a single json value, if not given, all info is output as json
+                        Name of field to output as a single json value, if not
+                        given, all info is output as json
+  project_directory     Directory of Python project
 options:
   -h, --help            show this help message and exit

{ci_helper-0.1.0 → ci_helper-0.3.0}/ci_helper.egg-info/SOURCES.txt RENAMED Viewed

@@ -3,15 +3,14 @@ LICENSE.txt
 README.md
 ci_distinfo.py
 pyproject.toml
-setup.cfg
-setup.py
 ci_helper/__init__.py
 ci_helper/__main__.py
 ci_helper/__version__.py
-ci_helper/ci_distinfo.py
 ci_helper.egg-info/PKG-INFO
 ci_helper.egg-info/SOURCES.txt
 ci_helper.egg-info/dependency_links.txt
 ci_helper.egg-info/entry_points.txt
 ci_helper.egg-info/requires.txt
-ci_helper.egg-info/top_level.txt
+ci_helper.egg-info/top_level.txt
+ci_helper/command/__init__.py
+ci_helper/command/ci_distinfo.py

{ci_helper-0.1.0 → ci_helper-0.3.0}/ci_helper.egg-info/requires.txt RENAMED Viewed

@@ -1,4 +1,4 @@
+setuptools
 setuptools_scm
-importlib_metadata
 toml
 requests

ci_helper-0.3.0/pyproject.toml ADDED Viewed

@@ -0,0 +1,44 @@
+[build-system]
+requires = ["setuptools", "wheel", "setuptools_scm"]
+build-backend = "setuptools.build_meta"
+[tool.setuptools_scm]
+local_scheme = "no-local-version"
+[tool.setuptools.packages]
+find = {namespaces = false}
+[project]
+name = "ci-helper"
+description = "Get info on how a package should be built on CI"
+authors = [
+    {name = "Christopher Billington", email = "chrisjbillington@gmail.com"},
+]
+keywords = ["build", "setuptools", "CI"]
+license = {file = 'LICENSE.txt'}
+classifiers = [
+    "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python :: 3 :: Only",
+]
+requires-python = ">=3.9"
+dependencies = [
+    "setuptools",
+    "setuptools_scm",
+    "toml",
+    "requests",
+]
+dynamic = ["version"]
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+[project.urls]
+Homepage = "https://github.com/chrisjbillington/ci-helper"
+Documentation = "https://github.com/chrisjbillington/ci-helper"
+Repository = "https://github.com/chrisjbillington/ci-helper"
+Downloads = "https://pypi.org/project/ci-helper/"
+Tracker = "https://github.com/chrisjbillington/ci-helper/issues"
+[project.scripts]
+ci-helper = "ci_helper.__main__:main"

ci_helper-0.3.0/setup.cfg ADDED Viewed

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build =
+tag_date = 0

ci_helper-0.1.0/pyproject.toml DELETED Viewed

	@@ -1,2 +0,0 @@
1	- [build-system]
2	- requires = ["setuptools", "wheel", "setuptools_scm"]

ci_helper-0.1.0/setup.cfg DELETED Viewed

@@ -1,35 +0,0 @@
-[metadata]
-name = ci-helper
-description = Get info on how a package should be built on CI
-long_description = file: README.md
-long_description_content_type = text/markdown
-author = Christopher Billington
-author_email = chrisjbillington@gmail.com
-url = http://github.com/chrisjbillington/ci-helper
-project_urls =
-	Source Code=https://github.com/chrisjbillington/ci-helper
-	Download=https://github.com/chrisjbillington/ci-helper/releases
-	Tracker=https://github.com/chrisjbillington/ci-helper/issues
-keywords = build setuptools conda
-license = MIT
-classifiers =
-	License :: OSI Approved :: MIT License
-	Programming Language :: Python :: 3 :: Only
-[options]
-packages = find:
-python_requires = >=3.8
-install_requires =
-	setuptools_scm
-	importlib_metadata
-	toml
-	requests
-[options.entry_points]
-console_scripts =
-	ci-helper = ci_helper.__main__:main
-[egg_info]
-tag_build =
-tag_date = 0

ci_helper-0.1.0/setup.py DELETED Viewed

@@ -1,29 +0,0 @@
-import sys
-import os
-from setuptools import setup
-import sysconfig
-from pathlib import Path
-# Normally packages don't have to do this - the dist_conda command should be
-# automatically available. But since we're installing it, it isn't there yet!
-from ci_helper.ci_distinfo import ci_distinfo
-CMDCLASS = {'ci_distinfo': ci_distinfo}
-VERSION_SCHEME = {
-    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
-    "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
-}
-SITE_PACKAGES = sysconfig.get_path('purelib')
-# Add the dist_conda command to the distlib vendored in setuptools:
-setuptools_distutils = Path(SITE_PACKAGES) / 'setuptools' / '_distutils' / 'command'
-DATA_FILES = [
-    (str(setuptools_distutils.relative_to(sys.prefix)), ["ci_distinfo.py"]),
-]
-setup(
-    use_scm_version=VERSION_SCHEME,
-    cmdclass=CMDCLASS,
-    data_files=DATA_FILES,
-)