Fix IntelliJ import by karenfeng · Pull Request #223 · projectglow/glow

karenfeng · 2020-06-01T20:19:40Z

What changes are proposed in this pull request?

The existing cross-build functionality does not work well with IntelliJ. To fix this and simplify the build, I changed our cross-build setup to set the Scala version via an environment variable SCALA_VERSION. The user will have to change their SBT settings according to the README.

As a result, the core_2_11 and core_2_12 projects no longer exist; the Scala base project is accessed via core with the appropriate env var. To make this compatible with the release process, we toggle the scalaVersion SBT settingKey before running the full suites of tests.

How is this patch tested?

Unit tests
Integration tests
Manual tests

* WIP Signed-off-by: Karen Feng <karen.feng@databricks.com> * Ndarray Signed-off-by: Karen Feng <karen.feng@databricks.com> * More tests Signed-off-by: Karen Feng <karen.feng@databricks.com> * Support flat array Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move registering Signed-off-by: Karen Feng <karen.feng@databricks.com> * pytest Signed-off-by: Karen Feng <karen.feng@databricks.com> * Make docstring more accurate Signed-off-by: Karen Feng <karen.feng@databricks.com> * idempotent registration Signed-off-by: Karen Feng <karen.feng@databricks.com> * Test fixup Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move import out Signed-off-by: Karen Feng <karen.feng@databricks.com>

* doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * notebook Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * attributes Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * yapf Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> Signed-off-by: Karen Feng <karen.feng@databricks.com>

Signed-off-by: Karen Feng <karen.feng@databricks.com>

…ss-build-env-vars Signed-off-by: Karen Feng <karen.feng@databricks.com>

Signed-off-by: Karen Feng <karen.feng@databricks.com>

codecov · 2020-06-01T22:33:33Z

Codecov Report

Merging #223 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #223   +/-   ##
=======================================
  Coverage   93.59%   93.59%           
=======================================
  Files          88       88           
  Lines        4232     4232           
  Branches      359      359           
=======================================
  Hits         3961     3961           
  Misses        271      271

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 33ea171...2a19cf9. Read the comment docs.

henrydavidge

LGTM!!!!!!

build.sbt

Signed-off-by: Karen Feng <karen.feng@databricks.com>

