Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SecretStorage package #1907

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions admin/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def update_changelog(version: str, changelog: Path) -> None:


def create_github_release(
repository: Repository,
repository: Repository.Repository,
version: str,
) -> None:
"""
Expand Down Expand Up @@ -103,7 +103,7 @@ def create_github_release(

def commit_and_push(
version: str,
repository: Repository,
repository: Repository.Repository,
paths: List[Path],
) -> None:
"""
Expand All @@ -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.
Expand Down Expand Up @@ -157,15 +157,15 @@ 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.
"""
github_client = Github(github_token)
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')

Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion indirect-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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'``
#
Expand Down
8 changes: 4 additions & 4 deletions minidcos.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down