update dependencies including github3.py

.github/workflows/feature_test.yml

@@ -16,46 +16,7 @@ jobs:
  lint:
  name: Lint
  if: ${{ github.event_name == 'pull_request' }}
- runs-on: ubuntu-latest
- steps:
- - name: "Checkout"
- uses: actions/checkout@v2
- with:
- fetch-depth: 1
- - name: Set up Python 3.8
- id: py
- uses: actions/setup-python@v2
- with:
- python-version: 3.8
- - name: pip cache
- id: pip_cache
- uses: actions/cache@v1
- with:
- path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
- restore-keys: |
- ${{ runner.os }}-pip-
- - name: pre-commit cache
- id: pc_cache
- uses: actions/cache@v1
- with:
- path: ~/.cache/pre-commit
- key: ${{ steps.py.outputs.python-version }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
- restore-keys: |
- ${{ steps.py.outputs.python-version }}-pre-commit-
- - name: Install dependencies
- run: |
- python -m pip install -U pip
- pip install pre-commit
- - name: Install pre-commit
- if: steps.pc_cache.outputs.cache-hit != 'true'
- run: |
- pre-commit install --install-hooks
- - name: Run pre-commit on changed files
- run: |
- git fetch --depth=1 --no-tags origin $GITHUB_BASE_REF:$GITHUB_BASE_REF
- git fetch --depth=1 --no-tags origin $GITHUB_HEAD_REF:$GITHUB_HEAD_REF
- pre-commit run --files $(git diff --diff-filter=d --name-only $GITHUB_BASE_REF..$GITHUB_HEAD_REF)
+ uses: SFDO-Tooling/.github/.github/workflows/pre-commit.yml@main
  docs:
  name: Build Docs
  if: ${{ github.event_name == 'pull_request' }}
@@ -70,18 +31,10 @@ jobs:
  uses: actions/setup-python@v2
  with:
  python-version: 3.8
- - name: pip cache
- id: pip_cache
- uses: actions/cache@v1
- with:
- path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
- restore-keys: |
- ${{ runner.os }}-pip-
+ cache: pip
+ cache-dependency-path: "requirements/*.txt"
  - name: Install dependencies
- run: |
- python -m pip install -U pip
- make dev-install
+ run: make dev-install
  - name: Build Docs
  run: make docs
 
@@ -99,17 +52,10 @@ jobs:
  uses: actions/setup-python@v2
  with:
  python-version: "${{ matrix.python-version }}"
- - name: pip cache
- uses: actions/cache@v1
- with:
- path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
- restore-keys: |
- ${{ runner.os }}-pip-
+ cache: pip
+ cache-dependency-path: "requirements/*.txt"
  - name: Install
- run: |
- python -m pip install -U pip
- make dev-install
+ run: make dev-install
  - run: |
  coverage run $(which pytest)
  coveralls
@@ -123,17 +69,10 @@ jobs:
  uses: actions/setup-python@v2
  with:
  python-version: 3.8
- - name: pip cache
- uses: actions/cache@v1
- with:
- path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
- restore-keys: |
- ${{ runner.os }}-pip-
+ cache: pip
+ cache-dependency-path: "requirements/*.txt"
  - name: Install Python dependencies
- run: |
- python -m pip install -U pip
- make dev-install
+ run: make dev-install
  - name: Install sfdx
  run: |
  mkdir sfdx
@@ -177,17 +116,10 @@ jobs:
  uses: actions/setup-python@v2
  with:
  python-version: 3.8
- - name: pip cache
- uses: actions/cache@v1
- with:
- path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
- restore-keys: |
- ${{ runner.os }}-pip-
+ cache: pip
+ cache-dependency-path: "requirements/*.txt"
  - name: Install Python dependencies
- run: |
- python -m pip install -U pip
- make dev-install
+ run: make dev-install
  - name: Install sfdx
  run: |
  mkdir sfdx
@@ -231,17 +163,10 @@ jobs:
  uses: actions/setup-python@v2
  with:
  python-version: 3.8
- - name: pip cache
- uses: actions/cache@v1
- with:
- path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
- restore-keys: |
- ${{ runner.os }}-pip-
+ cache: pip
+ cache-dependency-path: "requirements/*.txt"
  - name: Install Python dependencies
- run: |
- python -m pip install -U pip
- make dev-install
+ run: make dev-install
  - name: Install sfdx
  run: |
  mkdir sfdx
@@ -285,17 +210,10 @@ jobs:
  uses: actions/setup-python@v2
  with:
  python-version: 3.8
- - name: pip cache
- uses: actions/cache@v1
- with:
- path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
- restore-keys: |
- ${{ runner.os }}-pip-
+ cache: pip
+ cache-dependency-path: "requirements/*.txt"
  - name: Install Python dependencies
- run: |
- python -m pip install -U pip
- make dev-install
+ run: make dev-install
  - name: Install sfdx
  run: |
  mkdir sfdx

.github/workflows/release_test.yml

@@ -27,13 +27,8 @@ jobs:
  uses: actions/setup-python@v1
  with:
  python-version: 3.8
- - name: pip cache
- uses: actions/cache@v1
- with:
- path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
- restore-keys: |
- ${{ runner.os }}-pip-
+ cache: pip
+ cache-dependency-path: "requirements/*.txt"
  - name: Install Python dependencies
  run: |
  python -m pip install -U pip

.github/workflows/slow_integration_tests.yml

@@ -19,13 +19,8 @@ jobs:
  uses: actions/setup-python@v2
  with:
  python-version: 3.8
- - name: pip cache
- uses: actions/cache@v1
- with:
- path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('requirements/*.txt') }}
- restore-keys: |
- ${{ runner.os }}-pip-
+ cache: pip
+ cache-dependency-path: "requirements/*.txt"
  - name: Install Python dependencies
  run: |
  python -m pip install -U pip

