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

[BE] Add s3_management to the linted folders #1558

Merged
merged 1 commit into from
Sep 30, 2023
Merged
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
2 changes: 1 addition & 1 deletion .lintrunner.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ merge_base_with = "origin/main"

[[linter]]
code = 'RUFF'
include_patterns = ['test/smoke_test/*.py']
include_patterns = ['test/smoke_test/*.py', 's3_management/*.py']
command = [
'python3',
'tools/linter/adapters/ruff_linter.py',
Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[tool.ruff]
target-version = "py38"
line-length = 120
ignore = [
"PERF401",
]
select = [
"B",
"C4",
Expand Down
14 changes: 8 additions & 6 deletions s3_management/backup_conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# Do not use unless you know what you are doing
# Usage: python backup_conda.py --version 1.6.0

import conda.api
import boto3
from typing import List, Optional
import conda.api
import urllib
import os
import hashlib
Expand All @@ -22,8 +22,11 @@ def compute_md5(path:str) -> str:
return hashlib.md5(f.read()).hexdigest()


def download_conda_package(package:str, version:Optional[str] = None, depends:Optional[str] = None, channel:Optional[str] = None) -> List[str]:
packages = conda.api.SubdirData.query_all(package, channels = [channel] if channel is not None else None, subdirs = _known_subdirs)
def download_conda_package(package:str, version:Optional[str] = None,
depends:Optional[str] = None, channel:Optional[str] = None) -> List[str]:
packages = conda.api.SubdirData.query_all(package,
channels = [channel] if channel is not None else None,
subdirs = _known_subdirs)
rc = []

for pkg in packages:
Expand All @@ -36,9 +39,8 @@ def download_conda_package(package:str, version:Optional[str] = None, depends:Op
os.makedirs(pkg.subdir, exist_ok = True)
fname = f"{pkg.subdir}/{pkg.fn}"
if not os.path.exists(fname):
with open(fname, "wb") as f:
with urllib.request.urlopen(pkg.url) as url:
f.write(url.read())
with open(fname, "wb") as f, urllib.request.urlopen(pkg.url) as url:
f.write(url.read())
if compute_md5(fname) != pkg.md5:
print(f"md5 of {fname} is {compute_md5(fname)} does not match {pkg.md5}")
continue
Expand Down
17 changes: 7 additions & 10 deletions s3_management/manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,7 @@ def nightly_packages_to_show(self: S3IndexType) -> Set[S3Object]:
if package_name not in PACKAGE_ALLOW_LIST:
to_hide.add(obj)
continue
if packages[package_name] >= KEEP_THRESHOLD:
to_hide.add(obj)
elif between_bad_dates(package_build_time):
if packages[package_name] >= KEEP_THRESHOLD or between_bad_dates(package_build_time):
to_hide.add(obj)
else:
packages[package_name] += 1
Expand Down Expand Up @@ -215,14 +213,13 @@ def gen_file_list(
)
subdir = self._resolve_subdir(subdir) + '/'
for obj in objects:
if package_name is not None:
if self.obj_to_package_name(obj) != package_name:
continue
if package_name is not None and self.obj_to_package_name(obj) != package_name:
continue
if self.is_obj_at_root(obj) or obj.key.startswith(subdir):
yield obj

def get_package_names(self, subdir: Optional[str] = None) -> List[str]:
return sorted(set(self.obj_to_package_name(obj) for obj in self.gen_file_list(subdir)))
return sorted({self.obj_to_package_name(obj) for obj in self.gen_file_list(subdir)})

def normalize_package_version(self: S3IndexType, obj: S3Object) -> str:
# removes the GPU specifier from the package name as well as
Expand Down Expand Up @@ -284,7 +281,7 @@ def to_simple_package_html(
# Adding html footer
out.append(' </body>')
out.append('</html>')
out.append('<!--TIMESTAMP {}-->'.format(int(time.time())))
out.append(f'<!--TIMESTAMP {int(time.time())}-->')
return '\n'.join(out)

def to_simple_packages_html(
Expand All @@ -303,7 +300,7 @@ def to_simple_packages_html(
# Adding html footer
out.append(' </body>')
out.append('</html>')
out.append('<!--TIMESTAMP {}-->'.format(int(time.time())))
out.append(f'<!--TIMESTAMP {int(time.time())}-->')
return '\n'.join(out)

def upload_legacy_html(self) -> None:
Expand Down Expand Up @@ -412,7 +409,7 @@ def main():
args = parser.parse_args()
action = "Saving" if args.do_not_upload else "Uploading"
if args.prefix == 'all':
for prefix in PREFIXES_WITH_HTML.keys():
for prefix in PREFIXES_WITH_HTML:
print(f"INFO: {action} indices for '{prefix}'")
idx = S3Index.from_S3(prefix=prefix)
if args.do_not_upload:
Expand Down