Merge branch 'main' into cancel_invite

Author: staticdev

.github/workflows/build.yml

@@ -9,30 +9,33 @@ jobs:
     strategy:
       matrix:
         python:
-          - { VERSION: "3.6", TOXENV: "py36", ALLOW_FAILURE: false }
           - { VERSION: "3.7", TOXENV: "py37", ALLOW_FAILURE: false }
           - { VERSION: "3.8", TOXENV: "py38",ALLOW_FAILURE: false }
           - { VERSION: "3.9", TOXENV: "py39",ALLOW_FAILURE: false }
           - { VERSION: "3.10", TOXENV: "py310",ALLOW_FAILURE: false }
-          - { VERSION: "3.9", TOXENV: "flake8,doclint,docs,commitlint", ALLOW_FAILURE: false }
-          - { VERSION: "3.9", TOXENV: "docstrings", ALLOW_FAILURE: true}
-          - { VERSION: "pypy3", TOXENV: "pypy", ALLOW_FAILURE: false }
+          - { VERSION: "3.10", TOXENV: "flake8,doclint,docs,commitlint", ALLOW_FAILURE: false }
+          - { VERSION: "3.10", TOXENV: "docstrings", ALLOW_FAILURE: true}
+          - { VERSION: "pypy3.9", TOXENV: "pypy", ALLOW_FAILURE: false }
 
     steps:
       - name: Check out the repository
-        uses: actions/[email protected]
+        uses: actions/checkout@v3
+
       - name: Setup Python
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v4.2.0
         with:
           python-version: ${{ matrix.PYTHON.VERSION }}
+
       - name: Upgrade pip
         run: |
           pip install --constraint=.github/workflows/constraints.txt pip
           pip --version
+
       - name: Install Tox
         run: |
           pip install --constraint=.github/workflows/constraints.txt tox
           tox --version
+
       - name: Run Tox
         run: tox
         env:

.pre-commit-config.yaml

@@ -14,19 +14,19 @@ repos:
       types: [text]
       stages: [commit, push, manual]
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.8.1
+    rev: v3.8.2
     hooks:
     - id: reorder-python-imports
-      args: [--application-directories, '.:src', --py36-plus]
+      args: [--application-directories, '.:src', --py37-plus]
   - repo: https://github.com/psf/black
     rev: 22.6.0
     hooks:
     - id: black
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.1
+    rev: v2.37.3
     hooks:
     - id: pyupgrade
-      args: [--py36-plus]
+      args: [--py37-plus]
   #- repo: https://github.com/pre-commit/mirrors-mypy
   #  rev: v0.910
   #  hooks:
@@ -37,7 +37,7 @@ repos:
     hooks:
     - id: gitlint
   - repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.20.1
+    rev: v2.0.0
     hooks:
     - id: setup-cfg-fmt
-      args: [--min-py3-version, '3.6']
+      args: [--min-py3-version, '3.7']

AUTHORS.rst

@@ -216,3 +216,5 @@ Contributors
 - Philipp Heil (@zkdev)
 
 - Petter Kvalvaag (@pettermk)
+
+- Peter Küffner (@kuepe-sl)

README.rst

@@ -4,7 +4,7 @@
 github3.py is a comprehensive, actively developed, and extraordinarily stable
 wrapper around the GitHub API (v3).
 
-Note: This library currently works with Python 3.6+ or pypy3. For older versions, please use version 1.3.0.
+Note: This library currently works with Python 3.7+ or pypy3. For older versions, please use version 1.3.0.
 
 Installation
 ------------

appveyor.yml

@@ -123,8 +123,6 @@ The tests are generally run using tox. Tox can be installed like so
 
 We test against PyPy3 and the following versions of Python:
 
-- 3.6
-
 - 3.7
 
 - 3.8

docs/source/index.rst

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 78
-target-version = ['py36']
+target-version = ['py37']
 safe = true
 exclude = '''
 (

pyproject.toml

@@ -17,11 +17,6 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
     Programming Language :: Python :: Implementation :: CPython
 project_urls =
     Documentation = https://github3.readthedocs.io
@@ -41,8 +36,7 @@ install_requires =
     python-dateutil>=2.6.0
     requests>=2.18
     uritemplate>=3.0.0
-    typing-extensions>=3.10.0.2;python_version < "3.7"
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir =
     =src
 

setup.cfg

@@ -1980,7 +1980,7 @@ def rate_limit(self):
     def repositories(
         self, type=None, sort=None, direction=None, number=-1, etag=None
     ):
-        """List repositories for the authenticated user, filterable by ``type``.
+        """List repositories for the authenticated user filterable by ``type``.
 
         .. versionchanged:: 0.6
 

src/github3/github.py

@@ -118,13 +118,18 @@ def _create_pull(self, data):
         return self._instance_or_null(pulls.ShortPullRequest, json)
 
     @decorators.requires_auth
-    def add_collaborator(self, username):
+    def add_collaborator(self, username, permission=None):
         """Add ``username`` as a collaborator to a repository.
 
         :param username:
             (required), username of the user
         :type username:
             str or :class:`~github3.users.User`
+        :param str permission:
+            (optional), permission to grant the collaborator, valid on
+            organization repositories only.
+            Can be 'pull', 'triage', 'push', 'maintain', 'admin' or an
+            organization-defined custom role name.
         :returns:
             True if successful, False otherwise
         :rtype:
@@ -134,7 +139,12 @@ def add_collaborator(self, username):
         url = self._build_url(
             "collaborators", str(username), base_url=self._api
         )
-        return self._boolean(self._put(url), 201, 404)
+        if permission:
+            data = {"permission": permission}
+            resp = self._put(url, data=jsonlib.dumps(data))
+        else:
+            resp = self._put(url)
+        return self._boolean(resp, 201, 404)
 
     def archive(self, format, path="", ref="master"):
         """Get the tarball or zipball archive for this repo at ref.