Makefile

@@ -109,11 +109,11 @@ update-deps:
  pip-compile --upgrade requirements/dev.in
 
 dev-install:
- pip install --upgrade pip-tools
+ python -m pip install --upgrade pip pip-tools setuptools
  pip-sync requirements/*.txt
- pip install -e .
+ python -m pip install -e .
 
 schema:
-  python -c 'from cumulusci.utils.yaml import cumulusci_yml; open("cumulusci/schema/cumulusci.jsonschema.json", "w").write(cumulusci_yml.CumulusCIRoot.schema_json(indent=4))'
-  @pre-commit run prettier --files cumulusci/schema/cumulusci.jsonschema.json > /dev/null || true
-  @echo cumulusci/schema/cumulusci.jsonschema.json
+ python -c 'from cumulusci.utils.yaml import cumulusci_yml; open("cumulusci/schema/cumulusci.jsonschema.json", "w").write(cumulusci_yml.CumulusCIRoot.schema_json(indent=4))'
+ @pre-commit run prettier --files cumulusci/schema/cumulusci.jsonschema.json > /dev/null || true
+ @echo cumulusci/schema/cumulusci.jsonschema.json

cumulusci/core/tests/test_github.py

@@ -299,7 +299,7 @@ def test_get_tag_by_name(self, repo):
  self.init_github()
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/tag_SHA",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/tag_SHA",
  json=self._get_expected_tag_ref("tag_SHA", "tag_SHA"),
  status=200,
  )
@@ -317,7 +317,7 @@ def test_get_tag_by_name__404(self, repo):
  self.init_github()
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/tag_SHA",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/tag_SHA",
  json=self._get_expected_tag_ref("tag_SHA", "tag_SHA"),
  status=200,
  )
@@ -337,7 +337,7 @@ def test_current_tag_is_lightweight(self, repo):
  light_tag["object"]["type"] = "commit"
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/tag_SHA",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/tag_SHA",
  json=light_tag,
  status=200,
  )
@@ -357,7 +357,7 @@ def test_get_ref_by_name(self, repo):
  self.init_github()
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/tag_SHA",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/tag_SHA",
  json=self._get_expected_tag_ref("tag_SHA", "tag_SHA"),
  status=200,
  )
@@ -369,7 +369,7 @@ def test_get_ref_by_name__404(self, repo):
  self.init_github()
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/tag_SHA",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/tag_SHA",
  json=self._get_expected_tag_ref("tag_SHA", "tag_SHA"),
  status=404,
  )
@@ -381,7 +381,7 @@ def test_get_version_id_from_tag(self, repo):
  self.init_github()
  responses.add( # the ref for the tag is fetched first
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/test-tag-name",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/test-tag-name",
  json=self._get_expected_tag_ref("test-tag-name", "tag_SHA"),
  status=200,
  )
@@ -400,7 +400,7 @@ def test_get_version_id_from_tag__dependency_error(self, repo):
  self.init_github()
  responses.add( # the ref for the tag is fetched first
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/test-tag-name",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/test-tag-name",
  json=self._get_expected_tag_ref("test-tag-name", "tag_SHA"),
  status=200,
  )

cumulusci/core/tests/test_source.py

@@ -63,7 +63,7 @@ def test_resolve__default(self):
  )
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/release/1.0",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/release/1.0",
  json=self._get_expected_tag_ref("release/1.0", "tag_sha"),
  )
  responses.add(
@@ -132,7 +132,7 @@ def test_resolve__ref(self):
  )
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/main",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/main",
  json=self._get_expected_ref("main", "abcdef"),
  )
 
@@ -155,7 +155,7 @@ def test_resolve__branch(self):
  )
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/heads/main",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/heads/main",
  json=self._get_expected_ref("main", "abcdef"),
  )
 
@@ -178,7 +178,7 @@ def test_resolve__tag(self):
  )
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/release/1.0",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/release/1.0",
  json=self._get_expected_tag_ref("release/1.0", "abcdef"),
  )
 
@@ -207,7 +207,7 @@ def test_resolve__latest_release(self):
  )
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/release/1.0",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/release/1.0",
  json=self._get_expected_tag_ref("release/1.0", "tag_sha"),
  )
 
@@ -236,7 +236,7 @@ def test_resolve__latest_beta(self):
  )
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/beta/1.0-Beta_1",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/beta/1.0-Beta_1",
  json=self._get_expected_tag_ref("beta/1.0-Beta_1", "tag_sha"),
  )
 
@@ -270,7 +270,7 @@ def test_resolve__previous_release(self):
  )
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/release/1.0",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/release/1.0",
  json=self._get_expected_tag_ref("release/1.0", "tag_sha"),
  )
 
@@ -320,7 +320,7 @@ def test_fetch(self):
  )
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/release/1.0",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/release/1.0",
  json=self._get_expected_tag_ref("release/1.0", "tag_sha"),
  )
  f = io.BytesIO()
@@ -375,7 +375,7 @@ def test_fetch__cleans_up_after_failed_extract(self, download_extract_github):
  )
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/release/1.0",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/release/1.0",
  json=self._get_expected_tag_ref("release/1.0", "tag_sha"),
  )
  # Set up a fake IOError while extracting the zipball
@@ -409,7 +409,7 @@ def test_hash(self):
  )
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/release/1.0",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/release/1.0",
  json=self._get_expected_tag_ref("release/1.0", "tag_sha"),
  )
 
@@ -437,7 +437,7 @@ def test_frozenspec(self):
  )
  responses.add(
  "GET",
- "https://api.github.com/repos/TestOwner/TestRepo/git/refs/tags/release/1.0",
+ "https://api.github.com/repos/TestOwner/TestRepo/git/ref/tags/release/1.0",
  json=self._get_expected_tag_ref("release/1.0", "tag_sha"),
  )