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

Rattler build support #55

Merged
merged 16 commits into from
Jan 10, 2025
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
30 changes: 15 additions & 15 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
repos:
- repo: https://github.com/psf/black
rev: 19.10b0
rev: 24.3.0
hooks:
- id: black
args: [--safe, --quiet]
- repo: https://github.com/asottile/blacken-docs
rev: v1.7.0
rev: 1.16.0
hooks:
- id: blacken-docs
additional_dependencies: [black==19.10b0]
additional_dependencies: [black]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
exclude: ^examples/
Expand All @@ -21,14 +21,14 @@ repos:
# hooks:
# - id: isort
# exclude: tests/data
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.3
hooks:
- id: flake8
exclude: tests/data
language_version: python3
additional_dependencies:
- flake8-typing-imports==1.9.0
- flake8-builtins==1.5.3
- flake8-bugbear==20.1.4
# - flake8-isort==3.0.1
# - repo: https://github.com/PyCQA/flake8
# rev: 7.0.0
# hooks:
# - id: flake8
# exclude: tests/data
# language_version: python3
# additional_dependencies:
# - flake8-typing-imports==1.9.0
# - flake8-builtins==1.5.3
# - flake8-bugbear==20.1.4
# # - flake8-isort==3.0.1
4 changes: 3 additions & 1 deletion vinca/generate_azure.py
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,9 @@ def main():

if args.platform == "osx-64":
build_osx_pipeline(
stages, args.trigger_branch, script=azure_osx_script,
stages,
args.trigger_branch,
script=azure_osx_script,
)

if args.platform == "osx-arm64":
Expand Down
10 changes: 4 additions & 6 deletions vinca/generate_gha.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def parse_command_line(argv):
action="store_true",
help="search for additional_recipes folder?",
)

parser.add_argument(
"-b",
"--batch_size",
Expand Down Expand Up @@ -263,8 +263,6 @@ def build_linux_pipeline(
if docker_image is None:
docker_image = "condaforge/linux-anvil-cos7-x86_64"

jobs = []
job_names = []
prev_batch_keys = []

for i, s in enumerate(stages):
Expand Down Expand Up @@ -319,8 +317,6 @@ def build_osx_pipeline(
if azure_template is None:
azure_template = blurb

jobs = []
job_names = []
prev_batch_keys = []
for i, s in enumerate(stages):
stage_name = f"stage_{i}"
Expand Down Expand Up @@ -571,7 +567,9 @@ def main():

if args.platform == "osx-64":
build_osx_pipeline(
stages, args.trigger_branch, script=azure_osx_script,
stages,
args.trigger_branch,
script=azure_osx_script,
)

if args.platform == "osx-arm64":
Expand Down
Loading