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

Lots of things to try and get publishing working #557

Merged
merged 49 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
210abe4
bump
a10y Aug 5, 2024
1b296e5
0.4.0
a10y Aug 5, 2024
8fd9ac5
release 0.4.2
a10y Aug 5, 2024
476f9ce
save
a10y Aug 6, 2024
3c616d5
lib name
a10y Aug 6, 2024
eea73fb
default features
a10y Aug 6, 2024
27f205b
bump to 0.4.3
a10y Aug 6, 2024
e04d060
save
a10y Aug 6, 2024
9332f08
undo
a10y Aug 6, 2024
18acdc5
0.4.4
a10y Aug 6, 2024
ffc7d48
more
a10y Aug 6, 2024
be6e9b5
0.4.5
a10y Aug 6, 2024
b3dd989
save
a10y Aug 6, 2024
9f97579
try again
a10y Aug 6, 2024
3d4ba86
save
a10y Aug 6, 2024
022a078
some mroe
a10y Aug 6, 2024
149958e
0.4.8
a10y Aug 6, 2024
da69e4b
remove gitmodules
a10y Aug 6, 2024
e1bb127
revert this
a10y Aug 7, 2024
6e30c11
try
a10y Aug 7, 2024
a324a4e
Revert "try"
a10y Aug 7, 2024
4d99591
build
a10y Aug 7, 2024
471bec8
more logs
a10y Aug 7, 2024
3108f6f
0.4.11
a10y Aug 7, 2024
920a912
partway
a10y Aug 8, 2024
4dc7dc4
fix compile
a10y Aug 8, 2024
27e6565
path instead
a10y Aug 8, 2024
5ce1e5c
save
a10y Aug 8, 2024
7667bdd
remove comment
a10y Aug 8, 2024
d6a216f
Merge remote-tracking branch 'origin/develop' into aduffy/hail-mary
a10y Aug 8, 2024
36f1728
proto
a10y Aug 8, 2024
bd1d576
fix up xtask
a10y Aug 8, 2024
43c1f2b
pass clippy
a10y Aug 8, 2024
d31bb90
disable publish
a10y Aug 8, 2024
5faf35f
bump
a10y Aug 8, 2024
0583374
rename funcs
a10y Aug 8, 2024
6443b14
fmt
a10y Aug 8, 2024
1ecac5e
back to develop
a10y Aug 8, 2024
7c827cc
not needed
a10y Aug 8, 2024
55f52f6
revert
a10y Aug 8, 2024
82b9775
revert
a10y Aug 8, 2024
e65857e
more
a10y Aug 8, 2024
6aa2b19
revert
a10y Aug 8, 2024
6aaab51
closer
a10y Aug 8, 2024
f0a9418
revert
a10y Aug 8, 2024
4829268
newline
a10y Aug 8, 2024
1b9d033
again
a10y Aug 8, 2024
50131de
delete
a10y Aug 8, 2024
14d6052
more
a10y Aug 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix compile
  • Loading branch information
a10y committed Aug 8, 2024
commit 4dc7dc479c818421dbc02cb58d7ce6cce1998f01
3 changes: 2 additions & 1 deletion vortex-scalar/src/serde/flatbuffers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ use vortex_dtype::DType;
use vortex_error::VortexError;
use vortex_flatbuffers::WriteFlatBuffer;

use crate::{flatbuffers as fb, Scalar, ScalarValue};
use vortex_flatbuffers::scalar as fb;
use crate::{Scalar, ScalarValue};

impl TryFrom<fb::Scalar<'_>> for Scalar {
type Error = VortexError;
Expand Down
11 changes: 6 additions & 5 deletions vortex-scalar/src/serde/proto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ use vortex_buffer::{Buffer, BufferString};
use vortex_dtype::DType;
use vortex_error::{vortex_err, VortexError};

use crate::proto::scalar as pb;
use crate::proto::scalar::scalar_value::Kind;
use crate::proto::scalar::ListValue;
use vortex_proto::scalar as pb;
use vortex_proto::scalar::scalar_value::Kind;
use vortex_proto::scalar::ListValue;
use crate::pvalue::PValue;
use crate::{Scalar, ScalarValue};

Expand Down Expand Up @@ -149,10 +149,11 @@ mod test {
use vortex_dtype::PType::I32;
use vortex_dtype::{DType, Nullability};

use crate::{proto as pb, Scalar, ScalarValue};
use vortex_proto::scalar as pb;
use crate::{Scalar, ScalarValue};

fn round_trip(scalar: Scalar) {
Scalar::try_from(&pb::scalar::Scalar::from(&scalar)).unwrap();
Scalar::try_from(&pb::Scalar::from(&scalar)).unwrap();
}

#[test]
Expand Down