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

Fix IntelliJ import #223

Merged
merged 11 commits into from
Jun 2, 2020
Merged

Conversation

karenfeng
Copy link
Collaborator

@karenfeng karenfeng commented Jun 1, 2020

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

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

Signed-off-by: Karen Feng <[email protected]>

* Ndarray

Signed-off-by: Karen Feng <[email protected]>

* More tests

Signed-off-by: Karen Feng <[email protected]>

* Support flat array

Signed-off-by: Karen Feng <[email protected]>

* Move registering

Signed-off-by: Karen Feng <[email protected]>

* pytest

Signed-off-by: Karen Feng <[email protected]>

* Make docstring more accurate

Signed-off-by: Karen Feng <[email protected]>

* idempotent registration

Signed-off-by: Karen Feng <[email protected]>

* Test fixup

Signed-off-by: Karen Feng <[email protected]>

* Move import out

Signed-off-by: Karen Feng <[email protected]>
* doc

Signed-off-by: kianfar77 <[email protected]>

* doc

Signed-off-by: kianfar77 <[email protected]>

* notebook

Signed-off-by: kianfar77 <[email protected]>

* attributes

Signed-off-by: kianfar77 <[email protected]>

* yapf

Signed-off-by: kianfar77 <[email protected]>
Signed-off-by: Karen Feng <[email protected]>
Signed-off-by: Karen Feng <[email protected]>
Signed-off-by: Karen Feng <[email protected]>
Signed-off-by: Karen Feng <[email protected]>
Signed-off-by: Karen Feng <[email protected]>
Signed-off-by: Karen Feng <[email protected]>
Signed-off-by: Karen Feng <[email protected]>
@codecov
Copy link

codecov bot commented Jun 1, 2020

Codecov Report

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

Impacted file tree graph

@@           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.

Copy link
Contributor

@henrydavidge henrydavidge left a comment

Choose a reason for hiding this comment

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

LGTM!!!!!!

