search

jpy-consortium / jpy

Apache License 2.0
74 stars 18 forks source link

Import and create PRs for Deephaven changes #7

Open chipkent opened 3 years ago

chipkent commented 3 years ago

Import and create PRs for Deephaven changes

devinrsmith commented 2 years ago

Some context:

Deephaven has maintained a fork of jpy, starting from https://github.com/deephaven/jpy/tree/common-ancestor.

Early on in the history, Deephaven used a git subtree model to maintain history. Later on in the history, Deephaven maintained a squashed history and updates in https://github.com/deephaven/deephaven-core/tree/main/py/jpy. (These latter changes have been re-contextualized back into the https://github.com/deephaven/jpy.)

Roughly, these periods can be viewed as:

  1. https://github.com/deephaven/jpy/compare/common-ancestor...dhc-initial
  2. https://github.com/deephaven/jpy/compare/dhc-initial...dhc-main

In total, there are about 50 commits.

I'm currently engaged in getting these changes ship-shape for PRs back into https://github.com/jpy-consortium/jpy (while bringing https://github.com/deephaven/jpy up-to-date). My strategy is to step through this history, commit by commit; and starting with https://github.com/jpy-consortium/jpy/master, build up a string of PRs which build off of the history of the previous ones. I'm hoping these PRs can be merged with their history to make the process of responding to feedback cleanly apply to latter PRs.

niloc132 commented 2 years ago

Is this ready to be closed?