giterator 0.1.0__tar.gz → 0.3.0__tar.gz

{giterator-0.1.0 → giterator-0.3.0}/.carthorse.yml

@@ -3,7 +3,7 @@ carthorse:
   when:
     - version-not-tagged
   actions:
-    - run: "sudo pip install -e .[build]"
-    - run: "sudo python setup.py sdist bdist_wheel"
+    - run: "pip install -e .[build]"
+    - run: "python setup.py sdist bdist_wheel"
     - run: "twine upload -u __token__ -p $PYPI_TOKEN dist/*"
     - create-tag

{giterator-0.1.0 → giterator-0.3.0}/.circleci/config.yml

@@ -1,16 +1,16 @@
 version: 2.1
 
 orbs:
-  python: cjw296/python-ci@2.1
+  python: cjw296/python-ci@6
 
 common: &common
   jobs:
 
     - python/pip-run-tests:
+        name: tests
         matrix:
           parameters:
             image:
-              - circleci/python:3.6
               - circleci/python:3.9
 
     - python/coverage:
@@ -22,7 +22,7 @@ common: &common
         name: release
         config: .carthorse.yml
         requires:
-          - coverage
+          - tests
         filters:
           branches:
             only: master
@@ -34,7 +34,7 @@ workflows:
     <<: *common
     triggers:
       - schedule:
-          cron: "0 0 * * *"
+          cron: "0 6 18 * *"
           filters:
             branches:
               only: master

{giterator-0.1.0 → giterator-0.3.0}/.coveragerc

@@ -1,2 +1,3 @@
 [run]
 source = giterator,tests
+parallel = true

giterator-0.3.0/.readthedocs.yml

@@ -0,0 +1,16 @@
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+         - build
+sphinx:
+  fail_on_warning: true
+  configuration: docs/conf.py

{giterator-0.1.0 → giterator-0.3.0}/PKG-INFO

@@ -1,19 +1,37 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: giterator
-Version: 0.1.0
+Version: 0.3.0
 Summary: Python tools for doing git things.
 Home-page: https://github.com/simplistix/giterator
 Author: Chris Withers
 Author-email: chris@withers.org
 License: MIT
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.9
+Requires-Python: >=3.9
+License-File: LICENSE.rst
 Provides-Extra: test
+Requires-Dist: coverage-enable-subprocess; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: sybil; extra == "test"
+Requires-Dist: testfixtures; extra == "test"
 Provides-Extra: build
-License-File: LICENSE.rst
+Requires-Dist: furo; extra == "build"
+Requires-Dist: sphinx; extra == "build"
+Requires-Dist: setuptools-git; extra == "build"
+Requires-Dist: twine; extra == "build"
+Requires-Dist: wheel; extra == "build"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-python
+Dynamic: summary
 
 
 giterator
@@ -28,5 +46,3 @@ giterator
 .. _Docs: http://giterator.readthedocs.org/en/latest/
 
 Python tools for doing git things.
-
-

giterator-0.3.0/docs/changes.rst

@@ -0,0 +1,22 @@
+.. py:currentmodule:: giterator
+
+Changes
+=======
+
+0.3.0 (4 Feb 2026)
+------------------
+
+- General refresh.
+
+- Add ``short`` parameter to methods that return commit hashes,
+  allowing the full commit hash to be returned.
+
+0.2.0 (1 Oct 2021)
+------------------
+
+- Methods that create commits now return the newly-create commit hash.
+
+0.1.0 (28 Sep 2021)
+-------------------
+
+- Initial release

{giterator-0.1.0 → giterator-0.3.0}/docs/conf.py

