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

fwk: rename package testdata to internal/fwktest #942

Merged
merged 4 commits into from
May 10, 2022

Conversation

dolmen
Copy link
Contributor

@dolmen dolmen commented May 5, 2022

Fixes #941 .

1st commit:

$ mkdir -p fwk/internal/fwktest
$ git mv fwk/testdata/*.go fwk/internal/fwktest
$ ( cd fwk/internal/fwktest; sed -i '' 's/package testdata/package fwktest/' *.go )
$ git add fwk/internal/fwktest

2nd commit:

$ ( cd fwk; find . -name '*.go' -exec grep -Hq 'fwk/testdata' '{}' \; -print | xargs sed -i '' -e 's!fwk/testdata!fwk/internal/fwktest!' -e 's!testdata\.!fwktest.!' -e 's!some tools defined in testdata!some tools defined in fwktest!' )
$ git add fwk

dolmen added 3 commits May 5, 2022 22:12
mkdir -p fwk/internal/fwktest
git mv fwk/testdata/*.go fwk/internal/fwktest
( cd fwk/internal/fwktest; sed -i '' 's/package testdata/package fwktest/' *.go )
git add fwk/internal/fwktest
( cd fwk; find . -name '*.go' -exec grep -Hq 'fwk/testdata' '{}' \; -print | xargs sed -i '' -e 's!fwk/testdata!fwk/internal/fwktest!' -e 's!testdata\.!fwktest.!' -e 's!some tools defined in testdata!some tools defined in fwktest!' )
Copy link
Member

@sbinet sbinet left a comment

Choose a reason for hiding this comment

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

LGTM.

thanks for cleaning that up.

like for the other pending PRs, please send another (just one) pull request against the go-hep/license repository, adding yourself to the AUTHORS and/or CONTRIBUTORS file(s).
then I'll be able to collect and merge all your other pull requests.
(I can't do that before you've added yourself to the list of authors/contributors of the Go-HEP project)

thanks.

@sbinet
Copy link
Member

sbinet commented May 6, 2022

ah. one finnicky import ordering that doesn't suit gofmt (or goimport in this case).

Apply gofmt after automated changes in previous commits.
@sbinet
Copy link
Member

sbinet commented May 10, 2022

I'll handle the staticcheck failure.

thanks.

@sbinet sbinet merged commit f81a84e into go-hep:main May 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rename package fwk/testdata (Go reserved name)
2 participants