Skip to content

Feature/54 modify usethis ci bitbucket to exhibit the merge behaviour #152

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.

Sign up for GitHub

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

Merged
nathanjmcdougall merged 111 commits into from
Jan 9, 2025
Merged

Feature/54 modify usethis ci bitbucket to exhibit the merge behaviour #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
e4acede
Major refactoring to support roundtrip Bitbucket pipelines config edi…
nathanjmcdougall Nov 16, 2024
4f82473
Add tests
nathanjmcdougall Nov 17, 2024
828a56d
Add tests
nathanjmcdougall Nov 18, 2024
5ba4248
Add tests
nathanjmcdougall Nov 18, 2024
449ea03
Separate interface layer into new core layer
nathanjmcdougall Nov 18, 2024
e3299a3
Various refactorings, mostly relating to printing
nathanjmcdougall Nov 19, 2024
bde6e16
Refactor pre-commit hook adding so that it uses a placeholder instead…
nathanjmcdougall Nov 21, 2024
de73003
Address a few TODOs
nathanjmcdougall Nov 21, 2024
ae76741
Add test for fancy_pipelines_model_dump
nathanjmcdougall Nov 21, 2024
5264687
WIP: Large-scale refactor to use data-model-codegen classes
nathanjmcdougall Dec 1, 2024
89938b8
Handle removing multiple pre-commit repos from the same tool.
nathanjmcdougall Dec 1, 2024
74df1e4
Avoid hard-coding the placeholder pre-commit hook
nathanjmcdougall Dec 12, 2024
692b168
Sync current thinking on local pre-commit config
nathanjmcdougall Dec 12, 2024
31471c9
Add test for fancy_model_dump removing an element
nathanjmcdougall Dec 12, 2024
9bd18f6
Add tests for round-tripping string format in ruamel.yaml
nathanjmcdougall Dec 12, 2024
8c06794
Change ruff-check to ruff to align with Astral config
nathanjmcdougall Dec 12, 2024
0cbf123
Add test for ruff rule selection message
nathanjmcdougall Dec 12, 2024
6301d31
Add more tests for pre-commit IO module
nathanjmcdougall Dec 12, 2024
ce49566
Remove commented-out code
nathanjmcdougall Dec 12, 2024
544bd93
Test bitbucket schema
nathanjmcdougall Dec 12, 2024
22c427b
Dissmissing minor TODOs
nathanjmcdougall Dec 13, 2024
c57b4d2
Add schema test for pre-commit
nathanjmcdougall Dec 13, 2024
9d1cb7b
Test pre-commit fancy dump
nathanjmcdougall Dec 13, 2024
04d712c
Add anchors to script items immediately
nathanjmcdougall Dec 13, 2024
377f579
Avoid supressing print statement and duplication
nathanjmcdougall Dec 13, 2024
7c9568a
Test message when writing bitbucket-pipelimes.yml
nathanjmcdougall Dec 13, 2024
4514d8e
Add docstring
nathanjmcdougall Dec 13, 2024
cd4927b
Add message for adding bitbucket placeholder
nathanjmcdougall Dec 13, 2024
586f657
refactor to use schema class in extract_hoook_names
nathanjmcdougall Dec 13, 2024
b412ffe
Consistent messages for after adding placeholder steps
nathanjmcdougall Dec 13, 2024
3835a5d
Better handling of indentation guessing with YAML
nathanjmcdougall Dec 13, 2024
1f83700
Avoid crude prefix approach for step anchors - create class
nathanjmcdougall Dec 14, 2024
541fc80
Pytest raise on warning
nathanjmcdougall Dec 14, 2024
602dde4
Add test for get_defined_script_item_names
nathanjmcdougall Dec 14, 2024
1f85ae6
Assign variable for placeholder IDs/names
nathanjmcdougall Dec 14, 2024
d37c26c
Cleanup TODOs
nathanjmcdougall Dec 14, 2024
747276e
Ensure that we can add pipeline steps for tools added after `usethis …
nathanjmcdougall Dec 14, 2024
8eae90a
Support removing a bitbucket pipelines step
nathanjmcdougall Dec 15, 2024
4c9319a
Handle expanded pipeline removal
nathanjmcdougall Dec 15, 2024
4b8d932
Handle stage items in step removal
nathanjmcdougall Dec 15, 2024
5b4eb87
Add bitbucket integration test for pytest
nathanjmcdougall Dec 15, 2024
b34215f
Add failing test - check pipeline steps are added in the correct orde…
nathanjmcdougall Dec 15, 2024
a7af003
Add pipeweld brainstorm and first test.
nathanjmcdougall Dec 18, 2024
28dad6b
Test singleton series start
nathanjmcdougall Dec 18, 2024
fd238a3
Testing combining with an existing parallelism
nathanjmcdougall Dec 18, 2024
d315c97
Test starting with two elements
nathanjmcdougall Dec 18, 2024
885c265
Add recursive partition logic to handle basic dependency case
nathanjmcdougall Dec 21, 2024
dfec51b
Collapse singleton in union
nathanjmcdougall Dec 22, 2024
336057e
Collapse singleton series in concat
nathanjmcdougall Dec 26, 2024
f46cfc6
Test example 7
nathanjmcdougall Dec 26, 2024
50b518a
Add example 8 test
nathanjmcdougall Dec 26, 2024
bb5caa2
Add failing test for instructions with mixed dependency parallelism
nathanjmcdougall Dec 26, 2024
b6f26a1
Fix bad test
nathanjmcdougall Dec 26, 2024
abd6208
Record instructions for parallel merge
nathanjmcdougall Dec 27, 2024
21403aa
Test instructions for mixed dependency parallelism of series
nathanjmcdougall Dec 27, 2024
c0113ba
Add instructions test for multi level heirarchy
nathanjmcdougall Dec 27, 2024
a20670e
Add failing test
nathanjmcdougall Dec 27, 2024
5219cf9
Handle basic dependency group functionality
nathanjmcdougall Dec 28, 2024
becd432
Vary tested behaviour to match design
nathanjmcdougall Dec 28, 2024
dbaf49d
Change wording
nathanjmcdougall Jan 3, 2025
40e5720
Handle pipeline order
nathanjmcdougall Jan 3, 2025
428aff4
Add failing test
nathanjmcdougall Jan 3, 2025
383fdba
Support removing the placeholder bitbucket pipeline element, tidy up …
nathanjmcdougall Jan 4, 2025
4f1464a
Add a couple ideas
nathanjmcdougall Jan 4, 2025
cc1e431
Fix broken test
nathanjmcdougall Jan 5, 2025
98cda91
Add failing test
nathanjmcdougall Jan 5, 2025
894edde
Support pre-existing anchors for scirpt item definitions
nathanjmcdougall Jan 5, 2025
1397018
Tweak and test message logic for adding bitbucket pipelines files
nathanjmcdougall Jan 5, 2025
b650be1
Fix bug in cache adding message logic
nathanjmcdougall Jan 5, 2025
35564bd
Better error handling in `ci` subcommand
nathanjmcdougall Jan 6, 2025
cdf0215
Add failing test
nathanjmcdougall Jan 6, 2025
a898d4d
Remove unused caches
nathanjmcdougall Jan 6, 2025
85e8ba7
Remove empty cache definitions section if removing a cache
nathanjmcdougall Jan 6, 2025
6d0f6d4
Add test for case where empty cache section doesn't need to be removed
nathanjmcdougall Jan 6, 2025
36b8f9d
Better tests for the remove_cache function
nathanjmcdougall Jan 6, 2025
60f7cf0
Add a test for invalid YAML indentation
nathanjmcdougall Jan 6, 2025
aff2f7b
Add test for message when removing pre-commit placeholder
nathanjmcdougall Jan 6, 2025
f82a65e
Naming consistency
nathanjmcdougall Jan 6, 2025
781a89b
Add failing test and refactor major version support detection logic
nathanjmcdougall Jan 7, 2025
1061a91
More robust way to determine supported major Python versions using uv
nathanjmcdougall Jan 7, 2025
9bd8389
Fix broken imports, don't refer to first pipeline in message, but pip…
nathanjmcdougall Jan 7, 2025
847b32d
Consistent hook config
nathanjmcdougall Jan 7, 2025
7e21336
Move test into the right place
nathanjmcdougall Jan 7, 2025
2f8c18b
Add test and dismiss many TODOs
nathanjmcdougall Jan 7, 2025
b77aff2
Add test and dismiss TODOs
nathanjmcdougall Jan 7, 2025
87de703
Handle bitbucket cleanup when removing pytest
nathanjmcdougall Jan 7, 2025
35ec49a
Add test for error message
nathanjmcdougall Jan 7, 2025
6efb520
Refinements to messaging for removing files
nathanjmcdougall Jan 7, 2025
65d5437
Test messaging for adding bitbucket pytest steps
nathanjmcdougall Jan 7, 2025
8e2430f
Add tests for pipeweld containers
nathanjmcdougall Jan 7, 2025
9e65021
Add unit tests for _op_series_merge_partitions
nathanjmcdougall Jan 8, 2025
de175e5
Forbid None in bitbucket schema
nathanjmcdougall Jan 8, 2025
1b4080f
Simplify bitbucket schema to align with validator website https://bit…
nathanjmcdougall Jan 8, 2025
cf05d72
Fix bug in Stage handling for bitbucket-pipeweld integration
nathanjmcdougall Jan 8, 2025
0695277
Fix bug in getting instructions for assertion in parallel
nathanjmcdougall Jan 8, 2025
a7dc406
Bump schema
nathanjmcdougall Jan 8, 2025
a51a0fc
Add tests for get_pipeweld_pipeline_from_default
nathanjmcdougall Jan 8, 2025
a354e4f
Add tests for get_pipeweld_step
nathanjmcdougall Jan 8, 2025
21a8454
Use single dispatch to reduce complexity of pipeweld functions
nathanjmcdougall Jan 8, 2025
b4e27ea
Refactor pipeweld add function to use class for shared problem config…
nathanjmcdougall Jan 8, 2025
520c9bf
Simplify _parallel_merge_partitions
nathanjmcdougall Jan 8, 2025
049d1c7
Simplify add_repo and _add_step_in_default_via_doc
nathanjmcdougall Jan 9, 2025
2afbfad
Add more tests for use_pyproject_fmt
nathanjmcdougall Jan 9, 2025
c5c561b
Add more tests for use_deptry
nathanjmcdougall Jan 9, 2025
b9758b0
Add more tests for use_ruff
nathanjmcdougall Jan 9, 2025
9775f04
Remove references to deleted ruff rules
nathanjmcdougall Jan 9, 2025
445dbcb
Add failing test for parsing 3.14.0a3
nathanjmcdougall Jan 9, 2025
1b258fc
Support alpha versions of Python in uv
nathanjmcdougall Jan 9, 2025
4a64400
Explicitly test err is empty in capfd tests
nathanjmcdougall Jan 9, 2025
e72c861
Don't use importlib.resources for loading schema.json files
nathanjmcdougall Jan 9, 2025
9922587
Make available Python versions test more robust for MacOS
nathanjmcdougall Jan 9, 2025
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 .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
git config --global user.email placeholder@example.com

- name: Set up uv
uses: astral-sh/setup-uv@3b9817b1bf26186f03ab8277bab9b827ea5cc254 # v3.2.0
uses: astral-sh/setup-uv@e779db74266a80753577425b0f4ee823649f251d # v3.2.3
with:
version: "latest"

Expand Down
21 changes: 12 additions & 9 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,31 @@
repos:
- repo: https://github.com/abravalheri/validate-pyproject
rev: "v0.23"
rev: v0.23
hooks:
- id: validate-pyproject
additional_dependencies: ["validate-pyproject-schema-store[all]"]
- repo: https://github.com/tox-dev/pyproject-fmt
rev: "v2.5.0"
rev: v2.5.0
hooks:
- id: pyproject-fmt
- repo: local
hooks:
- id: ruff-format
name: ruff-format
entry: uv run --frozen ruff format
entry: uv run --frozen ruff format --force-exclude
types_or: [python, pyi, jupyter]
language: system
always_run: true
pass_filenames: false
require_serial: true
- repo: local
hooks:
- id: ruff-check
name: ruff-check
entry: uv run --frozen ruff check --fix
- id: ruff
name: ruff
entry: uv run --frozen ruff check --fix --force-exclude
types_or: [python, pyi, jupyter]
language: system
always_run: true
pass_filenames: false
require_serial: true
- repo: local
hooks:
- id: deptry
Expand All @@ -46,5 +48,6 @@ repos:
name: pyright
entry: uv run --frozen pyright
language: system
types_or: [python, pyi]
always_run: true
pass_filenames: false
require_serial: true
Loading