@@ -4,7 +4,7 @@ import datetime, os, pkg_resources
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
 intersphinx_mapping = {
-    'http://docs.python.org': None,
+    'python': ('https://docs.python.org/3/', None),
 }
 
 extensions = [

{giterator-0.1.0 → giterator-0.3.0}/giterator/git.py

@@ -92,13 +92,20 @@ class Git:
     def _coerce_date(dt):
         return dt if isinstance(dt, str) else dt.isoformat()
 
-    def commit(self, msg: str, author_date: Date = None, commit_date: Date = None):
+    def commit(
+            self,
+            msg: str,
+            author_date: Date = None,
+            commit_date: Date = None,
+            short: bool = True,
+    ) -> str:
         """
         Commit changes in this repo, including and new or deleted files.
 
         :param msg: The commit message.
         :param author_date: The author date.
         :param commit_date: The commit date. Defaults to author date if not specified.
+        :param short: Return the short commit hash instead of the full 40-character hash.
         """
         self('add', '.')
         command = ['commit', '-m', msg]
@@ -108,9 +115,14 @@ class Git:
         if commit_date:
             env['GIT_COMMITTER_DATE'] = self._coerce_date(commit_date)
         self(*command, env=env)
-
-    def rev_parse(self, label: str):
-        return self('rev-parse', '--verify', '-q', '--short', label).strip()
+        return self.rev_parse('HEAD', short)
+
+    def rev_parse(self, label: str, short: bool = True) -> str:
+        command = ['rev-parse', '--verify', '-q']
+        if short:
+            command.append('--short')
+        command.append(label)
+        return self(*command).strip()
 
     def tag(self, name: str) -> None:
         """

{giterator-0.1.0 → giterator-0.3.0}/giterator/testing.py

@@ -26,8 +26,14 @@ class Repo(Git):
         repo.init(user or User(name='Giterator', email='giterator@example.com'))
         return repo
 
-    def commit(self, msg: str, author_date: Date = None, commit_date: Date = None):
-        super().commit(msg, author_date, commit_date or author_date)
+    def commit(
+        self,
+        msg: str,
+        author_date: Date = None,
+        commit_date: Date = None,
+        short: bool = True,
+    ) -> str:
+        return super().commit(msg, author_date, commit_date or author_date, short=short)
 
     def commit_content(
         self,
@@ -36,7 +42,8 @@ class Repo(Git):
         *,
         tag: str = None,
         branch: str = None,
-    ) -> None:
+        short: bool = True,
+    ) -> str:
         """
         Write new context based on the prefix and then commit it
         at the specified datetime, or using at a sequence of increasing
@@ -45,6 +52,7 @@ class Repo(Git):
         if branch:
             self.branch(branch)
         (self.path / prefix).write_text(f'{prefix} content')
-        self.commit('a commit', dt or self._clock.now())
+        commit = self.commit('a commit', dt or self._clock.now(), short=short)
         if tag:
             self.tag(tag)
+        return commit

{giterator-0.1.0 → giterator-0.3.0}/giterator.egg-info/PKG-INFO

@@ -1,19 +1,37 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: giterator
-Version: 0.1.0
+Version: 0.3.0
 Summary: Python tools for doing git things.
 Home-page: https://github.com/simplistix/giterator
 Author: Chris Withers
 Author-email: chris@withers.org
 License: MIT
-Platform: UNKNOWN
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.9
+Requires-Python: >=3.9
+License-File: LICENSE.rst
 Provides-Extra: test
+Requires-Dist: coverage-enable-subprocess; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: sybil; extra == "test"
+Requires-Dist: testfixtures; extra == "test"
 Provides-Extra: build
-License-File: LICENSE.rst
+Requires-Dist: furo; extra == "build"
+Requires-Dist: sphinx; extra == "build"
+Requires-Dist: setuptools-git; extra == "build"
+Requires-Dist: twine; extra == "build"
+Requires-Dist: wheel; extra == "build"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-python
+Dynamic: summary
 
 
 giterator
@@ -28,5 +46,3 @@ giterator
 .. _Docs: http://giterator.readthedocs.org/en/latest/
 
 Python tools for doing git things.
-
-

{giterator-0.1.0 → giterator-0.3.0}/giterator.egg-info/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 giterator = giterator.cli:main
-

{giterator-0.1.0 → giterator-0.3.0}/giterator.egg-info/requires.txt

@@ -7,6 +7,7 @@ twine
 wheel
 
 [test]
+coverage-enable-subprocess
 pytest
 pytest-cov
 sybil

{giterator-0.1.0 → giterator-0.3.0}/setup.py

@@ -9,7 +9,7 @@ base_dir = os.path.dirname(__file__)
 
 setup(
     name='giterator',
-    version='0.1.0',
+    version='0.3.0',
     author='Chris Withers',
     author_email='chris@withers.org',
     license='MIT',
@@ -21,14 +21,14 @@ setup(
     classifiers=[
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.9',
     ],
     packages=find_packages(exclude=["tests"]),
     zip_safe=False,
     include_package_data=True,
+    python_requires=">=3.9",
     extras_require=dict(
         test=[
+            'coverage-enable-subprocess',
             'pytest',
             'pytest-cov',
             'sybil',

{giterator-0.1.0 → giterator-0.3.0}/tests/conftest.py

@@ -1,3 +1,4 @@
+import os
 from pathlib import Path
 
 import pytest
@@ -7,6 +8,10 @@ from giterator import Git, User
 from giterator.testing import Repo
 
 
+# Enable coverage for subprocesses (CLI tests)
+os.environ.setdefault('COVERAGE_PROCESS_START', str(Path(__file__).parent.parent / '.coveragerc'))
+
+
 @pytest.fixture()
 def tmpdir():
     with TempDirectory() as _dir:

{giterator-0.1.0 → giterator-0.3.0}/tests/test_git.py

@@ -38,9 +38,10 @@ class TestInit:
 class TestClone:
 
     def test_minimal(self, repo: Repo, tmpdir: TempDirectory):
-        repo.commit_content('a')
+        hash = repo.commit_content('a')
         git = Git.clone(repo.path, tmpdir.getpath('clone'))
         commit, = git('log', '--format=%h').split()
+        compare(hash, expected=commit)
         compare(git.git('show', '--pretty=format:%s', '--stat', commit), expected=(
             'a commit\n'
             ' a | 1 +\n'
@@ -133,14 +134,14 @@ class TestCommit:
         (git.path / 'a').write_text('content')
         dt = datetime(2001, 1, 1, 10)
         git.commit('a commit', dt, dt)
-        compare(git('log', '--format=%aI %cI'),
+        compare(git('log', '--format=%aI %cI').replace("Z", "+00:00"),
                 expected='2001-01-01T10:00:00+00:00 2001-01-01T10:00:00+00:00\n')
 
     def test_with_tz_datetime(self, git: Git):
         (git.path / 'a').write_text('content')
         dt = datetime(2001, 1, 1, 10).astimezone(timezone.utc)
         git.commit('a commit', dt, dt)
-        compare(git('log', '--format=%aI %cI'),
+        compare(git('log', '--format=%aI %cI').replace("Z", "+00:00"),
                 expected='2001-01-01T10:00:00+00:00 2001-01-01T10:00:00+00:00\n')
 
 
@@ -150,6 +151,11 @@ class TestLabels:
         repo.commit_content('a', datetime(2001, 1, 1, 10))
         compare(repo.rev_parse('HEAD'), expected='5ee580a')
 
+    def test_rev_parse_full(self, repo: Repo):
+        repo.commit_content('a', datetime(2001, 1, 1, 10))
+        compare(repo.rev_parse('HEAD', short=False),
+                expected='5ee580aba98816af22cfa4e76ddf96bb3994964b')
+
     def test_tags_empty(self, repo: Repo):
         compare(repo.tags(), expected=[])
 

{giterator-0.1.0 → giterator-0.3.0}/tests/test_testing.py

@@ -32,7 +32,7 @@ class TestRepo:
         upstream = Repo.make(root / 'upstream')
         upstream.commit_content('a')
         clone = Repo.clone(upstream, root / 'clone')
-        tmpdir.check('clone', 'upstream')
+        tmpdir.compare(('clone', 'upstream'), recursive=False)
         config = (clone.path / '.git' / 'config').read_text()
         assert 'name = Giterator' in config
         assert 'email = giterator@example.com' in config
@@ -40,7 +40,7 @@ class TestRepo:
     def test_with_user(self, repo: Repo, tmpdir: TempDirectory):
         repo.commit_content('a')
         clone = Repo.clone(repo, 'clone', User('Foo', 'bar@example.com'))
-        tmpdir.check('clone', 'repo')
+        tmpdir.compare(('clone', 'repo'), recursive=False)
         config = (clone.path / '.git' / 'config').read_text()
         assert 'name = Foo' in config
         assert 'email = bar@example.com' in config
@@ -56,3 +56,10 @@ class TestRepo:
             ' a | 1 +\n'
             ' 1 file changed, 1 insertion(+)\n'
         ))
+
+    def test_commit_content(self, repo: Repo):
+        compare(repo.commit_content('a', datetime(2001, 1, 1, 10)), expected='5ee580a')
+
+    def test_commit_content_full(self, repo: Repo):
+        compare(repo.commit_content('a', datetime(2001, 1, 1, 10), short=False),
+                expected='5ee580aba98816af22cfa4e76ddf96bb3994964b')

giterator-0.1.0/.readthedocs.yml

@@ -1,8 +0,0 @@
-version: 2
-python:
-  version: 3.8
-  install:
-    - method: pip
-      path: .
-      extra_requirements:
-         - build

giterator-0.1.0/docs/changes.rst

@@ -1,9 +0,0 @@
-.. py:currentmodule:: giterator
-
-Changes
-=======
-
-0.1.0 (28 Sep 2021)
--------------------
-
-- Initial release