Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-22 07:08:10 +00:00
Code Issues Projects Releases Wiki Activity

fix snapshot upload

Browse Source
This commit is contained in:
Maximilian Hils 2016-02-27 14:26:54 +01:00
parent c68ab3e60c
commit 0faae87acc
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,7 +1,5 @@
.DS_Store
MANIFEST
*/build
*/dist
*/tmp
/venv
*.py[cdo]
@ -11,6 +9,7 @@ MANIFEST
.coverage
.idea
.cache/
build/
# UI

44
release/rtool.py
View File

@ -47,11 +47,16 @@ VENV_PYINSTALLER = join(VENV_DIR, VENV_BIN, "pyinstaller")
project = {
"name": "mitmproxy",
"tools": ["pathod", "pathoc", "mitmproxy", "mitmdump", "mitmweb"],
"bdists": {
"mitmproxy": ["mitmproxy", "mitmdump", "mitmweb"],
"pathod": ["pathoc", "pathod"]
},
"dir": ROOT_DIR,
"python_version": "py2"
}
if platform.system() == "Windows":
project["tools"].remove("mitmproxy")
project["bdists"]["mitmproxy"].remove("mitmproxy")
def get_version():
@ -71,7 +76,7 @@ def get_snapshot_version():
)
def archive_name():
def archive_name(project):
platform_tag = {
"Darwin": "osx",
"Windows": "win32",
@ -82,7 +87,7 @@ def archive_name():
else:
ext = "tar.gz"
return "{project}-{version}-{platform}.{ext}".format(
project=project["name"],
project=project,
version=get_version(),
platform=platform_tag,
ext=ext
@ -218,9 +223,9 @@ def bdist(ctx, use_existing_wheels, pyinstaller_version):
print("Installing PyInstaller...")
subprocess.check_call([VENV_PIP, "install", "-q", pyinstaller_version])
if project["tools"]:
with Archive(join(DIST_DIR, archive_name())) as archive:
for tool in project["tools"]:
for bdist_project, tools in project["bdists"].items():
with Archive(join(DIST_DIR, archive_name(bdist_project))) as archive:
for tool in tools:
spec = join(RELEASE_DIR, "specs/%s.spec" % tool)
print("Building %s binary..." % tool)
subprocess.check_call(
@ -244,7 +249,7 @@ def bdist(ctx, use_existing_wheels, pyinstaller_version):
subprocess.check_call([executable, "--version"])
archive.add(executable, os.path.basename(executable))
print("Packed {}.".format(archive_name()))
print("Packed {}.".format(archive_name(bdist_project)))
@cli.command("upload-release")
@ -255,17 +260,16 @@ def upload_release(username, password, repository):
"""
Upload wheels to PyPI
"""
for project in projects.keys():
filename = wheel_name()
print("Uploading {} to {}...".format(filename, repository))
subprocess.check_call([
"twine",
"upload",
"-u", username,
"-p", password,
"-r", repository,
join(DIST_DIR, filename)
])
filename = wheel_name()
print("Uploading {} to {}...".format(filename, repository))
subprocess.check_call([
"twine",
"upload",
"-u", username,
"-p", password,
"-r", repository,
join(DIST_DIR, filename)
])
@cli.command("upload-snapshot")
@ -285,15 +289,15 @@ def upload_snapshot(host, port, user, private_key, private_key_password, wheel,
username=user,
private_key=private_key,
private_key_pass=private_key_password) as sftp:
for project, conf in projects.items():
dir_name = "snapshots/v{}".format(get_version())
sftp.makedirs(dir_name)
with sftp.cd(dir_name):
files = []
if wheel:
files.append(wheel_name())
if bdist and conf["tools"]:
files.append(archive_name())
for bdist in project["bdists"].keys():
files.append(archive_name(bdist))
for f in files:
local_path = join(DIST_DIR, f)