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.

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

Jump to bottom

Line numbers #647

Open
wants to merge 53 commits into
base: main
Choose a base branch
from
Open

Line numbers #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
a57ae4a
Create test_line_numbers.py
acoleman2000 Nov 21, 2022
4b23d8d
adding tests
acoleman2000 Jan 9, 2023
2e584ac
updating save method within python_codegen_support.py
acoleman2000 Jan 9, 2023
b7f22de
adding helper methods
acoleman2000 Jan 9, 2023
21659d2
adding additional helper method
acoleman2000 Jan 9, 2023
f68e74a
fixing bugs in helper method
acoleman2000 Jan 9, 2023
2c26bfa
updating python codegen_support.py and python_codegen.py
acoleman2000 Jan 10, 2023
e0ee3f4
updating files
acoleman2000 Jan 11, 2023
8b31a59
updating test
acoleman2000 Jan 12, 2023
6d8bce9
updating files and adding test cwl files
acoleman2000 Jan 13, 2023
3150b2f
Merge branch 'common-workflow-language:main' into line_numbers
acoleman2000 Jan 13, 2023
3143595
Fixing bug with updating sub-docs and non-kv values getting added to …
acoleman2000 Jan 17, 2023
9919bc4
Merge branch 'line_numbers' of https://github.com/acoleman2000/schema…
acoleman2000 Jan 17, 2023
3b80801
updating CommentedSeq lc update
acoleman2000 Jan 17, 2023
8152f0c
updating CommentedSeq lc data
acoleman2000 Jan 17, 2023
6ec8730
Updating metaschema.py
acoleman2000 Jan 17, 2023
149b1ba
updating type -> asinstance and bug fix in save
acoleman2000 Jan 17, 2023
16996bb
Adding doc = copy.copy(doc) before removing values
acoleman2000 Jan 17, 2023
0522ce8
removing typecheck for key in val
acoleman2000 Jan 17, 2023
6f62fb8
running make cleanup
acoleman2000 Jan 18, 2023
ba2dd90
updating metaschema.py
acoleman2000 Jan 18, 2023
2dea597
Fixing type warning for doc
acoleman2000 Jan 23, 2023
74b23d0
working on test
acoleman2000 Jan 23, 2023
8575f3f
Fixing issue with type hints and indentation of setting global variable
acoleman2000 Jan 23, 2023
a087833
adding metaschema.py
acoleman2000 Jan 23, 2023
7bfac7c
fix type error
acoleman2000 Jan 23, 2023
06fc513
fix type error
acoleman2000 Jan 23, 2023
5fd6ca1
Merge branch 'common-workflow-language:main' into line_numbers
acoleman2000 Jan 25, 2023
41d406d
updates to codegen
acoleman2000 Mar 28, 2023
27c7314
Merge branch 'line_numbers' of https://github.com/acoleman2000/schema…
acoleman2000 May 2, 2023
f4e098b
Updating python_codegen and python_codegen_support for cleaner logic …
acoleman2000 May 5, 2023
8263fdb
updating for consistent line numbers
acoleman2000 May 8, 2023
add86c6
adding files for line number tests
acoleman2000 May 11, 2023
625a3a5
adding cwl python codegen files for tests and having them be ignored …
acoleman2000 May 11, 2023
6f544e9
updating python codegen/codegen_support, metaschema, and tests.
acoleman2000 May 11, 2023
4178c78
Merge branch 'main' into line_numbers
acoleman2000 May 11, 2023
74e3247
running make clean-up
acoleman2000 May 11, 2023
c9d35a2
Merge branch 'line_numbers' of https://github.com/acoleman2000/schema…
acoleman2000 May 11, 2023
752dbab
trying to pass tox tests
acoleman2000 May 15, 2023
5d198ee
updating to remove inserted_line_info from global variable
acoleman2000 May 15, 2023
160f559
updating cwl codegen filesfor updated codegen
acoleman2000 May 15, 2023
bdd5c04
Updating codegen to support shifting down of text
acoleman2000 Jun 5, 2023
cc76eb9
Updating metaschema.py and updating to pass lint
acoleman2000 Jun 5, 2023
f85ed3c
running make cleanup
acoleman2000 Jun 5, 2023
3d61e55
updating Makefile to properly exclude cwl files
acoleman2000 Jun 8, 2023
63da121
Trying to pass metaschema up to date test
acoleman2000 Jun 8, 2023
ba8be89
trying alternate style of loading test files in
acoleman2000 Jun 9, 2023
d84a8bd
Merge branch 'main' into line_numbers
acoleman2000 Jun 14, 2023
be53207
Bogus commit to re-run testS
acoleman2000 Jun 15, 2023
5b10422
Merge branch 'main' into line_numbers
Nov 9, 2023
93406dd
Updating line numbers tests to use generated cwl files.
Nov 14, 2023
154af86
Removing static cwl files.
Nov 14, 2023
3afd4b0
Merge branch 'main' into line_numbers
acoleman2000 Nov 14, 2023
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
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ help: Makefile
## cleanup : shortcut for "make sort_imports format flake8 diff_pydocstyle_report"
cleanup: sort_imports format flake8 diff_pydocstyle_report

## install-dep : install most of the development dependencies via pip
## install-dep : inshttps://github.com/common-workflow-language/cwltool/issues?q=is%3Aissue+is%3Aopen+author%3Atom-tantall most of the development dependencies via pip
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

install-dep: install-dependencies

install-dependencies: FORCE
Expand Down Expand Up @@ -79,18 +79,18 @@ clean: FORCE

# Linting and code style related targets
## sort_import : sorting imports using isort: https://github.com/timothycrosley/isort
sort_imports: $(filter-out schema_salad/metaschema.py,$(PYSOURCES)) mypy-stubs
sort_imports: $(filter-out $(EXCLUDE_FILES),$(PYSOURCES)) mypy-stubs
isort $^

remove_unused_imports: $(filter-out schema_salad/metaschema.py,$(PYSOURCES))
remove_unused_imports: $(filter-out $(EXCLUDE_FILES),$(PYSOURCES))
autoflake --in-place --remove-all-unused-imports $^

pep257: pydocstyle
## pydocstyle : check Python docstring style
pydocstyle: $(filter-out schema_salad/metaschema.py,$(PYSOURCES))
pydocstyle: $(filter-out $(EXCLUDE_FILES),$(PYSOURCES))
pydocstyle --add-ignore=D100,D101,D102,D103 $^ || true

pydocstyle_report.txt: $(filter-out schema_salad/metaschema.py,$(PYSOURCES))
pydocstyle_report.txt: $(filter-out $(EXCLUDE_FILES),$(PYSOURCES))
pydocstyle setup.py $^ > $@ 2>&1 || true

## diff_pydocstyle_report : check Python docstring style for changed files only
Expand All @@ -103,10 +103,10 @@ codespell:

## format : check/fix all code indentation and formatting (runs black)
format:
black --force-exclude metaschema.py --exclude _version.py schema_salad setup.py mypy-stubs
black --force-exclude "metaschema.py|schema_salad/tests/cwl_v1*"" --exclude _version.py schema_salad setup.py mypy-stubs

format-check:
black --diff --check --force-exclude metaschema.py --exclude _version.py schema_salad setup.py mypy-stubs
black --diff --check --force-exclude "metaschema.py|schema_salad/tests/cwl_v1*" --exclude _version.py setup.py mypy-stubs

## pylint : run static code analysis on Python code
pylint: $(PYSOURCES)
Expand Down
Loading
Loading