build.sbt Outdated Show resolved Hide resolved
build.sbt Outdated Show resolved Hide resolved
Signed-off-by: Karen Feng <[email protected]>
@karenfeng karenfeng merged commit 7548aa8 into projectglow:master Jun 2, 2020
@karenfeng karenfeng deleted the cross-build-env-vars branch June 2, 2020 00:56
henrydavidge pushed a commit to henrydavidge/glow that referenced this pull request Jun 2, 2020
* Support numpy literals (projectglow#213)

* WIP

Signed-off-by: Karen Feng <[email protected]>

* Ndarray

Signed-off-by: Karen Feng <[email protected]>

* More tests

Signed-off-by: Karen Feng <[email protected]>

* Support flat array

Signed-off-by: Karen Feng <[email protected]>

* Move registering

Signed-off-by: Karen Feng <[email protected]>

* pytest

Signed-off-by: Karen Feng <[email protected]>

* Make docstring more accurate

Signed-off-by: Karen Feng <[email protected]>

* idempotent registration

Signed-off-by: Karen Feng <[email protected]>

* Test fixup

Signed-off-by: Karen Feng <[email protected]>

* Move import out

Signed-off-by: Karen Feng <[email protected]>

* Add documentation for the GFF3 reader (projectglow#221)

* doc

Signed-off-by: kianfar77 <[email protected]>

* doc

Signed-off-by: kianfar77 <[email protected]>

* notebook

Signed-off-by: kianfar77 <[email protected]>

* attributes

Signed-off-by: kianfar77 <[email protected]>

* yapf

Signed-off-by: kianfar77 <[email protected]>
Signed-off-by: Karen Feng <[email protected]>

* Remove cross-build plugin

Signed-off-by: Karen Feng <[email protected]>

* wrap

Signed-off-by: Karen Feng <[email protected]>

* triple quote

Signed-off-by: Karen Feng <[email protected]>

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

Signed-off-by: Karen Feng <[email protected]>

* CircleCI config

Signed-off-by: Karen Feng <[email protected]>

* wrap release

Signed-off-by: Karen Feng <[email protected]>

* More docs

Signed-off-by: Karen Feng <[email protected]>

* Comments

Signed-off-by: Karen Feng <[email protected]>

Co-authored-by: Kiavash Kianfar <[email protected]>
henrydavidge added a commit that referenced this pull request Jun 2, 2020
* Support numpy literals (#213)

* WIP

Signed-off-by: Karen Feng <[email protected]>

* Ndarray

Signed-off-by: Karen Feng <[email protected]>

* More tests

Signed-off-by: Karen Feng <[email protected]>

* Support flat array

Signed-off-by: Karen Feng <[email protected]>

* Move registering

Signed-off-by: Karen Feng <[email protected]>

* pytest

Signed-off-by: Karen Feng <[email protected]>

* Make docstring more accurate

Signed-off-by: Karen Feng <[email protected]>

* idempotent registration

Signed-off-by: Karen Feng <[email protected]>

* Test fixup

Signed-off-by: Karen Feng <[email protected]>

* Move import out

Signed-off-by: Karen Feng <[email protected]>

* Add documentation for the GFF3 reader (#221)

* doc

Signed-off-by: kianfar77 <[email protected]>

* doc

Signed-off-by: kianfar77 <[email protected]>

* notebook

Signed-off-by: kianfar77 <[email protected]>

* attributes

Signed-off-by: kianfar77 <[email protected]>

* yapf

Signed-off-by: kianfar77 <[email protected]>
Signed-off-by: Karen Feng <[email protected]>

* Remove cross-build plugin

Signed-off-by: Karen Feng <[email protected]>

* wrap

Signed-off-by: Karen Feng <[email protected]>

* triple quote

Signed-off-by: Karen Feng <[email protected]>

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

Signed-off-by: Karen Feng <[email protected]>

* CircleCI config

Signed-off-by: Karen Feng <[email protected]>

* wrap release

Signed-off-by: Karen Feng <[email protected]>

* new rule

Signed-off-by: Henry D <[email protected]>

* Support numpy literals (#213)

* WIP

Signed-off-by: Karen Feng <[email protected]>

* Ndarray

Signed-off-by: Karen Feng <[email protected]>

* More tests

Signed-off-by: Karen Feng <[email protected]>

* Support flat array

Signed-off-by: Karen Feng <[email protected]>

* Move registering

Signed-off-by: Karen Feng <[email protected]>

* pytest

Signed-off-by: Karen Feng <[email protected]>

* Make docstring more accurate

Signed-off-by: Karen Feng <[email protected]>

* idempotent registration

Signed-off-by: Karen Feng <[email protected]>

* Test fixup

Signed-off-by: Karen Feng <[email protected]>

* Move import out

Signed-off-by: Karen Feng <[email protected]>

* Add documentation for the GFF3 reader (#221)

* doc

Signed-off-by: kianfar77 <[email protected]>

* doc

Signed-off-by: kianfar77 <[email protected]>

* notebook

Signed-off-by: kianfar77 <[email protected]>

* attributes

Signed-off-by: kianfar77 <[email protected]>

* yapf

Signed-off-by: kianfar77 <[email protected]>

* More docs

Signed-off-by: Karen Feng <[email protected]>

* add tests

Signed-off-by: Henry D <[email protected]>

* style

Signed-off-by: Henry D <[email protected]>

* Fix IntelliJ import (#223)

* Support numpy literals (#213)

* WIP

Signed-off-by: Karen Feng <[email protected]>

* Ndarray

Signed-off-by: Karen Feng <[email protected]>

* More tests

Signed-off-by: Karen Feng <[email protected]>

* Support flat array

Signed-off-by: Karen Feng <[email protected]>

* Move registering

Signed-off-by: Karen Feng <[email protected]>

* pytest

Signed-off-by: Karen Feng <[email protected]>

* Make docstring more accurate

Signed-off-by: Karen Feng <[email protected]>

* idempotent registration

Signed-off-by: Karen Feng <[email protected]>

* Test fixup

Signed-off-by: Karen Feng <[email protected]>

* Move import out

Signed-off-by: Karen Feng <[email protected]>

* Add documentation for the GFF3 reader (#221)

* doc

Signed-off-by: kianfar77 <[email protected]>

* doc

Signed-off-by: kianfar77 <[email protected]>

* notebook

Signed-off-by: kianfar77 <[email protected]>

* attributes

Signed-off-by: kianfar77 <[email protected]>

* yapf

Signed-off-by: kianfar77 <[email protected]>
Signed-off-by: Karen Feng <[email protected]>

* Remove cross-build plugin

Signed-off-by: Karen Feng <[email protected]>

* wrap

Signed-off-by: Karen Feng <[email protected]>

* triple quote

Signed-off-by: Karen Feng <[email protected]>

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

Signed-off-by: Karen Feng <[email protected]>

* CircleCI config

Signed-off-by: Karen Feng <[email protected]>

* wrap release

Signed-off-by: Karen Feng <[email protected]>

* More docs

Signed-off-by: Karen Feng <[email protected]>

* Comments

Signed-off-by: Karen Feng <[email protected]>

Co-authored-by: Kiavash Kianfar <[email protected]>

* comments

Signed-off-by: Henry D <[email protected]>

* more docs

Signed-off-by: Henry D <[email protected]>

* note pr

Signed-off-by: Henry D <[email protected]>

Co-authored-by: Karen Feng <[email protected]>
Co-authored-by: Kiavash Kianfar <[email protected]>
henrydavidge pushed a commit to henrydavidge/glow that referenced this pull request Jun 22, 2020
* Support numpy literals (projectglow#213)

* WIP

Signed-off-by: Karen Feng <[email protected]>

* Ndarray

Signed-off-by: Karen Feng <[email protected]>

* More tests

Signed-off-by: Karen Feng <[email protected]>

* Support flat array

Signed-off-by: Karen Feng <[email protected]>

* Move registering

Signed-off-by: Karen Feng <[email protected]>

* pytest

Signed-off-by: Karen Feng <[email protected]>

* Make docstring more accurate

Signed-off-by: Karen Feng <[email protected]>

* idempotent registration

Signed-off-by: Karen Feng <[email protected]>

* Test fixup

Signed-off-by: Karen Feng <[email protected]>

* Move import out

Signed-off-by: Karen Feng <[email protected]>

* Add documentation for the GFF3 reader (projectglow#221)

* doc

Signed-off-by: kianfar77 <[email protected]>

* doc

Signed-off-by: kianfar77 <[email protected]>

* notebook

Signed-off-by: kianfar77 <[email protected]>

* attributes

Signed-off-by: kianfar77 <[email protected]>

* yapf

Signed-off-by: kianfar77 <[email protected]>
Signed-off-by: Karen Feng <[email protected]>

* Remove cross-build plugin

Signed-off-by: Karen Feng <[email protected]>

* wrap

Signed-off-by: Karen Feng <[email protected]>

* triple quote

Signed-off-by: Karen Feng <[email protected]>

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

Signed-off-by: Karen Feng <[email protected]>

* CircleCI config

Signed-off-by: Karen Feng <[email protected]>

* wrap release

Signed-off-by: Karen Feng <[email protected]>

* More docs

Signed-off-by: Karen Feng <[email protected]>

* Comments

Signed-off-by: Karen Feng <[email protected]>

Co-authored-by: Kiavash Kianfar <[email protected]>
Signed-off-by: Henry Davidge <[email protected]>
henrydavidge added a commit to henrydavidge/glow that referenced this pull request Jun 22, 2020
* Support numpy literals (projectglow#213)

* WIP

Signed-off-by: Karen Feng <[email protected]>

* Ndarray

Signed-off-by: Karen Feng <[email protected]>

* More tests

Signed-off-by: Karen Feng <[email protected]>

* Support flat array

Signed-off-by: Karen Feng <[email protected]>

* Move registering

Signed-off-by: Karen Feng <[email protected]>

* pytest

Signed-off-by: Karen Feng <[email protected]>

* Make docstring more accurate

Signed-off-by: Karen Feng <[email protected]>

* idempotent registration

Signed-off-by: Karen Feng <[email protected]>

* Test fixup

Signed-off-by: Karen Feng <[email protected]>

* Move import out

Signed-off-by: Karen Feng <[email protected]>

* Add documentation for the GFF3 reader (projectglow#221)

* doc

Signed-off-by: kianfar77 <[email protected]>

* doc

Signed-off-by: kianfar77 <[email protected]>

* notebook

Signed-off-by: kianfar77 <[email protected]>

* attributes

Signed-off-by: kianfar77 <[email protected]>

* yapf

Signed-off-by: kianfar77 <[email protected]>
Signed-off-by: Karen Feng <[email protected]>

* Remove cross-build plugin

Signed-off-by: Karen Feng <[email protected]>

* wrap

Signed-off-by: Karen Feng <[email protected]>

* triple quote

Signed-off-by: Karen Feng <[email protected]>

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

Signed-off-by: Karen Feng <[email protected]>

* CircleCI config

Signed-off-by: Karen Feng <[email protected]>

* wrap release

Signed-off-by: Karen Feng <[email protected]>

* new rule

Signed-off-by: Henry D <[email protected]>

* Support numpy literals (projectglow#213)

* WIP

Signed-off-by: Karen Feng <[email protected]>

* Ndarray

Signed-off-by: Karen Feng <[email protected]>

* More tests

Signed-off-by: Karen Feng <[email protected]>

* Support flat array

Signed-off-by: Karen Feng <[email protected]>

* Move registering

Signed-off-by: Karen Feng <[email protected]>

* pytest

Signed-off-by: Karen Feng <[email protected]>

* Make docstring more accurate

Signed-off-by: Karen Feng <[email protected]>

* idempotent registration

Signed-off-by: Karen Feng <[email protected]>

* Test fixup

Signed-off-by: Karen Feng <[email protected]>

* Move import out

Signed-off-by: Karen Feng <[email protected]>

* Add documentation for the GFF3 reader (projectglow#221)

* doc

Signed-off-by: kianfar77 <[email protected]>

* doc

Signed-off-by: kianfar77 <[email protected]>

* notebook

Signed-off-by: kianfar77 <[email protected]>

* attributes

Signed-off-by: kianfar77 <[email protected]>

* yapf

Signed-off-by: kianfar77 <[email protected]>

* More docs

Signed-off-by: Karen Feng <[email protected]>

* add tests

Signed-off-by: Henry D <[email protected]>

* style

Signed-off-by: Henry D <[email protected]>

* Fix IntelliJ import (projectglow#223)

* Support numpy literals (projectglow#213)

* WIP

Signed-off-by: Karen Feng <[email protected]>

* Ndarray

Signed-off-by: Karen Feng <[email protected]>

* More tests

Signed-off-by: Karen Feng <[email protected]>

* Support flat array

Signed-off-by: Karen Feng <[email protected]>

* Move registering

Signed-off-by: Karen Feng <[email protected]>

* pytest

Signed-off-by: Karen Feng <[email protected]>

* Make docstring more accurate

Signed-off-by: Karen Feng <[email protected]>

* idempotent registration

Signed-off-by: Karen Feng <[email protected]>

* Test fixup

Signed-off-by: Karen Feng <[email protected]>

* Move import out

Signed-off-by: Karen Feng <[email protected]>

* Add documentation for the GFF3 reader (projectglow#221)

* doc

Signed-off-by: kianfar77 <[email protected]>

* doc

Signed-off-by: kianfar77 <[email protected]>

* notebook

Signed-off-by: kianfar77 <[email protected]>

* attributes

Signed-off-by: kianfar77 <[email protected]>

* yapf

Signed-off-by: kianfar77 <[email protected]>
Signed-off-by: Karen Feng <[email protected]>

* Remove cross-build plugin

Signed-off-by: Karen Feng <[email protected]>

* wrap

Signed-off-by: Karen Feng <[email protected]>

* triple quote

Signed-off-by: Karen Feng <[email protected]>

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

Signed-off-by: Karen Feng <[email protected]>

* CircleCI config

Signed-off-by: Karen Feng <[email protected]>

* wrap release

Signed-off-by: Karen Feng <[email protected]>

* More docs

Signed-off-by: Karen Feng <[email protected]>

* Comments

Signed-off-by: Karen Feng <[email protected]>

Co-authored-by: Kiavash Kianfar <[email protected]>

* comments

Signed-off-by: Henry D <[email protected]>

* more docs

Signed-off-by: Henry D <[email protected]>

* note pr

Signed-off-by: Henry D <[email protected]>

Co-authored-by: Karen Feng <[email protected]>
Co-authored-by: Kiavash Kianfar <[email protected]>
Signed-off-by: Henry Davidge <[email protected]>
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.

3 participants