* Support numpy literals (projectglow#213) * WIP Signed-off-by: Karen Feng <karen.feng@databricks.com> * Ndarray Signed-off-by: Karen Feng <karen.feng@databricks.com> * More tests Signed-off-by: Karen Feng <karen.feng@databricks.com> * Support flat array Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move registering Signed-off-by: Karen Feng <karen.feng@databricks.com> * pytest Signed-off-by: Karen Feng <karen.feng@databricks.com> * Make docstring more accurate Signed-off-by: Karen Feng <karen.feng@databricks.com> * idempotent registration Signed-off-by: Karen Feng <karen.feng@databricks.com> * Test fixup Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move import out Signed-off-by: Karen Feng <karen.feng@databricks.com> * Add documentation for the GFF3 reader (projectglow#221) * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * notebook Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * attributes Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * yapf Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> Signed-off-by: Karen Feng <karen.feng@databricks.com> * Remove cross-build plugin Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap Signed-off-by: Karen Feng <karen.feng@databricks.com> * triple quote Signed-off-by: Karen Feng <karen.feng@databricks.com> * set 'for imports' and 'for builds' within sbt settings Signed-off-by: Karen Feng <karen.feng@databricks.com> * CircleCI config Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap release Signed-off-by: Karen Feng <karen.feng@databricks.com> * More docs Signed-off-by: Karen Feng <karen.feng@databricks.com> * Comments Signed-off-by: Karen Feng <karen.feng@databricks.com> Co-authored-by: Kiavash Kianfar <kiavash.kianfar@databricks.com>

* Support numpy literals (#213) * WIP Signed-off-by: Karen Feng <karen.feng@databricks.com> * Ndarray Signed-off-by: Karen Feng <karen.feng@databricks.com> * More tests Signed-off-by: Karen Feng <karen.feng@databricks.com> * Support flat array Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move registering Signed-off-by: Karen Feng <karen.feng@databricks.com> * pytest Signed-off-by: Karen Feng <karen.feng@databricks.com> * Make docstring more accurate Signed-off-by: Karen Feng <karen.feng@databricks.com> * idempotent registration Signed-off-by: Karen Feng <karen.feng@databricks.com> * Test fixup Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move import out Signed-off-by: Karen Feng <karen.feng@databricks.com> * Add documentation for the GFF3 reader (#221) * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * notebook Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * attributes Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * yapf Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> Signed-off-by: Karen Feng <karen.feng@databricks.com> * Remove cross-build plugin Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap Signed-off-by: Karen Feng <karen.feng@databricks.com> * triple quote Signed-off-by: Karen Feng <karen.feng@databricks.com> * set 'for imports' and 'for builds' within sbt settings Signed-off-by: Karen Feng <karen.feng@databricks.com> * CircleCI config Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap release Signed-off-by: Karen Feng <karen.feng@databricks.com> * new rule Signed-off-by: Henry D <henrydavidge@gmail.com> * Support numpy literals (#213) * WIP Signed-off-by: Karen Feng <karen.feng@databricks.com> * Ndarray Signed-off-by: Karen Feng <karen.feng@databricks.com> * More tests Signed-off-by: Karen Feng <karen.feng@databricks.com> * Support flat array Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move registering Signed-off-by: Karen Feng <karen.feng@databricks.com> * pytest Signed-off-by: Karen Feng <karen.feng@databricks.com> * Make docstring more accurate Signed-off-by: Karen Feng <karen.feng@databricks.com> * idempotent registration Signed-off-by: Karen Feng <karen.feng@databricks.com> * Test fixup Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move import out Signed-off-by: Karen Feng <karen.feng@databricks.com> * Add documentation for the GFF3 reader (#221) * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * notebook Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * attributes Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * yapf Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * More docs Signed-off-by: Karen Feng <karen.feng@databricks.com> * add tests Signed-off-by: Henry D <henrydavidge@gmail.com> * style Signed-off-by: Henry D <henrydavidge@gmail.com> * Fix IntelliJ import (#223) * Support numpy literals (#213) * WIP Signed-off-by: Karen Feng <karen.feng@databricks.com> * Ndarray Signed-off-by: Karen Feng <karen.feng@databricks.com> * More tests Signed-off-by: Karen Feng <karen.feng@databricks.com> * Support flat array Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move registering Signed-off-by: Karen Feng <karen.feng@databricks.com> * pytest Signed-off-by: Karen Feng <karen.feng@databricks.com> * Make docstring more accurate Signed-off-by: Karen Feng <karen.feng@databricks.com> * idempotent registration Signed-off-by: Karen Feng <karen.feng@databricks.com> * Test fixup Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move import out Signed-off-by: Karen Feng <karen.feng@databricks.com> * Add documentation for the GFF3 reader (#221) * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * notebook Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * attributes Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * yapf Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> Signed-off-by: Karen Feng <karen.feng@databricks.com> * Remove cross-build plugin Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap Signed-off-by: Karen Feng <karen.feng@databricks.com> * triple quote Signed-off-by: Karen Feng <karen.feng@databricks.com> * set 'for imports' and 'for builds' within sbt settings Signed-off-by: Karen Feng <karen.feng@databricks.com> * CircleCI config Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap release Signed-off-by: Karen Feng <karen.feng@databricks.com> * More docs Signed-off-by: Karen Feng <karen.feng@databricks.com> * Comments Signed-off-by: Karen Feng <karen.feng@databricks.com> Co-authored-by: Kiavash Kianfar <kiavash.kianfar@databricks.com> * comments Signed-off-by: Henry D <henrydavidge@gmail.com> * more docs Signed-off-by: Henry D <henrydavidge@gmail.com> * note pr Signed-off-by: Henry D <henrydavidge@gmail.com> Co-authored-by: Karen Feng <karen.feng@databricks.com> Co-authored-by: Kiavash Kianfar <kiavash.kianfar@databricks.com>

* Support numpy literals (projectglow#213) * WIP Signed-off-by: Karen Feng <karen.feng@databricks.com> * Ndarray Signed-off-by: Karen Feng <karen.feng@databricks.com> * More tests Signed-off-by: Karen Feng <karen.feng@databricks.com> * Support flat array Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move registering Signed-off-by: Karen Feng <karen.feng@databricks.com> * pytest Signed-off-by: Karen Feng <karen.feng@databricks.com> * Make docstring more accurate Signed-off-by: Karen Feng <karen.feng@databricks.com> * idempotent registration Signed-off-by: Karen Feng <karen.feng@databricks.com> * Test fixup Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move import out Signed-off-by: Karen Feng <karen.feng@databricks.com> * Add documentation for the GFF3 reader (projectglow#221) * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * notebook Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * attributes Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * yapf Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> Signed-off-by: Karen Feng <karen.feng@databricks.com> * Remove cross-build plugin Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap Signed-off-by: Karen Feng <karen.feng@databricks.com> * triple quote Signed-off-by: Karen Feng <karen.feng@databricks.com> * set 'for imports' and 'for builds' within sbt settings Signed-off-by: Karen Feng <karen.feng@databricks.com> * CircleCI config Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap release Signed-off-by: Karen Feng <karen.feng@databricks.com> * More docs Signed-off-by: Karen Feng <karen.feng@databricks.com> * Comments Signed-off-by: Karen Feng <karen.feng@databricks.com> Co-authored-by: Kiavash Kianfar <kiavash.kianfar@databricks.com> Signed-off-by: Henry Davidge <hhd@databricks.com>

* Support numpy literals (projectglow#213) * WIP Signed-off-by: Karen Feng <karen.feng@databricks.com> * Ndarray Signed-off-by: Karen Feng <karen.feng@databricks.com> * More tests Signed-off-by: Karen Feng <karen.feng@databricks.com> * Support flat array Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move registering Signed-off-by: Karen Feng <karen.feng@databricks.com> * pytest Signed-off-by: Karen Feng <karen.feng@databricks.com> * Make docstring more accurate Signed-off-by: Karen Feng <karen.feng@databricks.com> * idempotent registration Signed-off-by: Karen Feng <karen.feng@databricks.com> * Test fixup Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move import out Signed-off-by: Karen Feng <karen.feng@databricks.com> * Add documentation for the GFF3 reader (projectglow#221) * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * notebook Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * attributes Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * yapf Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> Signed-off-by: Karen Feng <karen.feng@databricks.com> * Remove cross-build plugin Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap Signed-off-by: Karen Feng <karen.feng@databricks.com> * triple quote Signed-off-by: Karen Feng <karen.feng@databricks.com> * set 'for imports' and 'for builds' within sbt settings Signed-off-by: Karen Feng <karen.feng@databricks.com> * CircleCI config Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap release Signed-off-by: Karen Feng <karen.feng@databricks.com> * new rule Signed-off-by: Henry D <henrydavidge@gmail.com> * Support numpy literals (projectglow#213) * WIP Signed-off-by: Karen Feng <karen.feng@databricks.com> * Ndarray Signed-off-by: Karen Feng <karen.feng@databricks.com> * More tests Signed-off-by: Karen Feng <karen.feng@databricks.com> * Support flat array Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move registering Signed-off-by: Karen Feng <karen.feng@databricks.com> * pytest Signed-off-by: Karen Feng <karen.feng@databricks.com> * Make docstring more accurate Signed-off-by: Karen Feng <karen.feng@databricks.com> * idempotent registration Signed-off-by: Karen Feng <karen.feng@databricks.com> * Test fixup Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move import out Signed-off-by: Karen Feng <karen.feng@databricks.com> * Add documentation for the GFF3 reader (projectglow#221) * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * notebook Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * attributes Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * yapf Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * More docs Signed-off-by: Karen Feng <karen.feng@databricks.com> * add tests Signed-off-by: Henry D <henrydavidge@gmail.com> * style Signed-off-by: Henry D <henrydavidge@gmail.com> * Fix IntelliJ import (projectglow#223) * Support numpy literals (projectglow#213) * WIP Signed-off-by: Karen Feng <karen.feng@databricks.com> * Ndarray Signed-off-by: Karen Feng <karen.feng@databricks.com> * More tests Signed-off-by: Karen Feng <karen.feng@databricks.com> * Support flat array Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move registering Signed-off-by: Karen Feng <karen.feng@databricks.com> * pytest Signed-off-by: Karen Feng <karen.feng@databricks.com> * Make docstring more accurate Signed-off-by: Karen Feng <karen.feng@databricks.com> * idempotent registration Signed-off-by: Karen Feng <karen.feng@databricks.com> * Test fixup Signed-off-by: Karen Feng <karen.feng@databricks.com> * Move import out Signed-off-by: Karen Feng <karen.feng@databricks.com> * Add documentation for the GFF3 reader (projectglow#221) * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * doc Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * notebook Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * attributes Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> * yapf Signed-off-by: kianfar77 <kiavash.kianfar@databricks.com> Signed-off-by: Karen Feng <karen.feng@databricks.com> * Remove cross-build plugin Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap Signed-off-by: Karen Feng <karen.feng@databricks.com> * triple quote Signed-off-by: Karen Feng <karen.feng@databricks.com> * set 'for imports' and 'for builds' within sbt settings Signed-off-by: Karen Feng <karen.feng@databricks.com> * CircleCI config Signed-off-by: Karen Feng <karen.feng@databricks.com> * wrap release Signed-off-by: Karen Feng <karen.feng@databricks.com> * More docs Signed-off-by: Karen Feng <karen.feng@databricks.com> * Comments Signed-off-by: Karen Feng <karen.feng@databricks.com> Co-authored-by: Kiavash Kianfar <kiavash.kianfar@databricks.com> * comments Signed-off-by: Henry D <henrydavidge@gmail.com> * more docs Signed-off-by: Henry D <henrydavidge@gmail.com> * note pr Signed-off-by: Henry D <henrydavidge@gmail.com> Co-authored-by: Karen Feng <karen.feng@databricks.com> Co-authored-by: Kiavash Kianfar <kiavash.kianfar@databricks.com> Signed-off-by: Henry Davidge <hhd@databricks.com>

karenfeng and others added 8 commits June 1, 2020 13:37

Remove cross-build plugin

9902472

Signed-off-by: Karen Feng <karen.feng@databricks.com>

wrap

d5a98e7

Signed-off-by: Karen Feng <karen.feng@databricks.com>

triple quote

3ac1518

Signed-off-by: Karen Feng <karen.feng@databricks.com>

set 'for imports' and 'for builds' within sbt settings

a55fef1

Signed-off-by: Karen Feng <karen.feng@databricks.com>

CircleCI config

0ccc6dc

Signed-off-by: Karen Feng <karen.feng@databricks.com>

wrap release

dbc6459

Signed-off-by: Karen Feng <karen.feng@databricks.com>

karenfeng force-pushed the cross-build-env-vars branch from 4133fb0 to dbc6459 Compare June 1, 2020 20:38

Merge branch 'master' of https://github.com/projectglow/glow into cro…

50cd1d1

…ss-build-env-vars Signed-off-by: Karen Feng <karen.feng@databricks.com>

karenfeng requested a review from henrydavidge June 1, 2020 20:59

More docs

e2862a9

Signed-off-by: Karen Feng <karen.feng@databricks.com>

henrydavidge approved these changes Jun 1, 2020

View reviewed changes

build.sbt Outdated Show resolved Hide resolved

henrydavidge reviewed Jun 1, 2020

View reviewed changes

build.sbt Outdated Show resolved Hide resolved

Comments

2a19cf9

Signed-off-by: Karen Feng <karen.feng@databricks.com>

karenfeng merged commit 7548aa8 into projectglow:master Jun 2, 2020

karenfeng deleted the cross-build-env-vars branch June 2, 2020 00:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix IntelliJ import#223

Fix IntelliJ import#223
karenfeng merged 11 commits intoprojectglow:masterfrom
karenfeng:cross-build-env-vars

karenfeng commented Jun 1, 2020 •

edited

Loading

Uh oh!

codecov bot commented Jun 1, 2020 •

edited

Loading

Uh oh!

henrydavidge left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

karenfeng commented Jun 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What changes are proposed in this pull request?

How is this patch tested?

Uh oh!

codecov bot commented Jun 1, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

henrydavidge left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

karenfeng commented Jun 1, 2020 •

edited

Loading

codecov bot commented Jun 1, 2020 •

edited

Loading