Relocate python sources into py/ #2249
Conversation
| @@ -0,0 +1,7 @@ | |||
| plugins { | |||
There was a problem hiding this comment.
Note to other reviewers, this replaces py/deephaven2-wheel/build.gradle
| @@ -270,11 +255,28 @@ include(':application-mode') | |||
| include(':util-immutables') | |||
| project(':util-immutables').projectDir = file('Util/util-immutables') | |||
|
|
|||
| include(':deephaven-jpy') | |||
There was a problem hiding this comment.
note to other reviewers, I flattened this out since it is a net decrease in actual code, and just as clear as all the other renames we do, but without two different lambdas trying to define these projects
|
There are some conflicts waiting for me, as the moved files were modified after I made the commit that relocated them. Ideally I'd like to get a first round of review done before I redo that move, so as to not keep moving the files over and over as changes happen upstream. |
niloc132
force-pushed
the
dh-from-py
branch
2 times, most recently
from
bcc95fa
to
9b022a3
Compare
| COPY wheels/ /wheels | ||
| RUN set -eux; \ | ||
| python -m pip install -q --no-index --no-cache-dir /deephaven-jpy-wheel/*.whl; \ | ||
| rm -r /deephaven-jpy-wheel | ||
|
|
||
| COPY deephaven-wheel/ /deephaven-wheel | ||
| RUN set -eux; \ | ||
| python -m pip install -q --no-index --no-cache-dir /deephaven-wheel/*.whl; \ | ||
| rm -r /deephaven-wheel | ||
|
|
||
| COPY deephaven2-wheel/ /deephaven2-wheel | ||
| RUN set -eux; \ | ||
| python -m pip install -q --no-index --no-cache-dir /deephaven2-wheel/*.whl; \ | ||
| rm -r /deephaven2-wheel | ||
| python -m pip install -q --no-index --no-cache-dir /wheels/*.whl; \ | ||
| rm -r /wheels |
There was a problem hiding this comment.
We are "losing" a bit of docker cachability here, but I doubt it's of much consequence.
This also declares wheels as artifacts, making it simpler to declare and install dependencies.
Gradle build/ and python dist/ are now excluded from the python build - if we find this is onerous, buildPyWheel could take a CopySpec argument. With that said, this shouldn't be necessary soon, since deephaven-jpy will hopefully soon be replaced by upstream jpy, and deephaven-legacy will be phased out, leaving only projects that use the new
python-wheelplugin.Legacy deephaven-wheel is renamed now in gradle as well, but not relocated.
Partial #2221