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

Merge development branch into the master branch #42

Merged
merged 66 commits into from
Oct 26, 2023
Merged

Merge development branch into the master branch #42

merged 66 commits into from
Oct 26, 2023

Conversation

uwcdc
Copy link
Contributor

@uwcdc uwcdc commented Oct 11, 2023

This PR contains project restructuring and installation changes from @lsetiawan and @uwcdc. The project now follows the Scientific Python standards laid out by Scientific Python. In addition, the following dependencies were updated:

  • neuraltoolkit
  • smart-open

Due to the fact that the dependence on neuraltoolkit has not been used in over a year, the pip install neuraltoolkit (v0.3.1) was substituted, and the project built without any error.

In addition, the dependence on smart-open diverged from the master repo, so the original fork has been maintained internally by the Braingeneers. Consequently, the fork was migrated to here.

lsetiawan and others added 30 commits July 26, 2023 14:32
Initialize repo packaging based on sci py cookie
fix: bring back missing .so file and remove from gitignore
Updated ci and cd yaml to trigger on development
branch
Pinned neuraltoolkit dependency to version 0.3.1 only.

@lsetiawan: From some investigation, the actual functions that are being used in the braingeneers package from neuraltoolkit hasn't changed in over a year. And the latest stable v0.3.1 was released in March 2023. So it is safe to use this specific version and minimize breakage.
Sync current code within master into the development branch
that contains packaging changes.
Update installation instructions
uwcdc and others added 5 commits October 23, 2023 11:48
Co-authored-by: Lon Blauvelt <lblauvel@ucsc.edu>
Remove commented `sortedcontainers` dependency

Co-authored-by: Lon Blauvelt <lblauvel@ucsc.edu>
Remove `braingeneers-smart-open` statement
Resolves comment #42 (comment)
Updated link for AWS Data Wrangler
Add link to the `CONTRIBUTING.md` file
Resolves comment #42 (comment)
Copy link
Contributor

@lsetiawan lsetiawan left a comment

Choose a reason for hiding this comment

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

Thanks for your detailed review @DailyDreaming! Those are very helpful feedback. 😄

@uwcdc please update as I commented above. Thanks!

Remove `PyLint`
Resolves comment #42 (comment)
Remove the `_compat` module
Part 1 of resolving comment #42 (comment)
Remove the `_compat` module tests
Part 2 of resolving comment #42 (comment)
Remove the `_compat` module import
Part 3 of resolving comment #42 (comment)
Updated the `ci.yml` to allow for Python 3.12 (experimental) support
Added `continue-on-error` functionality in case the experimental support fails since it is new
Resolves comment #42 (comment)
@lsetiawan could you review the changes that I made here?
Commenting out `continue-on-error`
Remove commented line
Updated `python-version` to num
Copy link
Member

@DailyDreaming DailyDreaming left a comment

Choose a reason for hiding this comment

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

@lsetiawan @uwcdc This looks great. Thanks for addressing all of the comments.

I'm suggesting the MIT license after consulting with our managers on this side. Once that's changed, I think that this is good to merge. Thanks again!

Updated the LICENSE to MIT
Update to include the MIT license
Copy link
Contributor Author

@uwcdc uwcdc left a comment

Choose a reason for hiding this comment

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

Looks good

.github/workflows/ci.yml Outdated Show resolved Hide resolved
Removed commented `pre-commit` section
Copy link
Contributor Author

@uwcdc uwcdc left a comment

Choose a reason for hiding this comment

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

Done!

Copy link
Contributor

@lsetiawan lsetiawan left a comment

Choose a reason for hiding this comment

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

All looks good to me now. Thanks @uwcdc for making those changes.

@uwcdc uwcdc merged commit bfaf45f into master Oct 26, 2023
40 of 58 checks passed
@uwcdc uwcdc deleted the development branch October 26, 2023 21:44
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