From b9c014f7cdd705a36a0eef2c970e63b85fae6dc1 Mon Sep 17 00:00:00 2001 From: Jonathan Giddy Date: Fri, 8 Oct 2021 10:21:09 +0100 Subject: [PATCH 1/3] Update SecretStorage package --- indirect-requirements.txt | 2 +- minidcos.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/indirect-requirements.txt b/indirect-requirements.txt index c3fb51f95..fb0cd3421 100644 --- a/indirect-requirements.txt +++ b/indirect-requirements.txt @@ -14,7 +14,7 @@ msrestazure==0.4.34 keyring==16.0.2 # Without the following, some users get: # The 'secretstorage' distribution was not found and is required by keyring -SecretStorage==3.1.0 +SecretStorage==3.3.1 # Without the following, some users get: # ``ModuleNotFoundError: No module named 'keyring.util.escape'`` # diff --git a/minidcos.rb b/minidcos.rb index 3447c3a39..7164bf165 100644 --- a/minidcos.rb +++ b/minidcos.rb @@ -188,8 +188,8 @@ class Minidcos < Formula end resource "jeepney" do - url "https://files.pythonhosted.org/packages/bb/4f/06017fbbe94eeaf1e7852c2dd7a065ca7d813e17b4500f4e842531d72593/jeepney-0.6.0.tar.gz" - sha256 "7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657" + url "https://files.pythonhosted.org/packages/09/0d/81744e179cf3aede2d117c20c6d5b97a62ffe16b2ca5d856e068e81c7a68/jeepney-0.7.1.tar.gz" + sha256 "fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f" end resource "jmespath" do @@ -348,8 +348,8 @@ class Minidcos < Formula end resource "SecretStorage" do - url "https://files.pythonhosted.org/packages/17/7a/683ce8d41b0b392199f1f6273a5cc81a0583b886e799786b7add5750817f/SecretStorage-3.1.0.tar.gz" - sha256 "29aa3cbd36dd5e54ac17d69161f9a150548f4ffba21fa8b5fdd5add854fe7d8b" + url "https://files.pythonhosted.org/packages/cd/08/758aeb98db87547484728ea08b0292721f1b05ff9005f59b040d6203c009/SecretStorage-3.3.1.tar.gz" + sha256 "fd666c51a6bf200643495a04abb261f83229dcb6fd8472ec393df7ffc8b6f195" end resource "semver" do From 094f96d7f5cee311bdc4dd9a9388f887b8dd7303 Mon Sep 17 00:00:00 2001 From: Jonathan Giddy Date: Fri, 8 Oct 2021 10:24:05 +0100 Subject: [PATCH 2/3] Update PyGithub package --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 022464180..bb76b8c1b 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -14,7 +14,7 @@ pip-check-reqs==2.1.1 py==1.8.0 pydocstyle==3.0.0 pyenchant==3.2.0 -pygithub==1.43.7 +pygithub==1.55 pylint==2.3.1 pyroma==2.5 pytest-cov==2.7.1 # Measure code coverage From bcc448a55b1e25702c92bdefafbdbb061eedd1d8 Mon Sep 17 00:00:00 2001 From: Jonathan Giddy Date: Fri, 8 Oct 2021 10:51:19 +0100 Subject: [PATCH 3/3] Cleanup types --- admin/release.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/release.py b/admin/release.py index 661dd0aca..31e5ff97a 100644 --- a/admin/release.py +++ b/admin/release.py @@ -51,7 +51,7 @@ def update_changelog(version: str, changelog: Path) -> None: def create_github_release( - repository: Repository, + repository: Repository.Repository, version: str, ) -> None: """ @@ -103,7 +103,7 @@ def create_github_release( def commit_and_push( version: str, - repository: Repository, + repository: Repository.Repository, paths: List[Path], ) -> None: """ @@ -125,7 +125,7 @@ def commit_and_push( def update_homebrew( homebrew_file: Path, version_str: str, - repository: Repository, + repository: Repository.Repository, ) -> None: """ Update the Homebrew file. @@ -157,7 +157,7 @@ def update_vagrantfile(version: str, vagrantfile: Path) -> None: vagrantfile.write_text(updated) -def get_repo(github_token: str, github_owner: str) -> Repository: +def get_repo(github_token: str, github_owner: str) -> Repository.Repository: """ Get a GitHub repository. """ @@ -165,7 +165,7 @@ def get_repo(github_token: str, github_owner: str) -> Repository: try: github_user_or_org = github_client.get_organization(github_owner) except UnknownObjectException: - github_user_or_org = github_client.get_user(github_owner) + github_user_or_org = github_client.get_user(github_owner) # type: ignore # noqa return github_user_or_org.get_repo('dcos-e2e')