Skip to content

Commit

Permalink
Separate test suites from eachother and bump wheel
Browse files Browse the repository at this point in the history
  • Loading branch information
stealthycoin committed Sep 14, 2022
1 parent 3c35ee9 commit 0ff0f36
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 9 deletions.
2 changes: 1 addition & 1 deletion requirements-base.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
wheel==0.37.0
wheel==0.37.1
setuptools==57.5.0
12 changes: 6 additions & 6 deletions requirements/build-lock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# pip-compile --allow-unsafe --generate-hashes --output-file=/Users/jcarlyl/aws-code/aws-cli/requirements/build-lock.txt /Users/jcarlyl/aws-code/aws-cli/requirements/build.txt
#
altgraph==0.17 \
--hash=sha256:1f05a47122542f97028caf78775a095fbe6a2699b5089de8477eb583167d69aa \
--hash=sha256:c623e5f3408ca61d4016f23a681b9adb100802ca3e3da5e718915a9e4052cebe
altgraph==0.17.2 \
--hash=sha256:743628f2ac6a7c26f5d9223c91ed8ecbba535f506f4b6f558885a8a56a105857 \
--hash=sha256:ebf2269361b47d97b3b88e696439f6e4cbc607c17c51feb1754f90fb79839158
# via
# macholib
# pyinstaller
Expand Down Expand Up @@ -153,9 +153,9 @@ jmespath==1.0.1 \
--hash=sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980 \
--hash=sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe
# via -r /Users/jcarlyl/aws-code/aws-cli/requirements/runtime-lock.txt
macholib==1.14 \
--hash=sha256:0c436bc847e7b1d9bda0560351bf76d7caf930fb585a828d13608839ef42c432 \
--hash=sha256:c500f02867515e6c60a27875b408920d18332ddf96b4035ef03beddd782d4281
macholib==1.16 \
--hash=sha256:001bf281279b986a66d7821790d734e61150d52f40c080899df8fefae056e9f7 \
--hash=sha256:5a0742b587e6e57bfade1ab90651d4877185bf66fd4a176a488116de36878229
# via pyinstaller
prompt-toolkit==3.0.28 \
--hash=sha256:30129d870dcb0b3b6a53efdc9d0a83ea96162ffd28ffe077e94215b233dc670c \
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/run-backend-tests
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ if __name__ == "__main__":
with cd(os.path.join(REPO_ROOT, "tests")):
run(
f"{sys.executable} {RUN_TESTS_SCRIPTS} "
f"backends --allow-repo-root-on-path"
f"backends --ignore backends/build_system --allow-repo-root-on-path"
)
Empty file modified scripts/ci/run-build-system-tests
100644 → 100755
Empty file.
12 changes: 12 additions & 0 deletions scripts/ci/run-tests
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ def run(command, allow_repo_root_on_path=False):
def process_args(args):
runner = args.test_runner
test_args = ""
if args.ignore:
test_args += " ".join(f"--ignore {ignore}" for ignore in args.ignore)
test_args += " "

if args.with_cov:
test_args += (
# Even though botocore and s3transfer reside in the awscli package,
Expand Down Expand Up @@ -82,6 +86,14 @@ if __name__ == "__main__":
"distribution."
)
)
parser.add_argument(
"--ignore",
nargs='+',
default=[],
help=(
"Ignore a test subdirectory. Can be specified multiple times."
)
)
raw_args = parser.parse_args()
test_runner, test_args, test_dirs = process_args(raw_args)

Expand Down
10 changes: 9 additions & 1 deletion scripts/regenerate-lock-files
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
files. In order to run it you need to have pip-tools installed into the
curerntly active virtual environment."""
import sys
import os
from typing import List
from pathlib import Path

Expand All @@ -37,21 +38,28 @@ def pip_compile(args: List[str]):
return run(command, cwd=ROOT)


def delete_file(path: str):
os.remove(path)
print(f"Removed file: {path}")


def requriement_file_args(filename: str) -> List[str]:
source_path = REQ_DIR / f"{filename}.txt"
lock_path = REQ_DIR / f"{filename}-lock.txt"
delete_file(lock_path)
return [f"--output-file={lock_path}", f"{source_path}"]


def runtime_args() -> List[str]:
lock_path = REQ_DIR / "runtime-lock.txt"
delete_file(lock_path)
return [f"--output-file={lock_path}"]


def main():
pip_compile(runtime_args())
pip_compile(requriement_file_args("bootstrap"))
pip_compile(requriement_file_args("build"))
pip_compile(runtime_args())


if __name__ == "__main__":
Expand Down

0 comments on commit 0ff0f36

Please sign in to comment.