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

WIP: Apache pieces #26

Merged
merged 31 commits into from
Jul 1, 2021
Merged

Conversation

stephhazlitt
Copy link
Collaborator

@stephhazlitt stephhazlitt commented Jun 15, 2021

This PR is an attempt to address items listed in Issue #25.

I suggest code reviews by @JustinCally @ateucher and @boshek before merge consideration.

Current state is an attempt to bring in the {bcdata} source code Apache 2.0 licence elements with modifications still licensed under MIT. A simplification would be to switch the modifications to the Apache 2.0 licence (tasks would be: rm LICENCE.md file, rename LICENCE-APACHE2.md -> LICENCE.md, rm MIT in footer of README, rm MIT from DESCRIPTION file).

@stephhazlitt
Copy link
Collaborator Author

@JustinCally One Apache 2.0 piece I did not tackle is the description of changes in the relevant .R files.

@JustinCally JustinCally changed the base branch from master to develop June 16, 2021 06:23
@JustinCally
Copy link
Owner

Thanks @stephhazlitt. I made some modifications to get through the checks and have removed my original MIT licence so that both myself and the Province of British Columbia are copyright holders. As Andy said, this is probably easier. I'll add the state changes for the R and test files over the next couple of days.

@ateucher
Copy link
Collaborator

This is looking great @stephhazlitt and @JustinCally - thanks!

@boshek
Copy link

boshek commented Jun 18, 2021

Looks good to me. Thanks to @stephhazlitt for doing the heavy lifting here.

@JustinCally
Copy link
Owner

Thanks @stephhazlitt @ateucher @boshek

If you are all happy I will accept the pull request and make a CRAN release

@JustinCally JustinCally merged commit 60a0802 into JustinCally:develop Jul 1, 2021
@JustinCally JustinCally mentioned this pull request Jul 4, 2021
@JustinCally JustinCally mentioned this pull request Jul 12, 2021
8 tasks
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.

4 participants