[repo-helper] Configuration Update

.github/workflows/flake8.yml

@@ -10,12 +10,11 @@ on:
       - 'imgbot'
   pull_request:
 
-permissions:
-  contents: read
-
 jobs:
   Run:
     name: "Flake8"
+    permissions:
+      contents: read
     runs-on: "ubuntu-22.04"
 
     steps:

.github/workflows/mypy.yml

@@ -10,11 +10,10 @@ on:
       - 'imgbot'
   pull_request:
 
-permissions:
-  contents: read
-
 jobs:
   Run:
+    permissions:
+      contents: read
     name: "mypy / ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
 

.github/workflows/octocheese.yml

@@ -6,11 +6,10 @@ on:
   schedule:
     - cron: 0 12 * * *
 
-permissions:
-  contents: write
-
 jobs:
   Run:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
       - uses: domdfcoding/octocheese@master

.github/workflows/python_ci.yml

@@ -11,13 +11,11 @@ on:
 
   pull_request:
 
-permissions:
-  actions: write
-  issues: write
-  contents: read
-
 jobs:
   tests:
+    permissions:
+      actions: write
+      contents: read
     name: "windows-2022 / Python ${{ matrix.config.python-version }}"
     runs-on: "windows-2022"
     continue-on-error: ${{ matrix.config.experimental }}

.github/workflows/python_ci_linux.yml

@@ -12,13 +12,11 @@ on:
       - '*'
   pull_request:
 
-permissions:
-  actions: write
-  issues: write
-  contents: read
-
 jobs:
   tests:
+    permissions:
+      actions: write
+      contents: read
     name: "ubuntu-22.04 / Python ${{ matrix.config.python-version }}"
     runs-on: "ubuntu-22.04"
     continue-on-error: ${{ matrix.config.experimental }}
@@ -82,6 +80,9 @@ jobs:
 
   Coverage:
     needs: tests
+    permissions:
+      actions: write
+      contents: read
     runs-on: "ubuntu-22.04"
     steps:
       - name: Checkout 🛎️
@@ -131,7 +132,10 @@ jobs:
 
   Deploy:
     needs: tests
-
+    permissions:
+      actions: write
+      issues: write
+      contents: read
     runs-on: "ubuntu-22.04"
     steps:
       - name: Checkout 🛎️
@@ -162,7 +166,7 @@ jobs:
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
-          skip_existing: true
+          skip-existing: true
 
       - name: Close milestone 🚪
         if: startsWith(github.ref, 'refs/tags/')

.github/workflows/python_ci_macos.yml

@@ -11,13 +11,11 @@ on:
 
   pull_request:
 
-permissions:
-  actions: write
-  issues: write
-  contents: read
-
 jobs:
   tests:
+    permissions:
+      actions: write
+      contents: read
     name: "macos-${{ matrix.config.os-ver }} / Python ${{ matrix.config.python-version }}"
     runs-on: "macos-${{ matrix.config.os-ver }}"
     continue-on-error: ${{ matrix.config.experimental }}

.gitignore

@@ -47,7 +47,6 @@ docs/_build/
 doc/build
 target/
 .ipynb_checkpoints
-.python-version
 celerybeat-schedule
 celerybeat.pid
 *.sage.py

README.rst

@@ -102,11 +102,11 @@ The pertinent changes from Python 3.6 to Python 3.9 are:
 	:target: https://github.com/domdfcoding/pprint36/commit/master
 	:alt: GitHub last commit
 
-.. |maintained| image:: https://img.shields.io/maintenance/yes/2025
+.. |maintained| image:: https://img.shields.io/maintenance/yes/2026
 	:alt: Maintenance
 
 .. |pypi-downloads| image:: https://img.shields.io/pypi/dm/pprint36
-	:target: https://pypi.org/project/pprint36/
+	:target: https://pypistats.org/packages/pprint36
 	:alt: PyPI - Downloads
 
 .. end shields

justfile

@@ -12,6 +12,9 @@ unused-imports:
 incomplete-defs:
 	tox -e lint -- --select MAN
 
+commas:
+	tox -e lint -- --select C810,C812,C813,C814,C815,C816
+
 vdiff:
 	git diff $(repo-helper show version -q)..HEAD
 

pprint36/_pprint.py

@@ -46,15 +46,24 @@
 def pprint(object, stream=None, indent=1, width=80, depth=None, *, compact=False, sort_dicts=True):
 	"""Pretty-print a Python object to a stream [default is sys.stdout]."""
 	printer = PrettyPrinter(
-			stream=stream, indent=indent, width=width, depth=depth, compact=compact, sort_dicts=sort_dicts
+			stream=stream,
+			indent=indent,
+			width=width,
+			depth=depth,
+			compact=compact,
+			sort_dicts=sort_dicts,
 			)
 	printer.pprint(object)
 
 
 def pformat(object, indent=1, width=80, depth=None, *, compact=False, sort_dicts=True):
 	"""Format a Python object into a pretty-printed representation."""
 	return PrettyPrinter(
-			indent=indent, width=width, depth=depth, compact=compact, sort_dicts=sort_dicts
+			indent=indent,
+			width=width,
+			depth=depth,
+			compact=compact,
+			sort_dicts=sort_dicts,
 			).pformat(object)
 
 

tests/_test_set.py

@@ -243,12 +243,12 @@
 	def test_pickling(self):
 		for i in range(pickle.HIGHEST_PROTOCOL + 1):
 			p = pickle.dumps(self.s, i)
 			dup = pickle.loads(p)
 			self.assertEqual(self.s, dup, f"{self.s} != {dup}")
 			if type(self.s) not in (set, frozenset):
 				self.s.x = 10
 				p = pickle.dumps(self.s, i)
 				dup = pickle.loads(p)
 				self.assertEqual(self.s.x, dup.x)
 
 	def test_iterator_pickling(self):
@@ -256,20 +256,20 @@
 			itorg = iter(self.s)
 			data = self.thetype(self.s)
 			d = pickle.dumps(itorg, proto)
 			it = pickle.loads(d)
 			# Set iterators unpickle as list iterators due to the
 			# undefined order of set items.
 			# self.assertEqual(type(itorg), type(it))
 			self.assertIsInstance(it, collections.abc.Iterator)
 			self.assertEqual(self.thetype(it), data)
 
 			it = pickle.loads(d)
 			try:
 				drop = next(it)
 			except StopIteration:
 				continue
 			d = pickle.dumps(it, proto)
 			it = pickle.loads(d)
 			self.assertEqual(self.thetype(it), data - self.thetype((drop, )))
 
 	def test_deepcopy(self):
@@ -726,7 +726,7 @@
 				frozenset(range(0)),
 				frozenset(frozenset()),
 				frozenset(f),
-				f
+				f,
 				]
 		# All of the empty frozensets should have just one id()
 		self.assertEqual(len(set(map(id, efs))), 1)
@@ -836,7 +836,7 @@
 				f,
 				F,
 				Frozenset(f),
-				Frozenset(F)
+				Frozenset(F),
 				]
 		# All empty frozenset subclass instances should have different ids
 		self.assertEqual(len(set(map(id, efs))), len(efs))
@@ -954,7 +954,7 @@
 	def test_pickling(self):
 		for proto in range(pickle.HIGHEST_PROTOCOL + 1):
 			p = pickle.dumps(self.set, proto)
 			copy = pickle.loads(p)
 			self.assertEqual(self.set, copy, f"{self.set} != {copy}")
 
 	def test_issue_37219(self):