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

#468: update master from develop v1.0.1 #466

Merged
merged 14 commits into from
Oct 30, 2023
Merged

#468: update master from develop v1.0.1 #466

merged 14 commits into from
Oct 30, 2023

Conversation

cwschilly
Copy link
Contributor

@cwschilly cwschilly commented Oct 16, 2023

Fixes #468

cwschilly and others added 6 commits September 30, 2023 11:59
…r-defined data (#452)

* #421: add user_defined data to jsonwriter

* #421: return to original config
* #447: Try removing authentication

* #447: fix classifiers

* #447: update development status

* #447: try publishing to PyPi

* #447: clean up

* #447: add condition back to pypi pipeline

* #447: add newline

---------

Co-authored-by: Caleb Schilly <cwschilly@gmail.com>
* #431: create optional target_imbalance parameter

* #431: add clarifying comment
* #439: time every iteration in InformAndTransfer algorithm

* #439: clean up comments
@cwschilly cwschilly requested a review from ppebay October 16, 2023 18:12
Copy link
Contributor

@ppebay ppebay left a comment

Choose a reason for hiding this comment

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

+1

Copy link
Contributor

@nlslatt nlslatt left a comment

Choose a reason for hiding this comment

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

It looks like someone has probably been merging PRs that do not pass all checks, because I see stuff on develop now causing the checks for this PR to fail. Choices like this could complicate all our processes down the road (this accidentally happened in the vt repo and has been a nightmare ever since).

This PR should not "fix" a closed issue. A new issue should be created.

@cwschilly cwschilly changed the title #457: update master from develop v1.0.1 #468: update master from develop v1.0.1 Oct 17, 2023
@cwschilly
Copy link
Contributor Author

cwschilly commented Oct 17, 2023

@nlslatt @ppebay Should I create an issue for the dependabot PR to fix (in hindsight) and then rebase/rename the commit?

The other failing pipeline is because the branch of this PR is develop

@nlslatt
Copy link
Contributor

nlslatt commented Oct 17, 2023

@nlslatt @ppebay Should I create an issue for the dependabot PR to fix (in hindsight) and then rebase/rename the commit?

The other failing pipeline is because the branch of this PR is develop

@lifflander?

@lifflander
Copy link
Contributor

@nlslatt @ppebay Should I create an issue for the dependabot PR to fix (in hindsight) and then rebase/rename the commit?
The other failing pipeline is because the branch of this PR is develop

@lifflander?

I think it's worth doing that although it will break everyone's develop if we force push to it.

dependabot bot and others added 5 commits October 19, 2023 16:43
Bumps [pygments](https://github.com/pygments/pygments) from 2.13.0 to 2.15.0.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](pygments/pygments@2.13.0...2.15.0)

---
updated-dependencies:
- dependency-name: pygments
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* #419: modify deploy_docs.yml

* #419: add newline

* #419: change target branch to test workflow

* #419: fix pip install

* #419: explicitly install necessary packages

* #419: download json files validator

* #419: return to original target branch
…improve it (#460)

* #441: add scalene optimization suggestions

* #441: change r to rank
…465)

* #464: optimized transfer swapping logic and improved instrumentation and stata

* #464: fixed incorrect cherry-picking between branches

* #464: restored inadvertently deleted constructor parameter

* #464: fixed typo

* #464: restored timers that got lost in cherry picking

* #464: reintegrated missing code

* #464: revert more changes

---------

Co-authored-by: Caleb Schilly <cwschilly@gmail.com>
@cwschilly
Copy link
Contributor Author

@nlslatt @ppebay @lifflander This should be ready to go now; the only remaining failure is because the branch name is not formatted correctly

@nlslatt
Copy link
Contributor

nlslatt commented Oct 20, 2023

I was going to ask if we updated the version number in the VERSION file mentioned in the LICENSE file, but it seems we don't have one yet. We should probably create one before merging into master.

@cwschilly cwschilly mentioned this pull request Oct 23, 2023
@cwschilly
Copy link
Contributor Author

I was going to ask if we updated the version number in the VERSION file mentioned in the LICENSE file, but it seems we don't have one yet. We should probably create one before merging into master.

I have created a VERSION file in PR #473

Copy link
Contributor

@ppebay ppebay 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 additional change

* #472: create VERSION file

* #472: add newline
* #446: Restored instrumentation that had been removed due to conflicts with 1.0.1

* #446: whitespace cleanup

* #446: simplified subclustering and further improved instrumentation

* #446: final improvement of the subclustering subsampling logic

* #446: whitespace cleanup

* #446: EOL cleanup

* #446: fix variable name

* #446: fixed incorrect random selection of target/criterion in non deterministic mode

* #446: fixed debug hack use to prevent division by zero error when skipping swaps

---------

Co-authored-by: Caleb Schilly <cwschilly@gmail.com>
@cwschilly
Copy link
Contributor Author

@ppebay @nlslatt @lifflander We've now merged all relevant PRs to v1.0.1 -- once we merge this PR I can go ahead with the release

@ppebay
Copy link
Contributor

ppebay commented Oct 25, 2023

I think only either @lifflander or @nlslatt can merge this PR

* #469: introduce new visualization parameter and create script for updating configuration files

* #469: use ruamel.yaml to read/write config files

* #469: update all files in tests/unit/config

* #469: update remaining files

* #469: clean up and comment code

* #469: remove extraneous code

* #469: replace instances of LBAF_Viz throughout code

* #469: fix string typo

* #469: move script to proper directory; add error message for missing import

* #469: remove requirement to install package
@nlslatt nlslatt merged commit c46970c into master Oct 30, 2023
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.

5 participants