commit_message
stringlengths 9
4.28k
| sha
stringlengths 40
40
| type
stringclasses 10
values | commit_url
stringlengths 78
90
| masked_commit_message
stringlengths 2
4.26k
| author_email
stringclasses 8
values | git_diff
stringlengths 129
19.1M
|
|---|---|---|---|---|---|---|
fix: smallest type selection
|
7c9970f1405efe9373fa87ea0d4e7dd90827fb44
|
fix
|
https://github.com/erg-lang/erg/commit/7c9970f1405efe9373fa87ea0d4e7dd90827fb44
|
smallest type selection
|
diff --git a/compare.rs b/compare.rs
index 50e053c..37225de 100644
--- a/compare.rs
+++ b/compare.rs
@@ -170,10 +170,11 @@ impl Context {
(Obj, _) | (_, Never | Failure) => (Absolutely, true),
(_, Obj) if lhs.is_simple_class() => (Absolutely, false),
(Never | Failure, _) if rhs.is_simple_class() => (Absolutely, false),
- (Float | Ratio | Int | Nat | Bool, Bool)
- | (Float | Ratio | Int | Nat, Nat)
- | (Float | Ratio | Int, Int)
- | (Float | Ratio, Ratio) => (Absolutely, true),
+ (Complex | Float | Ratio | Int | Nat | Bool, Bool)
+ | (Complex | Float | Ratio | Int | Nat, Nat)
+ | (Complex | Float | Ratio | Int, Int)
+ | (Complex | Float | Ratio, Ratio)
+ | (Complex | Float, Float) => (Absolutely, true),
(Type, ClassType | TraitType) => (Absolutely, true),
(
Mono(n),
diff --git a/generalize.rs b/generalize.rs
index 4167c21..0c45946 100644
--- a/generalize.rs
+++ b/generalize.rs
@@ -346,7 +346,7 @@ impl Context {
match tp {
TyParam::FreeVar(fv) if fv.is_linked() => {
let inner = fv.unwrap_linked();
- self.deref_tp(inner, variance, &set! {}, loc)
+ self.deref_tp(inner, variance, qnames, loc)
}
TyParam::FreeVar(fv)
if fv.is_generalized() && qnames.contains(&fv.unbound_name().unwrap()) =>
@@ -539,7 +539,7 @@ impl Context {
loc: &impl Locational,
) -> TyCheckResult<Type> {
if self.is_trait(&super_t) {
- self.check_trait_impl(&sub_t, &super_t, &set! {}, loc)?;
+ self.check_trait_impl(&sub_t, &super_t, qnames, loc)?;
}
// REVIEW: Even if type constraints can be satisfied, implementation may not exist
if self.subtype_of(&sub_t, &super_t) {
@@ -934,7 +934,7 @@ impl Context {
self.level = 0;
let mut errs = TyCheckErrors::empty();
for chunk in hir.module.iter_mut() {
- if let Err(es) = self.resolve_expr_t(chunk) {
+ if let Err(es) = self.resolve_expr_t(chunk, &set! {}) {
errs.extend(es);
}
}
@@ -981,7 +981,7 @@ impl Context {
var_params.vi.t = self.deref_tyvar(
mem::take(&mut var_params.vi.t),
Contravariant,
- &set! {},
+ qnames,
var_params.as_ref(),
)?;
}
@@ -989,41 +989,46 @@ impl Context {
param.sig.vi.t.generalize();
param.sig.vi.t =
self.deref_tyvar(mem::take(&mut param.sig.vi.t), Contravariant, qnames, param)?;
- self.resolve_expr_t(&mut param.default_val)?;
+ self.resolve_expr_t(&mut param.default_val, qnames)?;
}
Ok(())
}
- fn resolve_expr_t(&self, expr: &mut hir::Expr) -> TyCheckResult<()> {
+ fn resolve_expr_t(&self, expr: &mut hir::Expr, qnames: &Set<Str>) -> TyCheckResult<()> {
match expr {
hir::Expr::Lit(_) => Ok(()),
hir::Expr::Accessor(acc) => {
- if !acc.ref_t().is_qvar() {
- let variance = if acc.var_info().kind.is_parameter() {
+ if acc
+ .ref_t()
+ .unbound_name()
+ .map_or(false, |name| !qnames.contains(&name))
+ {
+ /*let variance = if acc.var_info().kind.is_parameter() {
Contravariant
} else {
Covariant
- };
+ };*/
+ let variance = Covariant;
let t = mem::take(acc.ref_mut_t());
- *acc.ref_mut_t() = self.deref_tyvar(t, variance, &set! {}, acc)?;
+ *acc.ref_mut_t() = self.deref_tyvar(t, variance, qnames, acc)?;
}
if let hir::Accessor::Attr(attr) = acc {
- self.resolve_expr_t(&mut attr.obj)?;
+ self.resolve_expr_t(&mut attr.obj, qnames)?;
}
Ok(())
}
hir::Expr::Array(array) => match array {
hir::Array::Normal(arr) => {
- arr.t = self.deref_tyvar(mem::take(&mut arr.t), Covariant, &set! {}, arr)?;
+ arr.t = self.deref_tyvar(mem::take(&mut arr.t), Covariant, qnames, arr)?;
for elem in arr.elems.pos_args.iter_mut() {
- self.resolve_expr_t(&mut elem.expr)?;
+ self.resolve_expr_t(&mut elem.expr, qnames)?;
}
Ok(())
}
hir::Array::WithLength(arr) => {
- arr.t = self.deref_tyvar(mem::take(&mut arr.t), Covariant, &set! {}, arr)?;
- self.resolve_expr_t(&mut arr.elem)?;
- self.resolve_expr_t(&mut arr.len)?;
+ arr.t = self.deref_tyvar(mem::take(&mut arr.t), Covariant, qnames, arr)?;
+ self.resolve_expr_t(&mut arr.elem, qnames)?;
+ self.resolve_expr_t(&mut arr.len, qnames)?;
Ok(())
}
other => feature_error!(
@@ -1036,34 +1041,34 @@ impl Context {
},
hir::Expr::Tuple(tuple) => match tuple {
hir::Tuple::Normal(tup) => {
- tup.t = self.deref_tyvar(mem::take(&mut tup.t), Covariant, &set! {}, tup)?;
+ tup.t = self.deref_tyvar(mem::take(&mut tup.t), Covariant, qnames, tup)?;
for elem in tup.elems.pos_args.iter_mut() {
- self.resolve_expr_t(&mut elem.expr)?;
+ self.resolve_expr_t(&mut elem.expr, qnames)?;
}
Ok(())
}
},
hir::Expr::Set(set) => match set {
hir::Set::Normal(st) => {
- st.t = self.deref_tyvar(mem::take(&mut st.t), Covariant, &set! {}, st)?;
+ st.t = self.deref_tyvar(mem::take(&mut st.t), Covariant, qnames, st)?;
for elem in st.elems.pos_args.iter_mut() {
- self.resolve_expr_t(&mut elem.expr)?;
+ self.resolve_expr_t(&mut elem.expr, qnames)?;
}
Ok(())
}
hir::Set::WithLength(st) => {
- st.t = self.deref_tyvar(mem::take(&mut st.t), Covariant, &set! {}, st)?;
- self.resolve_expr_t(&mut st.elem)?;
- self.resolve_expr_t(&mut st.len)?;
+ st.t = self.deref_tyvar(mem::take(&mut st.t), Covariant, qnames, st)?;
+ self.resolve_expr_t(&mut st.elem, qnames)?;
+ self.resolve_expr_t(&mut st.len, qnames)?;
Ok(())
}
},
hir::Expr::Dict(dict) => match dict {
hir::Dict::Normal(dic) => {
- dic.t = self.deref_tyvar(mem::take(&mut dic.t), Covariant, &set! {}, dic)?;
+ dic.t = self.deref_tyvar(mem::take(&mut dic.t), Covariant, qnames, dic)?;
for kv in dic.kvs.iter_mut() {
- self.resolve_expr_t(&mut kv.key)?;
- self.resolve_expr_t(&mut kv.value)?;
+ self.resolve_expr_t(&mut kv.key, qnames)?;
+ self.resolve_expr_t(&mut kv.value, qnames)?;
}
Ok(())
}
@@ -1076,15 +1081,14 @@ impl Context {
),
},
hir::Expr::Record(record) => {
- record.t =
- self.deref_tyvar(mem::take(&mut record.t), Covariant, &set! {}, record)?;
+ record.t = self.deref_tyvar(mem::take(&mut record.t), Covariant, qnames, record)?;
for attr in record.attrs.iter_mut() {
match &mut attr.sig {
hir::Signature::Var(var) => {
*var.ref_mut_t() = self.deref_tyvar(
mem::take(var.ref_mut_t()),
Covariant,
- &set! {},
+ qnames,
var,
)?;
}
@@ -1092,13 +1096,13 @@ impl Context {
*subr.ref_mut_t() = self.deref_tyvar(
mem::take(subr.ref_mut_t()),
Covariant,
- &set! {},
+ qnames,
subr,
)?;
}
}
for chunk in attr.body.block.iter_mut() {
- self.resolve_expr_t(chunk)?;
+ self.resolve_expr_t(chunk, qnames)?;
}
}
Ok(())
@@ -1106,42 +1110,43 @@ impl Context {
hir::Expr::BinOp(binop) => {
let t = mem::take(binop.signature_mut_t().unwrap());
*binop.signature_mut_t().unwrap() =
- self.deref_tyvar(t, Covariant, &set! {}, binop)?;
- self.resolve_expr_t(&mut binop.lhs)?;
- self.resolve_expr_t(&mut binop.rhs)?;
+ self.deref_tyvar(t, Covariant, qnames, binop)?;
+ self.resolve_expr_t(&mut binop.lhs, qnames)?;
+ self.resolve_expr_t(&mut binop.rhs, qnames)?;
Ok(())
}
hir::Expr::UnaryOp(unaryop) => {
let t = mem::take(unaryop.signature_mut_t().unwrap());
*unaryop.signature_mut_t().unwrap() =
- self.deref_tyvar(t, Covariant, &set! {}, unaryop)?;
- self.resolve_expr_t(&mut unaryop.expr)?;
+ self.deref_tyvar(t, Covariant, qnames, unaryop)?;
+ self.resolve_expr_t(&mut unaryop.expr, qnames)?;
Ok(())
}
hir::Expr::Call(call) => {
if let Some(t) = call.signature_mut_t() {
let t = mem::take(t);
*call.signature_mut_t().unwrap() =
- self.deref_tyvar(t, Covariant, &set! {}, call)?;
+ self.deref_tyvar(t, Covariant, qnames, call)?;
}
- self.resolve_expr_t(&mut call.obj)?;
+ self.resolve_expr_t(&mut call.obj, qnames)?;
for arg in call.args.pos_args.iter_mut() {
- self.resolve_expr_t(&mut arg.expr)?;
+ self.resolve_expr_t(&mut arg.expr, qnames)?;
}
if let Some(var_args) = &mut call.args.var_args {
- self.resolve_expr_t(&mut var_args.expr)?;
+ self.resolve_expr_t(&mut var_args.expr, qnames)?;
}
for arg in call.args.kw_args.iter_mut() {
- self.resolve_expr_t(&mut arg.expr)?;
+ self.resolve_expr_t(&mut arg.expr, qnames)?;
}
Ok(())
}
hir::Expr::Def(def) => {
let qnames = if let Type::Quantified(quant) = def.sig.ref_t() {
+ // double quantification is not allowed
let Ok(subr) = <&SubrType>::try_from(quant.as_ref()) else { unreachable!() };
subr.essential_qnames()
} else {
- set! {}
+ qnames.clone()
};
*def.sig.ref_mut_t() =
self.deref_tyvar(mem::take(def.sig.ref_mut_t()), Covariant, &qnames, &def.sig)?;
@@ -1149,7 +1154,7 @@ impl Context {
self.resolve_params_t(params, &qnames)?;
}
for chunk in def.body.block.iter_mut() {
- self.resolve_expr_t(chunk)?;
+ self.resolve_expr_t(chunk, &qnames)?;
}
Ok(())
}
@@ -1158,45 +1163,45 @@ impl Context {
let Ok(subr) = <&SubrType>::try_from(quant.as_ref()) else { unreachable!() };
subr.essential_qnames()
} else {
- set! {}
+ qnames.clone()
};
lambda.t =
self.deref_tyvar(mem::take(&mut lambda.t), Covariant, &qnames, lambda)?;
self.resolve_params_t(&mut lambda.params, &qnames)?;
for chunk in lambda.body.iter_mut() {
- self.resolve_expr_t(chunk)?;
+ self.resolve_expr_t(chunk, &qnames)?;
}
Ok(())
}
hir::Expr::ClassDef(class_def) => {
for def in class_def.methods.iter_mut() {
- self.resolve_expr_t(def)?;
+ self.resolve_expr_t(def, qnames)?;
}
Ok(())
}
hir::Expr::PatchDef(patch_def) => {
for def in patch_def.methods.iter_mut() {
- self.resolve_expr_t(def)?;
+ self.resolve_expr_t(def, qnames)?;
}
Ok(())
}
hir::Expr::ReDef(redef) => {
// REVIEW: redef.attr is not dereferenced
for chunk in redef.block.iter_mut() {
- self.resolve_expr_t(chunk)?;
+ self.resolve_expr_t(chunk, qnames)?;
}
Ok(())
}
- hir::Expr::TypeAsc(tasc) => self.resolve_expr_t(&mut tasc.expr),
+ hir::Expr::TypeAsc(tasc) => self.resolve_expr_t(&mut tasc.expr, qnames),
hir::Expr::Code(chunks) | hir::Expr::Compound(chunks) => {
for chunk in chunks.iter_mut() {
- self.resolve_expr_t(chunk)?;
+ self.resolve_expr_t(chunk, qnames)?;
}
Ok(())
}
hir::Expr::Dummy(chunks) => {
for chunk in chunks.iter_mut() {
- self.resolve_expr_t(chunk)?;
+ self.resolve_expr_t(chunk, qnames)?;
}
Ok(())
}
diff --git a/classes.rs b/classes.rs
index 89b0ac4..f8442f7 100644
--- a/classes.rs
+++ b/classes.rs
@@ -117,6 +117,13 @@ impl Context {
Visibility::BUILTIN_PUBLIC,
Some(FUNDAMENTAL_CALL),
);
+ complex.register_builtin_py_impl(
+ FUNDAMENTAL_HASH,
+ fn0_met(Float, Nat),
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNDAMENTAL_HASH),
+ );
/* Float */
let mut float = Self::builtin_mono_class(FLOAT, 2);
float.register_superclass(Complex, &complex);
@@ -145,6 +152,12 @@ impl Context {
Some(FUNC_FROMHEX),
53,
);
+ float.register_py_builtin(
+ FUNDAMENTAL_INT,
+ fn0_met(Float, Int),
+ Some(FUNDAMENTAL_INT),
+ 0,
+ );
float.register_py_builtin(OP_GT, fn1_met(Float, Float, Bool), Some(OP_GT), 0);
float.register_py_builtin(OP_GE, fn1_met(Float, Float, Bool), Some(OP_GE), 0);
float.register_py_builtin(OP_LT, fn1_met(Float, Float, Bool), Some(OP_LT), 0);
diff --git a/mod.rs b/mod.rs
index c3edc34..1e0a207 100644
--- a/mod.rs
+++ b/mod.rs
@@ -353,6 +353,8 @@ const OP_NEG: &str = "__neg__";
const FUNDAMENTAL_CALL: &str = "__call__";
const FUNDAMENTAL_NAME: &str = "__name__";
const FUNDAMENTAL_STR: &str = "__str__";
+const FUNDAMENTAL_HASH: &str = "__hash__";
+const FUNDAMENTAL_INT: &str = "__int__";
const FUNDAMENTAL_ITER: &str = "__iter__";
const FUNDAMENTAL_MODULE: &str = "__module__";
const FUNDAMENTAL_SIZEOF: &str = "__sizeof__";
diff --git a/inquire.rs b/inquire.rs
index 835b4de..6445bd2 100644
--- a/inquire.rs
+++ b/inquire.rs
@@ -1965,6 +1965,32 @@ impl Context {
concatenated
}
+ /// Returns the smallest type among the iterators of a given type.
+ /// If there is no subtype relationship, returns `None`.
+ /// ```erg
+ /// min_type([Int, Int]) == Int
+ /// min_type([Int, Nat]) == Nat
+ /// min_type([Int, Str]) == None
+ /// min_type([Int, Str, Nat]) == None
+ /// ```
+ pub fn min_type<'a>(&self, types: impl Iterator<Item = &'a Type>) -> Option<&'a Type> {
+ let mut opt_min = None;
+ for t in types {
+ if let Some(min) = opt_min {
+ if self.subtype_of(min, t) {
+ continue;
+ } else if self.subtype_of(t, min) {
+ opt_min = Some(t);
+ } else {
+ return None;
+ }
+ } else {
+ opt_min = Some(t);
+ }
+ }
+ opt_min
+ }
+
pub fn get_nominal_super_type_ctxs<'a>(&'a self, t: &Type) -> Option<Vec<&'a Context>> {
match t {
Type::FreeVar(fv) if fv.is_linked() => self.get_nominal_super_type_ctxs(&fv.crack()),
@@ -2544,51 +2570,46 @@ impl Context {
}
}
+ fn get_attr_type<'m>(
+ &self,
+ name: &Identifier,
+ candidates: &'m [MethodInfo],
+ ) -> Triple<&'m MethodInfo, TyCheckError> {
+ let first_method_type = &candidates[0].method_type;
+ if candidates
+ .iter()
+ .skip(1)
+ .all(|t| &t.method_type == first_method_type)
+ {
+ Triple::Ok(&candidates[0])
+ } else if let Some(min) = self.min_type(candidates.iter().map(|mi| &mi.definition_type)) {
+ let min_info = candidates
+ .iter()
+ .find(|mi| &mi.definition_type == min)
+ .unwrap();
+ Triple::Ok(min_info)
+ } else {
+ Triple::Err(TyCheckError::ambiguous_type_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ name,
+ &candidates
+ .iter()
+ .map(|t| t.definition_type.clone())
+ .collect::<Vec<_>>(),
+ self.caused_by(),
+ ))
+ }
+ }
+
/// Infer the receiver type from the attribute name.
/// Returns an error if multiple candidates are found. If nothing is found, returns None.
fn get_attr_type_by_name(&self, name: &Identifier) -> Triple<&MethodInfo, TyCheckError> {
- // TODO: min_by
if let Some(candidates) = self.method_to_traits.get(name.inspect()) {
- let first_method_type = &candidates.first().unwrap().method_type;
- if candidates
- .iter()
- .skip(1)
- .all(|t| &t.method_type == first_method_type)
- {
- return Triple::Ok(&candidates[0]);
- } else {
- return Triple::Err(TyCheckError::ambiguous_type_error(
- self.cfg.input.clone(),
- line!() as usize,
- name,
- &candidates
- .iter()
- .map(|t| t.definition_type.clone())
- .collect::<Vec<_>>(),
- self.caused_by(),
- ));
- }
+ return self.get_attr_type(name, candidates);
}
if let Some(candidates) = self.method_to_classes.get(name.inspect()) {
- let first_method_type = &candidates.first().unwrap().method_type;
- if candidates
- .iter()
- .skip(1)
- .all(|t| &t.method_type == first_method_type)
- {
- return Triple::Ok(&candidates[0]);
- } else {
- return Triple::Err(TyCheckError::ambiguous_type_error(
- self.cfg.input.clone(),
- line!() as usize,
- name,
- &candidates
- .iter()
- .map(|t| t.definition_type.clone())
- .collect::<Vec<_>>(),
- self.caused_by(),
- ));
- }
+ return self.get_attr_type(name, candidates);
}
if let Some(outer) = self.get_outer().or_else(|| self.get_builtins()) {
outer.get_attr_type_by_name(name)
diff --git a/_erg_int.py b/_erg_int.py
index 0c4fc10..068bab9 100644
--- a/_erg_int.py
+++ b/_erg_int.py
@@ -66,6 +66,8 @@ class IntMut: # inherits Int
def __init__(self, i):
self.value = Int(i)
+ def __int__(self):
+ return self.value.__int__()
def __repr__(self):
return self.value.__repr__()
diff --git a/_erg_nat.py b/_erg_nat.py
index fe733c8..dd96a5e 100644
--- a/_erg_nat.py
+++ b/_erg_nat.py
@@ -40,6 +40,9 @@ class NatMut(IntMut): # and Nat
def __init__(self, n: Nat):
self.value = n
+ def __int__(self):
+ return self.value.__int__()
+
def __repr__(self):
return self.value.__repr__()
|
|
refactor: improved some path generator code
|
c1ef8c65228199999bf4330f47a92d37c6316328
|
refactor
|
https://github.com/tsparticles/tsparticles/commit/c1ef8c65228199999bf4330f47a92d37c6316328
|
improved some path generator code
|
diff --git a/Container.ts b/Container.ts
index d3ecea6..7e65e79 100644
--- a/Container.ts
+++ b/Container.ts
@@ -292,19 +292,11 @@ export class Container {
} else {
const oldGenerator = this.pathGenerator;
- this.pathGenerator = pathOrGenerator || {};
+ this.pathGenerator = pathOrGenerator;
- if (!pathOrGenerator.generate) {
- this.pathGenerator.generate = oldGenerator.generate;
- }
-
- if (!pathOrGenerator.init) {
- this.pathGenerator.init = oldGenerator.init;
- }
-
- if (!pathOrGenerator.update) {
- this.pathGenerator.update = oldGenerator.update;
- }
+ this.pathGenerator.generate ||= oldGenerator.generate;
+ this.pathGenerator.init ||= oldGenerator.init;
+ this.pathGenerator.update ||= oldGenerator.update;
}
}
|
|
feat: add module `stat`
|
50136ef6ae302dad67f70974834b164254beef54
|
feat
|
https://github.com/erg-lang/erg/commit/50136ef6ae302dad67f70974834b164254beef54
|
add module `stat`
|
diff --git a/__init__.d.er b/__init__.d.er
index a3895f6..1614955 100644
--- a/__init__.d.er
+++ b/__init__.d.er
@@ -8,6 +8,7 @@ The name of the operating system dependent module imported. The following names
.name: Str
.chdir!: (path: PathLike, ) => NoneType
+.chmod!: (path: PathLike, mode: Nat) => NoneType
.getcwd!: () => Str
.getenv!: (key: Str, default: Str or NoneType := NoneType) => Str
.listdir!: (path := PathLike,) => [Str; _]
diff --git a/pathlib.d.er b/pathlib.d.er
index 77b98d6..21454f4 100644
--- a/pathlib.d.er
+++ b/pathlib.d.er
@@ -1,7 +1,37 @@
.PurePath: ClassType
-.PurePath.parts: [Str; _]
+.PurePath.
+ parts: [Str; _]
+ drive: Str
+ root: Str
+ anchor: Str
+ parents: [.PurePath; _]
+ parent: .PurePath
+ name: Str
+ suffix: Str
+ suffixes: [Str; _]
+ stem: Str
+ __call__: (*segments: Str) -> .PurePath
+ as_posix: (self: .PurePath) -> Str
+ as_uri: (self: .PurePath) -> Str
+ is_absolute: (self: .PurePath) -> Bool
+ is_relative_to: (self: .PurePath, *other: .PurePath) -> Bool
+ is_reserved: (self: .PurePath) -> Bool
+ joinpath: (self: .PurePath, *other: .PurePath) -> .PurePath
+ match: (self: .PurePath, pattern: Str) -> Bool
+ relative_to: (self: .PurePath, *other: .PurePath) -> .PurePath
+ with_name: (self: .PurePath, name: Str) -> .PurePath
+ with_stem: (self: .PurePath, suffix: Str) -> .PurePath
+ with_suffix: (self: .PurePath, suffix: Str) -> .PurePath
.PurePosixPath: ClassType
.PureWindowsPath: ClassType
.Path: ClassType
+.Path <: .PurePath
+.Path.
+ __call__: (*segments: Str) -> .Path
+ cwd!: () => .Path
+ home!: () => .Path
+ samefile!: (self: .Path, other: .Path) => Bool
+ open!: (self: .Path, mode := Str) => File!
+ chmod!: (self: .Path, mode: Nat) => NoneType
.PosixPath: ClassType
.WindowsPath: ClassType
diff --git a/stat.d.er b/stat.d.er
index d7af34e..2a81790 100644
--- a/stat.d.er
+++ b/stat.d.er
@@ -0,0 +1,88 @@
+.ST_MMODE: {0}
+.ST_INO: {1}
+.ST_DEV: {2}
+.ST_NLINK: {3}
+.ST_UID: {4}
+.ST_GID: {5}
+.ST_SIZE: {6}
+.ST_ATIME: {7}
+.ST_MTIME: {8}
+.ST_CTIME: {9}
+
+.S_IMODE: (mode: Nat) -> Nat
+.S_IFMT: (mode: Nat) -> Nat
+
+.S_IFDIR: {0o04000}
+.S_IFCHR: {0o02000}
+.S_IFBLK: {0o06000}
+.S_IFREG: {0o10000}
+.S_IFIFO: {0o01000}
+.S_IFLNK: {0o12000}
+.S_IFSOCK: {0o14000}
+.S_IFDOOR: {0}
+.S_IFPORT: {0}
+.S_IFWHT: {0}
+
+.S_ISDIR: (mode: Nat) -> Bool
+.S_ISCHR: (mode: Nat) -> Bool
+.S_ISBLK: (mode: Nat) -> Bool
+.S_ISREG: (mode: Nat) -> Bool
+.S_ISFIFO: (mode: Nat) -> Bool
+.S_ISLNK: (mode: Nat) -> Bool
+.S_ISSOCK: (mode: Nat) -> Bool
+.S_ISDOOR: (mode: Nat) -> Bool
+.S_ISPORT: (mode: Nat) -> Bool
+.S_ISWHT: (mode: Nat) -> Bool
+
+.S_ISUID: {0o4000}
+.S_ISGID: {0o2000}
+.S_ENFMT: {0o2000}
+.S_ISVTX: {0o1000}
+.S_IREAD: {0o0400}
+.S_IWRITE: {0o0200}
+.S_IEXEC: {0o0100}
+.S_IRWXU: {0o0700}
+.S_IRUSR: {0o0400}
+.S_IWUSR: {0o0200}
+.S_IXUSR: {0o0100}
+.S_IRWXG: {0o0070}
+.S_IRGRP: {0o0040}
+.S_IWGRP: {0o0020}
+.S_IXGRP: {0o0010}
+.S_IRWXO: {0o0007}
+.S_IROTH: {0o0004}
+.S_IWOTH: {0o0002}
+.S_IXOTH: {0o0001}
+
+.UF_NODUMP: {0x00000001}
+.UF_IMMUTABLE: {0x00000002}
+.UF_APPEND: {0x00000004}
+.UF_OPAQUE: {0x00000008}
+.UF_NOUNLINK: {0x00000010}
+.UF_COMPRESSED: {0x00000020}
+.UF_HIDDEN: {0x00008000}
+.SF_ARCHIVED: {0x00010000}
+.SF_IMMUTABLE: {0x00020000}
+.SF_APPEND: {0x00040000}
+.SF_NOUNLINK: {0x00100000}
+.SF_SNAPSHOT: {0x00200000}
+
+.filemode: (mode: Nat) -> Str
+
+.FILE_ATTRIBUTE_ARCHIVE: {32}
+.FILE_ATTRIBUTE_COMPRESSED: {2048}
+.FILE_ATTRIBUTE_DEVICE: {64}
+.FILE_ATTRIBUTE_DIRECTORY: {16}
+.FILE_ATTRIBUTE_ENCRYPTED: {16384}
+.FILE_ATTRIBUTE_HIDDEN: {2}
+.FILE_ATTRIBUTE_INTEGRITY_STREAM: {32768}
+.FILE_ATTRIBUTE_NORMAL: {128}
+.FILE_ATTRIBUTE_NOT_CONTENT_INDEXED: {8192}
+.FILE_ATTRIBUTE_NO_SCRUB_DATA: {131072}
+.FILE_ATTRIBUTE_OFFLINE: {4096}
+.FILE_ATTRIBUTE_READONLY: {1}
+.FILE_ATTRIBUTE_REPARSE_POINT: {1024}
+.FILE_ATTRIBUTE_SPARSE_FILE: {512}
+.FILE_ATTRIBUTE_SYSTEM: {4}
+.FILE_ATTRIBUTE_TEMPORARY: {256}
+.FILE_ATTRIBUTE_VIRTUAL: {65536}
|
|
perf(sql): optimize diffing M:N collection state
In this particular case, the diffing added ~800ms that were caused by a comparison of 2000 collections represented by their PKs in the form of arrays.
The comparison was done via `Utils.equals()` which is completely generic. Now we use an optimized version of `compareArray()` method, which checks scalar
values by `===` instead. As a result, the diffing went from ~800ms down to ~30ms.
Related: #5627
|
f46e7c86e29727b57f3220901ac5b14a6f1719c1
|
perf
|
https://github.com/mikro-orm/mikro-orm/commit/f46e7c86e29727b57f3220901ac5b14a6f1719c1
|
optimize diffing M:N collection state
In this particular case, the diffing added ~800ms that were caused by a comparison of 2000 collections represented by their PKs in the form of arrays.
The comparison was done via `Utils.equals()` which is completely generic. Now we use an optimized version of `compareArray()` method, which checks scalar
values by `===` instead. As a result, the diffing went from ~800ms down to ~30ms.
Related: #5627
|
diff --git a/AbstractSqlDriver.ts b/AbstractSqlDriver.ts
index 584eb7f..d18cd51 100644
--- a/AbstractSqlDriver.ts
+++ b/AbstractSqlDriver.ts
@@ -821,6 +821,27 @@ export abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection
return this.rethrow(qb.execute('run', false));
}
+ /**
+ * Fast comparison for collection snapshots that are represented by PK arrays.
+ * Compares scalars via `===` and fallbacks to Utils.equals()` for more complex types like Buffer.
+ * Always expects the same length of the arrays, since we only compare PKs of the same entity type.
+ */
+ private comparePrimaryKeyArrays(a: unknown[], b: unknown[]) {
+ for (let i = a.length; i-- !== 0;) {
+ if (['number', 'string', 'bigint', 'boolean'].includes(typeof a[i])) {
+ if (a[i] !== b[i]) {
+ return false;
+ }
+ } else {
+ if (!Utils.equals(a[i], b[i])) {
+ return false;
+ }
+ }
+ }
+
+ return true;
+ }
+
override async syncCollections<T extends object, O extends object>(collections: Iterable<Collection<T, O>>, options?: DriverMethodOptions): Promise<void> {
const groups = {} as Dictionary<PivotCollectionPersister<any>>;
@@ -829,7 +850,7 @@ export abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection
const meta = wrapped.__meta;
const pks = wrapped.getPrimaryKeys(true)!;
const snap = coll.getSnapshot();
- const includes = <T>(arr: T[], item: T) => !!arr.find(i => Utils.equals(i, item));
+ const includes = <T>(arr: T[][], item: T[]) => !!arr.find(i => this.comparePrimaryKeyArrays(i, item));
const snapshot = snap ? snap.map(item => helper(item).getPrimaryKeys(true)!) : [];
const current = coll.getItems(false).map(item => helper(item).getPrimaryKeys(true)!);
const deleteDiff = snap ? snapshot.filter(item => !includes(current, item)) : true;
@@ -840,8 +861,14 @@ export abstract class AbstractSqlDriver<Connection extends AbstractSqlConnection
// wrong order if we just delete and insert to the end (only owning sides can have fixed order)
if (coll.property.owner && coll.property.fixedOrder && !equals && Array.isArray(deleteDiff)) {
deleteDiff.length = insertDiff.length = 0;
- deleteDiff.push(...snapshot);
- insertDiff.push(...current);
+
+ for (const item of snapshot) {
+ deleteDiff.push(item);
+ }
+
+ for (const item of current) {
+ insertDiff.push(item);
+ }
}
if (coll.property.kind === ReferenceKind.ONE_TO_MANY) {
diff --git a/GH1930.test.ts b/GH1930.test.ts
index 4300fc8..f17f46c 100644
--- a/GH1930.test.ts
+++ b/GH1930.test.ts
@@ -1,6 +1,7 @@
import { v4, parse, stringify } from 'uuid';
import { Collection, Entity, ManyToMany, ManyToOne, PrimaryKey, Property, ref, Ref, Type } from '@mikro-orm/core';
import { MikroORM } from '@mikro-orm/mysql';
+import { mockLogger } from '../../helpers';
export class UuidBinaryType extends Type<string, Buffer> {
@@ -92,6 +93,15 @@ describe('GH issue 1930', () => {
expect(a1.fields[0].id).toBe(a.fields[0].id);
expect(a1.fields[1].id).toBe(a.fields[1].id);
expect(a1.fields[2].id).toBe(a.fields[2].id);
+
+ a1.fields.set([a1.fields[0], new B('b4'), new B('b5'), new B('b6')]);
+ const mock = mockLogger(orm);
+ await orm.em.flush();
+ expect(mock.mock.calls[0][0]).toMatch('begin');
+ expect(mock.mock.calls[1][0]).toMatch(/insert into `b` .* 3 rows affected/); // created 3 new B entities
+ expect(mock.mock.calls[2][0]).toMatch(/delete from `a_fields` .* 2 rows affected/); // removed 2 old items
+ expect(mock.mock.calls[3][0]).toMatch(/insert into `a_fields` .* 3 rows affected/); // added 3 new items
+ expect(mock.mock.calls[4][0]).toMatch('commit');
});
});
diff --git a/GH5627.test.ts b/GH5627.test.ts
index 0e9b984..605c246 100644
--- a/GH5627.test.ts
+++ b/GH5627.test.ts
@@ -63,7 +63,6 @@ test('basic CRUD example', async () => {
const newBs = getRange(2001, 1001).map(i => em.create(B, { id: i }));
await em.persistAndFlush(newBs);
- a.b.remove(bs);
- a.b.add(newBs);
+ a.b.set(newBs);
await em.persistAndFlush(a);
});
|
|
refactor(core): `PrimaryKeyType` symbol should be defined as optional
BREAKING CHANGE:
Previously when we had nonstandard PK types, we could use `PrimaryKeyType` symbol
to let the type system know it. It was required to define this property as required,
now it can be defined as optional too.
|
db0b399da133f7ca04c73347b1bd1a01c3c88001
|
refactor
|
https://github.com/mikro-orm/mikro-orm/commit/db0b399da133f7ca04c73347b1bd1a01c3c88001
|
`PrimaryKeyType` symbol should be defined as optional
BREAKING CHANGE:
Previously when we had nonstandard PK types, we could use `PrimaryKeyType` symbol
to let the type system know it. It was required to define this property as required,
now it can be defined as optional too.
|
diff --git a/composite-keys.md b/composite-keys.md
index e9a42dd..2aa4820 100644
--- a/composite-keys.md
+++ b/composite-keys.md
@@ -33,7 +33,7 @@ export class Car {
@PrimaryKey()
year: number;
- [PrimaryKeyType]: [string, number]; // this is needed for proper type checks in `FilterQuery`
+ [PrimaryKeyType]?: [string, number]; // this is needed for proper type checks in `FilterQuery`
constructor(name: string, year: number) {
this.name = name;
@@ -120,7 +120,7 @@ export class ArticleAttribute {
@Property()
value!: string;
- [PrimaryKeyType]: [number, string]; // this is needed for proper type checks in `FilterQuery`
+ [PrimaryKeyType]?: [number, string]; // this is needed for proper type checks in `FilterQuery`
constructor(name: string, value: string, article: Article) {
this.attribute = name;
@@ -155,7 +155,7 @@ export class Address {
@OneToOne({ primary: true })
user!: User;
- [PrimaryKeyType]: number; // this is needed for proper type checks in `FilterQuery`
+ [PrimaryKeyType]?: number; // this is needed for proper type checks in `FilterQuery`
}
```
@@ -223,7 +223,7 @@ export class OrderItem {
@Property()
offeredPrice: number;
- [PrimaryKeyType]: [number, number]; // this is needed for proper type checks in `FilterQuery`
+ [PrimaryKeyType]?: [number, number]; // this is needed for proper type checks in `FilterQuery`
constructor(order: Order, product: Product, amount = 1) {
this.order = order;
diff --git a/upgrading-v4-to-v5.md b/upgrading-v4-to-v5.md
index dbad3a6..9cc112c 100644
--- a/upgrading-v4-to-v5.md
+++ b/upgrading-v4-to-v5.md
@@ -224,3 +224,16 @@ const a = await em.find(Author, { books: [1, 2, 3] }, {
populateWhere: PopulateHint.INFER,
});
```
+
+## `em.create()` respects required properties
+
+`em.create()` will now require you to pass all non-optional properties. Some
+properties might be defined as required for TS, but we have a default value for
+them (either runtime, or database one) - for such we can use `OptionalProps`
+symbol to specify which properties should be considered as optional.
+
+## `PrimaryKeyType` symbol should be defined as optional
+
+Previously when we had nonstandard PK types, we could use `PrimaryKeyType` symbol
+to let the type system know it. It was required to define this property as
+required, now it can be defined as optional too.
diff --git a/EntityManager.ts b/EntityManager.ts
index ffc78cb..f2da5b0 100644
--- a/EntityManager.ts
+++ b/EntityManager.ts
@@ -32,7 +32,7 @@ export class EntityManager<D extends IDatabaseDriver = IDatabaseDriver> {
private readonly unitOfWork: UnitOfWork = new UnitOfWork(this);
private readonly entityFactory: EntityFactory = new EntityFactory(this.unitOfWork, this);
private readonly resultCache = this.config.getResultCacheAdapter();
- private filters: Dictionary<FilterDef<any>> = {};
+ private filters: Dictionary<FilterDef> = {};
private filterParams: Dictionary<Dictionary> = {};
private transactionContext?: Transaction;
private flushMode?: FlushMode;
@@ -187,8 +187,8 @@ export class EntityManager<D extends IDatabaseDriver = IDatabaseDriver> {
/**
* Registers global filter to this entity manager. Global filters are enabled by default (unless disabled via last parameter).
*/
- addFilter(name: string, cond: FilterQuery<AnyEntity> | ((args: Dictionary) => FilterQuery<AnyEntity>), entityName?: EntityName<AnyEntity> | EntityName<AnyEntity>[], enabled = true): void {
- const options: FilterDef<AnyEntity> = { name, cond, default: enabled };
+ addFilter(name: string, cond: Dictionary | ((args: Dictionary) => FilterQuery<AnyEntity>), entityName?: EntityName<AnyEntity> | EntityName<AnyEntity>[], enabled = true): void {
+ const options: FilterDef = { name, cond, default: enabled };
if (entityName) {
options.entity = Utils.asArray(entityName).map(n => Utils.className(n));
@@ -251,7 +251,7 @@ export class EntityManager<D extends IDatabaseDriver = IDatabaseDriver> {
*/
async applyFilters<T extends AnyEntity<T>>(entityName: string, where: FilterQuery<T>, options: Dictionary<boolean | Dictionary> | string[] | boolean, type: 'read' | 'update' | 'delete'): Promise<FilterQuery<T>> {
const meta = this.metadata.find<T>(entityName);
- const filters: FilterDef<any>[] = [];
+ const filters: FilterDef[] = [];
const ret: Dictionary[] = [];
if (!meta) {
@@ -259,7 +259,7 @@ export class EntityManager<D extends IDatabaseDriver = IDatabaseDriver> {
}
const active = new Set<string>();
- const push = (source: Dictionary<FilterDef<any>>) => {
+ const push = (source: Dictionary<FilterDef>) => {
const activeFilters = QueryHelper
.getActiveFilters(entityName, options, source)
.filter(f => !active.has(f.name));
diff --git a/Filter.ts b/Filter.ts
index 8099f21..5e0adf2 100644
--- a/Filter.ts
+++ b/Filter.ts
@@ -1,10 +1,10 @@
import { MetadataStorage } from '../metadata';
import type { Dictionary, FilterDef } from '../typings';
-export function Filter<T>(options: FilterDef<T>) {
+export function Filter<T>(options: FilterDef) {
return function <U>(target: U & Dictionary) {
const meta = MetadataStorage.getMetadataFromDecorator(target);
- meta.filters[options.name] = options as unknown as FilterDef<U>;
+ meta.filters[options.name] = options;
return target;
};
diff --git a/typings.ts b/typings.ts
index 71e2f62..1b176ef 100644
--- a/typings.ts
+++ b/typings.ts
@@ -30,7 +30,7 @@ export const PrimaryKeyProp = Symbol('PrimaryKeyProp');
export const OptionalProps = Symbol('OptionalProps');
type ReadonlyPrimary<T> = T extends any[] ? Readonly<T> : T;
-export type Primary<T> = T extends { [PrimaryKeyType]: infer PK } // TODO `PrimaryKeyType` should be optional
+export type Primary<T> = T extends { [PrimaryKeyType]?: infer PK }
? ReadonlyPrimary<PK> : T extends { _id: infer PK }
? ReadonlyPrimary<PK> | string : T extends { uuid: infer PK }
? ReadonlyPrimary<PK> : T extends { id: infer PK }
@@ -73,14 +73,12 @@ export type OperatorMap<T> = {
export type FilterValue2<T> = T | ExpandScalar<T> | Primary<T>;
export type FilterValue<T> = OperatorMap<FilterValue2<T>> | FilterValue2<T> | FilterValue2<T>[] | null;
-// eslint-disable-next-line @typescript-eslint/ban-types
type ExpandObject<T> = T extends object
? T extends Scalar
? never
: { [K in keyof T]?: Query<ExpandProperty<T[K]>> | FilterValue<ExpandProperty<T[K]>> | null }
: never;
-// eslint-disable-next-line @typescript-eslint/ban-types
export type Query<T> = T extends object
? T extends Scalar
? never
@@ -433,7 +431,7 @@ export interface EntityMetadata<T extends AnyEntity<T> = any> {
class: Constructor<T>;
abstract: boolean;
useCache: boolean;
- filters: Dictionary<FilterDef<T>>;
+ filters: Dictionary<FilterDef>;
comment?: string;
selfReferencing?: boolean;
readonly?: boolean;
@@ -534,9 +532,9 @@ export interface MigrationObject {
class: Constructor<Migration>;
}
-export type FilterDef<T extends AnyEntity<T>> = {
+export type FilterDef = {
name: string;
- cond: FilterQuery<T> | ((args: Dictionary, type: 'read' | 'update' | 'delete', em: any) => FilterQuery<T> | Promise<FilterQuery<T>>);
+ cond: Dictionary | ((args: Dictionary, type: 'read' | 'update' | 'delete', em: any) => Dictionary | Promise<Dictionary>);
default?: boolean;
entity?: string[];
args?: boolean;
@@ -558,7 +556,6 @@ type StringKeys<T> = T extends Collection<any>
? `${Exclude<keyof ExtractType<T>, symbol>}`
: T extends Reference<any>
? `${Exclude<keyof ExtractType<T>, symbol>}`
- // eslint-disable-next-line @typescript-eslint/ban-types
: T extends object
? `${Exclude<keyof ExtractType<T>, symbol>}`
: never;
diff --git a/Configuration.ts b/Configuration.ts
index ee12174..eea5570 100644
--- a/Configuration.ts
+++ b/Configuration.ts
@@ -399,7 +399,7 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver> ex
entities: (string | EntityClass<AnyEntity> | EntityClassGroup<AnyEntity> | EntitySchema<any>)[]; // `any` required here for some TS weirdness
entitiesTs: (string | EntityClass<AnyEntity> | EntityClassGroup<AnyEntity> | EntitySchema<any>)[]; // `any` required here for some TS weirdness
subscribers: EventSubscriber[];
- filters: Dictionary<{ name?: string } & Omit<FilterDef<AnyEntity>, 'name'>>;
+ filters: Dictionary<{ name?: string } & Omit<FilterDef, 'name'>>;
discovery: {
warnWhenNoEntities?: boolean;
requireEntitiesArray?: boolean;
diff --git a/QueryHelper.ts b/QueryHelper.ts
index b1ca91e..9b464f0 100644
--- a/QueryHelper.ts
+++ b/QueryHelper.ts
@@ -175,7 +175,7 @@ export class QueryHelper {
}, {} as ObjectQuery<T>);
}
- static getActiveFilters(entityName: string, options: Dictionary<boolean | Dictionary> | string[] | boolean, filters: Dictionary<FilterDef<any>>): FilterDef<any>[] {
+ static getActiveFilters(entityName: string, options: Dictionary<boolean | Dictionary> | string[] | boolean, filters: Dictionary<FilterDef>): FilterDef[] {
if (options === false) {
return [];
}
@@ -196,7 +196,7 @@ export class QueryHelper {
});
}
- static isFilterActive(entityName: string, filterName: string, filter: FilterDef<any>, options: Dictionary<boolean | Dictionary>): boolean {
+ static isFilterActive(entityName: string, filterName: string, filter: FilterDef, options: Dictionary<boolean | Dictionary>): boolean {
if (filter.entity && !filter.entity.includes(entityName)) {
return false;
}
diff --git a/QueryBuilder.ts b/QueryBuilder.ts
index 9725561..a02c817 100644
--- a/QueryBuilder.ts
+++ b/QueryBuilder.ts
@@ -1,7 +1,7 @@
import type { Knex } from 'knex';
import type {
AnyEntity, Dictionary, EntityData, EntityMetadata, EntityProperty, FlatQueryOrderMap,
- GroupOperator, MetadataStorage, PopulateOptions, QBFilterQuery, QueryOrderMap, QueryResult, FlushMode,
+ GroupOperator, MetadataStorage, PopulateOptions, QBFilterQuery, QueryOrderMap, QueryResult, FlushMode, FilterQuery,
} from '@mikro-orm/core';
import { LoadStrategy, LockMode, QueryFlag, QueryHelper, ReferenceType, Utils, ValidationError } from '@mikro-orm/core';
import { QueryType } from './enums';
@@ -185,7 +185,7 @@ export class QueryBuilder<T extends AnyEntity<T> = AnyEntity> {
cond = { [`(${cond})`]: Utils.asArray(params) };
operator = operator || '$and';
} else {
- cond = QueryHelper.processWhere(cond, this.entityName, this.metadata, this.platform, this.flags.has(QueryFlag.CONVERT_CUSTOM_TYPES))!;
+ cond = QueryHelper.processWhere(cond, this.entityName, this.metadata, this.platform, this.flags.has(QueryFlag.CONVERT_CUSTOM_TYPES)) as FilterQuery<T>;
}
const op = operator || params as keyof typeof GroupOperator;
diff --git a/EntityManager.mongo.test.ts b/EntityManager.mongo.test.ts
index 1692b38..ce12baf 100644
--- a/EntityManager.mongo.test.ts
+++ b/EntityManager.mongo.test.ts
@@ -530,7 +530,7 @@ describe('EntityManagerMongo', () => {
const conn = driver.getConnection();
const ctx = await conn.begin();
- const first = await driver.nativeInsert(Publisher.name, { name: 'test 123', type: 'GLOBAL' }, { ctx });
+ const first = await driver.nativeInsert<Publisher>(Publisher.name, { name: 'test 123', type: PublisherType.GLOBAL }, { ctx });
await conn.commit(ctx);
await driver.nativeUpdate<Publisher>(Publisher.name, first.insertId, { name: 'test 456' });
await driver.nativeUpdateMany<Publisher>(Publisher.name, [first.insertId], [{ name: 'test 789' }]);
diff --git a/Car2.ts b/Car2.ts
index 2de17ce..3cbc637 100644
--- a/Car2.ts
+++ b/Car2.ts
@@ -19,7 +19,7 @@ export class Car2 {
@ManyToMany(() => User2, u => u.cars)
users = new Collection<User2>(this);
- [PrimaryKeyType]: [string, number];
+ [PrimaryKeyType]?: [string, number];
constructor(name: string, year: number, price: number) {
this.name = name;
diff --git a/FooParam2.ts b/FooParam2.ts
index ae74641..c6883c2 100644
--- a/FooParam2.ts
+++ b/FooParam2.ts
@@ -17,7 +17,7 @@ export class FooParam2 {
@Property({ version: true })
version!: Date;
- [PrimaryKeyType]: [number, number];
+ [PrimaryKeyType]?: [number, number];
[PrimaryKeyProp]?: 'bar' | 'baz';
constructor(bar: FooBar2, baz: FooBaz2, value: string) {
diff --git a/User2.ts b/User2.ts
index bf99873..620c697 100644
--- a/User2.ts
+++ b/User2.ts
@@ -23,7 +23,7 @@ export class User2 {
@OneToOne({ entity: () => Car2, nullable: true })
favouriteCar?: Car2;
- [PrimaryKeyType]: [string, string];
+ [PrimaryKeyType]?: [string, string];
constructor(firstName: string, lastName: string) {
this.firstName = firstName;
diff --git a/GH1079.test.ts b/GH1079.test.ts
index 340ebb7..e6e2d38 100644
--- a/GH1079.test.ts
+++ b/GH1079.test.ts
@@ -14,7 +14,7 @@ class User {
@Entity()
class Wallet {
- [PrimaryKeyType]: [string, string];
+ [PrimaryKeyType]?: [string, string];
@PrimaryKey()
currencyRef!: string;
@@ -56,7 +56,7 @@ enum DepositStatus {
@Entity()
export class Deposit extends AbstractDeposit<'status'> {
- [PrimaryKeyType]: [string, string, string];
+ [PrimaryKeyType]?: [string, string, string];
@PrimaryKey()
txRef!: string;
diff --git a/GH1624.test.ts b/GH1624.test.ts
index 76fde97..6f4492b 100644
--- a/GH1624.test.ts
+++ b/GH1624.test.ts
@@ -52,7 +52,7 @@ export class User {
@OneToMany({ entity: 'UserRole', mappedBy: 'user' })
userRoles = new Collection<UserRole>(this);
- [PrimaryKeyType]: [string, string];
+ [PrimaryKeyType]?: [string, string];
constructor(value: Partial<User> = {}) {
Object.assign(this, value);
@@ -101,7 +101,7 @@ export class UserRole {
})
role!: IdentifiedReference<Role>;
- [PrimaryKeyType]: [string, string, string];
+ [PrimaryKeyType]?: [string, string, string];
constructor(value: Partial<UserRole> = {}) {
Object.assign(this, value);
@@ -155,7 +155,7 @@ export class Site {
@Property({ columnType: 'varchar' })
name!: string;
- [PrimaryKeyType]: [string, string, string];
+ [PrimaryKeyType]?: [string, string, string];
constructor(value: Partial<Site> = {}) {
Object.assign(this, value);
diff --git a/GH1914.test.ts b/GH1914.test.ts
index 5e02c3a..e7a4bff 100644
--- a/GH1914.test.ts
+++ b/GH1914.test.ts
@@ -43,7 +43,7 @@ export class SiteCategory {
@ManyToOne({ entity: () => Category, primary: true })
category!: Category;
- [PrimaryKeyType]: [number, number];
+ [PrimaryKeyType]?: [number, number];
}
diff --git a/composite-keys.sqlite.test.ts b/composite-keys.sqlite.test.ts
index 1607858..63bfb42 100644
--- a/composite-keys.sqlite.test.ts
+++ b/composite-keys.sqlite.test.ts
@@ -51,7 +51,7 @@ export class FooParam2 {
@Property({ version: true })
version!: Date;
- [PrimaryKeyType]: [number, number];
+ [PrimaryKeyType]?: [number, number];
constructor(bar: FooBar2, baz: FooBaz2, value: string) {
this.bar = bar;
@@ -155,7 +155,7 @@ export class Car2 {
@ManyToMany('User2', 'cars')
users = new Collection<User2>(this);
- [PrimaryKeyType]: [string, number];
+ [PrimaryKeyType]?: [string, number];
constructor(name: string, year: number, price: number) {
this.name = name;
@@ -186,7 +186,7 @@ export class User2 {
@OneToOne({ entity: () => Car2, nullable: true })
favouriteCar?: Car2;
- [PrimaryKeyType]: [string, string];
+ [PrimaryKeyType]?: [string, string];
constructor(firstName: string, lastName: string) {
this.firstName = firstName;
diff --git a/GH446.test.ts b/GH446.test.ts
index bbb0922..43e5ff4 100644
--- a/GH446.test.ts
+++ b/GH446.test.ts
@@ -44,7 +44,7 @@ class C {
@OneToOne({ primary: true })
b!: B;
- [PrimaryKeyType]: B | A | string;
+ [PrimaryKeyType]?: B | A | string;
}
diff --git a/GH1111.test.ts b/GH1111.test.ts
index 93a5f2f..2333332 100644
--- a/GH1111.test.ts
+++ b/GH1111.test.ts
@@ -14,7 +14,7 @@ class Node {
@Entity()
class A {
- [PrimaryKeyType]: number;
+ [PrimaryKeyType]?: number;
[PrimaryKeyProp]: 'node';
@OneToOne({ entity: () => Node, wrappedReference: true, primary: true, onDelete: 'cascade', onUpdateIntegrity: 'cascade' })
node!: IdentifiedReference<Node>;
diff --git a/GH1224.test.ts b/GH1224.test.ts
index 49ade24..f50e416 100644
--- a/GH1224.test.ts
+++ b/GH1224.test.ts
@@ -26,7 +26,7 @@ class B {
@Entity()
class A {
- [PrimaryKeyType]: number;
+ [PrimaryKeyType]?: number;
[PrimaryKeyProp]: 'node';
@OneToOne({ entity: 'Node', wrappedReference: true, primary: true, onDelete: 'cascade', onUpdateIntegrity: 'cascade' })
node!: IdentifiedReference<Node>;
diff --git a/GH1902.test.ts b/GH1902.test.ts
index b62a54f..28827ed 100644
--- a/GH1902.test.ts
+++ b/GH1902.test.ts
@@ -55,7 +55,7 @@ class UserTenantEntity {
@ManyToOne({ primary: true, entity: () => TenantEntity, fieldName: 'tenantId', cascade: [] })
tenant!: TenantEntity;
- [PrimaryKeyType]: [number, number];
+ [PrimaryKeyType]?: [number, number];
[OptionalProps]?: 'isActive';
@Property({ type: 'boolean', fieldName: 'isActive' })
diff --git a/GH2648.test.ts b/GH2648.test.ts
index b193292..ab85349 100644
--- a/GH2648.test.ts
+++ b/GH2648.test.ts
@@ -15,7 +15,7 @@ export class A {
@Entity()
export class B1 {
- [PrimaryKeyType]: number;
+ [PrimaryKeyType]?: number;
@ManyToOne({ entity: () => A, primary: true, wrappedReference: true })
a!: IdentifiedReference<A>;
@@ -27,7 +27,7 @@ export class B2 {
@PrimaryKey()
id!: number;
- [PrimaryKeyType]: number;
+ [PrimaryKeyType]?: number;
@OneToOne({ entity: () => A, primary: true, wrappedReference: true })
a!: IdentifiedReference<A>;
@@ -36,7 +36,7 @@ export class B2 {
@Entity()
export class B3 {
- [PrimaryKeyType]: number;
+ [PrimaryKeyType]?: number;
@OneToOne({ entity: () => A, primary: true, wrappedReference: true })
a!: IdentifiedReference<A>;
@@ -48,7 +48,7 @@ export class B4 {
@PrimaryKey()
id!: number;
- [PrimaryKeyType]: number;
+ [PrimaryKeyType]?: number;
@OneToOne({ entity: () => A, primary: true, wrappedReference: true })
a!: IdentifiedReference<A>;
diff --git a/GH529.test.ts b/GH529.test.ts
index e6a6af8..cdb68c0 100644
--- a/GH529.test.ts
+++ b/GH529.test.ts
@@ -70,7 +70,7 @@ export class OrderItem {
@Property()
offeredPrice: number;
- [PrimaryKeyType]: [number, number]; // this is needed for proper type checks in `FilterQuery`
+ [PrimaryKeyType]?: [number, number]; // this is needed for proper type checks in `FilterQuery`
constructor(order: Order, product: Product, amount = 1) {
this.order = order;
diff --git a/GH589.test.ts b/GH589.test.ts
index 25e4214..f0d3395 100644
--- a/GH589.test.ts
+++ b/GH589.test.ts
@@ -24,7 +24,7 @@ export class Chat {
@ManyToOne(() => User, { nullable: true })
User?: User;
- [PrimaryKeyType]: [number, number];
+ [PrimaryKeyType]?: [number, number];
constructor(owner: User, recipient: User) {
this.owner = Reference.create(owner);
diff --git a/GH910.test.ts b/GH910.test.ts
index aeca4de..194fb02 100644
--- a/GH910.test.ts
+++ b/GH910.test.ts
@@ -65,7 +65,7 @@ export class CartItem {
@PrimaryKey({ type: SkuType })
readonly sku: Sku;
- [PrimaryKeyType]: [string, string];
+ [PrimaryKeyType]?: [string, string];
@Property()
quantity: number;
diff --git a/GH915.test.ts b/GH915.test.ts
index 9c5618a..beb9560 100644
--- a/GH915.test.ts
+++ b/GH915.test.ts
@@ -11,7 +11,7 @@ export class A {
@Entity()
export class B {
- [PrimaryKeyType]: number;
+ [PrimaryKeyType]?: number;
@OneToOne({ primary: true, cascade: [] })
object!: A;
diff --git a/types.test.ts b/types.test.ts
index 2ba0996..7b288ba 100644
--- a/types.test.ts
+++ b/types.test.ts
@@ -18,7 +18,7 @@ describe('check typings', () => {
assert<IsExact<Primary<Author2>, string>>(false);
// PrimaryKeyType symbol has priority
- type Test = { _id: ObjectId; id: string; uuid: number; [PrimaryKeyType]: Date };
+ type Test = { _id: ObjectId; id: string; uuid: number; [PrimaryKeyType]?: Date };
assert<IsExact<Primary<Test>, Date>>(true);
assert<IsExact<Primary<Test>, ObjectId>>(false);
assert<IsExact<Primary<Test>, string>>(false);
|
|
docs: fill out table API with working examples
|
16fc8befaf639bbce1660fce7809c28122696bf2
|
docs
|
https://github.com/ibis-project/ibis/commit/16fc8befaf639bbce1660fce7809c28122696bf2
|
fill out table API with working examples
|
diff --git a/ibis-main.yml b/ibis-main.yml
index 6894727..e75788e 100644
--- a/ibis-main.yml
+++ b/ibis-main.yml
@@ -155,3 +155,52 @@ jobs:
- name: check shapely and duckdb imports
run: poetry run python -c 'import shapely.geometry, duckdb'
+
+ test_doctests:
+ name: Doctests
+ runs-on: ${{ matrix.os }}
+ strategy:
+ fail-fast: false
+ matrix:
+ os:
+ - ubuntu-latest
+ python-version:
+ - "3.11"
+ steps:
+ - name: install system dependencies
+ run: |
+ set -euo pipefail
+
+ sudo apt-get update -y -q
+ sudo apt-get install -y -q build-essential graphviz libgeos-dev libkrb5-dev
+
+ - name: checkout
+ uses: actions/checkout@v3
+
+ - name: install python
+ uses: actions/setup-python@v4
+ id: install_python
+ with:
+ python-version: ${{ matrix.python-version }}
+
+ - uses: syphar/restore-pip-download-cache@v1
+ with:
+ requirement_files: poetry.lock
+ custom_cache_key_element: doctests-${{ steps.install_python.outputs.python-version }}
+
+ - run: python -m pip install --upgrade pip 'poetry<1.4'
+
+ - uses: syphar/restore-virtualenv@v1
+ with:
+ requirement_files: poetry.lock
+ custom_cache_key_element: doctests-${{ steps.install_python.outputs.python-version }}
+
+ - name: install ibis with all extras
+ run: poetry install --without dev --without docs --extras all
+
+ - uses: extractions/setup-just@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: run doctests
+ run: just doctest
diff --git a/__init__.py b/__init__.py
index 11204a0..c0b452b 100644
--- a/__init__.py
+++ b/__init__.py
@@ -60,8 +60,8 @@ ir.Table
Examples
--------
->>> from ibis.interactive import *
->>> t = ex.{name}.fetch()
+>>> import ibis
+>>> t = ibis.examples.{name}.fetch()
"""
diff --git a/timecontext.py b/timecontext.py
index 13799d1..108bbd2 100644
--- a/timecontext.py
+++ b/timecontext.py
@@ -53,15 +53,16 @@ def combine_time_context(
Examples
--------
+ >>> import pandas as pd
>>> timecontexts = [
... (pd.Timestamp('20200102'), pd.Timestamp('20200103')),
... (pd.Timestamp('20200101'), pd.Timestamp('20200106')),
... (pd.Timestamp('20200109'), pd.Timestamp('20200110')),
... ]
>>> combine_time_context(timecontexts)
- (pd.Timestamp('20200101'), pd.Timestamp('20200110'))
+ (Timestamp(...), Timestamp(...))
>>> timecontexts = [None]
- >>> combine_time_context(timecontexts)
+ >>> print(combine_time_context(timecontexts))
None
"""
begin = min((t[0] for t in timecontexts if t), default=None)
diff --git a/client.py b/client.py
index 1824c27..d3fa9ab 100644
--- a/client.py
+++ b/client.py
@@ -260,13 +260,11 @@ def parse_project_and_dataset(project: str, dataset: str = "") -> tuple[str, str
'ibis-gbq'
>>> dataset
'my_dataset'
- >>> data_project, billing_project, dataset = parse_project_and_dataset(
+ >>> data_project, billing_project, _ = parse_project_and_dataset(
... 'ibis-gbq'
... )
>>> data_project
'ibis-gbq'
- >>> print(dataset)
- None
"""
if dataset.count(".") > 1:
raise ValueError(
diff --git a/find.py b/find.py
index 607886e..362bc0c 100644
--- a/find.py
+++ b/find.py
@@ -46,8 +46,8 @@ def find_names(node: ast.AST) -> list[ast.Name]:
>>> import ast
>>> node = ast.parse('a + b')
>>> names = find_names(node)
- >>> names # doctest: +ELLIPSIS
- [<_ast.Name object at 0x...>, <_ast.Name object at 0x...>]
+ >>> names
+ [<....Name object at 0x...>, <....Name object at 0x...>]
>>> names[0].id
'a'
>>> names[1].id
diff --git a/util.py b/util.py
index 820c60b..b7de390 100644
--- a/util.py
+++ b/util.py
@@ -510,11 +510,11 @@ def import_object(qualname: str) -> Any:
Examples
--------
- >>> out = import_object("foo.bar.baz")
+ >>> ex = import_object("ibis.examples")
Is the same as
- >>> from foo.bar import baz
+ >>> from ibis import examples as ex
"""
mod_name, name = qualname.rsplit(".", 1)
mod = importlib.import_module(mod_name)
diff --git a/aggcontext.py b/aggcontext.py
index 09ee9be..9b7766e 100644
--- a/aggcontext.py
+++ b/aggcontext.py
@@ -195,7 +195,7 @@ Pandas
... 'time': pd.date_range(periods=4, start='now')
... })
>>> sorter = lambda df: df.sort_values('time')
- >>> gb = df.groupby('key').apply(sorter).reset_index(
+ >>> gb = df.groupby('key', group_keys=False).apply(sorter).reset_index(
... drop=True
... ).groupby('key')
>>> rolling = gb.value.rolling(2)
diff --git a/annotations.py b/annotations.py
index d9e13f0..0c65626 100644
--- a/annotations.py
+++ b/annotations.py
@@ -413,7 +413,7 @@ def annotated(_1=None, _2=None, _3=None, **kwargs):
2. With argument validators passed as keyword arguments
- >>> from ibis.common.validate import instance_of
+ >>> from ibis.common.validators import instance_of
>>> @annotated(x=instance_of(int), y=instance_of(str))
... def foo(x, y):
... return float(x) + float(y)
diff --git a/collections.py b/collections.py
index 9254acf..0c5ba99 100644
--- a/collections.py
+++ b/collections.py
@@ -38,6 +38,9 @@ class MapSet(Mapping[K, V]):
... def __getitem__(self, key):
... return self._data[key]
...
+ ... def __repr__(self):
+ ... return f"MyMap({repr(self._data)})"
+ ...
>>> m = MyMap(a=1, b=2)
>>> n = dict(a=1, b=2, c=3)
>>> m <= n
diff --git a/conftest.py b/conftest.py
index 61e7317..5fcf3d1 100644
--- a/conftest.py
+++ b/conftest.py
@@ -0,0 +1,16 @@
+import os
+
+import pytest
+
+import ibis
+
+
[email protected](autouse=True)
[email protected]("doctest_namespace")
+def add_ibis(monkeypatch):
+ # disable color for doctests so we don't have to include
+ # escape codes in docstrings
+ monkeypatch.setitem(os.environ, "NO_COLOR", "1")
+ # reset interactive mode to False for doctests that don't execute
+ # expressions
+ ibis.options.interactive = False
diff --git a/analysis.py b/analysis.py
index fa8b624..27d1848 100644
--- a/analysis.py
+++ b/analysis.py
@@ -141,16 +141,12 @@ def find_immediate_parent_tables(input_node, keep_input=True):
>>> import ibis, toolz
>>> t = ibis.table([('a', 'int64')], name='t')
>>> expr = t.mutate(foo=t.a + 1)
- >>> result = find_immediate_parent_tables(expr)
- >>> len(result)
- 1
- >>> result[0]
- r0 := UnboundTable[t]
- a int64
- Selection[r0]
- selections:
- r0
- foo: r0.a + 1
+ >>> result, = find_immediate_parent_tables(expr.op())
+ >>> result.equals(expr.op())
+ True
+ >>> result, = find_immediate_parent_tables(expr.op(), keep_input=False)
+ >>> result.equals(t.op())
+ True
"""
assert all(isinstance(arg, ops.Node) for arg in util.promote_list(input_node))
@@ -681,19 +677,19 @@ def flatten_predicate(node):
>>> import ibis
>>> t = ibis.table([('a', 'int64'), ('b', 'string')], name='t')
>>> filt = (t.a == 1) & (t.b == 'foo')
- >>> predicates = flatten_predicate(filt)
+ >>> predicates = flatten_predicate(filt.op())
>>> len(predicates)
2
- >>> predicates[0]
- r0 := UnboundTable[t]
+ >>> predicates[0].to_expr().name("left")
+ r0 := UnboundTable: t
a int64
b string
- r0.a == 1
- >>> predicates[1]
- r0 := UnboundTable[t]
+ left: r0.a == 1
+ >>> predicates[1].to_expr().name("right")
+ r0 := UnboundTable: t
a int64
b string
- r0.b == 'foo'
+ right: r0.b == 'foo'
"""
def predicate(node):
diff --git a/api.py b/api.py
index c286a39..2b57d73 100644
--- a/api.py
+++ b/api.py
@@ -222,7 +222,7 @@ def param(type: dt.DataType) -> ir.Scalar:
predicates:
r0.timestamp_col >= $(date)
r0.timestamp_col <= $(date)
- sum: Sum(r1.value)
+ Sum(value): Sum(r1.value)
"""
return ops.ScalarParameter(type).to_expr()
@@ -269,7 +269,7 @@ def schema(
>>> sc = schema(names=['foo', 'bar', 'baz'],
... types=['string', 'int64', 'boolean'])
>>> sc = schema(dict(foo="string"))
- >>> sc = schema(Schema(['foo'], ['string'])) # no-op
+ >>> sc = schema(Schema(dict(foo="string"))) # no-op
Returns
-------
@@ -304,9 +304,12 @@ def table(
--------
Create a table with no data backing it
- >>> t = ibis.table(schema=dict(a="int", b="string"))
+ >>> import ibis
+ >>> ibis.options.interactive
+ False
+ >>> t = ibis.table(schema=dict(a="int", b="string"), name="t")
>>> t
- UnboundTable: unbound_table_0
+ UnboundTable: t
a int64
b string
"""
@@ -453,18 +456,20 @@ def desc(expr: ir.Column | str) -> ir.Value:
Examples
--------
>>> import ibis
- >>> t = ibis.table(dict(g='string'), name='t')
- >>> t.group_by('g').size('count').order_by(ibis.desc('count'))
- r0 := UnboundTable: t
- g string
- r1 := Aggregation[r0]
- metrics:
- count: Count(t)
- by:
- g: r0.g
- Selection[r1]
- sort_keys:
- desc|r1.count
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> t[["species", "year"]].order_by(ibis.desc("year")).head()
+ ┏━━━━━━━━━┳━━━━━━━┓
+ ┃ species ┃ year ┃
+ ┡━━━━━━━━━╇━━━━━━━┩
+ │ string │ int64 │
+ ├─────────┼───────┤
+ │ Adelie │ 2009 │
+ │ Adelie │ 2009 │
+ │ Adelie │ 2009 │
+ │ Adelie │ 2009 │
+ │ Adelie │ 2009 │
+ └─────────┴───────┘
Returns
-------
@@ -485,18 +490,20 @@ def asc(expr: ir.Column | str) -> ir.Value:
Examples
--------
>>> import ibis
- >>> t = ibis.table(dict(g='string'), name='t')
- >>> t.group_by('g').size('count').order_by(ibis.asc('count'))
- r0 := UnboundTable: t
- g string
- r1 := Aggregation[r0]
- metrics:
- count: Count(t)
- by:
- g: r0.g
- Selection[r1]
- sort_keys:
- asc|r1.count
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> t[["species", "year"]].order_by(ibis.asc("year")).head()
+ ┏━━━━━━━━━┳━━━━━━━┓
+ ┃ species ┃ year ┃
+ ┡━━━━━━━━━╇━━━━━━━┩
+ │ string │ int64 │
+ ├─────────┼───────┤
+ │ Adelie │ 2007 │
+ │ Adelie │ 2007 │
+ │ Adelie │ 2007 │
+ │ Adelie │ 2007 │
+ │ Adelie │ 2007 │
+ └─────────┴───────┘
Returns
-------
@@ -794,7 +801,8 @@ def case() -> bl.SearchedCaseBuilder:
>>> cond1 = ibis.literal(1) == 1
>>> cond2 = ibis.literal(2) == 1
>>> expr = ibis.case().when(cond1, 3).when(cond2, 4).end()
- SearchedCase(cases=(1 == 1, 2 == 1), results=(3, 4)), default=Cast(None, to=int8))
+ >>> expr
+ SearchedCase(...)
Returns
-------
@@ -849,7 +857,27 @@ def read_csv(sources: str | Path | Sequence[str | Path], **kwargs: Any) -> ir.Ta
Examples
--------
- >>> batting = ibis.read_csv("ci/ibis-testing-data/batting.csv")
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.Batting_raw.fetch()
+ >>> t
+ ┏━━━━━━━━━━━┳━━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━┓
+ ┃ playerID ┃ yearID ┃ stint ┃ teamID ┃ lgID ┃ G ┃ AB ┃ R ┃ … ┃
+ ┡━━━━━━━━━━━╇━━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━┩
+ │ string │ int64 │ int64 │ string │ string │ int64 │ int64 │ int64 │ … │
+ ├───────────┼────────┼───────┼────────┼────────┼───────┼───────┼───────┼───┤
+ │ abercda01 │ 1871 │ 1 │ TRO │ NA │ 1 │ 4 │ 0 │ … │
+ │ addybo01 │ 1871 │ 1 │ RC1 │ NA │ 25 │ 118 │ 30 │ … │
+ │ allisar01 │ 1871 │ 1 │ CL1 │ NA │ 29 │ 137 │ 28 │ … │
+ │ allisdo01 │ 1871 │ 1 │ WS3 │ NA │ 27 │ 133 │ 28 │ … │
+ │ ansonca01 │ 1871 │ 1 │ RC1 │ NA │ 25 │ 120 │ 29 │ … │
+ │ armstbo01 │ 1871 │ 1 │ FW1 │ NA │ 12 │ 49 │ 9 │ … │
+ │ barkeal01 │ 1871 │ 1 │ RC1 │ NA │ 1 │ 4 │ 0 │ … │
+ │ barnero01 │ 1871 │ 1 │ BS1 │ NA │ 31 │ 157 │ 66 │ … │
+ │ barrebi01 │ 1871 │ 1 │ FW1 │ NA │ 1 │ 5 │ 1 │ … │
+ │ barrofr01 │ 1871 │ 1 │ BS1 │ NA │ 18 │ 86 │ 13 │ … │
+ │ … │ … │ … │ … │ … │ … │ … │ … │ … │
+ └───────────┴────────┴───────┴────────┴────────┴───────┴───────┴───────┴───┘
"""
from ibis.config import _default_backend
@@ -886,9 +914,9 @@ def read_json(sources: str | Path | Sequence[str | Path], **kwargs: Any) -> ir.T
... {"a": 2, "b": null}
... {"a": null, "b": "f"}
... '''
- >>> with open("lines.json", mode="w") as f:
- ... f.write(lines)
- >>> t = ibis.read_json("lines.json")
+ >>> with open("/tmp/lines.json", mode="w") as f:
+ ... _ = f.write(lines)
+ >>> t = ibis.read_json("/tmp/lines.json")
>>> t
┏━━━━━━━━┳━━━━━━━━┓
┃ a ┃ b ┃
@@ -929,7 +957,27 @@ def read_parquet(sources: str | Path | Sequence[str | Path], **kwargs: Any) -> i
Examples
--------
- >>> batting = ibis.read_parquet("ci/ibis-testing-data/parquet/batting/batting.parquet")
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.Batting_raw.fetch()
+ >>> t
+ ┏━━━━━━━━━━━┳━━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━┓
+ ┃ playerID ┃ yearID ┃ stint ┃ teamID ┃ lgID ┃ G ┃ AB ┃ R ┃ … ┃
+ ┡━━━━━━━━━━━╇━━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━┩
+ │ string │ int64 │ int64 │ string │ string │ int64 │ int64 │ int64 │ … │
+ ├───────────┼────────┼───────┼────────┼────────┼───────┼───────┼───────┼───┤
+ │ abercda01 │ 1871 │ 1 │ TRO │ NA │ 1 │ 4 │ 0 │ … │
+ │ addybo01 │ 1871 │ 1 │ RC1 │ NA │ 25 │ 118 │ 30 │ … │
+ │ allisar01 │ 1871 │ 1 │ CL1 │ NA │ 29 │ 137 │ 28 │ … │
+ │ allisdo01 │ 1871 │ 1 │ WS3 │ NA │ 27 │ 133 │ 28 │ … │
+ │ ansonca01 │ 1871 │ 1 │ RC1 │ NA │ 25 │ 120 │ 29 │ … │
+ │ armstbo01 │ 1871 │ 1 │ FW1 │ NA │ 12 │ 49 │ 9 │ … │
+ │ barkeal01 │ 1871 │ 1 │ RC1 │ NA │ 1 │ 4 │ 0 │ … │
+ │ barnero01 │ 1871 │ 1 │ BS1 │ NA │ 31 │ 157 │ 66 │ … │
+ │ barrebi01 │ 1871 │ 1 │ FW1 │ NA │ 1 │ 5 │ 1 │ … │
+ │ barrofr01 │ 1871 │ 1 │ BS1 │ NA │ 18 │ 86 │ 13 │ … │
+ │ … │ … │ … │ … │ … │ … │ … │ … │ … │
+ └───────────┴────────┴───────┴────────┴────────┴───────┴───────┴───────┴───┘
"""
from ibis.config import _default_backend
@@ -947,13 +995,17 @@ def set_backend(backend: str | BaseBackend) -> None:
Examples
--------
- May pass the backend as a name:
+ You can pass the backend as a name:
+
+ >>> import ibis
>>> ibis.set_backend("polars")
- Or as a URI:
- >>> ibis.set_backend("postgres://user:password@hostname:5432")
+ Or as a URI
+
+ >>> ibis.set_backend("postgres://user:password@hostname:5432") # doctest: +SKIP
+
+ Or as an existing backend instance
- Or as an existing backend instance:
>>> ibis.set_backend(ibis.duckdb.connect())
"""
import ibis
diff --git a/logical.py b/logical.py
index 8237b6f..f17fa15 100644
--- a/logical.py
+++ b/logical.py
@@ -38,9 +38,9 @@ class BooleanValue(NumericValue):
>>> import ibis
>>> t = ibis.table([("is_person", "boolean")], name="t")
>>> expr = t.is_person.ifelse("yes", "no")
- >>> print(ibis.impala.compile(expr))
- SELECT CASE WHEN `is_person` THEN 'yes' ELSE 'no' END AS `tmp`
- FROM t
+ >>> print(ibis.impala.compile(expr.name("tmp")))
+ SELECT if(t0.`is_person`, 'yes', 'no') AS `tmp`
+ FROM t t0
"""
# Result will be the result of promotion of true/false exprs. These
# might be conflicting types; same type resolution as case expressions
diff --git a/schema.py b/schema.py
index ff8c8f9..de92c08 100644
--- a/schema.py
+++ b/schema.py
@@ -176,9 +176,9 @@ class Schema(Concrete, Coercible, MapSet):
Examples
--------
>>> import ibis
- >>> first = ibis.Schema.from_dict({"a": "int", "b": "string"})
- >>> second = ibis.Schema.from_dict({"c": "float", "d": "int16"})
- >>> first.merge(second)
+ >>> first = ibis.Schema({"a": "int", "b": "string"})
+ >>> second = ibis.Schema({"c": "float", "d": "int16"})
+ >>> first.merge(second) # doctest: +SKIP
ibis.Schema {
a int64
b string
@@ -206,7 +206,7 @@ class Schema(Concrete, Coercible, MapSet):
Examples
--------
>>> import ibis
- >>> sch = ibis.Schema.from_dict({"a": "int", "b": "string"})
+ >>> sch = ibis.Schema({"a": "int", "b": "string"})
>>> sch.name_at_position(0)
'a'
>>> sch.name_at_position(1)
diff --git a/selectors.py b/selectors.py
index a8eaa7c..f7f0de4 100644
--- a/selectors.py
+++ b/selectors.py
@@ -12,19 +12,19 @@ subsequent computation.
Without selectors this becomes quite verbose and tedious to write:
```python
->>> t.select([t[c] for c in t.columns if t[c].type().is_numeric()])
+>>> t.select([t[c] for c in t.columns if t[c].type().is_numeric()]) # doctest: +SKIP
```
Compare that to the [`numeric`][ibis.expr.selectors.numeric] selector:
```python
->>> t.select(s.numeric())
+>>> t.select(s.numeric()) # doctest: +SKIP
```
When there are multiple properties to check it gets worse:
```python
->>> t.select(
+>>> t.select( # doctest: +SKIP
... [
... t[c] for c in t.columns
... if t[c].type().is_numeric()
@@ -36,7 +36,7 @@ When there are multiple properties to check it gets worse:
Using a composition of selectors this is much less tiresome:
```python
->>> t.select(s.numeric() & s.contains(("a", "cd")))
+>>> t.select(s.numeric() & s.contains(("a", "cd"))) # doctest: +SKIP
```
"""
@@ -133,14 +133,12 @@ def where(predicate: Callable[[ir.Value], bool]) -> Predicate:
Examples
--------
+ >>> import ibis
+ >>> import ibis.expr.selectors as s
>>> t = ibis.table(dict(a="float32"), name="t")
- >>> t.select(s.where(lambda col: col.get_name() == "a"))
- r0 := UnboundTable: t
- a float32
- <BLANKLINE>
- Selection[r0]
- selections:
- a: r0.a
+ >>> expr = t.select(s.where(lambda col: col.get_name() == "a"))
+ >>> expr.columns
+ ['a']
"""
return Predicate(predicate=predicate)
@@ -151,22 +149,17 @@ def numeric() -> Predicate:
Examples
--------
- >>> import ibis.selectors as s
+ >>> import ibis
+ >>> import ibis.expr.selectors as s
>>> t = ibis.table(dict(a="int", b="string", c="array<string>"), name="t")
>>> t
- r0 := UnboundTable: t
+ UnboundTable: t
a int64
b string
c array<string>
- >>> t.select(s.numeric()) # `a` has integer type, so it's numeric
- r0 := UnboundTable: t
- a int64
- b string
- c array<string>
- <BLANKLINE>
- Selection[r0]
- selections:
- a: r0.a
+ >>> expr = t.select(s.numeric()) # `a` has integer type, so it's numeric
+ >>> expr.columns
+ ['a']
See Also
--------
@@ -188,15 +181,15 @@ def of_type(dtype: dt.DataType | str | type[dt.DataType]) -> Predicate:
--------
Select according to a specific `DataType` instance
- >>> t.select(s.of_type(dt.Array(dt.string)))
+ >>> t.select(s.of_type(dt.Array(dt.string))) # doctest: +SKIP
Strings are also accepted
- >>> t.select(s.of_type("map<string, float>"))
+ >>> t.select(s.of_type("map<string, float>")) # doctest: +SKIP
Select by category of `DataType` by passing the `DataType` class
- >>> t.select(s.of_type(dt.Struct)) # all struct columns, regardless of field types
+ >>> t.select(s.of_type(dt.Struct)) # doctest: +SKIP
See Also
--------
@@ -221,8 +214,12 @@ def startswith(prefixes: str | tuple[str, ...]) -> Predicate:
Examples
--------
+ >>> import ibis
+ >>> import ibis.expr.selectors as s
>>> t = ibis.table(dict(apples="int", oranges="float", bananas="bool"), name="t")
- >>> t.select(s.startswith(("a", "b")))
+ >>> expr = t.select(s.startswith(("a", "b")))
+ >>> expr.columns
+ ['apples', 'bananas']
See Also
--------
@@ -264,11 +261,11 @@ def contains(
--------
Select columns that contain either `"a"` or `"b"`
- >>> t.select(s.contains(("a", "b")))
+ >>> t.select(s.contains(("a", "b"))) # doctest: +SKIP
Select columns that contain all of `"a"` and `"b"`
- >>> t.select(s.contains(("a", "b"), how=all))
+ >>> t.select(s.contains(("a", "b"), how=all)) # doctest: +SKIP
See Also
--------
@@ -293,7 +290,7 @@ def matches(regex: str | re.Pattern) -> Selector:
Examples
--------
- >>> t.select(s.matches(r"ab+"))
+ >>> t.select(s.matches(r"ab+")) # doctest: +SKIP
See Also
--------
diff --git a/arrays.py b/arrays.py
index d380c58..f661e90 100644
--- a/arrays.py
+++ b/arrays.py
@@ -91,6 +91,7 @@ class ArrayValue(Value):
Extract a range of elements
>>> t = ibis.memtable({"a": [[7, 42, 72], [3] * 5, None]})
+ >>> t
┏━━━━━━━━━━━━━━━━━━━━━━┓
┃ a ┃
┡━━━━━━━━━━━━━━━━━━━━━━┩
diff --git a/core.py b/core.py
index 00a7587..5dc8667 100644
--- a/core.py
+++ b/core.py
@@ -87,6 +87,7 @@ class Expr(Immutable):
Examples
--------
+ >>> import ibis
>>> t1 = ibis.table(dict(a="int"), name="t")
>>> t2 = ibis.table(dict(a="int"), name="t")
>>> t1.equals(t2)
@@ -183,7 +184,7 @@ class Expr(Immutable):
>>> g = lambda a: (a * 2).name('a')
>>> result1 = t.a.pipe(f).pipe(g)
>>> result1
- r0 := UnboundTable[t]
+ r0 := UnboundTable: t
a int64
b string
a: r0.a + 1 * 2
@@ -487,10 +488,11 @@ def _binop(
Examples
--------
+ >>> import ibis
>>> import ibis.expr.operations as ops
>>> expr = _binop(ops.TimeAdd, ibis.time("01:00"), ibis.interval(hours=1))
>>> expr
- datetime.time(1, 0) + 1
+ TimeAdd(datetime.time(1, 0), 1): datetime.time(1, 0) + 1 h
>>> _binop(ops.TimeAdd, 1, ibis.interval(hours=1))
NotImplemented
"""
diff --git a/generic.py b/generic.py
index b3392fa..0e1e7a2 100644
--- a/generic.py
+++ b/generic.py
@@ -37,9 +37,9 @@ class Value(Expr):
Examples
--------
>>> import ibis
- >>> t = ibis.table(dict(a="int64"))
+ >>> t = ibis.table(dict(a="int64"), name="t")
>>> t.a.name("b")
- r0 := UnboundTable[unbound_table_...]
+ r0 := UnboundTable: t
a int64
b: r0.a
"""
@@ -120,8 +120,8 @@ class Value(Expr):
Examples
--------
>>> import ibis
- >>> ibis.coalesce(None, 4, 5)
- Coalesce((None, 4, 5))
+ >>> ibis.coalesce(None, 4, 5).name("x")
+ x: Coalesce(...)
"""
return ops.Coalesce((self, *args)).to_expr()
@@ -178,17 +178,44 @@ class Value(Expr):
Examples
--------
>>> import ibis
- >>> table = ibis.table(dict(col='int64', other_col='int64'))
- >>> result = table.col.fillna(5)
- r0 := UnboundTable: unbound_table_0
- col int64
- other_col int64
- IfNull(r0.col, ifnull_expr=5)
- >>> table.col.fillna(table.other_col * 3)
- r0 := UnboundTable: unbound_table_0
- col int64
- other_col int64
- IfNull(r0.col, ifnull_expr=r0.other_col * 3)
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> t.sex
+ ┏━━━━━━━━┓
+ ┃ sex ┃
+ ┡━━━━━━━━┩
+ │ string │
+ ├────────┤
+ │ male │
+ │ female │
+ │ female │
+ │ ∅ │
+ │ female │
+ │ male │
+ │ female │
+ │ male │
+ │ ∅ │
+ │ ∅ │
+ │ … │
+ └────────┘
+ >>> t.sex.fillna("unrecorded").name("sex")
+ ┏━━━━━━━━━━━━┓
+ ┃ sex ┃
+ ┡━━━━━━━━━━━━┩
+ │ string │
+ ├────────────┤
+ │ male │
+ │ female │
+ │ female │
+ │ unrecorded │
+ │ female │
+ │ male │
+ │ female │
+ │ male │
+ │ unrecorded │
+ │ unrecorded │
+ │ … │
+ └────────────┘
Returns
-------
@@ -254,21 +281,21 @@ class Value(Expr):
Check whether a column's values are contained in a sequence
>>> import ibis
- >>> table = ibis.table(dict(string_col='string'))
+ >>> table = ibis.table(dict(string_col='string'), name="t")
>>> table.string_col.isin(['foo', 'bar', 'baz'])
- r0 := UnboundTable: unbound_table_1
+ r0 := UnboundTable: t
string_col string
- Contains(value=r0.string_col, options=('foo', 'bar', 'baz'))
+ Contains(string_col): Contains(...)
Check whether a column's values are contained in another table's column
- >>> table2 = ibis.table(dict(other_string_col='string'))
+ >>> table2 = ibis.table(dict(other_string_col='string'), name="t2")
>>> table.string_col.isin(table2.other_string_col)
- r0 := UnboundTable: unbound_table_3
- other_string_col string
- r1 := UnboundTable: unbound_table_1
+ r0 := UnboundTable: t
string_col string
- Contains(value=r1.string_col, options=r0.other_string_col)
+ r1 := UnboundTable: t2
+ other_string_col string
+ Contains(string_col, other_string_col): Contains(...)
"""
return ops.Contains(self, values).to_expr()
@@ -410,9 +437,9 @@ class Value(Expr):
... .else_('null or (not a and not b)')
... .end())
>>> case_expr
- r0 := UnboundTable[t]
+ r0 := UnboundTable: t
string_col string
- SimpleCase(base=r0.string_col, cases=[List(values=['a', 'b'])], results=[List(values=['an a', 'a b'])], default='null or (not a and not b)')
+ SimpleCase(...)
"""
import ibis.expr.builders as bl
@@ -479,7 +506,7 @@ class Value(Expr):
>>> t.value.collect()
[1, 2, 3, 4, 5]
>>> type(t.value.collect())
- ibis.expr.types.arrays.ArrayScalar
+ <class 'ibis.expr.types.arrays.ArrayScalar'>
Collect elements per group
@@ -637,6 +664,8 @@ class Scalar(Value):
--------
Promote an aggregation to a table
+ >>> import ibis
+ >>> import ibis.expr.types as ir
>>> t = ibis.table(dict(a="str"), name="t")
>>> expr = t.a.length().sum().name("len").as_table()
>>> isinstance(expr, ir.Table)
diff --git a/groupby.py b/groupby.py
index f46cf46..945ff5d 100644
--- a/groupby.py
+++ b/groupby.py
@@ -172,7 +172,7 @@ class GroupedTable:
... ('baz', 'double'),
... ], name='t')
>>> t
- UnboundTable[t]
+ UnboundTable: t
foo string
bar string
baz float64
@@ -180,15 +180,15 @@ class GroupedTable:
... .order_by(ibis.desc('bar'))
... .mutate(qux=lambda x: x.baz.lag(), qux2=t.baz.lead()))
>>> print(expr)
- r0 := UnboundTable[t]
+ r0 := UnboundTable: t
foo string
bar string
baz float64
Selection[r0]
selections:
r0
- qux: Window(Lag(r0.baz), window=Window(group_by=[r0.foo], order_by=[desc|r0.bar], how='rows'))
- qux2: Window(Lead(r0.baz), window=Window(group_by=[r0.foo], order_by=[desc|r0.bar], how='rows'))
+ qux: WindowFunction(...)
+ qux2: WindowFunction(...)
Returns
-------
diff --git a/json.py b/json.py
index 7023249..b1f44fe 100644
--- a/json.py
+++ b/json.py
@@ -37,16 +37,16 @@ class JSONValue(Value):
>>> import json, ibis
>>> ibis.options.interactive = True
>>> rows = [{"js": json.dumps({"a": [i, 1]})} for i in range(2)]
- >>> t = ibis.memtable(rows, schema=ibis.schema(js="json"))
+ >>> t = ibis.memtable(rows, schema=ibis.schema(dict(js="json")))
>>> t
- ┏━━━━━━━━━━━━━━━┓
- ┃ js ┃
- ┡━━━━━━━━━━━━━━━┩
- │ json │
- ├───────────────┤
- │ {'a': [0, 1]} │
- │ {'a': [1, 1]} │
- └───────────────┘
+ ┏━━━━━━━━━━━━━━━━━━━━━━┓
+ ┃ js ┃
+ ┡━━━━━━━━━━━━━━━━━━━━━━┩
+ │ json │
+ ├──────────────────────┤
+ │ {'a': [...]} │
+ │ {'a': [...]} │
+ └──────────────────────┘
Extract the `"a"` field
@@ -74,7 +74,7 @@ class JSONValue(Value):
Extract a non-existent field
- >>> t.js.a["foo"]
+ >>> t.js["a"]["foo"]
┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
┃ JSONGetItem(JSONGetItem(js, 'a'), 'foo') ┃
┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
diff --git a/maps.py b/maps.py
index dd43603..c2a4700 100644
--- a/maps.py
+++ b/maps.py
@@ -39,11 +39,11 @@ class MapValue(Value):
>>> import ibis
>>> m = ibis.map({"a": 1, "b": 2})
>>> m.get("a")
- MapGet(frozendict({'a': 1, 'b': 2}), key='a', default=None)
+ MapGet(...)
>>> m.get("c", 3)
- MapGet(frozendict({'a': 1, 'b': 2}), key='c', default=3)
+ MapGet(...)
>>> m.get("d")
- MapGet(frozendict({'a': 1, 'b': 2}), key='d', default=None)
+ MapGet(...)
"""
return ops.MapGet(self, key, default).to_expr()
@@ -61,7 +61,7 @@ class MapValue(Value):
>>> import ibis
>>> m = ibis.map({"a": 1, "b": 2})
>>> m.length()
- MapLength(frozendict({'a': 1, 'b': 2}))
+ MapLength(...)
"""
return ops.MapLength(self).to_expr()
@@ -88,9 +88,9 @@ class MapValue(Value):
>>> import ibis
>>> m = ibis.map({"a": 1, "b": 2})
>>> m["a"]
- MapValueForKey(frozendict({'a': 1, 'b': 2}), key='a')
+ MapGet(...)
>>> m["c"] # note that this does not fail on construction
- MapValueForKey(frozendict({'a': 1, 'b': 2}), key='c')
+ MapGet(...)
"""
return ops.MapGet(self, key).to_expr()
@@ -124,7 +124,7 @@ class MapValue(Value):
>>> import ibis
>>> m = ibis.map({"a": 1, "b": 2})
>>> m.keys()
- MapKeys(frozendict({'a': 1, 'b': 2}))
+ MapKeys(...)
"""
return ops.MapKeys(self).to_expr()
@@ -140,8 +140,8 @@ class MapValue(Value):
--------
>>> import ibis
>>> m = ibis.map({"a": 1, "b": 2})
- >>> m.keys()
- MapKeys(frozendict({'a': 1, 'b': 2}))
+ >>> m.values()
+ MapValues(...)
"""
return ops.MapValues(self).to_expr()
@@ -164,7 +164,7 @@ class MapValue(Value):
>>> m1 = ibis.map({"a": 1, "b": 2})
>>> m2 = ibis.map({"c": 3, "d": 4})
>>> m1 + m2
- MapConcat(left=frozendict({'a': 1, 'b': 2}), right=frozendict({'c': 3, 'd': 4}))
+ MapMerge(...)
"""
return ops.MapMerge(self, other).to_expr()
@@ -187,7 +187,7 @@ class MapValue(Value):
>>> m1 = ibis.map({"a": 1, "b": 2})
>>> m2 = ibis.map({"c": 3, "d": 4})
>>> m1 + m2
- MapConcat(left=frozendict({'a': 1, 'b': 2}), right=frozendict({'c': 3, 'd': 4}))
+ MapMerge(...)
"""
return ops.MapMerge(self, other).to_expr()
diff --git a/relations.py b/relations.py
index a778ab4..63397a0 100644
--- a/relations.py
+++ b/relations.py
@@ -8,16 +8,7 @@ import re
import sys
import warnings
from keyword import iskeyword
-from typing import (
- IO,
- TYPE_CHECKING,
- Any,
- Callable,
- Iterable,
- Literal,
- Mapping,
- Sequence,
-)
+from typing import IO, TYPE_CHECKING, Callable, Iterable, Literal, Mapping, Sequence
from public import public
@@ -130,7 +121,27 @@ class Table(Expr, _FixedTextJupyterMixin):
"""
return self
- def __contains__(self, name):
+ def __contains__(self, name: str) -> bool:
+ """Return whether `name` is a column in the table.
+
+ Parameters
+ ----------
+ name
+ Possible column name
+
+ Returns
+ -------
+ bool
+ Whether `name` is a column in `self`
+
+ Examples
+ --------
+ >>> t = ibis.table(dict(a="string", b="float"), name="t")
+ >>> "a" in t
+ True
+ >>> "c" in t
+ False
+ """
return name in self.schema()
def __rich_console__(self, console, options):
@@ -157,6 +168,207 @@ class Table(Expr, _FixedTextJupyterMixin):
return console.render(table, options=options)
def __getitem__(self, what):
+ """Select items from a table expression.
+
+ This method implements square bracket syntax for table expressions,
+ including various forms of projection and filtering.
+
+ Parameters
+ ----------
+ what
+ Selection object. This can be a variety of types including strings, ints, lists.
+
+ Returns
+ -------
+ Table | Column
+ The return type depends on the input. For a single string or int
+ input a column is returned, otherwise a table is returned.
+
+ Examples
+ --------
+ >>> import ibis
+ >>> import ibis.expr.selectors as s
+ >>> from ibis import _
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> t
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Torgersen │ 39.1 │ 18.7 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.5 │ 17.4 │ 186 │ … │
+ │ Adelie │ Torgersen │ 40.3 │ 18.0 │ 195 │ … │
+ │ Adelie │ Torgersen │ nan │ nan │ ∅ │ … │
+ │ Adelie │ Torgersen │ 36.7 │ 19.3 │ 193 │ … │
+ │ Adelie │ Torgersen │ 39.3 │ 20.6 │ 190 │ … │
+ │ Adelie │ Torgersen │ 38.9 │ 17.8 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.2 │ 19.6 │ 195 │ … │
+ │ Adelie │ Torgersen │ 34.1 │ 18.1 │ 193 │ … │
+ │ Adelie │ Torgersen │ 42.0 │ 20.2 │ 190 │ … │
+ │ … │ … │ … │ … │ … │ … │
+ └─────────┴───────────┴────────────────┴───────────────┴───────────────────┴───┘
+
+ Return a column by name
+
+ >>> t["island"]
+ ┏━━━━━━━━━━━┓
+ ┃ island ┃
+ ┡━━━━━━━━━━━┩
+ │ string │
+ ├───────────┤
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ … │
+ └───────────┘
+
+ Return the second column, starting from index 0
+
+ >>> t.columns[1]
+ 'island'
+ >>> t[1]
+ ┏━━━━━━━━━━━┓
+ ┃ island ┃
+ ┡━━━━━━━━━━━┩
+ │ string │
+ ├───────────┤
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ … │
+ └───────────┘
+
+ Extract a range of rows
+
+ >>> t[:2]
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Torgersen │ 39.1 │ 18.7 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.5 │ 17.4 │ 186 │ … │
+ └─────────┴───────────┴────────────────┴───────────────┴───────────────────┴───┘
+ >>> t[:5]
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Torgersen │ 39.1 │ 18.7 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.5 │ 17.4 │ 186 │ … │
+ │ Adelie │ Torgersen │ 40.3 │ 18.0 │ 195 │ … │
+ │ Adelie │ Torgersen │ nan │ nan │ ∅ │ … │
+ │ Adelie │ Torgersen │ 36.7 │ 19.3 │ 193 │ … │
+ └─────────┴───────────┴────────────────┴───────────────┴───────────────────┴───┘
+ >>> t[2:5]
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Torgersen │ 40.3 │ 18.0 │ 195 │ … │
+ │ Adelie │ Torgersen │ nan │ nan │ ∅ │ … │
+ │ Adelie │ Torgersen │ 36.7 │ 19.3 │ 193 │ … │
+ └─────────┴───────────┴────────────────┴───────────────┴───────────────────┴───┘
+
+ Select columns
+
+ >>> t[["island", "bill_length_mm"]].head()
+ ┏━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┓
+ ┃ island ┃ bill_length_mm ┃
+ ┡━━━━━━━━━━━╇━━━━━━━━━━━━━━━━┩
+ │ string │ float64 │
+ ├───────────┼────────────────┤
+ │ Torgersen │ 39.1 │
+ │ Torgersen │ 39.5 │
+ │ Torgersen │ 40.3 │
+ │ Torgersen │ nan │
+ │ Torgersen │ 36.7 │
+ └───────────┴────────────────┘
+ >>> t["island", "bill_length_mm"].head()
+ ┏━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┓
+ ┃ island ┃ bill_length_mm ┃
+ ┡━━━━━━━━━━━╇━━━━━━━━━━━━━━━━┩
+ │ string │ float64 │
+ ├───────────┼────────────────┤
+ │ Torgersen │ 39.1 │
+ │ Torgersen │ 39.5 │
+ │ Torgersen │ 40.3 │
+ │ Torgersen │ nan │
+ │ Torgersen │ 36.7 │
+ └───────────┴────────────────┘
+ >>> t[_.island, _.bill_length_mm].head()
+ ┏━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┓
+ ┃ island ┃ bill_length_mm ┃
+ ┡━━━━━━━━━━━╇━━━━━━━━━━━━━━━━┩
+ │ string │ float64 │
+ ├───────────┼────────────────┤
+ │ Torgersen │ 39.1 │
+ │ Torgersen │ 39.5 │
+ │ Torgersen │ 40.3 │
+ │ Torgersen │ nan │
+ │ Torgersen │ 36.7 │
+ └───────────┴────────────────┘
+
+ Filtering
+
+ >>> t[t.island.lower() != "torgersen"].head()
+ ┏━━━━━━━━━┳━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Biscoe │ 37.8 │ 18.3 │ 174 │ … │
+ │ Adelie │ Biscoe │ 37.7 │ 18.7 │ 180 │ … │
+ │ Adelie │ Biscoe │ 35.9 │ 19.2 │ 189 │ … │
+ │ Adelie │ Biscoe │ 38.2 │ 18.1 │ 185 │ … │
+ │ Adelie │ Biscoe │ 38.8 │ 17.2 │ 180 │ … │
+ └─────────┴────────┴────────────────┴───────────────┴───────────────────┴───┘
+
+ Selectors
+
+ >>> t[~s.numeric() | (s.numeric() & ~s.c("year"))].head()
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Torgersen │ 39.1 │ 18.7 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.5 │ 17.4 │ 186 │ … │
+ │ Adelie │ Torgersen │ 40.3 │ 18.0 │ 195 │ … │
+ │ Adelie │ Torgersen │ nan │ nan │ ∅ │ … │
+ │ Adelie │ Torgersen │ 36.7 │ 19.3 │ 193 │ … │
+ └─────────┴───────────┴────────────────┴───────────────┴───────────────────┴───┘
+ >>> t[s.r["bill_length_mm":"body_mass_g"]].head()
+ ┏━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┓
+ ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃
+ ┡━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━┩
+ │ float64 │ float64 │ int64 │
+ ├────────────────┼───────────────┼───────────────────┤
+ │ 39.1 │ 18.7 │ 181 │
+ │ 39.5 │ 17.4 │ 186 │
+ │ 40.3 │ 18.0 │ 195 │
+ │ nan │ nan │ ∅ │
+ │ 36.7 │ 19.3 │ 193 │
+ └────────────────┴───────────────┴───────────────────┘
+ """
from ibis.expr.types.generic import Column
from ibis.expr.types.logical import BooleanValue
@@ -198,7 +410,43 @@ class Table(Expr, _FixedTextJupyterMixin):
def __len__(self):
raise com.ExpressionError('Use .count() instead')
- def __getattr__(self, key):
+ def __getattr__(self, key: str) -> ir.Column:
+ """Return the column name of a table.
+
+ Parameters
+ ----------
+ key
+ Column name
+
+ Returns
+ -------
+ Column
+ Column expression with name `key`
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> t.island
+ ┏━━━━━━━━━━━┓
+ ┃ island ┃
+ ┡━━━━━━━━━━━┩
+ │ string │
+ ├───────────┤
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ Torgersen │
+ │ … │
+ └───────────┘
+ """
with contextlib.suppress(com.IbisTypeError):
return ops.TableColumn(self, key).to_expr()
@@ -233,7 +481,7 @@ class Table(Expr, _FixedTextJupyterMixin):
)
raise AttributeError(f"'Table' object has no attribute {key!r}")
- def __dir__(self):
+ def __dir__(self) -> list[str]:
out = set(dir(type(self)))
out.update(c for c in self.columns if c.isidentifier() and not iskeyword(c))
return sorted(out)
@@ -263,62 +511,124 @@ class Table(Expr, _FixedTextJupyterMixin):
return expr
@property
- def columns(self):
- """The list of columns in this table."""
- return list(self._arg.schema.names)
+ def columns(self) -> list[str]:
+ """The list of columns in this table.
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.starwars.fetch()
+ >>> t.columns
+ ['name',
+ 'height',
+ 'mass',
+ 'hair_color',
+ 'skin_color',
+ 'eye_color',
+ 'birth_year',
+ 'sex',
+ 'gender',
+ 'homeworld',
+ 'species',
+ 'films',
+ 'vehicles',
+ 'starships']
+ """
+ return list(self.schema().names)
def schema(self) -> sch.Schema:
- """Get the schema for this table (if one is known).
+ """Return the schema for this table.
Returns
-------
Schema
The table's schema.
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.starwars.fetch()
+ >>> t.schema()
+ ibis.Schema {
+ name string
+ height int64
+ mass float64
+ hair_color string
+ skin_color string
+ eye_color string
+ birth_year float64
+ sex string
+ gender string
+ homeworld string
+ species string
+ films string
+ vehicles string
+ starships string
+ }
"""
return self.op().schema
- def group_by(self, by=None, **group_exprs: Any) -> GroupedTable:
+ def group_by(
+ self,
+ by: str | ir.Value | Iterable[str] | Iterable[ir.Value] | None = None,
+ **key_exprs: str | ir.Value | Iterable[str] | Iterable[ir.Value],
+ ) -> GroupedTable:
"""Create a grouped table expression.
Parameters
----------
by
Grouping expressions
- group_exprs
+ key_exprs
Named grouping expressions
- Examples
- --------
- >>> import ibis
- >>> from ibis import _
- >>> t = ibis.table(dict(a='int32', b='timestamp', c='double'), name='t')
- >>> t.group_by([_.a, _.b]).aggregate(sum_of_c=_.c.sum())
- r0 := UnboundTable: t
- a int32
- b timestamp
- c float64
- Aggregation[r0]
- metrics:
- sum_of_c: Sum(r0.c)
- by:
- a: r0.a
- b: r0.b
-
Returns
-------
GroupedTable
A grouped table expression
+
+ Examples
+ --------
+ >>> import ibis
+ >>> from ibis import _
+ >>> ibis.options.interactive = True
+ >>> t = ibis.memtable({"fruit": ["apple", "apple", "banana", "orange"], "price": [0.5, 0.5, 0.25, 0.33]})
+ >>> t
+ ┏━━━━━━━━┳━━━━━━━━━┓
+ ┃ fruit ┃ price ┃
+ ┡━━━━━━━━╇━━━━━━━━━┩
+ │ string │ float64 │
+ ├────────┼─────────┤
+ │ apple │ 0.50 │
+ │ apple │ 0.50 │
+ │ banana │ 0.25 │
+ │ orange │ 0.33 │
+ └────────┴─────────┘
+ >>> t.group_by("fruit").agg(total_cost=_.price.sum(), avg_cost=_.price.mean())
+ ┏━━━━━━━━┳━━━━━━━━━━━━┳━━━━━━━━━━┓
+ ┃ fruit ┃ total_cost ┃ avg_cost ┃
+ ┡━━━━━━━━╇━━━━━━━━━━━━╇━━━━━━━━━━┩
+ │ string │ float64 │ float64 │
+ ├────────┼────────────┼──────────┤
+ │ apple │ 1.00 │ 0.50 │
+ │ banana │ 0.25 │ 0.25 │
+ │ orange │ 0.33 │ 0.33 │
+ └────────┴────────────┴──────────┘
"""
from ibis.expr.types.groupby import GroupedTable
- return GroupedTable(self, by, **group_exprs)
+ return GroupedTable(self, by, **key_exprs)
def rowid(self) -> ir.IntegerValue:
- """A unique integer per row, only valid on physical tables.
+ """A unique integer per row.
+
+ !!! note "This operation is only valid on physical tables"
- Any further meaning behind this expression is backend dependent.
- Generally this corresponds to some index into the database storage
- (for example, sqlite or duckdb's `rowid`).
+ Any further meaning behind this expression is backend dependent.
+ Generally this corresponds to some index into the database storage
+ (for example, sqlite or duckdb's `rowid`).
For a monotonically increasing row number, see `ibis.row_number`.
@@ -362,6 +672,39 @@ class Table(Expr, _FixedTextJupyterMixin):
-------
Table
The rows present in `self` that are not present in `tables`.
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t1 = ibis.memtable({"a": [1, 2]})
+ >>> t1
+ ┏━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━┩
+ │ int64 │
+ ├───────┤
+ │ 1 │
+ │ 2 │
+ └───────┘
+ >>> t2 = ibis.memtable({"a": [2, 3]})
+ >>> t2
+ ┏━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━┩
+ │ int64 │
+ ├───────┤
+ │ 2 │
+ │ 3 │
+ └───────┘
+ >>> t1.difference(t2)
+ ┏━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━┩
+ │ int64 │
+ ├───────┤
+ │ 1 │
+ └───────┘
"""
left = self
if not tables:
@@ -396,6 +739,33 @@ class Table(Expr, _FixedTextJupyterMixin):
-------
Table
An aggregate table expression
+
+ Examples
+ --------
+ >>> import ibis
+ >>> from ibis import _
+ >>> ibis.options.interactive = True
+ >>> t = ibis.memtable({"fruit": ["apple", "apple", "banana", "orange"], "price": [0.5, 0.5, 0.25, 0.33]})
+ >>> t
+ ┏━━━━━━━━┳━━━━━━━━━┓
+ ┃ fruit ┃ price ┃
+ ┡━━━━━━━━╇━━━━━━━━━┩
+ │ string │ float64 │
+ ├────────┼─────────┤
+ │ apple │ 0.50 │
+ │ apple │ 0.50 │
+ │ banana │ 0.25 │
+ │ orange │ 0.33 │
+ └────────┴─────────┘
+ >>> t.aggregate(by=["fruit"], total_cost=_.price.sum(), avg_cost=_.price.mean(), having=_.price.sum() < 0.5)
+ ┏━━━━━━━━┳━━━━━━━━━━━━┳━━━━━━━━━━┓
+ ┃ fruit ┃ total_cost ┃ avg_cost ┃
+ ┡━━━━━━━━╇━━━━━━━━━━━━╇━━━━━━━━━━┩
+ │ string │ float64 │ float64 │
+ ├────────┼────────────┼──────────┤
+ │ banana │ 0.25 │ 0.25 │
+ │ orange │ 0.33 │ 0.33 │
+ └────────┴────────────┴──────────┘
"""
import ibis.expr.analysis as an
@@ -428,11 +798,44 @@ class Table(Expr, _FixedTextJupyterMixin):
agg = aggregate
def distinct(self) -> Table:
- """Compute the set of unique rows in the table."""
+ """Compute the unique rows in `self`.
+
+ Returns
+ -------
+ Table
+ Unique rows of `self`
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.memtable({"a": [1, 1, 2], "b": ["c", "a", "a"]})
+ >>> t[["a"]].distinct()
+ ┏━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━┩
+ │ int64 │
+ ├───────┤
+ │ 1 │
+ │ 2 │
+ └───────┘
+ >>> t.distinct()
+ ┏━━━━━━━┳━━━━━━━━┓
+ ┃ a ┃ b ┃
+ ┡━━━━━━━╇━━━━━━━━┩
+ │ int64 │ string │
+ ├───────┼────────┤
+ │ 1 │ c │
+ │ 1 │ a │
+ │ 2 │ a │
+ └───────┴────────┘
+ """
return ops.Distinct(self).to_expr()
def limit(self, n: int, offset: int = 0) -> Table:
- """Select the first `n` rows starting at `offset`.
+ """Select `n` rows from `self` starting at `offset`.
+
+ !!! note "The result set is not deterministic without a call to [`order_by`][ibis.expr.types.relations.Table.order_by]."
Parameters
----------
@@ -444,24 +847,83 @@ class Table(Expr, _FixedTextJupyterMixin):
Returns
-------
Table
- The first `n` rows of `table` starting at `offset`
+ The first `n` rows of `self` starting at `offset`
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.memtable({"a": [1, 1, 2], "b": ["c", "a", "a"]})
+ >>> t
+ ┏━━━━━━━┳━━━━━━━━┓
+ ┃ a ┃ b ┃
+ ┡━━━━━━━╇━━━━━━━━┩
+ │ int64 │ string │
+ ├───────┼────────┤
+ │ 1 │ c │
+ │ 1 │ a │
+ │ 2 │ a │
+ └───────┴────────┘
+ >>> t.limit(2)
+ ┏━━━━━━━┳━━━━━━━━┓
+ ┃ a ┃ b ┃
+ ┡━━━━━━━╇━━━━━━━━┩
+ │ int64 │ string │
+ ├───────┼────────┤
+ │ 1 │ c │
+ │ 1 │ a │
+ └───────┴────────┘
+
+ See Also
+ --------
+ [`Table.order_by`][ibis.expr.types.relations.Table.order_by]
"""
return ops.Limit(self, n, offset=offset).to_expr()
def head(self, n: int = 5) -> Table:
"""Select the first `n` rows of a table.
- The result set is not deterministic without a sort.
+ !!! note "The result set is not deterministic without a call to [`order_by`][ibis.expr.types.relations.Table.order_by]."
Parameters
----------
n
- Number of rows to include, defaults to 5
+ Number of rows to include
Returns
-------
Table
- `table` limited to `n` rows
+ `self` limited to `n` rows
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.memtable({"a": [1, 1, 2], "b": ["c", "a", "a"]})
+ >>> t
+ ┏━━━━━━━┳━━━━━━━━┓
+ ┃ a ┃ b ┃
+ ┡━━━━━━━╇━━━━━━━━┩
+ │ int64 │ string │
+ ├───────┼────────┤
+ │ 1 │ c │
+ │ 1 │ a │
+ │ 2 │ a │
+ └───────┴────────┘
+ >>> t.head(2)
+ ┏━━━━━━━┳━━━━━━━━┓
+ ┃ a ┃ b ┃
+ ┡━━━━━━━╇━━━━━━━━┩
+ │ int64 │ string │
+ ├───────┼────────┤
+ │ 1 │ c │
+ │ 1 │ a │
+ └───────┴────────┘
+
+ See Also
+ --------
+ [`Table.limit`][ibis.expr.types.relations.Table.limit]
+ [`Table.order_by`][ibis.expr.types.relations.Table.order_by]
"""
return self.limit(n=n)
@@ -479,26 +941,49 @@ class Table(Expr, _FixedTextJupyterMixin):
Parameters
----------
- by:
- An expression (or expressions) to sort the table by.
-
- Examples
- --------
- >>> import ibis
- >>> t = ibis.table(dict(a='int64', b='string'))
- >>> t.order_by(['a', ibis.desc('b')])
- r0 := UnboundTable: unbound_table_0
- a int64
- b string
- Selection[r0]
- sort_keys:
- asc|r0.a
- desc|r0.b
+ by
+ Expressions to sort the table by.
Returns
-------
Table
Sorted table
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.memtable({"a": [1, 2, 3], "b": ["c", "b", "a"], "c": [4, 6, 5]})
+ >>> t
+ ┏━━━━━━━┳━━━━━━━━┳━━━━━━━┓
+ ┃ a ┃ b ┃ c ┃
+ ┡━━━━━━━╇━━━━━━━━╇━━━━━━━┩
+ │ int64 │ string │ int64 │
+ ├───────┼────────┼───────┤
+ │ 1 │ c │ 4 │
+ │ 2 │ b │ 6 │
+ │ 3 │ a │ 5 │
+ └───────┴────────┴───────┘
+ >>> t.order_by("b")
+ ┏━━━━━━━┳━━━━━━━━┳━━━━━━━┓
+ ┃ a ┃ b ┃ c ┃
+ ┡━━━━━━━╇━━━━━━━━╇━━━━━━━┩
+ │ int64 │ string │ int64 │
+ ├───────┼────────┼───────┤
+ │ 3 │ a │ 5 │
+ │ 2 │ b │ 6 │
+ │ 1 │ c │ 4 │
+ └───────┴────────┴───────┘
+ >>> t.order_by(ibis.desc("c"))
+ ┏━━━━━━━┳━━━━━━━━┳━━━━━━━┓
+ ┃ a ┃ b ┃ c ┃
+ ┡━━━━━━━╇━━━━━━━━╇━━━━━━━┩
+ │ int64 │ string │ int64 │
+ ├───────┼────────┼───────┤
+ │ 2 │ b │ 6 │
+ │ 3 │ a │ 5 │
+ │ 1 │ c │ 4 │
+ └───────┴────────┴───────┘
"""
if isinstance(by, tuple):
by = [by]
@@ -524,6 +1009,52 @@ class Table(Expr, _FixedTextJupyterMixin):
-------
Table
A new table containing the union of all input tables.
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t1 = ibis.memtable({"a": [1, 2]})
+ >>> t1
+ ┏━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━┩
+ │ int64 │
+ ├───────┤
+ │ 1 │
+ │ 2 │
+ └───────┘
+ >>> t2 = ibis.memtable({"a": [2, 3]})
+ >>> t2
+ ┏━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━┩
+ │ int64 │
+ ├───────┤
+ │ 2 │
+ │ 3 │
+ └───────┘
+ >>> t1.union(t2) # union all by default
+ ┏━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━┩
+ │ int64 │
+ ├───────┤
+ │ 1 │
+ │ 2 │
+ │ 2 │
+ │ 3 │
+ └───────┘
+ >>> t1.union(t2, distinct=True).order_by("a")
+ ┏━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━┩
+ │ int64 │
+ ├───────┤
+ │ 1 │
+ │ 2 │
+ │ 3 │
+ └───────┘
"""
left = self
if not tables:
@@ -550,6 +1081,39 @@ class Table(Expr, _FixedTextJupyterMixin):
-------
Table
A new table containing the intersection of all input tables.
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t1 = ibis.memtable({"a": [1, 2]})
+ >>> t1
+ ┏━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━┩
+ │ int64 │
+ ├───────┤
+ │ 1 │
+ │ 2 │
+ └───────┘
+ >>> t2 = ibis.memtable({"a": [2, 3]})
+ >>> t2
+ ┏━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━┩
+ │ int64 │
+ ├───────┤
+ │ 2 │
+ │ 3 │
+ └───────┘
+ >>> t1.intersect(t2)
+ ┏━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━┩
+ │ int64 │
+ ├───────┤
+ │ 2 │
+ └───────┘
"""
left = self
if not tables:
@@ -577,9 +1141,7 @@ class Table(Expr, _FixedTextJupyterMixin):
return ops.TableArrayView(self).to_expr()
def mutate(
- self,
- exprs: Sequence[ir.Expr] | None = None,
- **mutations: ir.Value,
+ self, exprs: Sequence[ir.Expr] | None = None, **mutations: ir.Value
) -> Table:
"""Add columns to a table expression.
@@ -597,32 +1159,74 @@ class Table(Expr, _FixedTextJupyterMixin):
Examples
--------
- Using keywords arguments to name the new columns
-
>>> import ibis
- >>> table = ibis.table(
- ... [('foo', 'double'), ('bar', 'double')],
- ... name='t'
- ... )
- >>> expr = table.mutate(qux=table.foo + table.bar, baz=5)
- >>> expr
- r0 := UnboundTable[t]
- foo float64
- bar float64
- Selection[r0]
- selections:
- r0
- baz: 5
- qux: r0.foo + r0.bar
-
- Use the [`name`][ibis.expr.types.generic.Value.name] method to name
- the new columns.
-
- >>> new_columns = [ibis.literal(5).name('baz',),
- ... (table.foo + table.bar).name('qux')]
- >>> expr2 = table.mutate(new_columns)
- >>> expr.equals(expr2)
- True
+ >>> import ibis.expr.selectors as s
+ >>> from ibis import _
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch().select("species", "year", "bill_length_mm")
+ >>> t
+ ┏━━━━━━━━━┳━━━━━━━┳━━━━━━━━━━━━━━━━┓
+ ┃ species ┃ year ┃ bill_length_mm ┃
+ ┡━━━━━━━━━╇━━━━━━━╇━━━━━━━━━━━━━━━━┩
+ │ string │ int64 │ float64 │
+ ├─────────┼───────┼────────────────┤
+ │ Adelie │ 2007 │ 39.1 │
+ │ Adelie │ 2007 │ 39.5 │
+ │ Adelie │ 2007 │ 40.3 │
+ │ Adelie │ 2007 │ nan │
+ │ Adelie │ 2007 │ 36.7 │
+ │ Adelie │ 2007 │ 39.3 │
+ │ Adelie │ 2007 │ 38.9 │
+ │ Adelie │ 2007 │ 39.2 │
+ │ Adelie │ 2007 │ 34.1 │
+ │ Adelie │ 2007 │ 42.0 │
+ │ … │ … │ … │
+ └─────────┴───────┴────────────────┘
+
+ Add a new column from a per-element expression
+
+ >>> t.mutate(next_year=_.year + 1).head()
+ ┏━━━━━━━━━┳━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━┓
+ ┃ species ┃ year ┃ bill_length_mm ┃ next_year ┃
+ ┡━━━━━━━━━╇━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━┩
+ │ string │ int64 │ float64 │ int64 │
+ ├─────────┼───────┼────────────────┼───────────┤
+ │ Adelie │ 2007 │ 39.1 │ 2008 │
+ │ Adelie │ 2007 │ 39.5 │ 2008 │
+ │ Adelie │ 2007 │ 40.3 │ 2008 │
+ │ Adelie │ 2007 │ nan │ 2008 │
+ │ Adelie │ 2007 │ 36.7 │ 2008 │
+ └─────────┴───────┴────────────────┴───────────┘
+
+ Add a new column based on an aggregation. Note the automatic broadcasting.
+
+ >>> t.select("species", bill_demean=_.bill_length_mm - _.bill_length_mm.mean()).head()
+ ┏━━━━━━━━━┳━━━━━━━━━━━━━┓
+ ┃ species ┃ bill_demean ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━━━┩
+ │ string │ float64 │
+ ├─────────┼─────────────┤
+ │ Adelie │ -4.82193 │
+ │ Adelie │ -4.42193 │
+ │ Adelie │ -3.62193 │
+ │ Adelie │ nan │
+ │ Adelie │ -7.22193 │
+ └─────────┴─────────────┘
+
+ Mutate across multiple columns
+
+ >>> t.mutate(s.across(s.numeric() & ~s.c("year"), _ - _.mean())).head()
+ ┏━━━━━━━━━┳━━━━━━━┳━━━━━━━━━━━━━━━━┓
+ ┃ species ┃ year ┃ bill_length_mm ┃
+ ┡━━━━━━━━━╇━━━━━━━╇━━━━━━━━━━━━━━━━┩
+ │ string │ int64 │ float64 │
+ ├─────────┼───────┼────────────────┤
+ │ Adelie │ 2007 │ -4.82193 │
+ │ Adelie │ 2007 │ -4.42193 │
+ │ Adelie │ 2007 │ -3.62193 │
+ │ Adelie │ 2007 │ nan │
+ │ Adelie │ 2007 │ -7.22193 │
+ └─────────┴───────┴────────────────┘
"""
import ibis.expr.analysis as an
@@ -671,49 +1275,119 @@ class Table(Expr, _FixedTextJupyterMixin):
Examples
--------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> t
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Torgersen │ 39.1 │ 18.7 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.5 │ 17.4 │ 186 │ … │
+ │ Adelie │ Torgersen │ 40.3 │ 18.0 │ 195 │ … │
+ │ Adelie │ Torgersen │ nan │ nan │ ∅ │ … │
+ │ Adelie │ Torgersen │ 36.7 │ 19.3 │ 193 │ … │
+ │ Adelie │ Torgersen │ 39.3 │ 20.6 │ 190 │ … │
+ │ Adelie │ Torgersen │ 38.9 │ 17.8 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.2 │ 19.6 │ 195 │ … │
+ │ Adelie │ Torgersen │ 34.1 │ 18.1 │ 193 │ … │
+ │ Adelie │ Torgersen │ 42.0 │ 20.2 │ 190 │ … │
+ │ … │ … │ … │ … │ … │ … │
+ └─────────┴───────────┴────────────────┴───────────────┴───────────────────┴───┘
+
Simple projection
- >>> import ibis
- >>> t = ibis.table(dict(a="int64", b="double"), name='t')
- >>> proj = t.select(t.a, b_plus_1=t.b + 1)
- >>> proj
- r0 := UnboundTable[t]
- a int64
- b float64
- Selection[r0]
- selections:
- a: r0.a
- b_plus_1: r0.b + 1
- >>> proj2 = t.select("a", b_plus_1=t.b + 1)
- >>> proj.equals(proj2)
- True
+ >>> t.select("island", "bill_length_mm").head()
+ ┏━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┓
+ ┃ island ┃ bill_length_mm ┃
+ ┡━━━━━━━━━━━╇━━━━━━━━━━━━━━━━┩
+ │ string │ float64 │
+ ├───────────┼────────────────┤
+ │ Torgersen │ 39.1 │
+ │ Torgersen │ 39.5 │
+ │ Torgersen │ 40.3 │
+ │ Torgersen │ nan │
+ │ Torgersen │ 36.7 │
+ └───────────┴────────────────┘
+
+ Projection by zero-indexed column position
+
+ >>> t.select(0, 4).head()
+ ┏━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┓
+ ┃ species ┃ flipper_length_mm ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━┩
+ │ string │ int64 │
+ ├─────────┼───────────────────┤
+ │ Adelie │ 181 │
+ │ Adelie │ 186 │
+ │ Adelie │ 195 │
+ │ Adelie │ ∅ │
+ │ Adelie │ 193 │
+ └─────────┴───────────────────┘
+
+ Projection with renaming and compute in one call
+
+ >>> t.select(next_year=t.year + 1).head()
+ ┏━━━━━━━━━━━┓
+ ┃ next_year ┃
+ ┡━━━━━━━━━━━┩
+ │ int64 │
+ ├───────────┤
+ │ 2008 │
+ │ 2008 │
+ │ 2008 │
+ │ 2008 │
+ │ 2008 │
+ └───────────┘
+
+ Projection with aggregation expressions
+
+ >>> t.select("island", bill_mean=t.bill_length_mm.mean()).head()
+ ┏━━━━━━━━━━━┳━━━━━━━━━━━┓
+ ┃ island ┃ bill_mean ┃
+ ┡━━━━━━━━━━━╇━━━━━━━━━━━┩
+ │ string │ float64 │
+ ├───────────┼───────────┤
+ │ Torgersen │ 43.92193 │
+ │ Torgersen │ 43.92193 │
+ │ Torgersen │ 43.92193 │
+ │ Torgersen │ 43.92193 │
+ │ Torgersen │ 43.92193 │
+ └───────────┴───────────┘
+
+ Projection with a selector
+
+ >>> import ibis.expr.selectors as s
+ >>> t.select(s.numeric() & ~s.c("year")).head()
+ ┏━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━┓
+ ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ body_mass_g ┃
+ ┡━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━┩
+ │ float64 │ float64 │ int64 │ int64 │
+ ├────────────────┼───────────────┼───────────────────┼─────────────┤
+ │ 39.1 │ 18.7 │ 181 │ 3750 │
+ │ 39.5 │ 17.4 │ 186 │ 3800 │
+ │ 40.3 │ 18.0 │ 195 │ 3250 │
+ │ nan │ nan │ ∅ │ ∅ │
+ │ 36.7 │ 19.3 │ 193 │ 3450 │
+ └────────────────┴───────────────┴───────────────────┴─────────────┘
+
+ Projection + aggregation across multiple columns
- Aggregate projection
-
- >>> agg_proj = t.select(sum_a=t.a.sum(), mean_b=t.b.mean())
- >>> agg_proj
- r0 := UnboundTable[t]
- a int64
- b float64
- Selection[r0]
- selections:
- sum_a: Window(Sum(r0.a), window=Window(how='rows'))
- mean_b: Window(Mean(r0.b), window=Window(how='rows'))
-
- Note the `Window` objects here.
-
- Their existence means that the result of the aggregation will be
- broadcast across the number of rows in the input column.
- The purpose of this expression rewrite is to make it easy to write
- column/scalar-aggregate operations like
-
- >>> t.select(demeaned_a=t.a - t.a.mean())
- r0 := UnboundTable[t]
- a int64
- b float64
- Selection[r0]
- selections:
- demeaned_a: r0.a - Window(Mean(r0.a), window=Window(how='rows'))
+ >>> from ibis import _
+ >>> t.select(s.across(s.numeric() & ~s.c("year"), _.mean())).head()
+ ┏━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━┓
+ ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ body_mass_g ┃
+ ┡━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━┩
+ │ float64 │ float64 │ float64 │ float64 │
+ ├────────────────┼───────────────┼───────────────────┼─────────────┤
+ │ 43.92193 │ 17.15117 │ 200.915205 │ 4201.754386 │
+ │ 43.92193 │ 17.15117 │ 200.915205 │ 4201.754386 │
+ │ 43.92193 │ 17.15117 │ 200.915205 │ 4201.754386 │
+ │ 43.92193 │ 17.15117 │ 200.915205 │ 4201.754386 │
+ │ 43.92193 │ 17.15117 │ 200.915205 │ 4201.754386 │
+ └────────────────┴───────────────┴───────────────────┴─────────────┘
"""
import ibis.expr.analysis as an
from ibis.expr.selectors import Selector
@@ -762,7 +1436,66 @@ class Table(Expr, _FixedTextJupyterMixin):
Returns
-------
Table
- A relabeled table expression
+ A relabeled table expressi
+
+ Examples
+ --------
+ >>> import ibis
+ >>> import ibis.expr.selectors as s
+ >>> ibis.options.interactive = True
+ >>> first3 = s.r[:3] # first 3 columns
+ >>> t = ibis.examples.penguins_raw_raw.fetch().select(first3)
+ >>> t
+ ┏━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+ ┃ studyName ┃ Sample Number ┃ Species ┃
+ ┡━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
+ │ string │ int64 │ string │
+ ├───────────┼───────────────┼─────────────────────────────────────┤
+ │ PAL0708 │ 1 │ Adelie Penguin (Pygoscelis adeliae) │
+ │ PAL0708 │ 2 │ Adelie Penguin (Pygoscelis adeliae) │
+ │ PAL0708 │ 3 │ Adelie Penguin (Pygoscelis adeliae) │
+ │ PAL0708 │ 4 │ Adelie Penguin (Pygoscelis adeliae) │
+ │ PAL0708 │ 5 │ Adelie Penguin (Pygoscelis adeliae) │
+ │ PAL0708 │ 6 │ Adelie Penguin (Pygoscelis adeliae) │
+ │ PAL0708 │ 7 │ Adelie Penguin (Pygoscelis adeliae) │
+ │ PAL0708 │ 8 │ Adelie Penguin (Pygoscelis adeliae) │
+ │ PAL0708 │ 9 │ Adelie Penguin (Pygoscelis adeliae) │
+ │ PAL0708 │ 10 │ Adelie Penguin (Pygoscelis adeliae) │
+ │ … │ … │ … │
+ └───────────┴───────────────┴─────────────────────────────────────┘
+
+ Relabel column names using a mapping from old name to new name
+
+ >>> t.relabel({"studyName": "study_name"}).head(1)
+ ┏━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+ ┃ study_name ┃ Sample Number ┃ Species ┃
+ ┡━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
+ │ string │ int64 │ string │
+ ├────────────┼───────────────┼─────────────────────────────────────┤
+ │ PAL0708 │ 1 │ Adelie Penguin (Pygoscelis adeliae) │
+ └────────────┴───────────────┴─────────────────────────────────────┘
+
+ Relabel column names using a snake_case convention
+
+ >>> t.relabel("snake_case").head(1)
+ ┏━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+ ┃ study_name ┃ sample_number ┃ species ┃
+ ┡━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
+ │ string │ int64 │ string │
+ ├────────────┼───────────────┼─────────────────────────────────────┤
+ │ PAL0708 │ 1 │ Adelie Penguin (Pygoscelis adeliae) │
+ └────────────┴───────────────┴─────────────────────────────────────┘
+
+ Relabel column names using a callable
+
+ >>> t.relabel(str.upper).head(1)
+ ┏━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+ ┃ STUDYNAME ┃ SAMPLE NUMBER ┃ SPECIES ┃
+ ┡━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
+ │ string │ int64 │ string │
+ ├───────────┼───────────────┼─────────────────────────────────────┤
+ │ PAL0708 │ 1 │ Adelie Penguin (Pygoscelis adeliae) │
+ └───────────┴───────────────┴─────────────────────────────────────┘
"""
observed = set()
@@ -811,6 +1544,48 @@ class Table(Expr, _FixedTextJupyterMixin):
-------
Table
A table with all columns in `fields` removed.
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> t
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Torgersen │ 39.1 │ 18.7 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.5 │ 17.4 │ 186 │ … │
+ │ Adelie │ Torgersen │ 40.3 │ 18.0 │ 195 │ … │
+ │ Adelie │ Torgersen │ nan │ nan │ ∅ │ … │
+ │ Adelie │ Torgersen │ 36.7 │ 19.3 │ 193 │ … │
+ │ Adelie │ Torgersen │ 39.3 │ 20.6 │ 190 │ … │
+ │ Adelie │ Torgersen │ 38.9 │ 17.8 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.2 │ 19.6 │ 195 │ … │
+ │ Adelie │ Torgersen │ 34.1 │ 18.1 │ 193 │ … │
+ │ Adelie │ Torgersen │ 42.0 │ 20.2 │ 190 │ … │
+ │ … │ … │ … │ … │ … │ … │
+ └─────────┴───────────┴────────────────┴───────────────┴───────────────────┴───┘
+ >>> t.drop("species")
+ ┏━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ float64 │ float64 │ int64 │ … │
+ ├───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Torgersen │ 39.1 │ 18.7 │ 181 │ … │
+ │ Torgersen │ 39.5 │ 17.4 │ 186 │ … │
+ │ Torgersen │ 40.3 │ 18.0 │ 195 │ … │
+ │ Torgersen │ nan │ nan │ ∅ │ … │
+ │ Torgersen │ 36.7 │ 19.3 │ 193 │ … │
+ │ Torgersen │ 39.3 │ 20.6 │ 190 │ … │
+ │ Torgersen │ 38.9 │ 17.8 │ 181 │ … │
+ │ Torgersen │ 39.2 │ 19.6 │ 195 │ … │
+ │ Torgersen │ 34.1 │ 18.1 │ 193 │ … │
+ │ Torgersen │ 42.0 │ 20.2 │ 190 │ … │
+ │ … │ … │ … │ … │ … │
+ └───────────┴────────────────┴───────────────┴───────────────────┴───┘
"""
if not fields:
# no-op if nothing to be dropped
@@ -833,10 +1608,7 @@ class Table(Expr, _FixedTextJupyterMixin):
return self[[field for field in schema if field not in field_set]]
- def filter(
- self,
- predicates: ir.BooleanValue | Sequence[ir.BooleanValue],
- ) -> Table:
+ def filter(self, predicates: ir.BooleanValue | Sequence[ir.BooleanValue]) -> Table:
"""Select rows from `table` based on `predicates`.
Parameters
@@ -848,6 +1620,39 @@ class Table(Expr, _FixedTextJupyterMixin):
-------
Table
Filtered table expression
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> t
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Torgersen │ 39.1 │ 18.7 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.5 │ 17.4 │ 186 │ … │
+ │ Adelie │ Torgersen │ 40.3 │ 18.0 │ 195 │ … │
+ │ Adelie │ Torgersen │ nan │ nan │ ∅ │ … │
+ │ Adelie │ Torgersen │ 36.7 │ 19.3 │ 193 │ … │
+ │ Adelie │ Torgersen │ 39.3 │ 20.6 │ 190 │ … │
+ │ Adelie │ Torgersen │ 38.9 │ 17.8 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.2 │ 19.6 │ 195 │ … │
+ │ Adelie │ Torgersen │ 34.1 │ 18.1 │ 193 │ … │
+ │ Adelie │ Torgersen │ 42.0 │ 20.2 │ 190 │ … │
+ │ … │ … │ … │ … │ … │ … │
+ └─────────┴───────────┴────────────────┴───────────────┴───────────────────┴───┘
+ >>> t.filter([t.species == "Adelie", t.body_mass_g > 3500]).sex.value_counts().dropna("sex")
+ ┏━━━━━━━━┳━━━━━━━━━━━┓
+ ┃ sex ┃ sex_count ┃
+ ┡━━━━━━━━╇━━━━━━━━━━━┩
+ │ string │ int64 │
+ ├────────┼───────────┤
+ │ male │ 68 │
+ │ female │ 22 │
+ └────────┴───────────┘
"""
import ibis.expr.analysis as an
@@ -874,26 +1679,29 @@ class Table(Expr, _FixedTextJupyterMixin):
Examples
--------
>>> import ibis
- >>> from ibis import _
- >>> t = ibis.table(dict(a="int"), name="t")
+ >>> ibis.options.interactive = True
+ >>> t = ibis.memtable({"a": ["foo", "bar", "baz"]})
+ >>> t
+ ┏━━━━━━━━┓
+ ┃ a ┃
+ ┡━━━━━━━━┩
+ │ string │
+ ├────────┤
+ │ foo │
+ │ bar │
+ │ baz │
+ └────────┘
>>> t.count()
- r0 := UnboundTable: t
- a int64
- count: CountStar(t)
- >>> t.aggregate(n=_.count(_.a > 1), total=_.sum())
- r0 := UnboundTable: t
- a int64
- Aggregation[r0]
- metrics:
- n: CountStar(t, where=r0.a > 1)
- total: Sum(r0.a)
+ 3
+ >>> t.count(t.a != "foo")
+ 2
+ >>> type(t.count())
+ <class 'ibis.expr.types.numeric.IntegerScalar'>
"""
return ops.CountStar(self, where).to_expr().name("count")
def dropna(
- self,
- subset: Sequence[str] | None = None,
- how: Literal["any", "all"] = "any",
+ self, subset: Sequence[str] | None = None, how: Literal["any", "all"] = "any"
) -> Table:
"""Remove rows with null values from the table.
@@ -903,40 +1711,44 @@ class Table(Expr, _FixedTextJupyterMixin):
Columns names to consider when dropping nulls. By default all columns
are considered.
how
- Determine whether a row is removed if there is at least one null
- value in the row ('any'), or if all row values are null ('all').
- Options are 'any' or 'all'. Default is 'any'.
-
- Examples
- --------
- >>> import ibis
- >>> t = ibis.table(dict(a='int64', b='string'), name='t')
- >>> t = t.dropna() # Drop all rows where any values are null
- >>> t
- r0 := UnboundTable: t
- a int64
- b string
- DropNa[r0]
- how: 'any'
- >>> t.dropna(how='all') # Only drop rows where all values are null
- r0 := UnboundTable: t
- a int64
- b string
- r1 := DropNa[r0]
- how: 'all'
- >>> t.dropna(subset=['a'], how='all') # Only drop rows where all values in column 'a' are null # noqa: E501
- r0 := UnboundTable: t
- a int64
- b string
- DropNa[r0]
- how: 'all'
- subset:
- r0.a
+ Determine whether a row is removed if there is **at least one null
+ value in the row** (`'any'`), or if **all** row values are null
+ (`'all'`).
Returns
-------
Table
Table expression
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> t
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Torgersen │ 39.1 │ 18.7 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.5 │ 17.4 │ 186 │ … │
+ │ Adelie │ Torgersen │ 40.3 │ 18.0 │ 195 │ … │
+ │ Adelie │ Torgersen │ nan │ nan │ ∅ │ … │
+ │ Adelie │ Torgersen │ 36.7 │ 19.3 │ 193 │ … │
+ │ Adelie │ Torgersen │ 39.3 │ 20.6 │ 190 │ … │
+ │ Adelie │ Torgersen │ 38.9 │ 17.8 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.2 │ 19.6 │ 195 │ … │
+ │ Adelie │ Torgersen │ 34.1 │ 18.1 │ 193 │ … │
+ │ Adelie │ Torgersen │ 42.0 │ 20.2 │ 190 │ … │
+ │ … │ … │ … │ … │ … │ … │
+ └─────────┴───────────┴────────────────┴───────────────┴───────────────────┴───┘
+ >>> t.count()
+ 344
+ >>> t.dropna(["bill_length_mm", "body_mass_g"]).count()
+ 342
+ >>> t.dropna(how="all").count() # no rows where all columns are null
+ 344
"""
if subset is not None:
subset = util.promote_list(subset)
@@ -948,33 +1760,65 @@ class Table(Expr, _FixedTextJupyterMixin):
) -> Table:
"""Fill null values in a table expression.
+ !!! note "There is potential lack of type stability with the `fillna` API"
+
+ For example, different library versions may impact whether a given
+ backend promotes integer replacement values to floats.
+
Parameters
----------
replacements
- Value with which to fill the nulls. If passed as a mapping, the keys
- are column names that map to their replacement value. If passed
- as a scalar, all columns are filled with that value.
-
- Notes
- -----
- There is potential lack of type stability with the `fillna` API. For
- example, different library versions may impact whether or not a given
- backend promotes integer replacement values to floats.
+ Value with which to fill nulls. If `replacements` is a mapping, the
+ keys are column names that map to their replacement value. If
+ passed as a scalar all columns are filled with that value.
Examples
--------
>>> import ibis
- >>> import ibis.expr.datatypes as dt
- >>> t = ibis.table([('a', 'int64'), ('b', 'string')])
- >>> res = t.fillna(0.0) # Replace nulls in all columns with 0.0
- >>> res = t.fillna({c: 0.0 for c, t in t.schema().items() if t == dt.float64})
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> t.sex
+ ┏━━━━━━━━┓
+ ┃ sex ┃
+ ┡━━━━━━━━┩
+ │ string │
+ ├────────┤
+ │ male │
+ │ female │
+ │ female │
+ │ ∅ │
+ │ female │
+ │ male │
+ │ female │
+ │ male │
+ │ ∅ │
+ │ ∅ │
+ │ … │
+ └────────┘
+ >>> t.fillna({"sex": "unrecorded"}).sex
+ ┏━━━━━━━━━━━━┓
+ ┃ sex ┃
+ ┡━━━━━━━━━━━━┩
+ │ string │
+ ├────────────┤
+ │ male │
+ │ female │
+ │ female │
+ │ unrecorded │
+ │ female │
+ │ male │
+ │ female │
+ │ male │
+ │ unrecorded │
+ │ unrecorded │
+ │ … │
+ └────────────┘
Returns
-------
Table
Table expression
"""
-
schema = self.schema()
if isinstance(replacements, collections.abc.Mapping):
@@ -1025,21 +1869,36 @@ class Table(Expr, _FixedTextJupyterMixin):
Examples
--------
- >>> schema = dict(a="struct<b: float, c: string>", d="string")
- >>> t = ibis.table(schema, name="t")
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> lines = '''
+ ... {"name": "a", "pos": {"lat": 10.1, "lon": 30.3}}
+ ... {"name": "b", "pos": {"lat": 10.2, "lon": 30.2}}
+ ... {"name": "c", "pos": {"lat": 10.3, "lon": 30.1}}
+ ... '''
+ >>> with open("/tmp/lines.json", "w") as f:
+ ... _ = f.write(lines)
+ >>> t = ibis.read_json("/tmp/lines.json")
>>> t
- UnboundTable: t
- a struct<b: float64, c: string>
- d string
- >>> t.unpack("a")
- r0 := UnboundTable: t
- a struct<b: float64, c: string>
- d string
- Selection[r0]
- selections:
- b: StructField(r0.a, field='b')
- c: StructField(r0.a, field='c')
- d: r0.d
+ ┏━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+ ┃ name ┃ pos ┃
+ ┡━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
+ │ string │ struct<lat: float64, lon: float64> │
+ ├────────┼────────────────────────────────────┤
+ │ a │ {'lat': 10.1, 'lon': 30.3} │
+ │ b │ {'lat': 10.2, 'lon': 30.2} │
+ │ c │ {'lat': 10.3, 'lon': 30.1} │
+ └────────┴────────────────────────────────────┘
+ >>> t.unpack("pos")
+ ┏━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━┓
+ ┃ name ┃ lat ┃ lon ┃
+ ┡━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━┩
+ │ string │ float64 │ float64 │
+ ├────────┼─────────┼─────────┤
+ │ a │ 10.1 │ 30.3 │
+ │ b │ 10.2 │ 30.2 │
+ │ c │ 10.3 │ 30.1 │
+ └────────┴─────────┴─────────┘
See Also
--------
@@ -1058,12 +1917,65 @@ class Table(Expr, _FixedTextJupyterMixin):
def info(self, buf: IO[str] | None = None) -> None:
"""Show summary information about a table.
- Currently implemented as showing column names, types and null counts.
-
Parameters
----------
buf
A writable buffer, defaults to stdout
+
+ Returns
+ -------
+ None
+ This method prints to a buffer (stdout by default) and returns nothing.
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch(table_name="penguins")
+ >>> t
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Torgersen │ 39.1 │ 18.7 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.5 │ 17.4 │ 186 │ … │
+ │ Adelie │ Torgersen │ 40.3 │ 18.0 │ 195 │ … │
+ │ Adelie │ Torgersen │ nan │ nan │ ∅ │ … │
+ │ Adelie │ Torgersen │ 36.7 │ 19.3 │ 193 │ … │
+ │ Adelie │ Torgersen │ 39.3 │ 20.6 │ 190 │ … │
+ │ Adelie │ Torgersen │ 38.9 │ 17.8 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.2 │ 19.6 │ 195 │ … │
+ │ Adelie │ Torgersen │ 34.1 │ 18.1 │ 193 │ … │
+ │ Adelie │ Torgersen │ 42.0 │ 20.2 │ 190 │ … │
+ │ … │ … │ … │ … │ … │ … │
+ └─────────┴───────────┴────────────────┴───────────────┴───────────────────┴───┘
+
+ Default implementation prints to stdout
+
+ >>> t.info() # doctest: +SKIP
+ Summary of penguins
+ 344 rows
+ ┏━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━┓
+ ┃ Name ┃ Type ┃ # Nulls ┃ % Nulls ┃
+ ┡━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━┩
+ │ species │ String(nullable=True) │ 0 │ 0.00 │
+ │ island │ String(nullable=True) │ 0 │ 0.00 │
+ │ bill_length_mm │ Float64(nullable=True) │ 2 │ 0.58 │
+ │ bill_depth_mm │ Float64(nullable=True) │ 2 │ 0.58 │
+ │ flipper_length_mm │ Int64(nullable=True) │ 2 │ 0.58 │
+ │ body_mass_g │ Int64(nullable=True) │ 2 │ 0.58 │
+ │ sex │ String(nullable=True) │ 11 │ 3.20 │
+ │ year │ Int64(nullable=True) │ 0 │ 0.00 │
+ └───────────────────┴────────────────────────┴─────────┴─────────┘
+
+ Store the info into a buffer
+
+ >>> import io
+ >>> buf = io.StringIO()
+ >>> t.info(buf=buf)
+ >>> "Summary of penguins" in buf.getvalue()
+ True
"""
import rich
import rich.table
@@ -1269,26 +2181,48 @@ class Table(Expr, _FixedTextJupyterMixin):
Examples
--------
>>> import ibis
- >>> schemas = [(name, 'int64') for name in 'abcde']
- >>> a, b, c, d, e = [
- ... ibis.table([(name, type)], name=name) for name, type in schemas
- ... ]
- >>> joined1 = ibis.cross_join(a, b, c, d, e)
- >>> joined1
- r0 := UnboundTable[e]
- e int64
- r1 := UnboundTable[d]
- d int64
- r2 := UnboundTable[c]
- c int64
- r3 := UnboundTable[b]
- b int64
- r4 := UnboundTable[a]
- a int64
- r5 := CrossJoin[r3, r2]
- r6 := CrossJoin[r5, r1]
- r7 := CrossJoin[r6, r0]
- CrossJoin[r4, r7]
+ >>> import ibis.expr.selectors as s
+ >>> from ibis import _
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> agg = t.drop("year").agg(s.across(s.numeric(), _.mean()))
+ >>> expr = t.cross_join(agg)
+ >>> expr
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm_x ┃ bill_depth_mm_x ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ … │
+ ├─────────┼───────────┼──────────────────┼─────────────────┼───┤
+ │ Adelie │ Torgersen │ 39.1 │ 18.7 │ … │
+ │ Adelie │ Torgersen │ 39.5 │ 17.4 │ … │
+ │ Adelie │ Torgersen │ 40.3 │ 18.0 │ … │
+ │ Adelie │ Torgersen │ nan │ nan │ … │
+ │ Adelie │ Torgersen │ 36.7 │ 19.3 │ … │
+ │ Adelie │ Torgersen │ 39.3 │ 20.6 │ … │
+ │ Adelie │ Torgersen │ 38.9 │ 17.8 │ … │
+ │ Adelie │ Torgersen │ 39.2 │ 19.6 │ … │
+ │ Adelie │ Torgersen │ 34.1 │ 18.1 │ … │
+ │ Adelie │ Torgersen │ 42.0 │ 20.2 │ … │
+ │ … │ … │ … │ … │ … │
+ └─────────┴───────────┴──────────────────┴─────────────────┴───┘
+ >>> from pprint import pprint
+ >>> pprint(expr.columns)
+ ['species',
+ 'island',
+ 'bill_length_mm_x',
+ 'bill_depth_mm_x',
+ 'flipper_length_mm_x',
+ 'body_mass_g_x',
+ 'sex',
+ 'year',
+ 'bill_length_mm_y',
+ 'bill_depth_mm_y',
+ 'flipper_length_mm_y',
+ 'body_mass_g_y']
+ >>> expr.count()
+ 344
+ >>> t.count()
+ 344
"""
op = ops.CrossJoin(
left,
@@ -1332,23 +2266,22 @@ class Table(Expr, _FixedTextJupyterMixin):
Examples
--------
- >>> con = ibis.duckdb.connect("ci/ibis-testing-data/ibis_testing.ddb")
- >>> t = con.table("functional_alltypes")
- >>> expr = t.alias("my_t").sql("SELECT sum(double_col) FROM my_t")
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch()
+ >>> expr = t.alias("pingüinos").sql('SELECT * FROM "pingüinos" LIMIT 5')
>>> expr
- r0 := AlchemyTable: functional_alltypes
- index int64
- ⋮
- month int32
- r1 := View[r0]: my_t
- schema:
- index int64
- ⋮
- month int32
- SQLStringView[r1]: _ibis_view_0
- query: 'SELECT sum(double_col) FROM my_t'
- schema:
- sum(double_col) float64
+ ┏━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━┓
+ ┃ species ┃ island ┃ bill_length_mm ┃ bill_depth_mm ┃ flipper_length_mm ┃ … ┃
+ ┡━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━┩
+ │ string │ string │ float64 │ float64 │ int64 │ … │
+ ├─────────┼───────────┼────────────────┼───────────────┼───────────────────┼───┤
+ │ Adelie │ Torgersen │ 39.1 │ 18.7 │ 181 │ … │
+ │ Adelie │ Torgersen │ 39.5 │ 17.4 │ 186 │ … │
+ │ Adelie │ Torgersen │ 40.3 │ 18.0 │ 195 │ … │
+ │ Adelie │ Torgersen │ nan │ nan │ ∅ │ … │
+ │ Adelie │ Torgersen │ 36.7 │ 19.3 │ 193 │ … │
+ └─────────┴───────────┴────────────────┴───────────────┴───────────────────┴───┘
"""
expr = ops.View(child=self, name=alias).to_expr()
@@ -1364,7 +2297,9 @@ class Table(Expr, _FixedTextJupyterMixin):
!!! note "The SQL string is backend specific"
`query` must be valid SQL for the execution backend the expression
- will run against
+ will run against.
+
+ This restriction may be lifted in a future version of ibis.
See [`Table.alias`][ibis.expr.types.relations.Table.alias] for
details on using named table expressions in a SQL string.
@@ -1381,18 +2316,20 @@ class Table(Expr, _FixedTextJupyterMixin):
Examples
--------
- >>> con = ibis.duckdb.connect("ci/ibis-testing-data/ibis_testing.ddb")
- >>> t = con.table("functional_alltypes")
- >>> expr = t.sql("SELECT sum(double_col) FROM functional_alltypes")
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> t = ibis.examples.penguins.fetch(table_name="penguins")
+ >>> expr = t.sql("SELECT island, mean(bill_length_mm) FROM penguins GROUP BY 1 ORDER BY 2 DESC")
>>> expr
- r0 := AlchemyTable: functional_alltypes
- index int64
- ⋮
- month int32
- SQLStringView[r0]: _ibis_view_1
- query: 'SELECT sum(double_col) FROM functional_alltypes'
- schema:
- sum(double_col) float64
+ ┏━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━┓
+ ┃ island ┃ mean(bill_length_mm) ┃
+ ┡━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━┩
+ │ string │ float64 │
+ ├───────────┼──────────────────────┤
+ │ Biscoe │ 45.257485 │
+ │ Dream │ 44.167742 │
+ │ Torgersen │ 38.950980 │
+ └───────────┴──────────────────────┘
"""
op = ops.SQLStringView(
child=self,
diff --git a/strings.py b/strings.py
index 1f15639..f61718d 100644
--- a/strings.py
+++ b/strings.py
@@ -35,6 +35,7 @@ class StringValue(Value):
>>> import ibis
>>> ibis.options.interactive = True
>>> t = ibis.memtable({"food": ["bread", "cheese", "rice"], "idx": [1, 2, 4]})
+ >>> t
┏━━━━━━━━┳━━━━━━━┓
┃ food ┃ idx ┃
┡━━━━━━━━╇━━━━━━━┩
@@ -313,7 +314,7 @@ class StringValue(Value):
return ops.Strip(self).to_expr()
def lstrip(self) -> StringValue:
- """Remove whitespace from the left side of string.
+ r"""Remove whitespace from the left side of string.
Returns
-------
@@ -349,7 +350,7 @@ class StringValue(Value):
return ops.LStrip(self).to_expr()
def rstrip(self) -> StringValue:
- """Remove whitespace from the right side of string.
+ r"""Remove whitespace from the right side of string.
Returns
-------
@@ -1052,15 +1053,15 @@ class StringValue(Value):
Extract a specific group
>>> t.s.re_extract(r"^(a)bc", 1)
- ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
- ┃ RegexExtract(s, '^(a)', 1) ┃
- ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
- │ string │
- ├────────────────────────────┤
- │ a │
- │ ~ │
- │ ~ │
- └────────────────────────────┘
+ ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+ ┃ RegexExtract(s, '^(a)bc', 1) ┃
+ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
+ │ string │
+ ├──────────────────────────────┤
+ │ a │
+ │ ~ │
+ │ ~ │
+ └──────────────────────────────┘
Extract the entire match
diff --git a/structs.py b/structs.py
index 5180254..bf51711 100644
--- a/structs.py
+++ b/structs.py
@@ -1,14 +1,12 @@
from __future__ import annotations
import collections
-
from keyword import iskeyword
from typing import TYPE_CHECKING, Iterable, Mapping, Sequence
from public import public
import ibis.expr.operations as ops
-
from ibis.expr.types.generic import Column, Scalar, Value, literal
from ibis.expr.types.typing import V
@@ -88,7 +86,7 @@ class StructValue(Value):
>>> import ibis
>>> s = ibis.struct(dict(fruit="pear", weight=0))
>>> s['fruit']
- fruit: StructField(frozendict({'fruit': 'pear', 'weight': 0}), field='fruit')
+ fruit: StructField(...)
"""
return ops.StructField(self, name).to_expr()
@@ -130,21 +128,36 @@ class StructValue(Value):
Examples
--------
- >>> schema = dict(a="struct<b: float, c: string>", d="string")
- >>> t = ibis.table(schema, name="t")
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> lines = '''
+ ... {"pos": {"lat": 10.1, "lon": 30.3}}
+ ... {"pos": {"lat": 10.2, "lon": 30.2}}
+ ... {"pos": {"lat": 10.3, "lon": 30.1}}
+ ... '''
+ >>> with open("/tmp/lines.json", "w") as f:
+ ... _ = f.write(lines)
+ >>> t = ibis.read_json("/tmp/lines.json")
>>> t
- UnboundTable: t
- a struct<b: float64, c: string>
- d string
- >>> t.a.lift()
- r0 := UnboundTable: t
- a struct<b: float64, c: string>
- d string
-
- Selection[r0]
- selections:
- b: StructField(r0.a, field='b')
- c: StructField(r0.a, field='c')
+ ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+ ┃ pos ┃
+ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩
+ │ struct<lat: float64, lon: float64> │
+ ├────────────────────────────────────┤
+ │ {'lat': 10.1, 'lon': 30.3} │
+ │ {'lat': 10.2, 'lon': 30.2} │
+ │ {'lat': 10.3, 'lon': 30.1} │
+ └────────────────────────────────────┘
+ >>> t.pos.lift()
+ ┏━━━━━━━━━┳━━━━━━━━━┓
+ ┃ lat ┃ lon ┃
+ ┡━━━━━━━━━╇━━━━━━━━━┩
+ │ float64 │ float64 │
+ ├─────────┼─────────┤
+ │ 10.1 │ 30.3 │
+ │ 10.2 │ 30.2 │
+ │ 10.3 │ 30.1 │
+ └─────────┴─────────┘
See Also
--------
diff --git a/vectorized.py b/vectorized.py
index c819580..374fbdd 100644
--- a/vectorized.py
+++ b/vectorized.py
@@ -133,28 +133,25 @@ def _coerce_to_dataframe(
Examples
--------
- >>> _coerce_to_dataframe(pd.DataFrame({'a': [1, 2, 3]}), dt.Struct([('b', 'int32')])) # noqa: E501
+ >>> import pandas as pd
+ >>> _coerce_to_dataframe(pd.DataFrame({'a': [1, 2, 3]}), dt.Struct(dict(b="int32"))) # noqa: E501
b
0 1
1 2
2 3
- dtype: int32
- >>> _coerce_to_dataframe(pd.Series([[1, 2, 3]]), dt.Struct([('a', 'int32'), ('b', 'int32'), ('c', 'int32')])) # noqa: E501
+ >>> _coerce_to_dataframe(pd.Series([[1, 2, 3]]), dt.Struct(dict.fromkeys('abc', 'int32'))) # noqa: E501
a b c
0 1 2 3
- dtypes: [int32, int32, int32]
- >>> _coerce_to_dataframe(pd.Series([range(3), range(3)]), dt.Struct([('a', 'int32'), ('b', 'int32'), ('c', 'int32')])) # noqa: E501
+ >>> _coerce_to_dataframe(pd.Series([range(3), range(3)]), dt.Struct(dict.fromkeys('abc', 'int32'))) # noqa: E501
a b c
0 0 1 2
1 0 1 2
- dtypes: [int32, int32, int32]
- >>> _coerce_to_dataframe([pd.Series(x) for x in [1, 2, 3]], dt.Struct([('a', 'int32'), ('b', 'int32'), ('c', 'int32')])) # noqa: E501
+ >>> _coerce_to_dataframe([pd.Series(x) for x in [1, 2, 3]], dt.Struct(dict.fromkeys('abc', 'int32'))) # noqa: E501
a b c
0 1 2 3
- >>> _coerce_to_dataframe([1, 2, 3], dt.Struct([('a', 'int32'), ('b', 'int32'), ('c', 'int32')])) # noqa: E501
+ >>> _coerce_to_dataframe([1, 2, 3], dt.Struct(dict.fromkeys('abc', 'int32'))) # noqa: E501
a b c
0 1 2 3
- dtypes: [int32, int32, int32]
"""
import pandas as pd
@@ -285,7 +282,7 @@ def analytic(input_type, output_type):
>>> @analytic(
... input_type=[dt.double],
- ... output_type=dt.Struct(['demean', 'zscore'], [dt.double, dt.double])
+ ... output_type=dt.Struct(dict(demean="double", zscore="double")),
... )
... def demean_and_zscore(v):
... mean = v.mean()
@@ -294,7 +291,7 @@ def analytic(input_type, output_type):
>>>
>>> win = ibis.window(preceding=None, following=None, group_by='key')
>>> # add two columns "demean" and "zscore"
- >>> table = table.mutate(
+ >>> table = table.mutate( # doctest: +SKIP
... demean_and_zscore(table['v']).over(win).destructure()
... )
"""
@@ -332,13 +329,13 @@ def elementwise(input_type, output_type):
>>> @elementwise(
... input_type=[dt.string],
- ... output_type=dt.Struct(['year', 'monthday'], [dt.string, dt.string])
+ ... output_type=dt.Struct(dict(year=dt.string, monthday=dt.string))
... )
... def year_monthday(date):
... return date.str.slice(0, 4), date.str.slice(4, 8)
>>>
>>> # add two columns "year" and "monthday"
- >>> table = table.mutate(year_monthday(table['date']).destructure())
+ >>> table = table.mutate(year_monthday(table['date']).destructure()) # doctest: +SKIP
"""
return _udf_decorator(ElementWiseVectorizedUDF, input_type, output_type)
@@ -368,13 +365,13 @@ def reduction(input_type, output_type):
>>> @reduction(
... input_type=[dt.double],
- ... output_type=dt.Struct(['mean', 'std'], [dt.double, dt.double])
+ ... output_type=dt.Struct(dict(mean="double", std="double"))
... )
... def mean_and_std(v):
... return v.mean(), v.std()
>>>
>>> # create aggregation columns "mean" and "std"
- >>> table = table.group_by('key').aggregate(
+ >>> table = table.group_by('key').aggregate( # doctest: +SKIP
... mean_and_std(table['v']).destructure()
... )
"""
diff --git a/justfile b/justfile
index 495b768..1fbe91e 100644
--- a/justfile
+++ b/justfile
@@ -47,6 +47,21 @@ test +backends:
pytest "${pytest_args[@]}"
+# run doctests
+doctest *args:
+ #!/usr/bin/env bash
+
+ # TODO(cpcloud): why doesn't pytest --ignore-glob=test_*.py work?
+ mapfile -t doctest_modules < <(
+ find \\
+ ibis \\
+ -wholename '*.py' \\
+ -and -not -wholename '*test*.py' \\
+ -and -not -wholename '*__init__*' \\
+ -and -not -wholename '*gen_*.py'
+ )
+ pytest --doctest-modules {{ args }} "${doctest_modules[@]}"
+
# download testing data
download-data owner="ibis-project" repo="testing-data" rev="master":
#!/usr/bin/env bash
diff --git a/pyproject.toml b/pyproject.toml
index a22970a..e62b6fe 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -226,14 +226,30 @@ doctest_optionflags = [
]
xfail_strict = true
addopts = [
- "--ignore=site-packages",
- "--ignore=dist-packages",
"--strict-markers",
"--strict-config",
"--benchmark-disable",
"--benchmark-group-by=name",
"--benchmark-sort=name",
]
+norecursedirs = [
+ "**/snapshots",
+ ".benchmarks",
+ ".direnv",
+ ".git",
+ ".github",
+ ".hypothesis",
+ ".pytest_cache",
+ ".streamlit",
+ "LICENSES",
+ "ci",
+ "conda-lock",
+ "dev",
+ "docker",
+ "docs",
+ "nix",
+ "result*",
+]
filterwarnings = [
# fail on any warnings that are not explicitly matched below
"error",
@@ -281,22 +297,10 @@ filterwarnings = [
"ignore:Deprecated call to `pkg_resources\\\\.declare_namespace\\\\('google.*'\\\\):DeprecationWarning",
# pyspark on python 3.11
"ignore:typing\\\\.io is deprecated:DeprecationWarning",
+ # warnings from google's use of the cgi module
+ "ignore:'cgi' is deprecated and slated for removal in Python 3\\\\.13:DeprecationWarning",
]
empty_parameter_set_mark = "fail_at_collect"
-norecursedirs = [
- ".benchmarks",
- ".direnv",
- ".git",
- ".github",
- "LICENSES",
- "ci",
- "conda-lock",
- "dev",
- "docker",
- "nix",
- "result",
- "result-*",
-]
markers = [
"backend: tests specific to a backend",
"benchmark: benchmarks",
|
|
chore(release): update internal dependencies to use tilde [skip ci]
|
bcbc6292eb0b377a5acfdb320f37607bcd087050
|
chore
|
https://github.com/mikro-orm/mikro-orm/commit/bcbc6292eb0b377a5acfdb320f37607bcd087050
|
update internal dependencies to use tilde [skip ci]
|
diff --git a/package.json b/package.json
index f74cec3..db7cc43 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
"access": "public"
},
"dependencies": {
- "@mikro-orm/knex": "^5.8.4",
+ "@mikro-orm/knex": "~5.8.4",
"fs-extra": "11.1.1",
"sqlite3": "5.1.6",
"sqlstring-sqlite": "0.1.1"
diff --git a/yarn.lock b/yarn.lock
index 590a555..717c49a 100644
--- a/yarn.lock
+++ b/yarn.lock
Binary files a/yarn.lock and b/yarn.lock differ
|
|
fix(query-builder): respect collection property where conditions (declarative partial loading)
Closes #5445
|
3b4fc417c9f85f7309d78faddcf11985667c5c20
|
fix
|
https://github.com/mikro-orm/mikro-orm/commit/3b4fc417c9f85f7309d78faddcf11985667c5c20
|
respect collection property where conditions (declarative partial loading)
Closes #5445
|
diff --git a/MySqlKnexDialect.ts b/MySqlKnexDialect.ts
index 7dcd40f..db6b959 100644
--- a/MySqlKnexDialect.ts
+++ b/MySqlKnexDialect.ts
@@ -1,6 +1,6 @@
-import { MonkeyPatchable } from '@mikro-orm/knex';
import { MySqlQueryCompiler } from './MySqlQueryCompiler';
import { MySqlColumnCompiler } from './MySqlColumnCompiler';
+import { MonkeyPatchable } from '../../MonkeyPatchable';
export class MySqlKnexDialect extends MonkeyPatchable.MySqlDialect {
diff --git a/PostgreSqlKnexDialect.ts b/PostgreSqlKnexDialect.ts
index 686c1bd..f4369fe 100644
--- a/PostgreSqlKnexDialect.ts
+++ b/PostgreSqlKnexDialect.ts
@@ -1,6 +1,6 @@
-import { MonkeyPatchable } from '@mikro-orm/knex';
import type { Configuration } from '@mikro-orm/core';
import { PostgreSqlTableCompiler } from './PostgreSqlTableCompiler';
+import { MonkeyPatchable } from '../../MonkeyPatchable';
export class PostgreSqlKnexDialect extends MonkeyPatchable.PostgresDialect {
diff --git a/QueryBuilderHelper.ts b/QueryBuilderHelper.ts
index e53454f..a31f198 100644
--- a/QueryBuilderHelper.ts
+++ b/QueryBuilderHelper.ts
@@ -186,6 +186,7 @@ export class QueryBuilderHelper {
const inverseJoinColumns = prop.referencedColumnNames;
const primaryKeys = prop.owner ? prop.joinColumns : prop2.referencedColumnNames;
schema ??= prop.targetMeta?.schema === '*' ? '*' : this.driver.getSchemaName(prop.targetMeta);
+ cond = Utils.merge(cond, prop.where);
return {
prop, type, cond, ownerAlias, alias, table, schema,
diff --git a/GH5445.test.ts b/GH5445.test.ts
index 812eb42..4fa9c85 100644
--- a/GH5445.test.ts
+++ b/GH5445.test.ts
@@ -11,6 +11,11 @@ import {
Opt,
} from '@mikro-orm/postgresql';
+export enum CommentObjectTypeEnum {
+ comment = 'comment',
+ post = 'post',
+}
+
abstract class BaseEntity {
[OptionalProps]?: 'createdAt' | 'updatedAt';
@@ -65,6 +70,9 @@ class Post extends BaseEntity {
@OneToMany({
entity: () => Comment,
mappedBy: 'post',
+ where: {
+ objectType: CommentObjectTypeEnum.post,
+ },
})
comments = new Collection<Comment>(this);
@@ -101,11 +109,6 @@ class Comment {
}
-export enum CommentObjectTypeEnum {
- comment = 'comment',
- post = 'post',
-}
-
let orm: MikroORM;
beforeAll(async () => {
@@ -134,6 +137,13 @@ beforeAll(async () => {
createdAt: new Date(),
updatedAt: new Date(),
});
+ orm.em.create(Comment, {
+ objectType: CommentObjectTypeEnum.comment,
+ post: 5,
+ content: 'bad comment content',
+ createdAt: new Date(),
+ updatedAt: new Date(),
+ });
await orm.em.flush();
orm.em.clear();
});
@@ -146,56 +156,25 @@ test('define joined columns in leftJoinAndSelect()', async () => {
const posts = await orm.em
.createQueryBuilder(Post, 'post')
.leftJoinAndSelect('post.author', 'author', {}, [
- 'author.id',
- 'author.name',
- 'author.biography',
+ 'id',
+ 'name',
+ 'biography',
])
- .leftJoinAndSelect(
- 'post.comments',
- 'comments',
- {
- objectType: CommentObjectTypeEnum.post,
- content: { $ne: null },
- },
- [
- 'comments.content',
- 'comments.created_at',
- 'comments.updated_at',
- ],
- )
+ .leftJoinAndSelect('post.comments', 'comments')
.where({ id: 5 })
.getResult();
- expect(posts[0].id).toBe(5);
- expect(posts[0].author).toBeDefined();
- expect(posts[0].author.id).toBe(3);
- expect(posts[0].author.name).toBe('author name');
- expect(posts[0].author.biography).toBe('author bio');
expect(posts[0].comments).toBeDefined();
- expect(posts[0].comments![0]).toBeDefined();
- expect(posts[0].comments![0].content).toBe('comment content');
- expect(posts[0].comments![0].createdAt).toBeDefined();
- expect(posts[0].comments![0].updatedAt).toBeDefined();
+ expect(posts[0].comments.length).toBe(1);
});
-test('use subquery for comments', async () => {
- const commentsSubQuery = orm.em
- .createQueryBuilder(Comment, 'comments')
- .select([
- 'post',
- 'objectType',
- 'content',
- 'createdAt',
- 'updatedAt',
- ]);
-
+test('em.find', async () => {
const posts = await orm.em
- .createQueryBuilder(Post, 'post')
- .leftJoinAndSelect('post.author', 'author')
- .leftJoinAndSelect(['post.comments', commentsSubQuery], 'comments', {
- objectType: CommentObjectTypeEnum.post,
- content: { $ne: null },
- })
- .where({ id: 5 })
- .getResult();
+ .find(Post, { id: 5 }, {
+ populate: ['author', 'comments'],
+ fields: ['author.name', 'author.biography'],
+ });
+
+ expect(posts[0].comments).toBeDefined();
+ expect(posts[0].comments.length).toBe(1);
});
|
|
fix(cli): only use dynamic imports for ESM projects
Closes #3442
|
b3e43d0fd98c090a47059597b719924260573e3b
|
fix
|
https://github.com/mikro-orm/mikro-orm/commit/b3e43d0fd98c090a47059597b719924260573e3b
|
only use dynamic imports for ESM projects
Closes #3442
|
diff --git a/CLIHelper.ts b/CLIHelper.ts
index 63ea05b..d24cebe 100644
--- a/CLIHelper.ts
+++ b/CLIHelper.ts
@@ -20,6 +20,11 @@ export class CLIHelper {
}
static async getORM(warnWhenNoEntities?: boolean, opts: Partial<Options> = {}): Promise<MikroORM> {
+ if (!(await ConfigurationLoader.isESM())) {
+ opts.dynamicImportProvider ??= id => Utils.requireFrom(id, process.cwd());
+ Utils.setDynamicImportProvider(opts.dynamicImportProvider);
+ }
+
const options = await CLIHelper.getConfiguration(warnWhenNoEntities, opts);
options.set('allowGlobalContext', true);
options.set('debug', !!process.env.MIKRO_ORM_VERBOSE);
diff --git a/ConfigurationLoader.ts b/ConfigurationLoader.ts
index df3c035..3ca133c 100644
--- a/ConfigurationLoader.ts
+++ b/ConfigurationLoader.ts
@@ -17,7 +17,6 @@ export class ConfigurationLoader {
this.registerDotenv(options);
const paths = await this.getConfigPaths();
const env = this.loadEnvironmentVars();
- const isESM = (await this.getModuleFormatFromPackage()) === 'module';
for (let path of paths) {
path = Utils.absolutePath(path);
@@ -36,7 +35,7 @@ export class ConfigurationLoader {
tmp = await tmp;
}
- const esmConfigOptions = isESM ? { entityGenerator: { esmImport: true } } : {};
+ const esmConfigOptions = await this.isESM() ? { entityGenerator: { esmImport: true } } : {};
return new Configuration({ ...esmConfigOptions, ...tmp, ...options, ...env }, validate);
}
@@ -103,9 +102,11 @@ export class ConfigurationLoader {
return paths.filter(p => p.endsWith('.js') || tsNode);
}
- static async getModuleFormatFromPackage(): Promise<string> {
+ static async isESM(): Promise<boolean> {
const config = await ConfigurationLoader.getPackageConfig();
- return config?.type ?? '';
+ const type = config?.type ?? '';
+
+ return type === 'module';
}
static async registerTsNode(configPath = 'tsconfig.json'): Promise<boolean> {
diff --git a/CLIHelper.test.ts b/CLIHelper.test.ts
index 9f32be8..0ed7726 100644
--- a/CLIHelper.test.ts
+++ b/CLIHelper.test.ts
@@ -411,14 +411,12 @@ Maybe you want to check, or regenerate your yarn.lock or package-lock.json file?
pathExistsMock.mockRestore();
});
- test('getModuleFormatFromPackage gets the type from package.json', async () => {
- const mikroPackage = await ConfigurationLoader.getModuleFormatFromPackage();
- expect(mikroPackage).toEqual('');
+ test('isESM', async () => {
+ await expect(ConfigurationLoader.isESM()).resolves.toEqual(false);
const packageSpy = jest.spyOn(ConfigurationLoader, 'getPackageConfig');
packageSpy.mockResolvedValue({ type: 'module' });
- const esmModulePackage = await ConfigurationLoader.getModuleFormatFromPackage();
- expect(esmModulePackage).toEqual('module');
+ await expect(ConfigurationLoader.isESM()).resolves.toEqual(true);
const pathExistsMock = jest.spyOn(require('fs-extra'), 'pathExists');
pathExistsMock.mockResolvedValue(true);
const conf = await CLIHelper.getConfiguration();
|
|
feat(api): add `to_pandas_batches`
|
740778fafc78f291966f3951a1ce00531cacb0c1
|
feat
|
https://github.com/rohankumardubey/ibis/commit/740778fafc78f291966f3951a1ce00531cacb0c1
|
add `to_pandas_batches`
|
diff --git a/__init__.py b/__init__.py
index c055118..69ac032 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,6 +1,7 @@
from __future__ import annotations
import contextlib
+import functools
import glob
import inspect
import itertools
@@ -374,6 +375,28 @@ $$""".format(
df = table.to_pandas(timestamp_as_object=True)
return SnowflakePandasData.convert_table(df, schema)
+ def to_pandas_batches(
+ self,
+ expr: ir.Expr,
+ *,
+ params: Mapping[ir.Scalar, Any] | None = None,
+ limit: int | str | None = None,
+ **_: Any,
+ ) -> Iterator[pd.DataFrame | pd.Series | Any]:
+ self._run_pre_execute_hooks(expr)
+ query_ast = self.compiler.to_ast_ensure_limit(expr, limit, params=params)
+ sql = query_ast.compile()
+ target_schema = expr.as_table().schema()
+ converter = functools.partial(
+ SnowflakePandasData.convert_table, schema=target_schema
+ )
+
+ with self.begin() as con, contextlib.closing(con.execute(sql)) as cur:
+ yield from map(
+ expr.__pandas_result__,
+ map(converter, cur.cursor.fetch_pandas_batches()),
+ )
+
def to_pyarrow_batches(
self,
expr: ir.Expr,
diff --git a/test_export.py b/test_export.py
index 63f7aae..dcbd84f 100644
--- a/test_export.py
+++ b/test_export.py
@@ -445,3 +445,44 @@ def test_empty_memtable(backend, con):
table = ibis.memtable(expected)
result = con.execute(table)
backend.assert_frame_equal(result, expected)
+
+
[email protected](["dask", "flink", "impala", "pyspark"])
+def test_to_pandas_batches_empty_table(backend, con):
+ t = backend.functional_alltypes.limit(0)
+ n = t.count().execute()
+
+ assert sum(map(len, con.to_pandas_batches(t))) == n
+ assert sum(map(len, t.to_pandas_batches())) == n
+
+
[email protected](["dask", "druid", "flink", "impala", "pyspark"])
[email protected]("n", [None, 1])
+def test_to_pandas_batches_nonempty_table(backend, con, n):
+ t = backend.functional_alltypes.limit(n)
+ n = t.count().execute()
+
+ assert sum(map(len, con.to_pandas_batches(t))) == n
+ assert sum(map(len, t.to_pandas_batches())) == n
+
+
[email protected](["dask", "flink", "impala", "pyspark"])
[email protected]("n", [None, 0, 1, 2])
+def test_to_pandas_batches_column(backend, con, n):
+ t = backend.functional_alltypes.limit(n).timestamp_col
+ n = t.count().execute()
+
+ assert sum(map(len, con.to_pandas_batches(t))) == n
+ assert sum(map(len, t.to_pandas_batches())) == n
+
+
[email protected](["dask", "druid", "flink", "impala", "pyspark"])
+def test_to_pandas_batches_scalar(backend, con):
+ t = backend.functional_alltypes.timestamp_col.max()
+ expected = t.execute()
+
+ result1 = list(con.to_pandas_batches(t))
+ assert result1 == [expected]
+
+ result2 = list(t.to_pandas_batches())
+ assert result2 == [expected]
diff --git a/core.py b/core.py
index 86662eb..1221550 100644
--- a/core.py
+++ b/core.py
@@ -3,7 +3,7 @@ from __future__ import annotations
import contextlib
import os
import webbrowser
-from typing import TYPE_CHECKING, Any, Mapping, NoReturn, Tuple
+from typing import TYPE_CHECKING, Any, Mapping, NoReturn, Tuple, Iterator
from public import public
from rich.jupyter import JupyterMixin
@@ -422,6 +422,44 @@ class Expr(Immutable, Coercible):
self, params=params, limit=limit, **kwargs
)
+ @experimental
+ def to_pandas_batches(
+ self,
+ *,
+ limit: int | str | None = None,
+ params: Mapping[ir.Value, Any] | None = None,
+ chunk_size: int = 1_000_000,
+ **kwargs: Any,
+ ) -> Iterator[pd.DataFrame | pd.Series | Any]:
+ """Execute expression and return an iterator of pandas DataFrames.
+
+ This method is eager and will execute the associated expression
+ immediately.
+
+ Parameters
+ ----------
+ limit
+ An integer to effect a specific row limit. A value of `None` means
+ "no limit". The default is in `ibis/config.py`.
+ params
+ Mapping of scalar parameter expressions to value.
+ chunk_size
+ Maximum number of rows in each returned batch.
+ kwargs
+ Keyword arguments
+
+ Returns
+ -------
+ Iterator[pd.DataFrame]
+ """
+ return self._find_backend(use_default=True).to_pandas_batches(
+ self,
+ params=params,
+ limit=limit,
+ chunk_size=chunk_size,
+ **kwargs,
+ )
+
@experimental
def to_parquet(
self,
|
|
fix(ir): handle the case of non-overlapping data and add a test
|
1c9ae1b15f97f31940550689649f2e27c5298ea1
|
fix
|
https://github.com/rohankumardubey/ibis/commit/1c9ae1b15f97f31940550689649f2e27c5298ea1
|
handle the case of non-overlapping data and add a test
|
diff --git a/test_join.py b/test_join.py
index d757935..f97741f 100644
--- a/test_join.py
+++ b/test_join.py
@@ -328,6 +328,10 @@ def test_join_with_trivial_predicate(awards_players, predicate, how, pandas_valu
assert len(result) == len(expected)
[email protected](
+ ["druid"], raises=sa.exc.NoSuchTableError, reason="`win` table isn't loaded"
+)
[email protected](["flink"], reason="`win` table isn't loaded")
@pytest.mark.parametrize(
("how", "nrows"),
[
@@ -349,17 +353,30 @@ def test_join_with_trivial_predicate(awards_players, predicate, how, pandas_valu
),
],
)
[email protected](
- ["druid"], raises=sa.exc.NoSuchTableError, reason="`win` table isn't loaded"
[email protected](
+ ("gen_right", "keys"),
+ [
+ param(
+ lambda left: left.filter(lambda t: t.x == 1).select(y=lambda t: t.x),
+ [("x", "y")],
+ id="non_overlapping",
+ marks=[pytest.mark.notyet(["polars"], reason="renaming fails")],
+ ),
+ param(
+ lambda left: left.filter(lambda t: t.x == 1),
+ "x",
+ id="overlapping",
+ marks=[pytest.mark.notimpl(["pyspark"], reason="overlapping columns")],
+ ),
+ ],
)
[email protected](["flink"], reason="`win` table isn't loaded")
-def test_outer_join_nullability(backend, how, nrows):
+def test_outer_join_nullability(backend, how, nrows, gen_right, keys):
win = backend.win
left = win.select(x=lambda t: t.x.cast(t.x.type().copy(nullable=False))).filter(
lambda t: t.x.isin((1, 2))
)
- right = left.filter(lambda t: t.x == 1)
- expr = left.join(right, "x", how=how)
+ right = gen_right(left)
+ expr = left.join(right, keys, how=how)
assert all(typ.nullable for typ in expr.schema().types)
result = expr.to_pyarrow()
diff --git a/relations.py b/relations.py
index befe61a..aedb052 100644
--- a/relations.py
+++ b/relations.py
@@ -293,17 +293,29 @@ class InnerJoin(Join):
@public
class LeftJoin(Join):
- pass
+ @property
+ def schema(self) -> Schema:
+ return Schema(
+ {name: typ.copy(nullable=True) for name, typ in super().schema.items()}
+ )
@public
class RightJoin(Join):
- pass
+ @property
+ def schema(self) -> Schema:
+ return Schema(
+ {name: typ.copy(nullable=True) for name, typ in super().schema.items()}
+ )
@public
class OuterJoin(Join):
- pass
+ @property
+ def schema(self) -> Schema:
+ return Schema(
+ {name: typ.copy(nullable=True) for name, typ in super().schema.items()}
+ )
@public
@@ -313,7 +325,11 @@ class AnyInnerJoin(Join):
@public
class AnyLeftJoin(Join):
- pass
+ @property
+ def schema(self) -> Schema:
+ return Schema(
+ {name: typ.copy(nullable=True) for name, typ in super().schema.items()}
+ )
@public
|
|
feat(docs): add new component to display code snippets side-by-side
|
146328c7e7eab41c7cfe4e67d26af58eeca9c09c
|
feat
|
https://github.com/wzhiqing/cube/commit/146328c7e7eab41c7cfe4e67d26af58eeca9c09c
|
add new component to display code snippets side-by-side
|
diff --git a/SnippetGroup.tsx b/SnippetGroup.tsx
index 18f616c..548ad3c 100644
--- a/SnippetGroup.tsx
+++ b/SnippetGroup.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import * as styles from './styles.module.scss';
+
+export const Snippet = ({ children }) => children;
+
+export const SnippetGroup = ({ children }) => {
+ return (
+ <div className={styles.snippetGroup}>
+ {children}
+ </div>
+ );
+};
diff --git a/styles.module.scss b/styles.module.scss
index 45822f9..1351373 100644
--- a/styles.module.scss
+++ b/styles.module.scss
@@ -0,0 +1,4 @@
+.snippetGroup {
+ display: flex;
+ gap: 1rem;
+}
diff --git a/DocTemplate.tsx b/DocTemplate.tsx
index 9ff5303..f0356b6 100644
--- a/DocTemplate.tsx
+++ b/DocTemplate.tsx
@@ -42,6 +42,7 @@ import ScrollSpyH3 from '../components/Headers/ScrollSpyH3';
import MyH2 from '../components/Headers/MyH2';
import MyH3 from '../components/Headers/MyH3';
import { ParameterTable } from '../components/ReferenceDocs/ParameterTable';
+import { Snippet, SnippetGroup } from '../components/Snippets/SnippetGroup';
const MyH4: React.FC<{ children: string }> = ({ children }) => {
return (<h4 id={kebabCase(children)} name={kebabCase(children)}>{children}</h4>);
@@ -59,6 +60,8 @@ const components = {
CubeQueryResultSet,
GitHubFolderLink,
ParameterTable,
+ SnippetGroup,
+ Snippet,
h2: ScrollSpyH2,
h3: ScrollSpyH3,
h4: MyH4,
|
|
feat(api): add `levenshtein` edit distance API
|
ab211a8da79d8a418d33ba7c25d25cf625bfa9f5
|
feat
|
https://github.com/ibis-project/ibis/commit/ab211a8da79d8a418d33ba7c25d25cf625bfa9f5
|
add `levenshtein` edit distance API
|
diff --git a/postgres.sql b/postgres.sql
index 4ac3c5f..2b6f641 100644
--- a/postgres.sql
+++ b/postgres.sql
@@ -3,6 +3,7 @@ CREATE EXTENSION IF NOT EXISTS postgis;
CREATE EXTENSION IF NOT EXISTS plpython3u;
CREATE EXTENSION IF NOT EXISTS vector;
CREATE EXTENSION IF NOT EXISTS first_last_agg;
+CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
DROP TABLE IF EXISTS diamonds CASCADE;
diff --git a/registry.py b/registry.py
index a3fd6fb..4f92beb 100644
--- a/registry.py
+++ b/registry.py
@@ -473,6 +473,7 @@ operation_registry.update(
lambda arg: sa.cast(sa.func.date_format(arg, "%f"), sa.INTEGER()),
1,
),
+ ops.Levenshtein: fixed_arity(sa.func.levenshtein_distance, 2),
}
)
diff --git a/compiler.py b/compiler.py
index 4c71008..6b4a55f 100644
--- a/compiler.py
+++ b/compiler.py
@@ -2059,3 +2059,10 @@ def compile_hash_column(t, op, **kwargs):
@compiles(ops.ArrayZip)
def compile_zip(t, op, **kwargs):
return F.arrays_zip(*map(partial(t.translate, **kwargs), op.arg))
+
+
+@compiles(ops.Levenshtein)
+def compile_levenshtein(t, op, **kwargs):
+ left = t.translate(op.left, **kwargs)
+ right = t.translate(op.right, **kwargs)
+ return F.levenshtein(left, right)
diff --git a/test_string.py b/test_string.py
index db4dbd2..c106c6a 100644
--- a/test_string.py
+++ b/test_string.py
@@ -1023,3 +1023,28 @@ def test_multiple_subs(con):
expr = ibis.literal("foo").substitute(m)
result = con.execute(expr)
assert result == "FOO"
+
+
[email protected](
+ [
+ "clickhouse",
+ "dask",
+ "datafusion",
+ "druid",
+ "impala",
+ "mssql",
+ "mysql",
+ "pandas",
+ "polars",
+ "sqlite",
+ ],
+ raises=com.OperationNotDefinedError,
+)
[email protected](
+ "right", ["sitting", ibis.literal("sitting")], ids=["python", "ibis"]
+)
+def test_levenshtein(con, right):
+ left = ibis.literal("kitten")
+ expr = left.levenshtein(right)
+ result = con.execute(expr)
+ assert result == 3
diff --git a/strings.py b/strings.py
index 82acdca..2a3fa1d 100644
--- a/strings.py
+++ b/strings.py
@@ -1515,6 +1515,29 @@ class StringValue(Value):
__rmul__ = __mul__
+ def levenshtein(self, other: StringValue) -> ir.IntegerValue:
+ """Return the Levenshtein distance between two strings.
+
+ Parameters
+ ----------
+ other
+ String to compare to
+
+ Returns
+ -------
+ IntegerValue
+ The edit distance between the two strings
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> s = ibis.literal("kitten")
+ >>> s.levenshtein("sitting")
+ 3
+ """
+ return ops.Levenshtein(self, other).to_expr()
+
@public
class StringScalar(Scalar, StringValue):
|
|
fix: minor bugs
|
a8c1113df711ec8000960636eec3621c5a1b9ffc
|
fix
|
https://github.com/erg-lang/erg/commit/a8c1113df711ec8000960636eec3621c5a1b9ffc
|
minor bugs
|
diff --git a/const_func.rs b/const_func.rs
index 16ea9ad..0228637 100644
--- a/const_func.rs
+++ b/const_func.rs
@@ -4,7 +4,7 @@ use std::mem;
use erg_common::dict::Dict;
#[allow(unused_imports)]
use erg_common::log;
-use erg_common::{dict, enum_unwrap, set};
+use erg_common::{dict, set};
use crate::context::Context;
use crate::feature_error;
@@ -186,14 +186,19 @@ pub(crate) fn __array_getitem__(mut args: ValueArgs, ctx: &Context) -> EvalValue
let slf = args
.remove_left_or_key("Self")
.ok_or_else(|| not_passed("Self"))?;
- let slf = ctx
- .convert_value_into_array(slf)
- .unwrap_or_else(|err| panic!("{err}, {args}"));
+ let slf = match ctx.convert_value_into_array(slf) {
+ Ok(slf) => slf,
+ Err(val) => {
+ return Err(type_mismatch("Array", val, "Self"));
+ }
+ };
let index = args
.remove_left_or_key("Index")
.ok_or_else(|| not_passed("Index"))?;
- let index = enum_unwrap!(index, ValueObj::Nat);
- if let Some(v) = slf.get(index as usize) {
+ let Ok(index) = usize::try_from(&index) else {
+ return Err(type_mismatch("Nat", index, "Index"));
+ };
+ if let Some(v) = slf.get(index) {
Ok(v.clone().into())
} else {
Err(ErrorCore::new(
@@ -280,7 +285,9 @@ pub(crate) fn __dict_getitem__(mut args: ValueArgs, ctx: &Context) -> EvalValueR
let slf = args
.remove_left_or_key("Self")
.ok_or_else(|| not_passed("Self"))?;
- let slf = enum_unwrap!(slf, ValueObj::Dict);
+ let ValueObj::Dict(slf) = slf else {
+ return Err(type_mismatch("Dict", slf, "Self"));
+ };
let index = args
.remove_left_or_key("Index")
.ok_or_else(|| not_passed("Index"))?;
@@ -302,7 +309,9 @@ pub(crate) fn dict_keys(mut args: ValueArgs, ctx: &Context) -> EvalValueResult<T
let slf = args
.remove_left_or_key("Self")
.ok_or_else(|| not_passed("Self"))?;
- let slf = enum_unwrap!(slf, ValueObj::Dict);
+ let ValueObj::Dict(slf) = slf else {
+ return Err(type_mismatch("Dict", slf, "Self"));
+ };
let slf = slf
.into_iter()
.map(|(k, v)| {
@@ -324,7 +333,9 @@ pub(crate) fn dict_values(mut args: ValueArgs, ctx: &Context) -> EvalValueResult
let slf = args
.remove_left_or_key("Self")
.ok_or_else(|| not_passed("Self"))?;
- let slf = enum_unwrap!(slf, ValueObj::Dict);
+ let ValueObj::Dict(slf) = slf else {
+ return Err(type_mismatch("Dict", slf, "Self"));
+ };
let slf = slf
.into_iter()
.map(|(k, v)| {
@@ -346,7 +357,9 @@ pub(crate) fn dict_items(mut args: ValueArgs, ctx: &Context) -> EvalValueResult<
let slf = args
.remove_left_or_key("Self")
.ok_or_else(|| not_passed("Self"))?;
- let slf = enum_unwrap!(slf, ValueObj::Dict);
+ let ValueObj::Dict(slf) = slf else {
+ return Err(type_mismatch("Dict", slf, "Self"));
+ };
let slf = slf
.into_iter()
.map(|(k, v)| {
@@ -369,11 +382,15 @@ pub(crate) fn dict_concat(mut args: ValueArgs, _ctx: &Context) -> EvalValueResul
let slf = args
.remove_left_or_key("Self")
.ok_or_else(|| not_passed("Self"))?;
- let slf = enum_unwrap!(slf, ValueObj::Dict);
+ let ValueObj::Dict(slf) = slf else {
+ return Err(type_mismatch("Dict", slf, "Self"));
+ };
let other = args
.remove_left_or_key("Other")
.ok_or_else(|| not_passed("Other"))?;
- let other = enum_unwrap!(other, ValueObj::Dict);
+ let ValueObj::Dict(other) = other else {
+ return Err(type_mismatch("Dict", other, "Other"));
+ };
Ok(ValueObj::Dict(slf.concat(other)).into())
}
@@ -381,11 +398,15 @@ pub(crate) fn dict_diff(mut args: ValueArgs, _ctx: &Context) -> EvalValueResult<
let slf = args
.remove_left_or_key("Self")
.ok_or_else(|| not_passed("Self"))?;
- let slf = enum_unwrap!(slf, ValueObj::Dict);
+ let ValueObj::Dict(slf) = slf else {
+ return Err(type_mismatch("Dict", slf, "Self"));
+ };
let other = args
.remove_left_or_key("Other")
.ok_or_else(|| not_passed("Other"))?;
- let other = enum_unwrap!(other, ValueObj::Dict);
+ let ValueObj::Dict(other) = other else {
+ return Err(type_mismatch("Dict", other, "Other"));
+ };
Ok(ValueObj::Dict(slf.diff(&other)).into())
}
@@ -394,7 +415,9 @@ pub(crate) fn array_union(mut args: ValueArgs, ctx: &Context) -> EvalValueResult
let slf = args
.remove_left_or_key("Self")
.ok_or_else(|| not_passed("Self"))?;
- let slf = enum_unwrap!(slf, ValueObj::Array);
+ let ValueObj::Array(slf) = slf else {
+ return Err(type_mismatch("Array", slf, "Self"));
+ };
let slf = slf
.iter()
.map(|t| ctx.convert_value_into_type(t.clone()).unwrap())
@@ -423,7 +446,12 @@ fn _arr_shape(arr: ValueObj, ctx: &Context) -> Result<Vec<TyParam>, String> {
}
ValueObj::Type(ref t) if &t.typ().qual_name()[..] == "Array" => {
let mut tps = t.typ().typarams();
- let elem = ctx.convert_tp_into_type(tps.remove(0)).unwrap();
+ let elem = match ctx.convert_tp_into_type(tps.remove(0)) {
+ Ok(elem) => elem,
+ Err(err) => {
+ return Err(err.to_string());
+ }
+ };
let len = tps.remove(0);
shape.push(len);
arr = ValueObj::builtin_type(elem);
@@ -452,24 +480,31 @@ pub(crate) fn array_shape(mut args: ValueArgs, ctx: &Context) -> EvalValueResult
}
pub(crate) fn __range_getitem__(mut args: ValueArgs, _ctx: &Context) -> EvalValueResult<TyParam> {
- let (_name, fields) = enum_unwrap!(
- args.remove_left_or_key("Self")
- .ok_or_else(|| not_passed("Self"))?,
- ValueObj::DataClass { name, fields }
- );
+ let slf = args
+ .remove_left_or_key("Self")
+ .ok_or_else(|| not_passed("Self"))?;
+ let ValueObj::DataClass { name: _, fields } = slf else {
+ return Err(type_mismatch("Range", slf, "Self"));
+ };
let index = args
.remove_left_or_key("Index")
.ok_or_else(|| not_passed("Index"))?;
- let index = enum_unwrap!(index, ValueObj::Nat);
+ let Ok(index) = usize::try_from(&index) else {
+ return Err(type_mismatch("Nat", index, "Index"));
+ };
let start = fields
.get("start")
.ok_or_else(|| no_key(&fields, "start"))?;
- let start = *enum_unwrap!(start, ValueObj::Nat);
+ let Ok(start) = usize::try_from(start) else {
+ return Err(type_mismatch("Nat", start, "start"));
+ };
let end = fields.get("end").ok_or_else(|| no_key(&fields, "end"))?;
- let end = *enum_unwrap!(end, ValueObj::Nat);
+ let Ok(end) = usize::try_from(end) else {
+ return Err(type_mismatch("Nat", end, "end"));
+ };
// FIXME <= if inclusive
if start + index < end {
- Ok(ValueObj::Nat(start + index).into())
+ Ok(ValueObj::Nat((start + index) as u64).into())
} else {
Err(ErrorCore::new(
vec![SubMessage::only_loc(Location::Unknown)],
diff --git a/unify.rs b/unify.rs
index 4205b0d..bf69a9c 100644
--- a/unify.rs
+++ b/unify.rs
@@ -826,55 +826,27 @@ impl<'c, 'l, 'u, L: Locational> Unifier<'c, 'l, 'u, L> {
self.sub_unify(&rsub, &union)?;
// self.sub_unify(&intersec, &lsup, loc, param_name)?;
// self.sub_unify(&lsub, &union, loc, param_name)?;
- if union == intersec {
- match sub_fv
- .level()
- .unwrap_or(GENERIC_LEVEL)
- .cmp(&sup_fv.level().unwrap_or(GENERIC_LEVEL))
- {
- std::cmp::Ordering::Less => {
- maybe_sub.link(&union, self.undoable);
- maybe_sup.link(maybe_sub, self.undoable);
- }
- std::cmp::Ordering::Greater => {
- maybe_sup.link(&union, self.undoable);
- maybe_sub.link(maybe_sup, self.undoable);
- }
- std::cmp::Ordering::Equal => {
- // choose named one
- if sup_fv.is_named_unbound() {
- maybe_sup.link(&union, self.undoable);
- maybe_sub.link(maybe_sup, self.undoable);
- } else {
- maybe_sub.link(&union, self.undoable);
- maybe_sup.link(maybe_sub, self.undoable);
- }
- }
+ match sub_fv
+ .level()
+ .unwrap_or(GENERIC_LEVEL)
+ .cmp(&sup_fv.level().unwrap_or(GENERIC_LEVEL))
+ {
+ std::cmp::Ordering::Less => {
+ maybe_sub.update_tyvar(union, intersec, self.undoable, false);
+ maybe_sup.link(maybe_sub, self.undoable);
}
- } else {
- let new_constraint = Constraint::new_sandwiched(union, intersec);
- match sub_fv
- .level()
- .unwrap_or(GENERIC_LEVEL)
- .cmp(&sup_fv.level().unwrap_or(GENERIC_LEVEL))
- {
- std::cmp::Ordering::Less => {
- maybe_sub.update_constraint(new_constraint, self.undoable, false);
- maybe_sup.link(maybe_sub, self.undoable);
- }
- std::cmp::Ordering::Greater => {
- maybe_sup.update_constraint(new_constraint, self.undoable, false);
+ std::cmp::Ordering::Greater => {
+ maybe_sup.update_tyvar(union, intersec, self.undoable, false);
+ maybe_sub.link(maybe_sup, self.undoable);
+ }
+ std::cmp::Ordering::Equal => {
+ // choose named one
+ if sup_fv.is_named_unbound() {
+ maybe_sup.update_tyvar(union, intersec, self.undoable, false);
maybe_sub.link(maybe_sup, self.undoable);
- }
- std::cmp::Ordering::Equal => {
- // choose named one
- if sup_fv.is_named_unbound() {
- maybe_sup.update_constraint(new_constraint, self.undoable, false);
- maybe_sub.link(maybe_sup, self.undoable);
- } else {
- maybe_sub.update_constraint(new_constraint, self.undoable, false);
- maybe_sup.link(maybe_sub, self.undoable);
- }
+ } else {
+ maybe_sub.update_tyvar(union, intersec, self.undoable, false);
+ maybe_sup.link(maybe_sub, self.undoable);
}
}
}
@@ -947,12 +919,7 @@ impl<'c, 'l, 'u, L: Locational> Unifier<'c, 'l, 'u, L> {
self.sub_unify(&rsub, &union)?;
// self.sub_unify(&intersec, &lsup, loc, param_name)?;
// self.sub_unify(&lsub, &union, loc, param_name)?;
- if union == intersec {
- maybe_sup.link(&union, self.undoable);
- } else {
- let new_constraint = Constraint::new_sandwiched(union, intersec);
- maybe_sup.update_constraint(new_constraint, self.undoable, false);
- }
+ maybe_sup.update_tyvar(union, intersec, self.undoable, false);
}
// (Int or ?T) <: (?U or Int)
// OK: (Int <: Int); (?T <: ?U)
diff --git a/lower.rs b/lower.rs
index d9f86bc..f72b026 100644
--- a/lower.rs
+++ b/lower.rs
@@ -1078,6 +1078,7 @@ impl ASTLowerer {
}
}
}
+ // TODO: expect var_args
if let Some(var_args) = var_args {
match self.lower_expr(var_args.expr, None) {
Ok(expr) => hir_args.var_args = Some(Box::new(hir::PosArg::new(expr))),
@@ -1089,7 +1090,12 @@ impl ASTLowerer {
}
}
for arg in kw_args.into_iter() {
- match self.lower_expr(arg.expr, None) {
+ let kw_param = expect.as_ref().and_then(|subr| {
+ subr.non_var_params()
+ .find(|pt| pt.name().is_some_and(|n| n == &arg.keyword.content))
+ .map(|pt| pt.typ())
+ });
+ match self.lower_expr(arg.expr, kw_param) {
Ok(expr) => hir_args.push_kw(hir::KwArg::new(arg.keyword, expr)),
Err(es) => {
errs.extend(es);
diff --git a/mod.rs b/mod.rs
index a24442f..23db7fc 100644
--- a/mod.rs
+++ b/mod.rs
@@ -564,10 +564,15 @@ impl SubrType {
.non_default_params
.iter()
.filter(|pt| !pt.name().is_some_and(|n| &n[..] == "self"));
+ let defaults = self.default_params.iter();
if let Some(var_params) = self.var_params.as_ref() {
- non_defaults.chain(std::iter::repeat(var_params.as_ref()))
+ non_defaults
+ .chain([].iter())
+ .chain(std::iter::repeat(var_params.as_ref()))
} else {
- non_defaults.chain(std::iter::repeat(&ParamTy::Pos(Type::Failure)))
+ non_defaults
+ .chain(defaults)
+ .chain(std::iter::repeat(&ParamTy::Pos(Type::Failure)))
}
}
@@ -1771,6 +1776,46 @@ impl Type {
}
}
+ pub fn immutate(&self) -> Option<Self> {
+ match self {
+ Self::FreeVar(fv) if fv.is_linked() => {
+ let t = fv.crack().clone();
+ if let Some(t) = t.immutate() {
+ fv.link(&t);
+ Some(Self::FreeVar(fv.clone()))
+ } else {
+ None
+ }
+ }
+ Self::Mono(name) => match &name[..] {
+ "Int!" => Some(Self::Int),
+ "Nat!" => Some(Self::Nat),
+ "Ratio!" => Some(Self::Ratio),
+ "Float!" => Some(Self::Float),
+ "Complex!" => Some(Self::Complex),
+ "Bool!" => Some(Self::Bool),
+ "Str!" => Some(Self::Str),
+ _ => None,
+ },
+ Self::Poly { name, params } => match &name[..] {
+ "Array!" => Some(Self::Poly {
+ name: "Array".into(),
+ params: params.clone(),
+ }),
+ "Set!" => Some(Self::Poly {
+ name: "Set".into(),
+ params: params.clone(),
+ }),
+ "Dict!" => Some(Self::Poly {
+ name: "Dict".into(),
+ params: params.clone(),
+ }),
+ _ => None,
+ },
+ _ => None,
+ }
+ }
+
pub fn quantify(self) -> Self {
debug_assert!(self.is_subr(), "{self} is not subr");
match self {
@@ -1835,6 +1880,10 @@ impl Type {
}
}
+ pub fn is_mut_value_class(&self) -> bool {
+ self.immutate().is_some_and(|t| t.is_value_class())
+ }
+
/// Procedure
pub fn is_procedure(&self) -> bool {
match self {
@@ -3567,6 +3616,21 @@ impl Type {
}
}
+ pub(crate) fn update_tyvar(
+ &self,
+ new_sub: Type,
+ new_sup: Type,
+ list: Option<&UndoableLinkedList>,
+ in_instantiation: bool,
+ ) {
+ if new_sub == new_sup {
+ self.link(&new_sub, list);
+ } else {
+ let new_constraint = Constraint::new_sandwiched(new_sub, new_sup);
+ self.update_constraint(new_constraint, list, in_instantiation);
+ }
+ }
+
fn inc_undo_count(&self) {
match self {
Self::FreeVar(fv) => fv.inc_undo_count(),
diff --git a/typaram.rs b/typaram.rs
index 2d92e03..aa9ea2b 100644
--- a/typaram.rs
+++ b/typaram.rs
@@ -668,6 +668,10 @@ impl TryFrom<TyParam> for ValueObj {
}
Ok(ValueObj::Array(Arc::from(vals)))
}
+ TyParam::UnsizedArray(elem) => {
+ let elem = ValueObj::try_from(*elem)?;
+ Ok(ValueObj::UnsizedArray(Box::new(elem)))
+ }
TyParam::Tuple(tps) => {
let mut vals = vec![];
for tp in tps {
@@ -689,6 +693,13 @@ impl TryFrom<TyParam> for ValueObj {
}
Ok(ValueObj::Record(vals))
}
+ TyParam::Set(tps) => {
+ let mut vals = set! {};
+ for tp in tps {
+ vals.insert(ValueObj::try_from(tp)?);
+ }
+ Ok(ValueObj::Set(vals))
+ }
TyParam::DataClass { name, fields } => {
let mut vals = dict! {};
for (k, v) in fields {
@@ -710,7 +721,7 @@ impl TryFrom<TyParam> for ValueObj {
TyParam::Type(t) => Ok(ValueObj::builtin_type(*t)),
TyParam::Value(v) => Ok(v),
_ => {
- log!(err "Expected value, got {tp} ({tp:?})");
+ log!(err "Expected value, got {tp}");
Err(())
}
}
diff --git a/value.rs b/value.rs
index 25fd881..18d1e83 100644
--- a/value.rs
+++ b/value.rs
@@ -1167,7 +1167,7 @@ impl ValueObj {
Self::Dict(dict) => {
let tp = dict
.iter()
- .map(|(k, v)| (TyParam::value(k.clone()), TyParam::value(v.clone())));
+ .map(|(k, v)| (TyParam::t(k.class()), TyParam::t(v.class())));
dict_t(TyParam::Dict(tp.collect()))
}
Self::Tuple(tup) => tuple_t(tup.iter().map(|v| v.class()).collect()),
|
|
chore: change logical operations order
|
7cd895a30e3fbd54822f208fccf1fa8747e97b07
|
chore
|
https://github.com/erg-lang/erg/commit/7cd895a30e3fbd54822f208fccf1fa8747e97b07
|
change logical operations order
|
diff --git a/compare.rs b/compare.rs
index cb262d2..a9f13a4 100644
--- a/compare.rs
+++ b/compare.rs
@@ -894,8 +894,7 @@ impl Context {
let r_fields = self.fields(r);
for (l_field, l_ty) in self.fields(l) {
if let Some((r_field, r_ty)) = r_fields.get_key_value(&l_field) {
- let compatible = self.supertype_of(&l_ty, r_ty);
- if r_field.vis != l_field.vis || !compatible {
+ if r_field.vis != l_field.vis || !self.supertype_of(&l_ty, r_ty) {
return false;
}
} else {
@@ -2211,9 +2210,9 @@ impl Context {
args: args2,
},
) => {
- self.supertype_of_tp(receiver, sub_receiver, Variance::Covariant)
- && name == name2
+ name == name2
&& args.len() == args2.len()
+ && self.supertype_of_tp(receiver, sub_receiver, Variance::Covariant)
&& args
.iter()
.zip(args2.iter())
diff --git a/eval.rs b/eval.rs
index 9e5f7a3..304f1e6 100644
--- a/eval.rs
+++ b/eval.rs
@@ -172,9 +172,9 @@ impl<'c> Substituter<'c> {
// Or, And are commutative, choose fitting order
if qt.qual_name() == st.qual_name() && (st.qual_name() == "Or" || st.qual_name() == "And") {
// REVIEW: correct condition?
- if ctx.covariant_supertype_of_tp(&qtps[0], &stps[1])
+ if qt != st
+ && ctx.covariant_supertype_of_tp(&qtps[0], &stps[1])
&& ctx.covariant_supertype_of_tp(&qtps[1], &stps[0])
- && qt != st
{
stps.swap(0, 1);
}
@@ -2608,7 +2608,7 @@ impl Context {
// FIXME: GenericDict
TyParam::FreeVar(fv)
if fv.get_type().is_some_and(|t| {
- self.subtype_of(&t, &Type::Type) || &t.qual_name() == "GenericDict"
+ &t.qual_name() == "GenericDict" || self.subtype_of(&t, &Type::Type)
}) =>
{
// FIXME: This procedure is clearly erroneous because it breaks the type variable linkage.
diff --git a/generalize.rs b/generalize.rs
index 2f4a447..bc96915 100644
--- a/generalize.rs
+++ b/generalize.rs
@@ -188,14 +188,14 @@ impl Generalizer {
res.generalize();
res
} else if sup != Obj
- && !self.qnames.contains(&fv.unbound_name().unwrap())
&& self.variance == Contravariant
+ && !self.qnames.contains(&fv.unbound_name().unwrap())
{
// |T <: Bool| T -> Int ==> Bool -> Int
self.generalize_t(sup, uninit)
} else if sub != Never
- && !self.qnames.contains(&fv.unbound_name().unwrap())
&& self.variance == Covariant
+ && !self.qnames.contains(&fv.unbound_name().unwrap())
{
// |T :> Int| X -> T ==> X -> Int
self.generalize_t(sub, uninit)
diff --git a/inquire.rs b/inquire.rs
index d8211ec..d96f400 100644
--- a/inquire.rs
+++ b/inquire.rs
@@ -2626,7 +2626,7 @@ impl Context {
);
log!(info "Substituted:\\ninstance: {instance}");
debug_assert!(
- self.subtype_of(&instance, &Type::Type) || instance.has_no_qvar(),
+ instance.has_no_qvar() || self.subtype_of(&instance, &Type::Type),
"{instance} has qvar (obj: {obj}, attr: {}",
fmt_option!(attr_name)
);
@@ -4072,7 +4072,7 @@ impl Context {
pub(crate) fn recover_typarams(&self, base: &Type, guard: &GuardType) -> TyCheckResult<Type> {
let intersec = self.intersection(&guard.to, base);
let is_never =
- self.subtype_of(&intersec, &Type::Never) && guard.to.as_ref() != &Type::Never;
+ guard.to.as_ref() != &Type::Never && self.subtype_of(&intersec, &Type::Never);
if !is_never {
return Ok(intersec);
}
diff --git a/unify.rs b/unify.rs
index c883e56..7162d1e 100644
--- a/unify.rs
+++ b/unify.rs
@@ -1196,9 +1196,9 @@ impl<'c, 'l, 'u, L: Locational> Unifier<'c, 'l, 'u, L> {
// NG: (Int <: ?U); (?T <: Int)
(Or(l1, r1), Or(l2, r2)) | (And(l1, r1), And(l2, r2)) => {
if self.ctx.subtype_of(l1, l2) && self.ctx.subtype_of(r1, r2) {
- let (l_sup, r_sup) = if self.ctx.subtype_of(l1, r2)
- && !l1.is_unbound_var()
+ let (l_sup, r_sup) = if !l1.is_unbound_var()
&& !r2.is_unbound_var()
+ && self.ctx.subtype_of(l1, r2)
{
(r2, l2)
} else {
|
|
feat(postgres): add support for native enum arrays
Closes #5322
|
c2e362bc6fe19ec792d13f475a11cf2290b94fde
|
feat
|
https://github.com/mikro-orm/mikro-orm/commit/c2e362bc6fe19ec792d13f475a11cf2290b94fde
|
add support for native enum arrays
Closes #5322
|
diff --git a/EnumArrayType.ts b/EnumArrayType.ts
index 8e36211..de686ce 100644
--- a/EnumArrayType.ts
+++ b/EnumArrayType.ts
@@ -3,6 +3,7 @@ import { ArrayType } from './ArrayType';
import type { Platform } from '../platforms';
import { ValidationError } from '../errors';
import type { TransformContext } from './Type';
+import type { EntityProperty } from '../typings';
function mapHydrator<T>(items: T[] | undefined, hydrate: (i: string) => T): (i: string) => T {
if (items && items.length > 0 && typeof items[0] === 'number') {
@@ -33,4 +34,12 @@ export class EnumArrayType<T extends string | number = string> extends ArrayType
return super.convertToDatabaseValue(value, platform, context);
}
+ override getColumnType(prop: EntityProperty, platform: Platform): string {
+ if (prop.nativeEnumName) {
+ return `${prop.nativeEnumName}[]`;
+ }
+
+ return super.getColumnType(prop, platform);
+ }
+
}
diff --git a/EnumType.ts b/EnumType.ts
index 4186f84..1cf9c31 100644
--- a/EnumType.ts
+++ b/EnumType.ts
@@ -5,6 +5,10 @@ import type { EntityProperty } from '../typings';
export class EnumType extends Type<string | null | undefined> {
override getColumnType(prop: EntityProperty, platform: Platform) {
+ if (prop.nativeEnumName) {
+ return prop.nativeEnumName;
+ }
+
return prop.columnTypes?.[0] ?? platform.getEnumTypeDeclarationSQL(prop);
}
diff --git a/SchemaHelper.ts b/SchemaHelper.ts
index 11e8901..aa4f237 100644
--- a/SchemaHelper.ts
+++ b/SchemaHelper.ts
@@ -63,6 +63,10 @@ export abstract class SchemaHelper {
return {};
}
+ getCreateNativeEnumSQL(name: string, values: unknown[], schema?: string): string {
+ throw new Error('Not supported by given driver');
+ }
+
getDropNativeEnumSQL(name: string, schema?: string): string {
throw new Error('Not supported by given driver');
}
diff --git a/SqlSchemaGenerator.ts b/SqlSchemaGenerator.ts
index 0831273..0952a08 100644
--- a/SqlSchemaGenerator.ts
+++ b/SqlSchemaGenerator.ts
@@ -91,6 +91,20 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator<AbstractSqlDrive
ret += await this.dump(this.knex.schema.createSchemaIfNotExists(namespace));
}
+ if (this.platform.supportsNativeEnums()) {
+ const created: string[] = [];
+
+ for (const [enumName, enumOptions] of Object.entries(toSchema.getNativeEnums())) {
+ if (created.includes(enumName)) {
+ continue;
+ }
+
+ created.push(enumName);
+ const sql = this.helper.getCreateNativeEnumSQL(enumName, enumOptions, options.schema ?? this.config.get('schema'));
+ ret += await this.dump(this.knex.schema.raw(sql), '\\n');
+ }
+ }
+
for (const tableDef of toSchema.getTables()) {
ret += await this.dump(this.createTable(tableDef));
}
@@ -369,14 +383,25 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator<AbstractSqlDrive
const [schemaName, tableName] = this.splitTableName(diff.name);
if (this.platform.supportsNativeEnums()) {
- const changedNativeEnums: [string, string[], string[]][] = [];
+ const createdNativeEnums: [enumName: string, items: string[]][] = [];
+ const changedNativeEnums: [enumName: string, itemsNew: string[], itemsOld: string[]][] = [];
- for (const { column, changedProperties } of Object.values(diff.changedColumns)) {
- if (column.nativeEnumName && changedProperties.has('enumItems') && column.nativeEnumName in diff.fromTable.nativeEnums) {
+ for (const { column, changedProperties, fromColumn } of Object.values(diff.changedColumns)) {
+ if (!column.nativeEnumName) {
+ continue;
+ }
+
+ if (changedProperties.has('enumItems') && column.nativeEnumName in diff.fromTable.nativeEnums) {
changedNativeEnums.push([column.nativeEnumName, column.enumItems!, diff.fromTable.getColumn(column.name)!.enumItems!]);
+ } else if (changedProperties.has('type') && !(column.nativeEnumName in diff.fromTable.nativeEnums)) {
+ createdNativeEnums.push([column.nativeEnumName, column.enumItems!]);
}
}
+ Utils.removeDuplicates(createdNativeEnums).forEach(([enumName, items]) => {
+ ret.push(this.knex.schema.raw(this.helper.getCreateNativeEnumSQL(enumName, items, schemaName)));
+ });
+
Utils.removeDuplicates(changedNativeEnums).forEach(([enumName, itemsNew, itemsOld]) => {
// postgres allows only adding new items, the values are case insensitive
itemsOld = itemsOld.map(v => v.toLowerCase());
@@ -426,7 +451,7 @@ export class SqlSchemaGenerator extends AbstractSchemaGenerator<AbstractSqlDrive
}
}
- for (const { column, changedProperties } of Object.values(diff.changedColumns)) {
+ for (const { column, changedProperties, fromColumn } of Object.values(diff.changedColumns)) {
if (changedProperties.size === 1 && changedProperties.has('comment')) {
continue;
}
diff --git a/PostgreSqlSchemaHelper.ts b/PostgreSqlSchemaHelper.ts
index 9a1f5e9..a375af7 100644
--- a/PostgreSqlSchemaHelper.ts
+++ b/PostgreSqlSchemaHelper.ts
@@ -1,5 +1,17 @@
-import { BigIntType, EnumType, Type, Utils, type Dictionary } from '@mikro-orm/core';
-import { SchemaHelper, type AbstractSqlConnection, type CheckDef, type Column, type DatabaseSchema, type DatabaseTable, type ForeignKey, type IndexDef, type Table, type TableDifference, type Knex } from '@mikro-orm/knex';
+import { BigIntType, type Dictionary, EnumType, Type, Utils } from '@mikro-orm/core';
+import {
+ type AbstractSqlConnection,
+ type CheckDef,
+ type Column,
+ type DatabaseSchema,
+ type DatabaseTable,
+ type ForeignKey,
+ type IndexDef,
+ type Knex,
+ SchemaHelper,
+ type Table,
+ type TableDifference,
+} from '@mikro-orm/knex';
export class PostgreSqlSchemaHelper extends SchemaHelper {
@@ -244,6 +256,14 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
}, {});
}
+ override getCreateNativeEnumSQL(name: string, values: unknown[], schema?: string): string {
+ if (schema && schema !== this.platform.getDefaultSchemaName()) {
+ name = schema + '.' + name;
+ }
+
+ return `create type ${this.platform.quoteIdentifier(name)} as enum (${values.map(value => this.platform.quoteValue(value)).join(', ')})`;
+ }
+
override getDropNativeEnumSQL(name: string, schema?: string): string {
if (schema && schema !== this.platform.getDefaultSchemaName()) {
name = schema + '.' + name;
@@ -318,12 +338,14 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
fromTable.nativeEnums[column.nativeEnumName] = [];
}
- return table.enum(column.name, column.enumItems, {
- useNative: true,
- enumName: column.nativeEnumName,
- schemaName: fromTable.schema && fromTable.schema !== this.platform.getDefaultSchemaName() ? fromTable.schema : undefined,
- existingType,
- });
+ const schemaPrefix = fromTable.schema && fromTable.schema !== this.platform.getDefaultSchemaName() ? `${fromTable.schema}.` : '';
+ const type = this.platform.quoteIdentifier(schemaPrefix + column.nativeEnumName);
+
+ if (column.type.endsWith('[]')) {
+ return table.specificType(column.name, type + '[]');
+ }
+
+ return table.specificType(column.name, type);
}
if (column.mappedType instanceof EnumType && column.enumItems?.every(item => Utils.isString(item))) {
diff --git a/GH5322.test.ts b/GH5322.test.ts
index b3aedfb..d0b9c80 100644
--- a/GH5322.test.ts
+++ b/GH5322.test.ts
@@ -0,0 +1,72 @@
+import { MikroORM, Entity, Enum, PrimaryKey, Opt } from '@mikro-orm/postgresql';
+import { mockLogger } from '../../helpers';
+
+enum MyEnum {
+ LOCAL = 'local',
+ GLOBAL = 'global',
+}
+
+@Entity()
+class EnumEntity {
+
+ @PrimaryKey()
+ id!: number;
+
+ @Enum({ items: () => MyEnum, nativeEnumName: 'my_enum' })
+ type: Opt<MyEnum> = MyEnum.LOCAL;
+
+ @Enum({ items: () => MyEnum, nativeEnumName: 'my_enum', array: true })
+ types: MyEnum[] = [];
+
+}
+
+let orm: MikroORM;
+
+beforeAll(async () => {
+ orm = await MikroORM.init({
+ entities: [EnumEntity],
+ dbName: '5322',
+ });
+
+ await orm.schema.ensureDatabase();
+ await orm.schema.execute(`drop type if exists my_enum cascade`);
+ await orm.schema.execute(`drop table if exists enum_entity`);
+});
+
+afterAll(() => orm.close());
+
+test('GH #5322', async () => {
+ const sql = await orm.schema.getCreateSchemaSQL();
+ expect(sql).toMatch(`create type "my_enum" as enum ('local', 'global');\\ncreate table "enum_entity" ("id" serial primary key, "type" "my_enum" not null default 'local', "types" "my_enum"[] not null);`);
+ await orm.schema.execute(sql);
+
+ const meta = orm.getMetadata(EnumEntity);
+ meta.properties.type.items = ['foo'];
+ meta.properties.types.items = ['foo'];
+ const diff = await orm.schema.getUpdateSchemaSQL();
+ expect(diff).toMatch(`alter type "my_enum" add value if not exists 'foo';`);
+ await orm.schema.execute(diff);
+
+ const mock = mockLogger(orm);
+ const foo = orm.em.create(EnumEntity, { types: [MyEnum.GLOBAL] });
+ await orm.em.flush();
+ orm.em.clear();
+
+ const foo2 = await orm.em.findOneOrFail(EnumEntity, foo);
+ expect(foo2.types).toEqual([MyEnum.GLOBAL]);
+ foo2.types.push(MyEnum.LOCAL);
+ await orm.em.flush();
+ orm.em.clear();
+
+ const foo3 = await orm.em.findOneOrFail(EnumEntity, foo);
+ expect(foo3.types).toEqual([MyEnum.GLOBAL, MyEnum.LOCAL]);
+
+ expect(mock.mock.calls[0][0]).toMatch(`begin`);
+ expect(mock.mock.calls[1][0]).toMatch(`insert into "enum_entity" ("type", "types") values ('local', '{global}') returning "id"`);
+ expect(mock.mock.calls[2][0]).toMatch(`commit`);
+ expect(mock.mock.calls[3][0]).toMatch(`select "e0".* from "enum_entity" as "e0" where "e0"."id" = 1 limit 1`);
+ expect(mock.mock.calls[4][0]).toMatch(`begin`);
+ expect(mock.mock.calls[5][0]).toMatch(`update "enum_entity" set "types" = '{global,local}' where "id" = 1`);
+ expect(mock.mock.calls[6][0]).toMatch(`commit`);
+ expect(mock.mock.calls[7][0]).toMatch(`select "e0".* from "enum_entity" as "e0" where "e0"."id" = 1 limit 1`);
+});
diff --git a/native-enum-diffing.postgres.test.ts.snap b/native-enum-diffing.postgres.test.ts.snap
index 45fdad6..a35b950 100644
--- a/native-enum-diffing.postgres.test.ts.snap
+++ b/native-enum-diffing.postgres.test.ts.snap
@@ -24,6 +24,7 @@ alter table "user" drop constraint if exists "user_type_check";
alter table "user" drop constraint if exists "user_type2_check";
create type "user_type" as enum ('personal', 'organization');
+
alter table "user" alter column "type" type "user_type" using ("type"::"user_type");
alter table "user" alter column "type2" type "user_type" using ("type2"::"user_type");
diff --git a/native-enums.postgres.test.ts.snap b/native-enums.postgres.test.ts.snap
index faf71c1..cda2eae 100644
--- a/native-enums.postgres.test.ts.snap
+++ b/native-enums.postgres.test.ts.snap
@@ -10,6 +10,7 @@ create table "different_schema"."new_table" ("id" serial primary key, "enum_test
exports[`native enums in postgres enum diffing: postgres-update-schema-enums-2 1`] = `
"create type "different_schema"."enum_test" as enum ('a', 'b');
+
alter table "different_schema"."new_table" alter column "enum_test" type "different_schema"."enum_test" using ("enum_test"::"different_schema"."enum_test");
"
@@ -31,12 +32,12 @@ exports[`native enums in postgres generate schema from metadata [postgres]: post
"set names 'utf8';
set session_replication_role = 'replica';
-create type "enum5" as enum ('a');
-create type "enum4" as enum ('a', 'b', 'c');
-create type "enum3" as enum ('1', '2', '3');
-create type "enum2" as enum ('1', '2');
-create type "enum_entity_type2" as enum ('LOCAL', 'GLOBAL');
create type "enum_entity_type" as enum ('local', 'global');
+create type "enum_entity_type2" as enum ('LOCAL', 'GLOBAL');
+create type "enum2" as enum ('1', '2');
+create type "enum3" as enum ('1', '2', '3');
+create type "enum4" as enum ('a', 'b', 'c');
+create type "enum5" as enum ('a');
create table "enum_entity" ("id" serial primary key, "type" "enum_entity_type" not null default 'local', "type2" "enum_entity_type2" not null default 'LOCAL', "enum2" "enum2" null, "enum3" "enum3" null, "enum4" "enum4" null, "enum5" "enum5" null);
set session_replication_role = 'origin';
@@ -63,12 +64,12 @@ exports[`native enums in postgres generate schema from metadata [postgres]: post
"set names 'utf8';
set session_replication_role = 'replica';
-create type "enum5" as enum ('a');
-create type "enum4" as enum ('a', 'b', 'c');
-create type "enum3" as enum ('1', '2', '3');
-create type "enum2" as enum ('1', '2');
-create type "enum_entity_type2" as enum ('LOCAL', 'GLOBAL');
create type "enum_entity_type" as enum ('local', 'global');
+create type "enum_entity_type2" as enum ('LOCAL', 'GLOBAL');
+create type "enum2" as enum ('1', '2');
+create type "enum3" as enum ('1', '2', '3');
+create type "enum4" as enum ('a', 'b', 'c');
+create type "enum5" as enum ('a');
create table "enum_entity" ("id" serial primary key, "type" "enum_entity_type" not null default 'local', "type2" "enum_entity_type2" not null default 'LOCAL', "enum2" "enum2" null, "enum3" "enum3" null, "enum4" "enum4" null, "enum5" "enum5" null);
set session_replication_role = 'origin';
diff --git a/native-enum-diffing.postgres.test.ts b/native-enum-diffing.postgres.test.ts
index 02643b2..418d3c1 100644
--- a/native-enum-diffing.postgres.test.ts
+++ b/native-enum-diffing.postgres.test.ts
diff --git a/native-enums.postgres.test.ts b/native-enums.postgres.test.ts
index 1d6790d..e8577af 100644
--- a/native-enums.postgres.test.ts
+++ b/native-enums.postgres.test.ts
|
|
docs(arrays): document behavior of unnest in the presence of empty array rows
|
5526c402784879b76beb1d0bea46cfa7e628b8f5
|
docs
|
https://github.com/ibis-project/ibis/commit/5526c402784879b76beb1d0bea46cfa7e628b8f5
|
document behavior of unnest in the presence of empty array rows
|
diff --git a/arrays.py b/arrays.py
index 7ffc810..d2643b1 100644
--- a/arrays.py
+++ b/arrays.py
@@ -268,7 +268,7 @@ class ArrayValue(Value):
"""Flatten an array into a column.
::: {.callout-note}
- ## This operation changes the cardinality of the result
+ ## Rows with empty arrays are dropped in the output.
:::
Examples
|
|
test(polars): xfail seemingly broken outer joins
|
6b1f53a01103dc72ea22919f95330b0ec53974ec
|
test
|
https://github.com/ibis-project/ibis/commit/6b1f53a01103dc72ea22919f95330b0ec53974ec
|
xfail seemingly broken outer joins
|
diff --git a/test_join.py b/test_join.py
index 5206f3b..7f88bd2 100644
--- a/test_join.py
+++ b/test_join.py
@@ -64,16 +64,14 @@ def check_eq(left, right, how, **kwargs):
+ ["sqlite"] * (vparse(sqlite3.sqlite_version) < vparse("3.39"))
),
pytest.mark.xfail_version(datafusion=["datafusion<31"]),
+ pytest.mark.broken(
+ ["polars"], reason="upstream outer joins are broken"
+ ),
],
),
],
)
@pytest.mark.notimpl(["druid"])
[email protected]_version(
- polars=["polars>=0.18.6,<0.18.8"],
- reason="https://github.com/pola-rs/polars/issues/9955",
- raises=ColumnNotFoundError,
-)
@pytest.mark.notimpl(["exasol"], raises=AttributeError)
def test_mutating_join(backend, batting, awards_players, how):
left = batting[batting.yearID == 2015]
|
|
perf(duckdb): faster `to_parquet`/`to_csv` implementations
|
6071bb5f8238f3ebb159fc197efcd088cdc452a0
|
perf
|
https://github.com/rohankumardubey/ibis/commit/6071bb5f8238f3ebb159fc197efcd088cdc452a0
|
faster `to_parquet`/`to_csv` implementations
|
diff --git a/__init__.py b/__init__.py
index e21376b..00674fa 100644
--- a/__init__.py
+++ b/__init__.py
@@ -137,6 +137,8 @@ class Backend(BaseAlchemyBackend):
Path(temp_directory).mkdir(parents=True, exist_ok=True)
config["temp_directory"] = str(temp_directory)
+ config.setdefault("experimental_parallel_csv", 1)
+
engine = sa.create_engine(
f"duckdb:///{database}",
connect_args=dict(read_only=read_only, config=config),
@@ -556,11 +558,80 @@ class Backend(BaseAlchemyBackend):
else:
raise ValueError
- def fetch_from_cursor(
+ @util.experimental
+ def to_parquet(
+ self,
+ expr: ir.Table,
+ path: str | Path,
+ *,
+ params: Mapping[ir.Scalar, Any] | None = None,
+ **kwargs: Any,
+ ) -> None:
+ """Write the results of executing the given expression to a parquet file.
+
+ This method is eager and will execute the associated expression
+ immediately.
+
+ Parameters
+ ----------
+ expr
+ The ibis expression to execute and persist to parquet.
+ path
+ The data source. A string or Path to the parquet file.
+ params
+ Mapping of scalar parameter expressions to value.
+ kwargs
+ DuckDB Parquet writer arguments. See
+ https://duckdb.org/docs/data/parquet#writing-to-parquet-files for
+ details
+ """
+ query = self._to_sql(expr, params=params)
+ args = ["FORMAT 'parquet'", *(f"{k.upper()} {v!r}" for k, v in kwargs.items())]
+ copy_cmd = f"COPY ({query}) TO {str(path)!r} ({', '.join(args)})"
+ with self.begin() as con:
+ con.exec_driver_sql(copy_cmd)
+
+ @util.experimental
+ def to_csv(
self,
- cursor: duckdb.DuckDBPyConnection,
- schema: sch.Schema,
- ):
+ expr: ir.Table,
+ path: str | Path,
+ *,
+ params: Mapping[ir.Scalar, Any] | None = None,
+ header: bool = True,
+ **kwargs: Any,
+ ) -> None:
+ """Write the results of executing the given expression to a CSV file.
+
+ This method is eager and will execute the associated expression
+ immediately.
+
+ Parameters
+ ----------
+ expr
+ The ibis expression to execute and persist to CSV.
+ path
+ The data source. A string or Path to the CSV file.
+ params
+ Mapping of scalar parameter expressions to value.
+ header
+ Whether to write the column names as the first line of the CSV file.
+ kwargs
+ DuckDB CSV writer arguments. https://duckdb.org/docs/data/csv.html#parameters
+ """
+ query = self._to_sql(expr, params=params)
+ args = [
+ "FORMAT 'csv'",
+ f"HEADER {int(header)}",
+ *(f"{k.upper()} {v!r}" for k, v in kwargs.items()),
+ ]
+ copy_cmd = f"COPY ({query}) TO {str(path)!r} ({', '.join(args)})"
+ with self.begin() as con:
+ con.exec_driver_sql(copy_cmd)
+
+ def fetch_from_cursor(
+ self, cursor: duckdb.DuckDBPyConnection, schema: sch.Schema
+ ) -> pd.DataFrame:
import pandas as pd
import pyarrow.types as pat
diff --git a/sql.py b/sql.py
index f06a695..85673ab 100644
--- a/sql.py
+++ b/sql.py
@@ -346,7 +346,7 @@ class SQLString:
@public
-def to_sql(expr: ir.Expr, dialect: str | None = None) -> SQLString:
+def to_sql(expr: ir.Expr, dialect: str | None = None, **kwargs) -> SQLString:
"""Return the formatted SQL string for an expression.
Parameters
@@ -355,6 +355,8 @@ def to_sql(expr: ir.Expr, dialect: str | None = None) -> SQLString:
Ibis expression.
dialect
SQL dialect to use for compilation.
+ kwargs
+ Scalar parameters
Returns
-------
@@ -382,6 +384,6 @@ def to_sql(expr: ir.Expr, dialect: str | None = None) -> SQLString:
else:
read = write = getattr(backend, "_sqlglot_dialect", dialect)
- sql = backend._to_sql(expr)
+ sql = backend._to_sql(expr, **kwargs)
(pretty,) = sg.transpile(sql, read=read, write=write, pretty=True)
return SQLString(pretty)
|
|
feat: add restricted visibility syntax
|
d92f5284c86ad4fbce748e1f3aaeb666bd450632
|
feat
|
https://github.com/erg-lang/erg/commit/d92f5284c86ad4fbce748e1f3aaeb666bd450632
|
add restricted visibility syntax
|
diff --git a/hir_visitor.rs b/hir_visitor.rs
index 0373223..ae05008 100644
--- a/hir_visitor.rs
+++ b/hir_visitor.rs
@@ -200,9 +200,9 @@ impl<'a> HIRVisitor<'a> {
token: &Token,
) -> Option<&Expr> {
match acc {
- Accessor::Ident(ident) => self.return_expr_if_same(expr, ident.name.token(), token),
+ Accessor::Ident(ident) => self.return_expr_if_same(expr, ident.raw.name.token(), token),
Accessor::Attr(attr) => self
- .return_expr_if_same(expr, attr.ident.name.token(), token)
+ .return_expr_if_same(expr, attr.ident.raw.name.token(), token)
.or_else(|| self.get_expr(&attr.obj, token)),
}
}
@@ -234,7 +234,7 @@ impl<'a> HIRVisitor<'a> {
.or_else(|| {
call.attr_name
.as_ref()
- .and_then(|attr| self.return_expr_if_same(expr, attr.name.token(), token))
+ .and_then(|attr| self.return_expr_if_same(expr, attr.raw.name.token(), token))
})
.or_else(|| self.get_expr(&call.obj, token))
.or_else(|| self.get_expr_from_args(&call.args, token))
@@ -266,7 +266,7 @@ impl<'a> HIRVisitor<'a> {
def: &'e Def,
token: &Token,
) -> Option<&Expr> {
- self.return_expr_if_same(expr, def.sig.ident().name.token(), token)
+ self.return_expr_if_same(expr, def.sig.ident().raw.name.token(), token)
.or_else(|| self.get_expr_from_block(&def.body.block, token))
.or_else(|| def.loc().contains(token.loc()).then_some(expr))
}
@@ -319,7 +319,7 @@ impl<'a> HIRVisitor<'a> {
patch_def: &'e PatchDef,
token: &Token,
) -> Option<&Expr> {
- self.return_expr_if_same(expr, patch_def.sig.ident().name.token(), token)
+ self.return_expr_if_same(expr, patch_def.sig.name().token(), token)
.or_else(|| self.get_expr(&patch_def.base, token))
.or_else(|| self.get_expr_from_block(&patch_def.methods, token))
.or_else(|| patch_def.loc().contains(token.loc()).then_some(expr))
@@ -489,10 +489,10 @@ impl<'a> HIRVisitor<'a> {
fn get_acc_info(&self, acc: &Accessor, token: &Token) -> Option<VarInfo> {
match acc {
Accessor::Ident(ident) => {
- self.return_var_info_if_same(ident, ident.name.token(), token)
+ self.return_var_info_if_same(ident, ident.raw.name.token(), token)
}
Accessor::Attr(attr) => self
- .return_var_info_if_same(&attr.ident, attr.ident.name.token(), token)
+ .return_var_info_if_same(&attr.ident, attr.ident.raw.name.token(), token)
.or_else(|| self.get_expr_info(&attr.obj, token)),
}
}
@@ -504,7 +504,7 @@ impl<'a> HIRVisitor<'a> {
fn get_call_info(&self, call: &Call, token: &Token) -> Option<VarInfo> {
if let Some(attr) = &call.attr_name {
- if let Some(t) = self.return_var_info_if_same(attr, attr.name.token(), token) {
+ if let Some(t) = self.return_var_info_if_same(attr, attr.raw.name.token(), token) {
return Some(t);
}
}
@@ -534,10 +534,10 @@ impl<'a> HIRVisitor<'a> {
fn get_sig_info(&self, sig: &Signature, token: &Token) -> Option<VarInfo> {
match sig {
Signature::Var(var) => {
- self.return_var_info_if_same(&var.ident, var.ident.name.token(), token)
+ self.return_var_info_if_same(&var.ident, var.name().token(), token)
}
Signature::Subr(subr) => self
- .return_var_info_if_same(&subr.ident, subr.ident.name.token(), token)
+ .return_var_info_if_same(&subr.ident, subr.name().token(), token)
.or_else(|| self.get_params_info(&subr.params, token)),
}
}
diff --git a/server.rs b/server.rs
index f5ceb81..e8e3ff1 100644
--- a/server.rs
+++ b/server.rs
@@ -526,7 +526,7 @@ impl<Checker: BuildRunnable> Server<Checker> {
ctxs.extend(type_ctxs);
if let Ok(singular_ctx) = module
.context
- .get_singular_ctx_by_hir_expr(expr, &"".into())
+ .get_singular_ctx_by_hir_expr(expr, &module.context)
{
ctxs.push(singular_ctx);
}
diff --git a/levenshtein.rs b/levenshtein.rs
index 0cd60c1..1b44e66 100644
--- a/levenshtein.rs
+++ b/levenshtein.rs
@@ -40,14 +40,17 @@ pub fn levenshtein(a: &str, b: &str, limit: usize) -> Option<usize> {
(dcol[m] <= limit).then_some(dcol[m])
}
-pub fn get_similar_name<'a, I: Iterator<Item = &'a str> + Clone>(
+pub fn get_similar_name<'a, S: ?Sized, I: Iterator<Item = &'a S> + Clone>(
candidates: I,
name: &str,
-) -> Option<&'a str> {
- let limit = (name.len() as f64).sqrt() as usize;
+) -> Option<&'a S>
+where
+ S: std::borrow::Borrow<str>,
+{
+ let limit = (name.len() as f64).sqrt().round() as usize;
let most_similar_name =
- candidates.min_by_key(|v| levenshtein(v, name, limit).unwrap_or(usize::MAX))?;
- let dist = levenshtein(most_similar_name, name, limit);
+ candidates.min_by_key(|v| levenshtein(v.borrow(), name, limit).unwrap_or(usize::MAX))?;
+ let dist = levenshtein(most_similar_name.borrow(), name, limit);
if dist.is_none() || dist.unwrap() >= limit {
None
} else {
@@ -55,6 +58,24 @@ pub fn get_similar_name<'a, I: Iterator<Item = &'a str> + Clone>(
}
}
+pub fn get_similar_name_and_some<'a, S: ?Sized, T, I: Iterator<Item = (&'a T, &'a S)> + Clone>(
+ candidates: I,
+ name: &str,
+) -> Option<(&'a T, &'a S)>
+where
+ S: std::borrow::Borrow<str>,
+{
+ let limit = (name.len() as f64).sqrt().round() as usize;
+ let most_similar_name_and_some = candidates
+ .min_by_key(|(_, v)| levenshtein(v.borrow(), name, limit).unwrap_or(usize::MAX))?;
+ let dist = levenshtein(most_similar_name_and_some.1.borrow(), name, limit);
+ if dist.is_none() || dist.unwrap() >= limit {
+ None
+ } else {
+ Some(most_similar_name_and_some)
+ }
+}
+
#[cfg(test)]
mod tests {
use crate::levenshtein::get_similar_name;
diff --git a/lib.rs b/lib.rs
index cada959..817a2ba 100644
--- a/lib.rs
+++ b/lib.rs
@@ -31,9 +31,9 @@ pub mod stdin;
pub mod str;
pub mod style;
pub mod traits;
+pub mod triple;
pub mod tsort;
pub mod tty;
-pub mod vis;
use crate::set::Set;
pub use crate::str::Str;
diff --git a/str.rs b/str.rs
index 486806e..8c23cfa 100644
--- a/str.rs
+++ b/str.rs
@@ -199,6 +199,30 @@ impl Str {
ret
}
+ /// ```
+ /// use erg_common::str::Str;
+ /// let s = Str::rc("a.b.c");
+ /// assert_eq!(s.rpartition_with(&[".", "/"]), ("a.b", "c"));
+ /// let s = Str::rc("a::b.c");
+ /// assert_eq!(s.rpartition_with(&["/", "::"]), ("a", "b.c"));
+ /// ```
+ pub fn rpartition_with(&self, seps: &[&str]) -> (&str, &str) {
+ let mut i = self.len();
+ while i > 0 {
+ for sep in seps {
+ if self[i..].starts_with(sep) {
+ return (&self[..i], &self[i + sep.len()..]);
+ }
+ }
+ i -= 1;
+ }
+ (&self[..], "")
+ }
+
+ pub fn reversed(&self) -> Str {
+ Str::rc(&self.chars().rev().collect::<String>())
+ }
+
pub fn multi_replace(&self, paths: &[(&str, &str)]) -> Self {
let mut self_ = self.to_string();
for (from, to) in paths {
@@ -237,11 +261,6 @@ impl Str {
mod tests {
use super::*;
- use crate::dict;
- // use crate::dict::Dict;
-
- use crate::vis::Field;
-
#[test]
fn test_split_with() {
assert_eq!(
@@ -261,17 +280,4 @@ mod tests {
vec!["aa", "bb", "ff"]
);
}
-
- #[test]
- fn test_std_key() {
- let dict = dict! {Str::ever("a") => 1, Str::rc("b") => 2};
- assert_eq!(dict.get("a"), Some(&1));
- assert_eq!(dict.get("b"), Some(&2));
- assert_eq!(dict.get(&Str::ever("b")), Some(&2));
- assert_eq!(dict.get(&Str::rc("b")), Some(&2));
-
- let dict = dict! {Field::private(Str::ever("a")) => 1, Field::public(Str::ever("b")) => 2};
- assert_eq!(dict.get("a"), Some(&1));
- assert_eq!(dict.get("b"), Some(&2));
- }
}
diff --git a/triple.rs b/triple.rs
index 6d250e0..e5b0f7c 100644
--- a/triple.rs
+++ b/triple.rs
@@ -0,0 +1,82 @@
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum Triple<T, E> {
+ Ok(T),
+ Err(E),
+ None,
+}
+
+impl<T, E> Triple<T, E> {
+ pub fn none_then(self, err: E) -> Result<T, E> {
+ match self {
+ Triple::None => Err(err),
+ Triple::Ok(ok) => Ok(ok),
+ Triple::Err(err) => Err(err),
+ }
+ }
+
+ pub fn none_or_result(self, f: impl FnOnce() -> E) -> Result<T, E> {
+ match self {
+ Triple::None => Err(f()),
+ Triple::Ok(ok) => Ok(ok),
+ Triple::Err(err) => Err(err),
+ }
+ }
+
+ pub fn none_or_else(self, f: impl FnOnce() -> Triple<T, E>) -> Triple<T, E> {
+ match self {
+ Triple::None => f(),
+ Triple::Ok(ok) => Triple::Ok(ok),
+ Triple::Err(err) => Triple::Err(err),
+ }
+ }
+
+ pub fn unwrap_to_result(self) -> Result<T, E> {
+ match self {
+ Triple::None => panic!("unwrapping Triple::None"),
+ Triple::Ok(ok) => Ok(ok),
+ Triple::Err(err) => Err(err),
+ }
+ }
+
+ pub fn ok(self) -> Option<T> {
+ match self {
+ Triple::None => None,
+ Triple::Ok(ok) => Some(ok),
+ Triple::Err(_) => None,
+ }
+ }
+
+ pub fn or_else(self, f: impl FnOnce() -> Result<T, E>) -> Result<T, E> {
+ match self {
+ Triple::None => f(),
+ Triple::Ok(ok) => Ok(ok),
+ Triple::Err(err) => Err(err),
+ }
+ }
+
+ pub fn unwrap_or(self, default: T) -> T {
+ match self {
+ Triple::None => default,
+ Triple::Ok(ok) => ok,
+ Triple::Err(_) => default,
+ }
+ }
+
+ pub fn unwrap_err(self) -> E {
+ match self {
+ Triple::None => panic!("unwrapping Triple::None"),
+ Triple::Ok(_) => panic!("unwrapping Triple::Ok"),
+ Triple::Err(err) => err,
+ }
+ }
+}
+
+impl<T, E: std::error::Error> Triple<T, E> {
+ pub fn unwrap(self) -> T {
+ match self {
+ Triple::None => panic!("unwrapping Triple::None"),
+ Triple::Ok(ok) => ok,
+ Triple::Err(err) => panic!("unwrapping Triple::Err({err})"),
+ }
+ }
+}
diff --git a/vis.rs b/vis.rs
index da1ad17..a01af20 100644
--- a/vis.rs
+++ b/vis.rs
@@ -0,0 +1,233 @@
+use std::borrow::Borrow;
+use std::fmt;
+
+#[allow(unused_imports)]
+use erg_common::log;
+use erg_common::set::Set;
+use erg_common::{switch_lang, Str};
+
+use erg_parser::ast::AccessModifier;
+
+use crate::context::Context;
+use crate::ty::Type;
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum VisibilityModifier {
+ Public,
+ Private,
+ Restricted(Set<Str>),
+ SubtypeRestricted(Type),
+}
+
+impl fmt::Display for VisibilityModifier {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ match self {
+ Self::Private => write!(f, "::"),
+ Self::Public => write!(f, "."),
+ Self::Restricted(namespaces) => write!(f, "::[{namespaces}]"),
+ Self::SubtypeRestricted(typ) => write!(f, "::[<: {typ}]"),
+ }
+ }
+}
+
+impl VisibilityModifier {
+ pub const fn is_public(&self) -> bool {
+ matches!(self, Self::Public)
+ }
+ pub const fn is_private(&self) -> bool {
+ matches!(self, Self::Private)
+ }
+
+ pub const fn display_as_accessor(&self) -> &'static str {
+ match self {
+ Self::Public => ".",
+ Self::Private | Self::Restricted(_) | Self::SubtypeRestricted(_) => "::",
+ }
+ }
+
+ pub fn display(&self) -> String {
+ match self {
+ Self::Private => switch_lang!(
+ "japanese" => "非公開",
+ "simplified_chinese" => "私有",
+ "traditional_chinese" => "私有",
+ "english" => "private",
+ )
+ .into(),
+ Self::Public => switch_lang!(
+ "japanese" => "公開",
+ "simplified_chinese" => "公开",
+ "traditional_chinese" => "公開",
+ "english" => "public",
+ )
+ .into(),
+ Self::Restricted(namespaces) => switch_lang!(
+ "japanese" => format!("制限付き公開({namespaces}でのみ公開)"),
+ "simplified_chinese" => format!("受限公开({namespaces}中可见)"),
+ "traditional_chinese" => format!("受限公開({namespaces}中可見)"),
+ "english" => format!("restricted public ({namespaces} only)"),
+ ),
+ Self::SubtypeRestricted(typ) => switch_lang!(
+ "japanese" => format!("制限付き公開({typ}の部分型でのみ公開)"),
+ "simplified_chinese" => format!("受限公开({typ}的子类型中可见)"),
+ "traditional_chinese" => format!("受限公開({typ}的子類型中可見)"),
+ "english" => format!("restricted public (subtypes of {typ} only)"),
+ ),
+ }
+ }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Visibility {
+ pub modifier: VisibilityModifier,
+ pub def_namespace: Str,
+}
+
+impl Visibility {
+ pub const DUMMY_PRIVATE: Self = Self {
+ modifier: VisibilityModifier::Private,
+ def_namespace: Str::ever("<dummy>"),
+ };
+ pub const DUMMY_PUBLIC: Self = Self {
+ modifier: VisibilityModifier::Public,
+ def_namespace: Str::ever("<dummy>"),
+ };
+ pub const BUILTIN_PRIVATE: Self = Self {
+ modifier: VisibilityModifier::Private,
+ def_namespace: Str::ever("<builtins>"),
+ };
+ pub const BUILTIN_PUBLIC: Self = Self {
+ modifier: VisibilityModifier::Public,
+ def_namespace: Str::ever("<builtins>"),
+ };
+
+ pub const fn new(modifier: VisibilityModifier, def_namespace: Str) -> Self {
+ Self {
+ modifier,
+ def_namespace,
+ }
+ }
+
+ pub fn private<S: Into<Str>>(namespace: S) -> Self {
+ Self {
+ modifier: VisibilityModifier::Private,
+ def_namespace: namespace.into(),
+ }
+ }
+
+ pub const fn is_public(&self) -> bool {
+ self.modifier.is_public()
+ }
+ pub const fn is_private(&self) -> bool {
+ self.modifier.is_private()
+ }
+
+ pub fn compatible(&self, access: &AccessModifier, namespace: &Context) -> bool {
+ match (&self.modifier, access) {
+ (_, AccessModifier::Force) => true,
+ (VisibilityModifier::Public, AccessModifier::Auto | AccessModifier::Public) => true,
+ // compatible example:
+ // def_namespace: <module>::C
+ // namespace: <module>::C::f
+ (VisibilityModifier::Private, AccessModifier::Auto | AccessModifier::Private) => {
+ &self.def_namespace[..] == "<builtins>"
+ || namespace.name.starts_with(&self.def_namespace[..])
+ }
+ (
+ VisibilityModifier::Restricted(namespaces),
+ AccessModifier::Auto | AccessModifier::Private,
+ ) => {
+ namespace.name.starts_with(&self.def_namespace[..])
+ || namespaces.contains(&namespace.name)
+ }
+ (
+ VisibilityModifier::SubtypeRestricted(typ),
+ AccessModifier::Auto | AccessModifier::Private,
+ ) => {
+ namespace.name.starts_with(&self.def_namespace[..]) || {
+ let Some(space_t) = namespace.rec_get_self_t() else {
+ return false;
+ };
+ namespace.subtype_of(&space_t, typ)
+ }
+ }
+ _ => false,
+ }
+ }
+}
+
+/// same structure as `Identifier`, but only for Record fields.
+#[derive(Debug, Clone, Eq)]
+pub struct Field {
+ pub vis: VisibilityModifier,
+ pub symbol: Str,
+}
+
+impl PartialEq for Field {
+ fn eq(&self, other: &Self) -> bool {
+ self.symbol == other.symbol
+ }
+}
+
+impl std::hash::Hash for Field {
+ fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+ self.symbol.hash(state);
+ }
+}
+
+impl fmt::Display for Field {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ write!(f, "{}{}", self.vis, self.symbol)
+ }
+}
+
+impl Borrow<str> for Field {
+ #[inline]
+ fn borrow(&self) -> &str {
+ &self.symbol[..]
+ }
+}
+
+impl Borrow<Str> for Field {
+ #[inline]
+ fn borrow(&self) -> &Str {
+ &self.symbol
+ }
+}
+
+impl Field {
+ pub const fn new(vis: VisibilityModifier, symbol: Str) -> Self {
+ Field { vis, symbol }
+ }
+
+ pub fn private(symbol: Str) -> Self {
+ Field::new(VisibilityModifier::Private, symbol)
+ }
+
+ pub fn public(symbol: Str) -> Self {
+ Field::new(VisibilityModifier::Public, symbol)
+ }
+
+ pub fn is_const(&self) -> bool {
+ self.symbol.starts_with(char::is_uppercase)
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use erg_common::dict;
+
+ #[test]
+ fn test_std_key() {
+ let dict = dict! {Str::ever("a") => 1, Str::rc("b") => 2};
+ assert_eq!(dict.get("a"), Some(&1));
+ assert_eq!(dict.get("b"), Some(&2));
+ assert_eq!(dict.get(&Str::ever("b")), Some(&2));
+ assert_eq!(dict.get(&Str::rc("b")), Some(&2));
+
+ let dict = dict! {Field::private(Str::ever("a")) => 1, Field::public(Str::ever("b")) => 2};
+ assert_eq!(dict.get("a"), Some(&1));
+ assert_eq!(dict.get("b"), Some(&2));
+ }
+}
diff --git a/codegen.rs b/codegen.rs
index 36e8530..f42751f 100644
--- a/codegen.rs
+++ b/codegen.rs
@@ -17,11 +17,11 @@ use erg_common::opcode311::{BinOpCode, Opcode311};
use erg_common::option_enum_unwrap;
use erg_common::python_util::{env_python_version, PythonVersion};
use erg_common::traits::{Locational, Stream};
-use erg_common::vis::Visibility;
use erg_common::Str;
use erg_common::{
debug_power_assert, enum_unwrap, fn_name, fn_name_full, impl_stream, log, switch_unreachable,
};
+use erg_parser::ast::VisModifierSpec;
use erg_parser::ast::{DefId, DefKind};
use CommonOpcode::*;
@@ -38,7 +38,7 @@ use crate::hir::{
SubrSignature, Tuple, UnaryOp, VarSignature, HIR,
};
use crate::ty::value::ValueObj;
-use crate::ty::{HasType, Type, TypeCode, TypePair};
+use crate::ty::{HasType, Type, TypeCode, TypePair, VisibilityModifier};
use crate::varinfo::VarInfo;
use erg_common::fresh::fresh_varname;
use AccessKind::*;
@@ -70,7 +70,7 @@ fn debind(ident: &Identifier) -> Option<Str> {
}
}
-fn escape_name(name: &str, vis: Visibility) -> Str {
+fn escape_name(name: &str, vis: &VisibilityModifier) -> Str {
let name = name.replace('!', "__erg_proc__");
let name = name.replace('$', "__erg_shared__");
if vis.is_private() {
@@ -908,7 +908,7 @@ impl PyCodeGenerator {
if s == "_" {
format!("_{i}")
} else {
- escape_name(s, Visibility::Private).to_string()
+ escape_name(s, &VisibilityModifier::Private).to_string()
}
})
.map(|s| self.get_cached(&s))
@@ -930,11 +930,11 @@ impl PyCodeGenerator {
// Since Erg does not allow the coexistence of private and public variables with the same name, there is no problem in this trick.
let is_record = a.obj.ref_t().is_record();
if is_record {
- a.ident.dot = Some(DOT);
+ a.ident.raw.vis = VisModifierSpec::Public(DOT);
}
if let Some(varname) = debind(&a.ident) {
- a.ident.dot = None;
- a.ident.name = VarName::from_str(varname);
+ a.ident.raw.vis = VisModifierSpec::Private;
+ a.ident.raw.name = VarName::from_str(varname);
self.emit_load_name_instr(a.ident);
} else {
self.emit_expr(*a.obj);
@@ -1153,9 +1153,9 @@ impl PyCodeGenerator {
self.emit_load_const(code);
if self.py_version.minor < Some(11) {
if let Some(class) = class_name {
- self.emit_load_const(Str::from(format!("{class}.{}", ident.name.inspect())));
+ self.emit_load_const(Str::from(format!("{class}.{}", ident.inspect())));
} else {
- self.emit_load_const(ident.name.inspect().clone());
+ self.emit_load_const(ident.inspect().clone());
}
} else {
self.stack_inc();
@@ -1213,8 +1213,8 @@ impl PyCodeGenerator {
patch_def.sig.ident().to_string_notype(),
def.sig.ident().to_string_notype()
);
- def.sig.ident_mut().name = VarName::from_str(Str::from(name));
- def.sig.ident_mut().dot = None;
+ def.sig.ident_mut().raw.name = VarName::from_str(Str::from(name));
+ def.sig.ident_mut().raw.vis = VisModifierSpec::Private;
self.emit_def(def);
}
}
@@ -1925,7 +1925,8 @@ impl PyCodeGenerator {
}
match param.raw.pat {
ParamPattern::VarName(name) => {
- let ident = Identifier::bare(None, name);
+ let ident = erg_parser::ast::Identifier::private_from_varname(name);
+ let ident = Identifier::bare(ident);
self.emit_store_instr(ident, AccessKind::Name);
}
ParamPattern::Discard(_) => {
@@ -2190,7 +2191,7 @@ impl PyCodeGenerator {
let kw = if is_py_api {
arg.keyword.content
} else {
- escape_name(&arg.keyword.content, Visibility::Private)
+ escape_name(&arg.keyword.content, &VisibilityModifier::Private)
};
kws.push(ValueObj::Str(kw));
self.emit_expr(arg.expr);
@@ -2301,7 +2302,7 @@ impl PyCodeGenerator {
mut args: Args,
) {
log!(info "entered {}", fn_name!());
- method_name.dot = None;
+ method_name.raw.vis = VisModifierSpec::Private;
method_name.vi.py_name = Some(func_name);
self.emit_push_null();
self.emit_load_name_instr(method_name);
@@ -2785,6 +2786,7 @@ impl PyCodeGenerator {
let vi = VarInfo::nd_parameter(
__new__.return_t().unwrap().clone(),
ident.vi.def_loc.clone(),
+ "?".into(),
);
let raw =
erg_parser::ast::NonDefaultParamSignature::new(ParamPattern::VarName(self_param), None);
@@ -2797,7 +2799,11 @@ impl PyCodeGenerator {
let param = VarName::from_str_and_line(Str::from(param_name.clone()), line);
let raw =
erg_parser::ast::NonDefaultParamSignature::new(ParamPattern::VarName(param), None);
- let vi = VarInfo::nd_parameter(new_first_param.typ().clone(), ident.vi.def_loc.clone());
+ let vi = VarInfo::nd_parameter(
+ new_first_param.typ().clone(),
+ ident.vi.def_loc.clone(),
+ "?".into(),
+ );
let param = NonDefaultParamSignature::new(raw, vi, None);
let params = Params::new(vec![self_param, param], None, vec![], None);
(param_name, params)
@@ -2818,20 +2824,19 @@ impl PyCodeGenerator {
for field in rec.keys() {
let obj =
Expr::Accessor(Accessor::private_with_line(Str::from(¶m_name), line));
- let expr = obj.attr_expr(Identifier::bare(
- Some(DOT),
- VarName::from_str(field.symbol.clone()),
- ));
+ let ident = erg_parser::ast::Identifier::public(field.symbol.clone());
+ let expr = obj.attr_expr(Identifier::bare(ident));
let obj = Expr::Accessor(Accessor::private_with_line(Str::ever("self"), line));
let dot = if field.vis.is_private() {
- None
+ VisModifierSpec::Private
} else {
- Some(DOT)
+ VisModifierSpec::Public(DOT)
};
- let attr = obj.attr(Identifier::bare(
+ let attr = erg_parser::ast::Identifier::new(
dot,
VarName::from_str(field.symbol.clone()),
- ));
+ );
+ let attr = obj.attr(Identifier::bare(attr));
let redef = ReDef::new(attr, Block::new(vec![expr]));
attrs.push(Expr::ReDef(redef));
}
@@ -2865,8 +2870,7 @@ impl PyCodeGenerator {
let line = sig.ln_begin().unwrap();
let mut ident = Identifier::public_with_line(DOT, Str::ever("new"), line);
let class = Expr::Accessor(Accessor::Ident(class_ident.clone()));
- let mut new_ident =
- Identifier::bare(None, VarName::from_str_and_line(Str::ever("__new__"), line));
+ let mut new_ident = Identifier::private_with_line(Str::ever("__new__"), line);
new_ident.vi.py_name = Some(Str::ever("__call__"));
let class_new = class.attr_expr(new_ident);
ident.vi.t = __new__;
@@ -2876,7 +2880,11 @@ impl PyCodeGenerator {
.map(|s| s.to_string())
.unwrap_or_else(fresh_varname);
let param = VarName::from_str_and_line(Str::from(param_name.clone()), line);
- let vi = VarInfo::nd_parameter(new_first_param.typ().clone(), ident.vi.def_loc.clone());
+ let vi = VarInfo::nd_parameter(
+ new_first_param.typ().clone(),
+ ident.vi.def_loc.clone(),
+ "?".into(),
+ );
let raw =
erg_parser::ast::NonDefaultParamSignature::new(ParamPattern::VarName(param), None);
let param = NonDefaultParamSignature::new(raw, vi, None);
diff --git a/compare.rs b/compare.rs
index 389e29b..b19931a 100644
--- a/compare.rs
+++ b/compare.rs
@@ -1,21 +1,20 @@
//! provides type-comparison
use std::option::Option; // conflicting to Type::Option
+use erg_common::dict::Dict;
use erg_common::error::MultiErrorDisplay;
use erg_common::style::colors::DEBUG_ERROR;
use erg_common::traits::StructuralEq;
+use erg_common::{assume_unreachable, log};
use crate::ty::constructors::{and, not, or, poly};
use crate::ty::free::{Constraint, FreeKind};
use crate::ty::typaram::{OpKind, TyParam, TyParamOrdering};
use crate::ty::value::ValueObj;
use crate::ty::value::ValueObj::Inf;
-use crate::ty::{Predicate, RefinementType, SubrKind, SubrType, Type};
+use crate::ty::{Field, Predicate, RefinementType, SubrKind, SubrType, Type};
use Predicate as Pred;
-use erg_common::dict::Dict;
-use erg_common::vis::Field;
-use erg_common::{assume_unreachable, log};
use TyParamOrdering::*;
use Type::*;
@@ -705,7 +704,12 @@ impl Context {
.unwrap_or_else(|| panic!("{other} is not found"));
ctx.type_dir()
.into_iter()
- .map(|(name, vi)| (Field::new(vi.vis, name.inspect().clone()), vi.t.clone()))
+ .map(|(name, vi)| {
+ (
+ Field::new(vi.vis.modifier.clone(), name.inspect().clone()),
+ vi.t.clone(),
+ )
+ })
.collect()
}
}
diff --git a/eval.rs b/eval.rs
index 2bd10b6..8e82c77 100644
--- a/eval.rs
+++ b/eval.rs
@@ -7,7 +7,6 @@ use erg_common::log;
use erg_common::set::Set;
use erg_common::shared::Shared;
use erg_common::traits::{Locational, Stream};
-use erg_common::vis::Field;
use erg_common::{dict, fn_name, option_enum_unwrap, set};
use erg_common::{enum_unwrap, fmt_vec};
use erg_common::{RcArray, Str};
@@ -27,7 +26,7 @@ use crate::ty::typaram::{OpKind, TyParam};
use crate::ty::value::{GenTypeObj, TypeObj, ValueObj};
use crate::ty::{ConstSubr, HasType, Predicate, SubrKind, Type, UserConstSubr, ValueArgs};
-use crate::context::instantiate::ParamKind;
+use crate::context::instantiate_spec::ParamKind;
use crate::context::{ClassDefType, Context, ContextKind, RegistrationMode};
use crate::error::{EvalError, EvalErrors, EvalResult, SingleEvalResult};
@@ -166,7 +165,10 @@ impl Context {
}
fn eval_attr(&self, obj: ValueObj, ident: &Identifier) -> SingleEvalResult<ValueObj> {
- if let Some(val) = obj.try_get_attr(&Field::from(ident)) {
+ let field = self
+ .instantiate_field(ident)
+ .map_err(|mut errs| errs.remove(0))?;
+ if let Some(val) = obj.try_get_attr(&field) {
return Ok(val);
}
if let ValueObj::Type(t) = &obj {
@@ -301,7 +303,7 @@ impl Context {
fn eval_const_def(&mut self, def: &Def) -> EvalResult<ValueObj> {
if def.is_const() {
let __name__ = def.sig.ident().unwrap().inspect();
- let vis = def.sig.vis();
+ let vis = self.instantiate_vis_modifier(def.sig.vis())?;
let tv_cache = match &def.sig {
Signature::Subr(subr) => {
let ty_cache =
@@ -430,7 +432,7 @@ impl Context {
let elem = record_ctx.eval_const_block(&attr.body.block)?;
let ident = match &attr.sig {
Signature::Var(var) => match &var.pat {
- VarPattern::Ident(ident) => Field::new(ident.vis(), ident.inspect().clone()),
+ VarPattern::Ident(ident) => self.instantiate_field(ident)?,
other => {
return feature_error!(self, other.loc(), &format!("record field: {other}"))
}
diff --git a/classes.rs b/classes.rs
index ebe6b8b..55fb3c7 100644
--- a/classes.rs
+++ b/classes.rs
@@ -1,12 +1,11 @@
#[allow(unused_imports)]
use erg_common::log;
-use erg_common::vis::Visibility;
use erg_common::Str as StrStruct;
use crate::ty::constructors::*;
use crate::ty::typaram::TyParam;
use crate::ty::value::ValueObj;
-use crate::ty::Type;
+use crate::ty::{Type, Visibility};
use ParamSpec as PS;
use Type::*;
@@ -14,14 +13,13 @@ use crate::context::initialize::*;
use crate::context::{Context, ParamSpec};
use crate::varinfo::Mutability;
use Mutability::*;
-use Visibility::*;
impl Context {
pub(super) fn init_builtin_classes(&mut self) {
let vis = if cfg!(feature = "py_compatible") {
- Public
+ Visibility::BUILTIN_PUBLIC
} else {
- Private
+ Visibility::BUILTIN_PRIVATE
};
let T = mono_q(TY_T, instanceof(Type));
let U = mono_q(TY_U, instanceof(Type));
@@ -62,12 +60,17 @@ impl Context {
);
obj.register_py_builtin(FUNDAMENTAL_STR, fn0_met(Obj, Str), Some(FUNDAMENTAL_STR), 9);
let mut obj_in = Self::builtin_methods(Some(poly(IN, vec![ty_tp(Type)])), 2);
- obj_in.register_builtin_erg_impl(OP_IN, fn1_met(Obj, Type, Bool), Const, Public);
+ obj_in.register_builtin_erg_impl(
+ OP_IN,
+ fn1_met(Obj, Type, Bool),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
obj.register_trait(Obj, obj_in);
let mut obj_mutizable = Self::builtin_methods(Some(mono(MUTIZABLE)), 1);
obj_mutizable.register_builtin_const(
MUTABLE_MUT_TYPE,
- Public,
+ Visibility::BUILTIN_PUBLIC,
ValueObj::builtin_t(mono(MUTABLE_OBJ)),
);
obj.register_trait(Obj, obj_mutizable);
@@ -77,9 +80,25 @@ impl Context {
let mut float = Self::builtin_mono_class(FLOAT, 2);
float.register_superclass(Obj, &obj);
// TODO: support multi platform
- float.register_builtin_const(EPSILON, Public, ValueObj::Float(2.220446049250313e-16));
- float.register_builtin_py_impl(REAL, Float, Const, Public, Some(FUNC_REAL));
- float.register_builtin_py_impl(IMAG, Float, Const, Public, Some(FUNC_IMAG));
+ float.register_builtin_const(
+ EPSILON,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::Float(2.220446049250313e-16),
+ );
+ float.register_builtin_py_impl(
+ REAL,
+ Float,
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_REAL),
+ );
+ float.register_builtin_py_impl(
+ IMAG,
+ Float,
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_IMAG),
+ );
float.register_py_builtin(
FUNC_AS_INTEGER_RATIO,
fn0_met(Float, tuple_t(vec![Int, Int])),
@@ -112,58 +131,139 @@ impl Context {
OP_CMP,
fn1_met(Float, Float, mono(ORDERING)),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
float.register_trait(Float, float_ord);
// Float doesn't have an `Eq` implementation
let op_t = fn1_met(Float, Float, Float);
let mut float_add = Self::builtin_methods(Some(poly(ADD, vec![ty_tp(Float)])), 2);
- float_add.register_builtin_erg_impl(OP_ADD, op_t.clone(), Const, Public);
- float_add.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Float));
+ float_add.register_builtin_erg_impl(
+ OP_ADD,
+ op_t.clone(),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ float_add.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Float),
+ );
float.register_trait(Float, float_add);
let mut float_sub = Self::builtin_methods(Some(poly(SUB, vec![ty_tp(Float)])), 2);
- float_sub.register_builtin_erg_impl(OP_SUB, op_t.clone(), Const, Public);
- float_sub.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Float));
+ float_sub.register_builtin_erg_impl(
+ OP_SUB,
+ op_t.clone(),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ float_sub.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Float),
+ );
float.register_trait(Float, float_sub);
let mut float_mul = Self::builtin_methods(Some(poly(MUL, vec![ty_tp(Float)])), 2);
- float_mul.register_builtin_erg_impl(OP_MUL, op_t.clone(), Const, Public);
- float_mul.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Float));
- float_mul.register_builtin_const(POW_OUTPUT, Public, ValueObj::builtin_t(Float));
+ float_mul.register_builtin_erg_impl(
+ OP_MUL,
+ op_t.clone(),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ float_mul.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Float),
+ );
+ float_mul.register_builtin_const(
+ POW_OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Float),
+ );
float.register_trait(Float, float_mul);
let mut float_div = Self::builtin_methods(Some(poly(DIV, vec![ty_tp(Float)])), 2);
- float_div.register_builtin_erg_impl(OP_DIV, op_t.clone(), Const, Public);
- float_div.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Float));
- float_div.register_builtin_const(MOD_OUTPUT, Public, ValueObj::builtin_t(Float));
+ float_div.register_builtin_erg_impl(
+ OP_DIV,
+ op_t.clone(),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ float_div.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Float),
+ );
+ float_div.register_builtin_const(
+ MOD_OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Float),
+ );
float.register_trait(Float, float_div);
let mut float_floordiv =
Self::builtin_methods(Some(poly(FLOOR_DIV, vec![ty_tp(Float)])), 2);
- float_floordiv.register_builtin_erg_impl(OP_FLOOR_DIV, op_t, Const, Public);
- float_floordiv.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Float));
+ float_floordiv.register_builtin_erg_impl(
+ OP_FLOOR_DIV,
+ op_t,
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ float_floordiv.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Float),
+ );
float.register_trait(Float, float_floordiv);
let mut float_pos = Self::builtin_methods(Some(mono(POS)), 1);
- float_pos.register_builtin_erg_impl(OP_POS, fn0_met(Float, Float), Const, Public);
+ float_pos.register_builtin_erg_impl(
+ OP_POS,
+ fn0_met(Float, Float),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
float.register_trait(Float, float_pos);
let mut float_neg = Self::builtin_methods(Some(mono(NEG)), 1);
- float_neg.register_builtin_erg_impl(OP_NEG, fn0_met(Float, Float), Const, Public);
+ float_neg.register_builtin_erg_impl(
+ OP_NEG,
+ fn0_met(Float, Float),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
float.register_trait(Float, float_neg);
let mut float_mutizable = Self::builtin_methods(Some(mono(MUTIZABLE)), 2);
float_mutizable.register_builtin_const(
MUTABLE_MUT_TYPE,
- Public,
+ Visibility::BUILTIN_PUBLIC,
ValueObj::builtin_t(mono(MUT_FLOAT)),
);
float.register_trait(Float, float_mutizable);
let mut float_show = Self::builtin_methods(Some(mono(SHOW)), 1);
let t = fn0_met(Float, Str);
- float_show.register_builtin_py_impl(TO_STR, t, Immutable, Public, Some(FUNDAMENTAL_STR));
+ float_show.register_builtin_py_impl(
+ TO_STR,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNDAMENTAL_STR),
+ );
float.register_trait(Float, float_show);
/* Ratio */
// TODO: Int, Nat, Boolの継承元をRatioにする(今はFloat)
let mut ratio = Self::builtin_mono_class(RATIO, 2);
ratio.register_superclass(Obj, &obj);
- ratio.register_builtin_py_impl(REAL, Ratio, Const, Public, Some(FUNC_REAL));
- ratio.register_builtin_py_impl(IMAG, Ratio, Const, Public, Some(FUNC_IMAG));
+ ratio.register_builtin_py_impl(
+ REAL,
+ Ratio,
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_REAL),
+ );
+ ratio.register_builtin_py_impl(
+ IMAG,
+ Ratio,
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_IMAG),
+ );
ratio.register_marker_trait(mono(NUM));
ratio.register_marker_trait(mono(ORD));
let mut ratio_ord = Self::builtin_methods(Some(mono(ORD)), 2);
@@ -171,46 +271,104 @@ impl Context {
OP_CMP,
fn1_met(Ratio, Ratio, mono(ORDERING)),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
ratio.register_trait(Ratio, ratio_ord);
let mut ratio_eq = Self::builtin_methods(Some(mono(EQ)), 2);
- ratio_eq.register_builtin_erg_impl(OP_EQ, fn1_met(Ratio, Ratio, Bool), Const, Public);
+ ratio_eq.register_builtin_erg_impl(
+ OP_EQ,
+ fn1_met(Ratio, Ratio, Bool),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
ratio.register_trait(Ratio, ratio_eq);
let op_t = fn1_met(Ratio, Ratio, Ratio);
let mut ratio_add = Self::builtin_methods(Some(poly(ADD, vec![ty_tp(Ratio)])), 2);
- ratio_add.register_builtin_erg_impl(OP_ADD, op_t.clone(), Const, Public);
- ratio_add.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Ratio));
+ ratio_add.register_builtin_erg_impl(
+ OP_ADD,
+ op_t.clone(),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ ratio_add.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Ratio),
+ );
ratio.register_trait(Ratio, ratio_add);
let mut ratio_sub = Self::builtin_methods(Some(poly(SUB, vec![ty_tp(Ratio)])), 2);
- ratio_sub.register_builtin_erg_impl(OP_SUB, op_t.clone(), Const, Public);
- ratio_sub.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Ratio));
+ ratio_sub.register_builtin_erg_impl(
+ OP_SUB,
+ op_t.clone(),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ ratio_sub.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Ratio),
+ );
ratio.register_trait(Ratio, ratio_sub);
let mut ratio_mul = Self::builtin_methods(Some(poly(MUL, vec![ty_tp(Ratio)])), 2);
- ratio_mul.register_builtin_erg_impl(OP_MUL, op_t.clone(), Const, Public);
- ratio_mul.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Ratio));
- ratio_mul.register_builtin_const(POW_OUTPUT, Public, ValueObj::builtin_t(Ratio));
+ ratio_mul.register_builtin_erg_impl(
+ OP_MUL,
+ op_t.clone(),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ ratio_mul.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Ratio),
+ );
+ ratio_mul.register_builtin_const(
+ POW_OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Ratio),
+ );
ratio.register_trait(Ratio, ratio_mul);
let mut ratio_div = Self::builtin_methods(Some(poly(DIV, vec![ty_tp(Ratio)])), 2);
- ratio_div.register_builtin_erg_impl(OP_DIV, op_t.clone(), Const, Public);
- ratio_div.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Ratio));
- ratio_div.register_builtin_const(MOD_OUTPUT, Public, ValueObj::builtin_t(Ratio));
+ ratio_div.register_builtin_erg_impl(
+ OP_DIV,
+ op_t.clone(),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ ratio_div.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Ratio),
+ );
+ ratio_div.register_builtin_const(
+ MOD_OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Ratio),
+ );
ratio.register_trait(Ratio, ratio_div);
let mut ratio_floordiv =
Self::builtin_methods(Some(poly(FLOOR_DIV, vec![ty_tp(Ratio)])), 2);
- ratio_floordiv.register_builtin_erg_impl(OP_FLOOR_DIV, op_t, Const, Public);
- ratio_floordiv.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Ratio));
+ ratio_floordiv.register_builtin_erg_impl(
+ OP_FLOOR_DIV,
+ op_t,
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ ratio_floordiv.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Ratio),
+ );
ratio.register_trait(Ratio, ratio_floordiv);
let mut ratio_mutizable = Self::builtin_methods(Some(mono(MUTIZABLE)), 2);
ratio_mutizable.register_builtin_const(
MUTABLE_MUT_TYPE,
- Public,
+ Visibility::BUILTIN_PUBLIC,
ValueObj::builtin_t(mono(MUT_RATIO)),
);
ratio.register_trait(Ratio, ratio_mutizable);
let mut ratio_show = Self::builtin_methods(Some(mono(SHOW)), 1);
let t = fn0_met(Ratio, Str);
- ratio_show.register_builtin_erg_impl(TO_STR, t, Immutable, Public);
+ ratio_show.register_builtin_erg_impl(TO_STR, t, Immutable, Visibility::BUILTIN_PUBLIC);
ratio.register_trait(Ratio, ratio_show);
/* Int */
@@ -267,50 +425,108 @@ impl Context {
OP_PARTIAL_CMP,
fn1_met(Int, Int, or(mono(ORDERING), NoneType)),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
int.register_trait(Int, int_ord);
let mut int_eq = Self::builtin_methods(Some(mono(EQ)), 2);
- int_eq.register_builtin_erg_impl(OP_EQ, fn1_met(Int, Int, Bool), Const, Public);
+ int_eq.register_builtin_erg_impl(
+ OP_EQ,
+ fn1_met(Int, Int, Bool),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
int.register_trait(Int, int_eq);
// __div__ is not included in Int (cast to Ratio)
let op_t = fn1_met(Int, Int, Int);
let mut int_add = Self::builtin_methods(Some(poly(ADD, vec![ty_tp(Int)])), 2);
- int_add.register_builtin_erg_impl(OP_ADD, op_t.clone(), Const, Public);
- int_add.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Int));
+ int_add.register_builtin_erg_impl(OP_ADD, op_t.clone(), Const, Visibility::BUILTIN_PUBLIC);
+ int_add.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Int),
+ );
int.register_trait(Int, int_add);
let mut int_sub = Self::builtin_methods(Some(poly(SUB, vec![ty_tp(Int)])), 2);
- int_sub.register_builtin_erg_impl(OP_SUB, op_t.clone(), Const, Public);
- int_sub.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Int));
+ int_sub.register_builtin_erg_impl(OP_SUB, op_t.clone(), Const, Visibility::BUILTIN_PUBLIC);
+ int_sub.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Int),
+ );
int.register_trait(Int, int_sub);
let mut int_mul = Self::builtin_methods(Some(poly(MUL, vec![ty_tp(Int)])), 2);
- int_mul.register_builtin_erg_impl(OP_MUL, op_t.clone(), Const, Public);
- int_mul.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Int));
- int_mul.register_builtin_const(POW_OUTPUT, Public, ValueObj::builtin_t(Nat));
+ int_mul.register_builtin_erg_impl(OP_MUL, op_t.clone(), Const, Visibility::BUILTIN_PUBLIC);
+ int_mul.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Int),
+ );
+ int_mul.register_builtin_const(
+ POW_OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Nat),
+ );
int.register_trait(Int, int_mul);
let mut int_floordiv = Self::builtin_methods(Some(poly(FLOOR_DIV, vec![ty_tp(Int)])), 2);
- int_floordiv.register_builtin_erg_impl(OP_FLOOR_DIV, op_t, Const, Public);
- int_floordiv.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Int));
+ int_floordiv.register_builtin_erg_impl(
+ OP_FLOOR_DIV,
+ op_t,
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ int_floordiv.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Int),
+ );
int.register_trait(Int, int_floordiv);
let mut int_pos = Self::builtin_methods(Some(mono(POS)), 2);
- int_pos.register_builtin_erg_impl(OP_POS, fn0_met(Int, Int), Const, Public);
+ int_pos.register_builtin_erg_impl(
+ OP_POS,
+ fn0_met(Int, Int),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
int.register_trait(Int, int_pos);
let mut int_neg = Self::builtin_methods(Some(mono(NEG)), 2);
- int_neg.register_builtin_erg_impl(OP_NEG, fn0_met(Int, Int), Const, Public);
+ int_neg.register_builtin_erg_impl(
+ OP_NEG,
+ fn0_met(Int, Int),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
int.register_trait(Int, int_neg);
let mut int_mutizable = Self::builtin_methods(Some(mono(MUTIZABLE)), 2);
int_mutizable.register_builtin_const(
MUTABLE_MUT_TYPE,
- Public,
+ Visibility::BUILTIN_PUBLIC,
ValueObj::builtin_t(mono(MUT_INT)),
);
int.register_trait(Int, int_mutizable);
let mut int_show = Self::builtin_methods(Some(mono(SHOW)), 1);
let t = fn0_met(Int, Str);
- int_show.register_builtin_py_impl(TO_STR, t, Immutable, Public, Some(FUNDAMENTAL_STR));
+ int_show.register_builtin_py_impl(
+ TO_STR,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNDAMENTAL_STR),
+ );
int.register_trait(Int, int_show);
- int.register_builtin_py_impl(REAL, Int, Const, Public, Some(FUNC_REAL));
- int.register_builtin_py_impl(IMAG, Int, Const, Public, Some(FUNC_IMAG));
+ int.register_builtin_py_impl(
+ REAL,
+ Int,
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_REAL),
+ );
+ int.register_builtin_py_impl(
+ IMAG,
+ Int,
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_IMAG),
+ );
/* Nat */
let mut nat = Self::builtin_mono_class(NAT, 10);
@@ -331,63 +547,110 @@ impl Context {
);
nat.register_marker_trait(mono(NUM));
let mut nat_eq = Self::builtin_methods(Some(mono(EQ)), 2);
- nat_eq.register_builtin_erg_impl(OP_EQ, fn1_met(Nat, Nat, Bool), Const, Public);
+ nat_eq.register_builtin_erg_impl(
+ OP_EQ,
+ fn1_met(Nat, Nat, Bool),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
nat.register_trait(Nat, nat_eq);
let mut nat_ord = Self::builtin_methods(Some(mono(ORD)), 2);
- nat_ord.register_builtin_erg_impl(OP_CMP, fn1_met(Nat, Nat, mono(ORDERING)), Const, Public);
+ nat_ord.register_builtin_erg_impl(
+ OP_CMP,
+ fn1_met(Nat, Nat, mono(ORDERING)),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
nat.register_trait(Nat, nat_ord);
// __sub__, __div__ is not included in Nat (cast to Int/ Ratio)
let op_t = fn1_met(Nat, Nat, Nat);
let mut nat_add = Self::builtin_methods(Some(poly(ADD, vec![ty_tp(Nat)])), 2);
- nat_add.register_builtin_erg_impl(OP_ADD, op_t.clone(), Const, Public);
- nat_add.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Nat));
+ nat_add.register_builtin_erg_impl(OP_ADD, op_t.clone(), Const, Visibility::BUILTIN_PUBLIC);
+ nat_add.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Nat),
+ );
nat.register_trait(Nat, nat_add);
let mut nat_mul = Self::builtin_methods(Some(poly(MUL, vec![ty_tp(Nat)])), 2);
- nat_mul.register_builtin_erg_impl(OP_MUL, op_t.clone(), Const, Public);
- nat_mul.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Nat));
+ nat_mul.register_builtin_erg_impl(OP_MUL, op_t.clone(), Const, Visibility::BUILTIN_PUBLIC);
+ nat_mul.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Nat),
+ );
nat.register_trait(Nat, nat_mul);
let mut nat_floordiv = Self::builtin_methods(Some(poly(FLOOR_DIV, vec![ty_tp(Nat)])), 2);
- nat_floordiv.register_builtin_erg_impl(OP_FLOOR_DIV, op_t, Const, Public);
- nat_floordiv.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Nat));
+ nat_floordiv.register_builtin_erg_impl(
+ OP_FLOOR_DIV,
+ op_t,
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ nat_floordiv.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Nat),
+ );
nat.register_trait(Nat, nat_floordiv);
let mut nat_mutizable = Self::builtin_methods(Some(mono(MUTIZABLE)), 2);
nat_mutizable.register_builtin_const(
MUTABLE_MUT_TYPE,
- Public,
+ Visibility::BUILTIN_PUBLIC,
ValueObj::builtin_t(mono(MUT_NAT)),
);
nat.register_trait(Nat, nat_mutizable);
- nat.register_builtin_erg_impl(REAL, Nat, Const, Public);
- nat.register_builtin_erg_impl(IMAG, Nat, Const, Public);
+ nat.register_builtin_erg_impl(REAL, Nat, Const, Visibility::BUILTIN_PUBLIC);
+ nat.register_builtin_erg_impl(IMAG, Nat, Const, Visibility::BUILTIN_PUBLIC);
/* Bool */
let mut bool_ = Self::builtin_mono_class(BOOL, 10);
bool_.register_superclass(Nat, &nat);
// class("Rational"),
// class("Integral"),
- bool_.register_builtin_erg_impl(OP_AND, fn1_met(Bool, Bool, Bool), Const, Public);
- bool_.register_builtin_erg_impl(OP_OR, fn1_met(Bool, Bool, Bool), Const, Public);
+ bool_.register_builtin_erg_impl(
+ OP_AND,
+ fn1_met(Bool, Bool, Bool),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ bool_.register_builtin_erg_impl(
+ OP_OR,
+ fn1_met(Bool, Bool, Bool),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
bool_.register_marker_trait(mono(NUM));
let mut bool_ord = Self::builtin_methods(Some(mono(ORD)), 2);
bool_ord.register_builtin_erg_impl(
OP_CMP,
fn1_met(Bool, Bool, mono(ORDERING)),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
bool_.register_trait(Bool, bool_ord);
let mut bool_eq = Self::builtin_methods(Some(mono(EQ)), 2);
- bool_eq.register_builtin_erg_impl(OP_EQ, fn1_met(Bool, Bool, Bool), Const, Public);
+ bool_eq.register_builtin_erg_impl(
+ OP_EQ,
+ fn1_met(Bool, Bool, Bool),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
bool_.register_trait(Bool, bool_eq);
let mut bool_mutizable = Self::builtin_methods(Some(mono(MUTIZABLE)), 2);
bool_mutizable.register_builtin_const(
MUTABLE_MUT_TYPE,
- Public,
+ Visibility::BUILTIN_PUBLIC,
ValueObj::builtin_t(mono(MUT_BOOL)),
);
bool_.register_trait(Bool, bool_mutizable);
let mut bool_show = Self::builtin_methods(Some(mono(SHOW)), 1);
- bool_show.register_builtin_erg_impl(TO_STR, fn0_met(Bool, Str), Immutable, Public);
+ bool_show.register_builtin_erg_impl(
+ TO_STR,
+ fn0_met(Bool, Str),
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
bool_.register_trait(Bool, bool_show);
let t = fn0_met(Bool, Bool);
bool_.register_py_builtin(FUNC_INVERT, t, Some(FUNC_INVERT), 9);
@@ -406,7 +669,7 @@ impl Context {
Str,
),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
str_.register_builtin_erg_impl(
FUNC_ENCODE,
@@ -418,44 +681,44 @@ impl Context {
mono(BYTES),
),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
str_.register_builtin_erg_impl(
FUNC_FORMAT,
fn_met(Str, vec![], Some(kw(KW_ARGS, Obj)), vec![], Str),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
str_.register_builtin_erg_impl(
FUNC_LOWER,
fn_met(Str, vec![], None, vec![], Str),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
str_.register_builtin_erg_impl(
FUNC_UPPER,
fn_met(Str, vec![], None, vec![], Str),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
str_.register_builtin_erg_impl(
FUNC_TO_INT,
fn_met(Str, vec![], None, vec![], or(Int, NoneType)),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
str_.register_builtin_py_impl(
FUNC_STARTSWITH,
fn1_met(Str, Str, Bool),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_STARTSWITH),
);
str_.register_builtin_py_impl(
FUNC_ENDSWITH,
fn1_met(Str, Str, Bool),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_ENDSWITH),
);
str_.register_builtin_py_impl(
@@ -468,7 +731,7 @@ impl Context {
unknown_len_array_t(Str),
),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_SPLIT),
);
str_.register_builtin_py_impl(
@@ -481,14 +744,14 @@ impl Context {
unknown_len_array_t(Str),
),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_SPLITLINES),
);
str_.register_builtin_py_impl(
FUNC_JOIN,
fn1_met(unknown_len_array_t(Str), Str, Str),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_JOIN),
);
str_.register_builtin_py_impl(
@@ -501,7 +764,7 @@ impl Context {
or(Nat, Never),
),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_INDEX),
);
str_.register_builtin_py_impl(
@@ -514,7 +777,7 @@ impl Context {
or(Nat, Never),
),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_RINDEX),
);
str_.register_builtin_py_impl(
@@ -527,7 +790,7 @@ impl Context {
or(Nat, v_enum(set! {(-1).into()})),
),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_FIND),
);
str_.register_builtin_py_impl(
@@ -540,7 +803,7 @@ impl Context {
or(Nat, v_enum(set! {(-1).into()})),
),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_RFIND),
);
str_.register_builtin_py_impl(
@@ -553,7 +816,7 @@ impl Context {
Nat,
),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_COUNT),
);
str_.register_py_builtin(
@@ -562,43 +825,95 @@ impl Context {
Some(FUNC_CAPITALIZE),
13,
);
- str_.register_builtin_erg_impl(FUNC_CONTAINS, fn1_met(Str, Str, Bool), Immutable, Public);
+ str_.register_builtin_erg_impl(
+ FUNC_CONTAINS,
+ fn1_met(Str, Str, Bool),
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
let str_getitem_t = fn1_kw_met(Str, kw(KW_IDX, Nat), Str);
- str_.register_builtin_erg_impl(FUNDAMENTAL_GETITEM, str_getitem_t, Immutable, Public);
+ str_.register_builtin_erg_impl(
+ FUNDAMENTAL_GETITEM,
+ str_getitem_t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
let mut str_eq = Self::builtin_methods(Some(mono(EQ)), 2);
- str_eq.register_builtin_erg_impl(OP_EQ, fn1_met(Str, Str, Bool), Const, Public);
+ str_eq.register_builtin_erg_impl(
+ OP_EQ,
+ fn1_met(Str, Str, Bool),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
str_.register_trait(Str, str_eq);
let mut str_seq = Self::builtin_methods(Some(poly(SEQ, vec![ty_tp(Str)])), 2);
- str_seq.register_builtin_erg_impl(FUNC_LEN, fn0_met(Str, Nat), Const, Public);
- str_seq.register_builtin_erg_impl(FUNC_GET, fn1_met(Str, Nat, Str), Const, Public);
+ str_seq.register_builtin_erg_impl(
+ FUNC_LEN,
+ fn0_met(Str, Nat),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ str_seq.register_builtin_erg_impl(
+ FUNC_GET,
+ fn1_met(Str, Nat, Str),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
str_.register_trait(Str, str_seq);
let mut str_add = Self::builtin_methods(Some(poly(ADD, vec![ty_tp(Str)])), 2);
- str_add.register_builtin_erg_impl(OP_ADD, fn1_met(Str, Str, Str), Const, Public);
- str_add.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Str));
+ str_add.register_builtin_erg_impl(
+ OP_ADD,
+ fn1_met(Str, Str, Str),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ str_add.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Str),
+ );
str_.register_trait(Str, str_add);
let mut str_mul = Self::builtin_methods(Some(poly(MUL, vec![ty_tp(Nat)])), 2);
- str_mul.register_builtin_erg_impl(OP_MUL, fn1_met(Str, Nat, Str), Const, Public);
- str_mul.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(Str));
+ str_mul.register_builtin_erg_impl(
+ OP_MUL,
+ fn1_met(Str, Nat, Str),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ str_mul.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Str),
+ );
str_.register_trait(Str, str_mul);
let mut str_mutizable = Self::builtin_methods(Some(mono(MUTIZABLE)), 2);
str_mutizable.register_builtin_const(
MUTABLE_MUT_TYPE,
- Public,
+ Visibility::BUILTIN_PUBLIC,
ValueObj::builtin_t(mono(MUT_STR)),
);
str_.register_trait(Str, str_mutizable);
let mut str_show = Self::builtin_methods(Some(mono(SHOW)), 1);
- str_show.register_builtin_erg_impl(TO_STR, fn0_met(Str, Str), Immutable, Public);
+ str_show.register_builtin_erg_impl(
+ TO_STR,
+ fn0_met(Str, Str),
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
str_.register_trait(Str, str_show);
let mut str_iterable = Self::builtin_methods(Some(poly(ITERABLE, vec![ty_tp(Str)])), 2);
str_iterable.register_builtin_py_impl(
FUNC_ITER,
fn0_met(Str, mono(STR_ITERATOR)),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNDAMENTAL_ITER),
);
- str_iterable.register_builtin_const(ITERATOR, vis, ValueObj::builtin_t(mono(STR_ITERATOR)));
+ str_iterable.register_builtin_const(
+ ITERATOR,
+ vis.clone(),
+ ValueObj::builtin_t(mono(STR_ITERATOR)),
+ );
str_.register_trait(Str, str_iterable);
/* NoneType */
let mut nonetype = Self::builtin_mono_class(NONE_TYPE, 10);
@@ -608,11 +923,16 @@ impl Context {
OP_EQ,
fn1_met(NoneType, NoneType, Bool),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
nonetype.register_trait(NoneType, nonetype_eq);
let mut nonetype_show = Self::builtin_methods(Some(mono(SHOW)), 1);
- nonetype_show.register_builtin_erg_impl(TO_STR, fn0_met(NoneType, Str), Immutable, Public);
+ nonetype_show.register_builtin_erg_impl(
+ TO_STR,
+ fn0_met(NoneType, Str),
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
nonetype.register_trait(NoneType, nonetype_show);
/* Type */
let mut type_ = Self::builtin_mono_class(TYPE, 2);
@@ -621,11 +941,16 @@ impl Context {
FUNC_MRO,
array_t(Type, TyParam::erased(Nat)),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
type_.register_marker_trait(mono(NAMED));
let mut type_eq = Self::builtin_methods(Some(mono(EQ)), 2);
- type_eq.register_builtin_erg_impl(OP_EQ, fn1_met(Type, Type, Bool), Const, Public);
+ type_eq.register_builtin_erg_impl(
+ OP_EQ,
+ fn1_met(Type, Type, Bool),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
type_.register_trait(Type, type_eq);
let mut class_type = Self::builtin_mono_class(CLASS_TYPE, 2);
class_type.register_superclass(Type, &type_);
@@ -635,7 +960,7 @@ impl Context {
OP_EQ,
fn1_met(ClassType, ClassType, Bool),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
class_type.register_trait(ClassType, class_eq);
let mut trait_type = Self::builtin_mono_class(TRAIT_TYPE, 2);
@@ -646,54 +971,99 @@ impl Context {
OP_EQ,
fn1_met(TraitType, TraitType, Bool),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
trait_type.register_trait(TraitType, trait_eq);
let mut code = Self::builtin_mono_class(CODE, 10);
code.register_superclass(Obj, &obj);
- code.register_builtin_erg_impl(FUNC_CO_ARGCOUNT, Nat, Immutable, Public);
+ code.register_builtin_erg_impl(
+ FUNC_CO_ARGCOUNT,
+ Nat,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
code.register_builtin_erg_impl(
FUNC_CO_VARNAMES,
array_t(Str, TyParam::erased(Nat)),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
code.register_builtin_erg_impl(
FUNC_CO_CONSTS,
array_t(Obj, TyParam::erased(Nat)),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
code.register_builtin_erg_impl(
FUNC_CO_NAMES,
array_t(Str, TyParam::erased(Nat)),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
code.register_builtin_erg_impl(
FUNC_CO_FREEVARS,
array_t(Str, TyParam::erased(Nat)),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
code.register_builtin_erg_impl(
FUNC_CO_CELLVARS,
array_t(Str, TyParam::erased(Nat)),
Immutable,
- Public,
- );
- code.register_builtin_erg_impl(FUNC_CO_FILENAME, Str, Immutable, Public);
- code.register_builtin_erg_impl(FUNC_CO_NAME, Str, Immutable, Public);
- code.register_builtin_erg_impl(FUNC_CO_FIRSTLINENO, Nat, Immutable, Public);
- code.register_builtin_erg_impl(FUNC_CO_STACKSIZE, Nat, Immutable, Public);
- code.register_builtin_erg_impl(FUNC_CO_FLAGS, Nat, Immutable, Public);
- code.register_builtin_erg_impl(FUNC_CO_CODE, mono(BYTES), Immutable, Public);
- code.register_builtin_erg_impl(FUNC_CO_LNOTAB, mono(BYTES), Immutable, Public);
- code.register_builtin_erg_impl(FUNC_CO_NLOCALS, Nat, Immutable, Public);
- code.register_builtin_erg_impl(FUNC_CO_KWONLYARGCOUNT, Nat, Immutable, Public);
- code.register_builtin_erg_impl(FUNC_CO_POSONLYARGCOUNT, Nat, Immutable, Public);
+ Visibility::BUILTIN_PUBLIC,
+ );
+ code.register_builtin_erg_impl(
+ FUNC_CO_FILENAME,
+ Str,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ code.register_builtin_erg_impl(FUNC_CO_NAME, Str, Immutable, Visibility::BUILTIN_PUBLIC);
+ code.register_builtin_erg_impl(
+ FUNC_CO_FIRSTLINENO,
+ Nat,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ code.register_builtin_erg_impl(
+ FUNC_CO_STACKSIZE,
+ Nat,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ code.register_builtin_erg_impl(FUNC_CO_FLAGS, Nat, Immutable, Visibility::BUILTIN_PUBLIC);
+ code.register_builtin_erg_impl(
+ FUNC_CO_CODE,
+ mono(BYTES),
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ code.register_builtin_erg_impl(
+ FUNC_CO_LNOTAB,
+ mono(BYTES),
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ code.register_builtin_erg_impl(FUNC_CO_NLOCALS, Nat, Immutable, Visibility::BUILTIN_PUBLIC);
+ code.register_builtin_erg_impl(
+ FUNC_CO_KWONLYARGCOUNT,
+ Nat,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
+ code.register_builtin_erg_impl(
+ FUNC_CO_POSONLYARGCOUNT,
+ Nat,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
let mut code_eq = Self::builtin_methods(Some(mono(EQ)), 2);
- code_eq.register_builtin_erg_impl(OP_EQ, fn1_met(Code, Code, Bool), Const, Public);
+ code_eq.register_builtin_erg_impl(
+ OP_EQ,
+ fn1_met(Code, Code, Bool),
+ Const,
+ Visibility::BUILTIN_PUBLIC,
+ );
code.register_trait(Code, code_eq);
let g_module_t = mono(GENERIC_MODULE);
let mut generic_module = Self::builtin_mono_class(GENERIC_MODULE, 2);
@@ -704,7 +1074,7 @@ impl Context {
OP_EQ,
fn1_met(g_module_t.clone(), g_module_t.clone(), Bool),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
generic_module.register_trait(g_module_t.clone(), generic_module_eq);
let Path = mono_q_tp(PATH, instanceof(Str));
@@ -741,9 +1111,13 @@ impl Context {
Some(poly(ADD, vec![ty_tp(array_t(T.clone(), M.clone()))])),
2,
);
- array_add.register_builtin_erg_impl(OP_ADD, t, Immutable, Public);
+ array_add.register_builtin_erg_impl(OP_ADD, t, Immutable, Visibility::BUILTIN_PUBLIC);
let out_t = array_t(T.clone(), N.clone() + M.clone());
- array_add.register_builtin_const(OUTPUT, Public, ValueObj::builtin_t(out_t));
+ array_add.register_builtin_const(
+ OUTPUT,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(out_t),
+ );
array_.register_trait(arr_t.clone(), array_add);
let t = fn_met(
arr_t.clone(),
@@ -753,13 +1127,13 @@ impl Context {
array_t(T.clone(), N.clone() + value(1usize)),
)
.quantify();
- array_.register_builtin_erg_impl(FUNC_PUSH, t, Immutable, Public);
+ array_.register_builtin_erg_impl(FUNC_PUSH, t, Immutable, Visibility::BUILTIN_PUBLIC);
// [T; N].MutType! = [T; !N] (neither [T!; N] nor [T; N]!)
let mut_type = ValueObj::builtin_t(poly(
MUT_ARRAY,
vec![TyParam::t(T.clone()), N.clone().mutate()],
));
- array_.register_builtin_const(MUTABLE_MUT_TYPE, Public, mut_type);
+ array_.register_builtin_const(MUTABLE_MUT_TYPE, Visibility::BUILTIN_PUBLIC, mut_type);
let var = StrStruct::from(fresh_varname());
let input = refinement(
var.clone(),
@@ -775,13 +1149,13 @@ impl Context {
array_getitem_t,
None,
)));
- array_.register_builtin_const(FUNDAMENTAL_GETITEM, Public, get_item);
+ array_.register_builtin_const(FUNDAMENTAL_GETITEM, Visibility::BUILTIN_PUBLIC, get_item);
let mut array_eq = Self::builtin_methods(Some(mono(EQ)), 2);
array_eq.register_builtin_erg_impl(
OP_EQ,
fn1_met(arr_t.clone(), arr_t.clone(), Bool).quantify(),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
array_.register_trait(arr_t.clone(), array_eq);
array_.register_marker_trait(mono(MUTIZABLE));
@@ -791,7 +1165,7 @@ impl Context {
TO_STR,
fn0_met(arr_t.clone(), Str).quantify(),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNDAMENTAL_STR),
);
array_.register_trait(arr_t.clone(), array_show);
@@ -803,10 +1177,14 @@ impl Context {
FUNC_ITER,
t,
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNDAMENTAL_ITER),
);
- array_iterable.register_builtin_const(ITERATOR, vis, ValueObj::builtin_t(array_iter));
+ array_iterable.register_builtin_const(
+ ITERATOR,
+ vis.clone(),
+ ValueObj::builtin_t(array_iter),
+ );
array_.register_trait(arr_t.clone(), array_iterable);
let t = fn1_met(
array_t(T.clone(), TyParam::erased(Nat)),
@@ -842,18 +1220,18 @@ impl Context {
array_t(T.clone(), N.clone() + M),
)
.quantify();
- set_.register_builtin_erg_impl(FUNC_CONCAT, t, Immutable, Public);
+ set_.register_builtin_erg_impl(FUNC_CONCAT, t, Immutable, Visibility::BUILTIN_PUBLIC);
let mut_type = ValueObj::builtin_t(poly(
MUT_SET,
vec![TyParam::t(T.clone()), N.clone().mutate()],
));
- set_.register_builtin_const(MUTABLE_MUT_TYPE, Public, mut_type);
+ set_.register_builtin_const(MUTABLE_MUT_TYPE, Visibility::BUILTIN_PUBLIC, mut_type);
let mut set_eq = Self::builtin_methods(Some(mono(EQ)), 2);
set_eq.register_builtin_erg_impl(
OP_EQ,
fn1_met(set_t.clone(), set_t.clone(), Bool).quantify(),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
set_.register_trait(set_t.clone(), set_eq);
set_.register_marker_trait(mono(MUTIZABLE));
@@ -863,7 +1241,7 @@ impl Context {
TO_STR,
fn0_met(set_t.clone(), Str).quantify(),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
set_.register_trait(set_t.clone(), set_show);
let g_dict_t = mono(GENERIC_DICT);
@@ -874,13 +1252,18 @@ impl Context {
OP_EQ,
fn1_met(g_dict_t.clone(), g_dict_t.clone(), Bool).quantify(),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
generic_dict.register_trait(g_dict_t.clone(), generic_dict_eq);
let D = mono_q_tp(TY_D, instanceof(mono(GENERIC_DICT)));
// .get: _: T -> T or None
let dict_get_t = fn1_met(g_dict_t.clone(), T.clone(), or(T.clone(), NoneType)).quantify();
- generic_dict.register_builtin_erg_impl(FUNC_GET, dict_get_t, Immutable, Public);
+ generic_dict.register_builtin_erg_impl(
+ FUNC_GET,
+ dict_get_t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
let dict_t = poly(DICT, vec![D.clone()]);
let mut dict_ =
// TODO: D <: GenericDict
@@ -900,7 +1283,7 @@ impl Context {
dict_getitem_t,
None,
)));
- dict_.register_builtin_const(FUNDAMENTAL_GETITEM, Public, get_item);
+ dict_.register_builtin_const(FUNDAMENTAL_GETITEM, Visibility::BUILTIN_PUBLIC, get_item);
/* Bytes */
let mut bytes = Self::builtin_mono_class(BYTES, 2);
bytes.register_superclass(Obj, &obj);
@@ -920,7 +1303,7 @@ impl Context {
OP_EQ,
fn1_met(mono(GENERIC_TUPLE), mono(GENERIC_TUPLE), Bool),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
generic_tuple.register_trait(mono(GENERIC_TUPLE), tuple_eq);
let Ts = mono_q_tp(TY_TS, instanceof(array_t(Type, N.clone())));
@@ -941,7 +1324,7 @@ impl Context {
FUNDAMENTAL_TUPLE_GETITEM,
tuple_getitem_t.clone(),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNDAMENTAL_GETITEM),
);
// `__Tuple_getitem__` and `__getitem__` are the same thing
@@ -950,7 +1333,7 @@ impl Context {
FUNDAMENTAL_GETITEM,
tuple_getitem_t,
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNDAMENTAL_GETITEM),
);
/* record */
@@ -1005,7 +1388,11 @@ impl Context {
let mut obj_mut = Self::builtin_mono_class(MUTABLE_OBJ, 2);
obj_mut.register_superclass(Obj, &obj);
let mut obj_mut_mutable = Self::builtin_methods(Some(mono(MUTABLE)), 2);
- obj_mut_mutable.register_builtin_const(IMMUT_TYPE, Public, ValueObj::builtin_t(Obj));
+ obj_mut_mutable.register_builtin_const(
+ IMMUT_TYPE,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Obj),
+ );
let f_t = kw(KW_FUNC, func(vec![kw(KW_OLD, Int)], None, vec![], Int));
let t = pr_met(
ref_mut(mono(MUTABLE_OBJ), None),
@@ -1014,13 +1401,22 @@ impl Context {
vec![],
NoneType,
);
- obj_mut_mutable.register_builtin_erg_impl(PROC_UPDATE, t, Immutable, Public);
+ obj_mut_mutable.register_builtin_erg_impl(
+ PROC_UPDATE,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
obj_mut.register_trait(mono(MUTABLE_OBJ), obj_mut_mutable);
/* Float! */
let mut float_mut = Self::builtin_mono_class(MUT_FLOAT, 2);
float_mut.register_superclass(Float, &float);
let mut float_mut_mutable = Self::builtin_methods(Some(mono(MUTABLE)), 2);
- float_mut_mutable.register_builtin_const(IMMUT_TYPE, Public, ValueObj::builtin_t(Float));
+ float_mut_mutable.register_builtin_const(
+ IMMUT_TYPE,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Float),
+ );
let f_t = kw(KW_FUNC, func(vec![kw(KW_OLD, Float)], None, vec![], Float));
let t = pr_met(
ref_mut(mono(MUT_FLOAT), None),
@@ -1029,13 +1425,22 @@ impl Context {
vec![],
NoneType,
);
- float_mut_mutable.register_builtin_erg_impl(PROC_UPDATE, t, Immutable, Public);
+ float_mut_mutable.register_builtin_erg_impl(
+ PROC_UPDATE,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
float_mut.register_trait(mono(MUT_FLOAT), float_mut_mutable);
/* Ratio! */
let mut ratio_mut = Self::builtin_mono_class(MUT_RATIO, 2);
ratio_mut.register_superclass(Ratio, &ratio);
let mut ratio_mut_mutable = Self::builtin_methods(Some(mono(MUTABLE)), 2);
- ratio_mut_mutable.register_builtin_const(IMMUT_TYPE, Public, ValueObj::builtin_t(Ratio));
+ ratio_mut_mutable.register_builtin_const(
+ IMMUT_TYPE,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Ratio),
+ );
let f_t = kw(KW_FUNC, func(vec![kw(KW_OLD, Ratio)], None, vec![], Ratio));
let t = pr_met(
ref_mut(mono(MUT_RATIO), None),
@@ -1044,17 +1449,38 @@ impl Context {
vec![],
NoneType,
);
- ratio_mut_mutable.register_builtin_erg_impl(PROC_UPDATE, t, Immutable, Public);
+ ratio_mut_mutable.register_builtin_erg_impl(
+ PROC_UPDATE,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
ratio_mut.register_trait(mono(MUT_RATIO), ratio_mut_mutable);
/* Int! */
let mut int_mut = Self::builtin_mono_class(MUT_INT, 2);
int_mut.register_superclass(Int, &int);
int_mut.register_superclass(mono(MUT_FLOAT), &float_mut);
let t = pr_met(mono(MUT_INT), vec![], None, vec![kw("i", Int)], NoneType);
- int_mut.register_builtin_py_impl(PROC_INC, t.clone(), Immutable, Public, Some(FUNC_INC));
- int_mut.register_builtin_py_impl(PROC_DEC, t, Immutable, Public, Some(FUNC_DEC));
+ int_mut.register_builtin_py_impl(
+ PROC_INC,
+ t.clone(),
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_INC),
+ );
+ int_mut.register_builtin_py_impl(
+ PROC_DEC,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_DEC),
+ );
let mut int_mut_mutable = Self::builtin_methods(Some(mono(MUTABLE)), 2);
- int_mut_mutable.register_builtin_const(IMMUT_TYPE, Public, ValueObj::builtin_t(Int));
+ int_mut_mutable.register_builtin_const(
+ IMMUT_TYPE,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Int),
+ );
let f_t = kw(KW_FUNC, func(vec![kw(KW_OLD, Int)], None, vec![], Int));
let t = pr_met(
ref_mut(mono(MUT_INT), None),
@@ -1063,14 +1489,23 @@ impl Context {
vec![],
NoneType,
);
- int_mut_mutable.register_builtin_erg_impl(PROC_UPDATE, t, Immutable, Public);
+ int_mut_mutable.register_builtin_erg_impl(
+ PROC_UPDATE,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
int_mut.register_trait(mono(MUT_INT), int_mut_mutable);
let mut nat_mut = Self::builtin_mono_class(MUT_NAT, 2);
nat_mut.register_superclass(Nat, &nat);
nat_mut.register_superclass(mono(MUT_INT), &int_mut);
/* Nat! */
let mut nat_mut_mutable = Self::builtin_methods(Some(mono(MUTABLE)), 2);
- nat_mut_mutable.register_builtin_const(IMMUT_TYPE, Public, ValueObj::builtin_t(Nat));
+ nat_mut_mutable.register_builtin_const(
+ IMMUT_TYPE,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Nat),
+ );
let f_t = kw(KW_FUNC, func(vec![kw(KW_OLD, Nat)], None, vec![], Nat));
let t = pr_met(
ref_mut(mono(MUT_NAT), None),
@@ -1079,14 +1514,23 @@ impl Context {
vec![],
NoneType,
);
- nat_mut_mutable.register_builtin_erg_impl(PROC_UPDATE, t, Immutable, Public);
+ nat_mut_mutable.register_builtin_erg_impl(
+ PROC_UPDATE,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
nat_mut.register_trait(mono(MUT_NAT), nat_mut_mutable);
/* Bool! */
let mut bool_mut = Self::builtin_mono_class(MUT_BOOL, 2);
bool_mut.register_superclass(Bool, &bool_);
bool_mut.register_superclass(mono(MUT_NAT), &nat_mut);
let mut bool_mut_mutable = Self::builtin_methods(Some(mono(MUTABLE)), 2);
- bool_mut_mutable.register_builtin_const(IMMUT_TYPE, Public, ValueObj::builtin_t(Bool));
+ bool_mut_mutable.register_builtin_const(
+ IMMUT_TYPE,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Bool),
+ );
let f_t = kw(KW_FUNC, func(vec![kw(KW_OLD, Bool)], None, vec![], Bool));
let t = pr_met(
ref_mut(mono(MUT_BOOL), None),
@@ -1095,15 +1539,30 @@ impl Context {
vec![],
NoneType,
);
- bool_mut_mutable.register_builtin_erg_impl(PROC_UPDATE, t, Immutable, Public);
+ bool_mut_mutable.register_builtin_erg_impl(
+ PROC_UPDATE,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
bool_mut.register_trait(mono(MUT_BOOL), bool_mut_mutable);
let t = pr0_met(mono(MUT_BOOL), NoneType);
- bool_mut.register_builtin_py_impl(PROC_INVERT, t, Immutable, Public, Some(FUNC_INVERT));
+ bool_mut.register_builtin_py_impl(
+ PROC_INVERT,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_INVERT),
+ );
/* Str! */
let mut str_mut = Self::builtin_mono_class(MUT_STR, 2);
str_mut.register_superclass(Str, &nonetype);
let mut str_mut_mutable = Self::builtin_methods(Some(mono(MUTABLE)), 2);
- str_mut_mutable.register_builtin_const(IMMUT_TYPE, Public, ValueObj::builtin_t(Str));
+ str_mut_mutable.register_builtin_const(
+ IMMUT_TYPE,
+ Visibility::BUILTIN_PUBLIC,
+ ValueObj::builtin_t(Str),
+ );
let f_t = kw(KW_FUNC, func(vec![kw(KW_OLD, Str)], None, vec![], Str));
let t = pr_met(
ref_mut(mono(MUT_STR), None),
@@ -1112,7 +1571,12 @@ impl Context {
vec![],
NoneType,
);
- str_mut_mutable.register_builtin_erg_impl(PROC_UPDATE, t, Immutable, Public);
+ str_mut_mutable.register_builtin_erg_impl(
+ PROC_UPDATE,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
str_mut.register_trait(mono(MUT_STR), str_mut_mutable);
let t = pr_met(
ref_mut(mono(MUT_STR), None),
@@ -1121,11 +1585,29 @@ impl Context {
vec![],
NoneType,
);
- str_mut.register_builtin_py_impl(PROC_PUSH, t, Immutable, Public, Some(FUNC_PUSH));
+ str_mut.register_builtin_py_impl(
+ PROC_PUSH,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_PUSH),
+ );
let t = pr0_met(ref_mut(mono(MUT_STR), None), Str);
- str_mut.register_builtin_py_impl(PROC_POP, t, Immutable, Public, Some(FUNC_POP));
+ str_mut.register_builtin_py_impl(
+ PROC_POP,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_POP),
+ );
let t = pr0_met(ref_mut(mono(MUT_STR), None), NoneType);
- str_mut.register_builtin_py_impl(PROC_CLEAR, t, Immutable, Public, Some(FUNC_CLEAR));
+ str_mut.register_builtin_py_impl(
+ PROC_CLEAR,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_CLEAR),
+ );
let t = pr_met(
ref_mut(mono(MUT_STR), None),
vec![kw("idx", Nat), kw("s", Str)],
@@ -1133,7 +1615,13 @@ impl Context {
vec![],
NoneType,
);
- str_mut.register_builtin_py_impl(PROC_INSERT, t, Immutable, Public, Some(FUNC_INSERT));
+ str_mut.register_builtin_py_impl(
+ PROC_INSERT,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_INSERT),
+ );
let t = pr_met(
ref_mut(mono(MUT_STR), None),
vec![kw("idx", Nat)],
@@ -1141,7 +1629,13 @@ impl Context {
vec![],
Str,
);
- str_mut.register_builtin_py_impl(PROC_REMOVE, t, Immutable, Public, Some(FUNC_REMOVE));
+ str_mut.register_builtin_py_impl(
+ PROC_REMOVE,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_REMOVE),
+ );
/* File! */
let mut file_mut = Self::builtin_mono_class(MUT_FILE, 2);
let mut file_mut_readable = Self::builtin_methods(Some(mono(MUT_READABLE)), 1);
@@ -1155,7 +1649,7 @@ impl Context {
Str,
),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_READ),
);
file_mut.register_trait(mono(MUT_FILE), file_mut_readable);
@@ -1164,7 +1658,7 @@ impl Context {
PROC_WRITE,
pr1_kw_met(ref_mut(mono(MUT_FILE), None), kw(KW_S, Str), Nat),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_WRITE),
);
file_mut.register_trait(mono(MUT_FILE), file_mut_writable);
@@ -1194,7 +1688,13 @@ impl Context {
NoneType,
)
.quantify();
- array_mut_.register_builtin_py_impl(PROC_PUSH, t, Immutable, Public, Some(FUNC_APPEND));
+ array_mut_.register_builtin_py_impl(
+ PROC_PUSH,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_APPEND),
+ );
let t_extend = pr_met(
ref_mut(
array_mut_t.clone(),
@@ -1213,7 +1713,7 @@ impl Context {
PROC_EXTEND,
t_extend,
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_EXTEND),
);
let t_insert = pr_met(
@@ -1234,7 +1734,7 @@ impl Context {
PROC_INSERT,
t_insert,
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_INSERT),
);
let t_remove = pr_met(
@@ -1255,7 +1755,7 @@ impl Context {
PROC_REMOVE,
t_remove,
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_REMOVE),
);
let t_pop = pr_met(
@@ -1272,7 +1772,13 @@ impl Context {
T.clone(),
)
.quantify();
- array_mut_.register_builtin_py_impl(PROC_POP, t_pop, Immutable, Public, Some(FUNC_POP));
+ array_mut_.register_builtin_py_impl(
+ PROC_POP,
+ t_pop,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_POP),
+ );
let t_clear = pr0_met(
ref_mut(
array_mut_t.clone(),
@@ -1285,7 +1791,7 @@ impl Context {
PROC_CLEAR,
t_clear,
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_CLEAR),
);
let t_sort = pr_met(
@@ -1299,13 +1805,19 @@ impl Context {
NoneType,
)
.quantify();
- array_mut_.register_builtin_py_impl(PROC_SORT, t_sort, Immutable, Public, Some(FUNC_SORT));
+ array_mut_.register_builtin_py_impl(
+ PROC_SORT,
+ t_sort,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_SORT),
+ );
let t_reverse = pr0_met(ref_mut(array_mut_t.clone(), None), NoneType).quantify();
array_mut_.register_builtin_py_impl(
PROC_REVERSE,
t_reverse,
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNC_REVERSE),
);
let t = pr_met(
@@ -1316,7 +1828,12 @@ impl Context {
NoneType,
)
.quantify();
- array_mut_.register_builtin_erg_impl(PROC_STRICT_MAP, t, Immutable, Public);
+ array_mut_.register_builtin_erg_impl(
+ PROC_STRICT_MAP,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
let f_t = kw(
KW_FUNC,
func(vec![kw(KW_OLD, arr_t.clone())], None, vec![], arr_t.clone()),
@@ -1330,7 +1847,12 @@ impl Context {
)
.quantify();
let mut array_mut_mutable = Self::builtin_methods(Some(mono(MUTABLE)), 2);
- array_mut_mutable.register_builtin_erg_impl(PROC_UPDATE, t, Immutable, Public);
+ array_mut_mutable.register_builtin_erg_impl(
+ PROC_UPDATE,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
array_mut_.register_trait(array_mut_t.clone(), array_mut_mutable);
/* Set! */
let set_mut_t = poly(MUT_SET, vec![ty_tp(T.clone()), N_MUT]);
@@ -1355,7 +1877,13 @@ impl Context {
NoneType,
)
.quantify();
- set_mut_.register_builtin_py_impl(PROC_ADD, t, Immutable, Public, Some(FUNC_ADD));
+ set_mut_.register_builtin_py_impl(
+ PROC_ADD,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_ADD),
+ );
let t = pr_met(
set_mut_t.clone(),
vec![kw(KW_FUNC, nd_func(vec![anon(T.clone())], None, T.clone()))],
@@ -1364,7 +1892,12 @@ impl Context {
NoneType,
)
.quantify();
- set_mut_.register_builtin_erg_impl(PROC_STRICT_MAP, t, Immutable, Public);
+ set_mut_.register_builtin_erg_impl(
+ PROC_STRICT_MAP,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
let f_t = kw(
KW_FUNC,
func(vec![kw(KW_OLD, set_t.clone())], None, vec![], set_t.clone()),
@@ -1378,7 +1911,12 @@ impl Context {
)
.quantify();
let mut set_mut_mutable = Self::builtin_methods(Some(mono(MUTABLE)), 2);
- set_mut_mutable.register_builtin_erg_impl(PROC_UPDATE, t, Immutable, Public);
+ set_mut_mutable.register_builtin_erg_impl(
+ PROC_UPDATE,
+ t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
set_mut_.register_trait(set_mut_t.clone(), set_mut_mutable);
/* Range */
let range_t = poly(RANGE, vec![TyParam::t(T.clone())]);
@@ -1392,7 +1930,7 @@ impl Context {
OP_EQ,
fn1_met(range_t.clone(), range_t.clone(), Bool).quantify(),
Const,
- Public,
+ Visibility::BUILTIN_PUBLIC,
);
range.register_trait(range_t.clone(), range_eq);
let mut range_iterable =
@@ -1402,10 +1940,14 @@ impl Context {
FUNC_ITER,
fn0_met(range_t.clone(), range_iter.clone()).quantify(),
Immutable,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNDAMENTAL_ITER),
);
- range_iterable.register_builtin_const(ITERATOR, vis, ValueObj::builtin_t(range_iter));
+ range_iterable.register_builtin_const(
+ ITERATOR,
+ vis.clone(),
+ ValueObj::builtin_t(range_iter),
+ );
range.register_trait(range_t.clone(), range_iterable);
let range_getitem_t = fn1_kw_met(range_t.clone(), anon(T.clone()), T.clone()).quantify();
let get_item = ValueObj::Subr(ConstSubr::Builtin(BuiltinConstSubr::new(
@@ -1414,15 +1956,25 @@ impl Context {
range_getitem_t,
None,
)));
- range.register_builtin_const(FUNDAMENTAL_GETITEM, Public, get_item);
+ range.register_builtin_const(FUNDAMENTAL_GETITEM, Visibility::BUILTIN_PUBLIC, get_item);
let mut g_callable = Self::builtin_mono_class(GENERIC_CALLABLE, 2);
g_callable.register_superclass(Obj, &obj);
let t_return = fn1_met(mono(GENERIC_CALLABLE), Obj, Never).quantify();
- g_callable.register_builtin_erg_impl(FUNC_RETURN, t_return, Immutable, Public);
+ g_callable.register_builtin_erg_impl(
+ FUNC_RETURN,
+ t_return,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
let mut g_generator = Self::builtin_mono_class(GENERIC_GENERATOR, 2);
g_generator.register_superclass(mono(GENERIC_CALLABLE), &g_callable);
let t_yield = fn1_met(mono(GENERIC_GENERATOR), Obj, Never).quantify();
- g_generator.register_builtin_erg_impl(FUNC_YIELD, t_yield, Immutable, Public);
+ g_generator.register_builtin_erg_impl(
+ FUNC_YIELD,
+ t_yield,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ );
/* Proc */
let mut proc = Self::builtin_mono_class(PROC, 2);
proc.register_superclass(mono(GENERIC_CALLABLE), &g_callable);
@@ -1439,167 +1991,191 @@ impl Context {
quant.register_superclass(mono(PROC), &proc);
let mut qfunc = Self::builtin_mono_class(QUANTIFIED_FUNC, 2);
qfunc.register_superclass(mono(FUNC), &func);
- self.register_builtin_type(Never, never, vis, Const, Some(NEVER));
- self.register_builtin_type(Obj, obj, vis, Const, Some(FUNC_OBJECT));
- // self.register_type(mono(RECORD), vec![], record, Private, Const);
+ self.register_builtin_type(Never, never, vis.clone(), Const, Some(NEVER));
+ self.register_builtin_type(Obj, obj, vis.clone(), Const, Some(FUNC_OBJECT));
+ // self.register_type(mono(RECORD), vec![], record, Visibility::BUILTIN_PRIVATE, Const);
let name = if cfg!(feature = "py_compatible") {
FUNC_INT
} else {
INT
};
- self.register_builtin_type(Int, int, vis, Const, Some(name));
- self.register_builtin_type(Nat, nat, vis, Const, Some(NAT));
+ self.register_builtin_type(Int, int, vis.clone(), Const, Some(name));
+ self.register_builtin_type(Nat, nat, vis.clone(), Const, Some(NAT));
let name = if cfg!(feature = "py_compatible") {
FUNC_FLOAT
} else {
FLOAT
};
- self.register_builtin_type(Float, float, vis, Const, Some(name));
- self.register_builtin_type(Ratio, ratio, vis, Const, Some(RATIO));
+ self.register_builtin_type(Float, float, vis.clone(), Const, Some(name));
+ self.register_builtin_type(Ratio, ratio, vis.clone(), Const, Some(RATIO));
let name = if cfg!(feature = "py_compatible") {
FUNC_BOOL
} else {
BOOL
};
- self.register_builtin_type(Bool, bool_, vis, Const, Some(name));
+ self.register_builtin_type(Bool, bool_, vis.clone(), Const, Some(name));
let name = if cfg!(feature = "py_compatible") {
FUNC_STR
} else {
STR
};
- self.register_builtin_type(Str, str_, vis, Const, Some(name));
- self.register_builtin_type(NoneType, nonetype, vis, Const, Some(NONE_TYPE));
- self.register_builtin_type(Type, type_, vis, Const, Some(FUNC_TYPE));
- self.register_builtin_type(ClassType, class_type, vis, Const, Some(CLASS_TYPE));
- self.register_builtin_type(TraitType, trait_type, vis, Const, Some(TRAIT_TYPE));
- self.register_builtin_type(Code, code, vis, Const, Some(CODE_TYPE));
+ self.register_builtin_type(Str, str_, vis.clone(), Const, Some(name));
+ self.register_builtin_type(NoneType, nonetype, vis.clone(), Const, Some(NONE_TYPE));
+ self.register_builtin_type(Type, type_, vis.clone(), Const, Some(FUNC_TYPE));
+ self.register_builtin_type(ClassType, class_type, vis.clone(), Const, Some(CLASS_TYPE));
+ self.register_builtin_type(TraitType, trait_type, vis.clone(), Const, Some(TRAIT_TYPE));
+ self.register_builtin_type(Code, code, vis.clone(), Const, Some(CODE_TYPE));
self.register_builtin_type(
g_module_t,
generic_module,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(MODULE_TYPE),
);
- self.register_builtin_type(py_module_t, py_module, vis, Const, Some(MODULE_TYPE));
- self.register_builtin_type(arr_t, array_, vis, Const, Some(FUNC_LIST));
- self.register_builtin_type(set_t, set_, vis, Const, Some(FUNC_SET));
- self.register_builtin_type(g_dict_t, generic_dict, vis, Const, Some(FUNC_DICT));
- self.register_builtin_type(dict_t, dict_, vis, Const, Some(FUNC_DICT));
- self.register_builtin_type(mono(BYTES), bytes, vis, Const, Some(BYTES));
+ self.register_builtin_type(
+ py_module_t,
+ py_module,
+ vis.clone(),
+ Const,
+ Some(MODULE_TYPE),
+ );
+ self.register_builtin_type(arr_t, array_, vis.clone(), Const, Some(FUNC_LIST));
+ self.register_builtin_type(set_t, set_, vis.clone(), Const, Some(FUNC_SET));
+ self.register_builtin_type(g_dict_t, generic_dict, vis.clone(), Const, Some(FUNC_DICT));
+ self.register_builtin_type(dict_t, dict_, vis.clone(), Const, Some(FUNC_DICT));
+ self.register_builtin_type(mono(BYTES), bytes, vis.clone(), Const, Some(BYTES));
self.register_builtin_type(
mono(GENERIC_TUPLE),
generic_tuple,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(FUNC_TUPLE),
);
- self.register_builtin_type(_tuple_t, tuple_, vis, Const, Some(FUNC_TUPLE));
- self.register_builtin_type(mono(RECORD), record, vis, Const, Some(RECORD));
- self.register_builtin_type(or_t, or, vis, Const, Some(UNION));
+ self.register_builtin_type(_tuple_t, tuple_, vis.clone(), Const, Some(FUNC_TUPLE));
+ self.register_builtin_type(mono(RECORD), record, vis.clone(), Const, Some(RECORD));
+ self.register_builtin_type(or_t, or, vis.clone(), Const, Some(UNION));
self.register_builtin_type(
mono(STR_ITERATOR),
str_iterator,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(FUNC_STR_ITERATOR),
);
self.register_builtin_type(
poly(ARRAY_ITERATOR, vec![ty_tp(T.clone())]),
array_iterator,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(FUNC_ARRAY_ITERATOR),
);
self.register_builtin_type(
poly(RANGE_ITERATOR, vec![ty_tp(T.clone())]),
range_iterator,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(RANGE_ITERATOR),
);
self.register_builtin_type(
poly(ENUMERATE, vec![ty_tp(T.clone())]),
enumerate,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(FUNC_ENUMERATE),
);
self.register_builtin_type(
poly(FILTER, vec![ty_tp(T.clone())]),
filter,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(FUNC_FILTER),
);
self.register_builtin_type(
poly(MAP, vec![ty_tp(T.clone())]),
map,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(FUNC_MAP),
);
self.register_builtin_type(
poly(REVERSED, vec![ty_tp(T.clone())]),
reversed,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(FUNC_REVERSED),
);
self.register_builtin_type(
poly(ZIP, vec![ty_tp(T), ty_tp(U)]),
zip,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(FUNC_ZIP),
);
- self.register_builtin_type(mono(MUT_FILE), file_mut, vis, Const, Some(FILE));
- self.register_builtin_type(array_mut_t, array_mut_, vis, Const, Some(FUNC_LIST));
- self.register_builtin_type(set_mut_t, set_mut_, vis, Const, Some(FUNC_SET));
+ self.register_builtin_type(mono(MUT_FILE), file_mut, vis.clone(), Const, Some(FILE));
+ self.register_builtin_type(array_mut_t, array_mut_, vis.clone(), Const, Some(FUNC_LIST));
+ self.register_builtin_type(set_mut_t, set_mut_, vis.clone(), Const, Some(FUNC_SET));
self.register_builtin_type(
mono(GENERIC_CALLABLE),
g_callable,
- vis,
+ vis.clone(),
Const,
Some(CALLABLE),
);
self.register_builtin_type(
mono(GENERIC_GENERATOR),
g_generator,
- vis,
+ vis.clone(),
Const,
Some(GENERATOR),
);
- self.register_builtin_type(mono(PROC), proc, vis, Const, Some(PROC));
- self.register_builtin_type(mono(FUNC), func, vis, Const, Some(FUNC));
- self.register_builtin_type(range_t, range, vis, Const, Some(FUNC_RANGE));
+ self.register_builtin_type(mono(PROC), proc, vis.clone(), Const, Some(PROC));
+ self.register_builtin_type(mono(FUNC), func, vis.clone(), Const, Some(FUNC));
+ self.register_builtin_type(range_t, range, vis.clone(), Const, Some(FUNC_RANGE));
if !cfg!(feature = "py_compatible") {
- self.register_builtin_type(module_t, module, vis, Const, Some(MODULE_TYPE));
- self.register_builtin_type(mono(MUTABLE_OBJ), obj_mut, vis, Const, Some(FUNC_OBJECT));
- self.register_builtin_type(mono(MUT_INT), int_mut, vis, Const, Some(FUNC_INT));
- self.register_builtin_type(mono(MUT_NAT), nat_mut, vis, Const, Some(NAT));
- self.register_builtin_type(mono(MUT_FLOAT), float_mut, vis, Const, Some(FUNC_FLOAT));
- self.register_builtin_type(mono(MUT_RATIO), ratio_mut, vis, Const, Some(RATIO));
- self.register_builtin_type(mono(MUT_BOOL), bool_mut, vis, Const, Some(BOOL));
+ self.register_builtin_type(module_t, module, vis.clone(), Const, Some(MODULE_TYPE));
+ self.register_builtin_type(
+ mono(MUTABLE_OBJ),
+ obj_mut,
+ vis.clone(),
+ Const,
+ Some(FUNC_OBJECT),
+ );
+ self.register_builtin_type(mono(MUT_INT), int_mut, vis.clone(), Const, Some(FUNC_INT));
+ self.register_builtin_type(mono(MUT_NAT), nat_mut, vis.clone(), Const, Some(NAT));
+ self.register_builtin_type(
+ mono(MUT_FLOAT),
+ float_mut,
+ vis.clone(),
+ Const,
+ Some(FUNC_FLOAT),
+ );
+ self.register_builtin_type(mono(MUT_RATIO), ratio_mut, vis.clone(), Const, Some(RATIO));
+ self.register_builtin_type(mono(MUT_BOOL), bool_mut, vis.clone(), Const, Some(BOOL));
self.register_builtin_type(mono(MUT_STR), str_mut, vis, Const, Some(STR));
self.register_builtin_type(
mono(NAMED_PROC),
named_proc,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(NAMED_PROC),
);
self.register_builtin_type(
mono(NAMED_FUNC),
named_func,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(NAMED_FUNC),
);
- self.register_builtin_type(mono(QUANTIFIED), quant, Private, Const, Some(QUANTIFIED));
+ self.register_builtin_type(
+ mono(QUANTIFIED),
+ quant,
+ Visibility::BUILTIN_PRIVATE,
+ Const,
+ Some(QUANTIFIED),
+ );
self.register_builtin_type(
mono(QUANTIFIED_FUNC),
qfunc,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(QUANTIFIED_FUNC),
);
diff --git a/funcs.rs b/funcs.rs
index 2f60c0a..3bf8371 100644
--- a/funcs.rs
+++ b/funcs.rs
@@ -1,25 +1,23 @@
#[allow(unused_imports)]
use erg_common::log;
-use erg_common::vis::{Field, Visibility};
use crate::ty::constructors::*;
use crate::ty::typaram::TyParam;
use crate::ty::value::ValueObj;
-use crate::ty::Type;
+use crate::ty::{Field, Type, Visibility};
use Type::*;
use crate::context::initialize::*;
use crate::context::Context;
use crate::varinfo::Mutability;
use Mutability::*;
-use Visibility::*;
impl Context {
pub(super) fn init_builtin_funcs(&mut self) {
let vis = if cfg!(feature = "py_compatible") {
- Public
+ Visibility::BUILTIN_PUBLIC
} else {
- Private
+ Visibility::BUILTIN_PRIVATE
};
let T = mono_q(TY_T, instanceof(Type));
let U = mono_q(TY_U, instanceof(Type));
@@ -222,96 +220,144 @@ impl Context {
self.register_py_builtin(FUNC_ANY, t_any, Some(FUNC_ANY), 33);
self.register_py_builtin(FUNC_ASCII, t_ascii, Some(FUNC_ASCII), 53);
// Leave as `Const`, as it may negatively affect assert casting.
- self.register_builtin_erg_impl(FUNC_ASSERT, t_assert, Const, vis);
- self.register_builtin_py_impl(FUNC_BIN, t_bin, Immutable, vis, Some(FUNC_BIN));
- self.register_builtin_py_impl(FUNC_BYTES, t_bytes, Immutable, vis, Some(FUNC_BYTES));
- self.register_builtin_py_impl(FUNC_CHR, t_chr, Immutable, vis, Some(FUNC_CHR));
- self.register_builtin_py_impl(FUNC_CLASSOF, t_classof, Immutable, vis, Some(FUNC_TYPE));
- self.register_builtin_py_impl(FUNC_COMPILE, t_compile, Immutable, vis, Some(FUNC_COMPILE));
- self.register_builtin_erg_impl(KW_COND, t_cond, Immutable, vis);
+ self.register_builtin_erg_impl(FUNC_ASSERT, t_assert, Const, vis.clone());
+ self.register_builtin_py_impl(FUNC_BIN, t_bin, Immutable, vis.clone(), Some(FUNC_BIN));
+ self.register_builtin_py_impl(
+ FUNC_BYTES,
+ t_bytes,
+ Immutable,
+ vis.clone(),
+ Some(FUNC_BYTES),
+ );
+ self.register_builtin_py_impl(FUNC_CHR, t_chr, Immutable, vis.clone(), Some(FUNC_CHR));
+ self.register_builtin_py_impl(
+ FUNC_CLASSOF,
+ t_classof,
+ Immutable,
+ vis.clone(),
+ Some(FUNC_TYPE),
+ );
+ self.register_builtin_py_impl(
+ FUNC_COMPILE,
+ t_compile,
+ Immutable,
+ vis.clone(),
+ Some(FUNC_COMPILE),
+ );
+ self.register_builtin_erg_impl(KW_COND, t_cond, Immutable, vis.clone());
self.register_builtin_py_impl(
FUNC_ENUMERATE,
t_enumerate,
Immutable,
- vis,
+ vis.clone(),
Some(FUNC_ENUMERATE),
);
- self.register_builtin_py_impl(FUNC_EXIT, t_exit, Immutable, vis, Some(FUNC_EXIT));
+ self.register_builtin_py_impl(FUNC_EXIT, t_exit, Immutable, vis.clone(), Some(FUNC_EXIT));
self.register_builtin_py_impl(
FUNC_ISINSTANCE,
t_isinstance,
Immutable,
- vis,
+ vis.clone(),
Some(FUNC_ISINSTANCE),
);
self.register_builtin_py_impl(
FUNC_ISSUBCLASS,
t_issubclass,
Immutable,
- vis,
+ vis.clone(),
Some(FUNC_ISSUBCLASS),
);
- self.register_builtin_py_impl(FUNC_ITER, t_iter, Immutable, vis, Some(FUNC_ITER));
- self.register_builtin_py_impl(FUNC_LEN, t_len, Immutable, vis, Some(FUNC_LEN));
- self.register_builtin_py_impl(FUNC_MAP, t_map, Immutable, vis, Some(FUNC_MAP));
- self.register_builtin_py_impl(FUNC_MAX, t_max, Immutable, vis, Some(FUNC_MAX));
- self.register_builtin_py_impl(FUNC_MIN, t_min, Immutable, vis, Some(FUNC_MIN));
- self.register_builtin_py_impl(FUNC_NOT, t_not, Immutable, vis, None); // `not` is not a function in Python
- self.register_builtin_py_impl(FUNC_OCT, t_oct, Immutable, vis, Some(FUNC_OCT));
- self.register_builtin_py_impl(FUNC_ORD, t_ord, Immutable, vis, Some(FUNC_ORD));
- self.register_builtin_py_impl(FUNC_POW, t_pow, Immutable, vis, Some(FUNC_POW));
+ self.register_builtin_py_impl(FUNC_ITER, t_iter, Immutable, vis.clone(), Some(FUNC_ITER));
+ self.register_builtin_py_impl(FUNC_LEN, t_len, Immutable, vis.clone(), Some(FUNC_LEN));
+ self.register_builtin_py_impl(FUNC_MAP, t_map, Immutable, vis.clone(), Some(FUNC_MAP));
+ self.register_builtin_py_impl(FUNC_MAX, t_max, Immutable, vis.clone(), Some(FUNC_MAX));
+ self.register_builtin_py_impl(FUNC_MIN, t_min, Immutable, vis.clone(), Some(FUNC_MIN));
+ self.register_builtin_py_impl(FUNC_NOT, t_not, Immutable, vis.clone(), None); // `not` is not a function in Python
+ self.register_builtin_py_impl(FUNC_OCT, t_oct, Immutable, vis.clone(), Some(FUNC_OCT));
+ self.register_builtin_py_impl(FUNC_ORD, t_ord, Immutable, vis.clone(), Some(FUNC_ORD));
+ self.register_builtin_py_impl(FUNC_POW, t_pow, Immutable, vis.clone(), Some(FUNC_POW));
self.register_builtin_py_impl(
PYIMPORT,
t_pyimport.clone(),
Immutable,
- vis,
+ vis.clone(),
Some(FUNDAMENTAL_IMPORT),
);
- self.register_builtin_py_impl(FUNC_QUIT, t_quit, Immutable, vis, Some(FUNC_QUIT));
- self.register_builtin_py_impl(FUNC_REPR, t_repr, Immutable, vis, Some(FUNC_REPR));
+ self.register_builtin_py_impl(FUNC_QUIT, t_quit, Immutable, vis.clone(), Some(FUNC_QUIT));
+ self.register_builtin_py_impl(FUNC_REPR, t_repr, Immutable, vis.clone(), Some(FUNC_REPR));
self.register_builtin_py_impl(
FUNC_REVERSED,
t_reversed,
Immutable,
- vis,
+ vis.clone(),
Some(FUNC_REVERSED),
);
- self.register_builtin_py_impl(FUNC_ROUND, t_round, Immutable, vis, Some(FUNC_ROUND));
- self.register_builtin_py_impl(FUNC_SORTED, t_sorted, Immutable, vis, Some(FUNC_SORTED));
- self.register_builtin_py_impl(FUNC_STR, t_str, Immutable, vis, Some(FUNC_STR__));
- self.register_builtin_py_impl(FUNC_SUM, t_sum, Immutable, vis, Some(FUNC_SUM));
- self.register_builtin_py_impl(FUNC_ZIP, t_zip, Immutable, vis, Some(FUNC_ZIP));
+ self.register_builtin_py_impl(
+ FUNC_ROUND,
+ t_round,
+ Immutable,
+ vis.clone(),
+ Some(FUNC_ROUND),
+ );
+ self.register_builtin_py_impl(
+ FUNC_SORTED,
+ t_sorted,
+ Immutable,
+ vis.clone(),
+ Some(FUNC_SORTED),
+ );
+ self.register_builtin_py_impl(FUNC_STR, t_str, Immutable, vis.clone(), Some(FUNC_STR__));
+ self.register_builtin_py_impl(FUNC_SUM, t_sum, Immutable, vis.clone(), Some(FUNC_SUM));
+ self.register_builtin_py_impl(FUNC_ZIP, t_zip, Immutable, vis.clone(), Some(FUNC_ZIP));
let name = if cfg!(feature = "py_compatible") {
FUNC_INT
} else {
FUNC_INT__
};
- self.register_builtin_py_impl(FUNC_INT, t_int, Immutable, vis, Some(name));
+ self.register_builtin_py_impl(FUNC_INT, t_int, Immutable, vis.clone(), Some(name));
if !cfg!(feature = "py_compatible") {
- self.register_builtin_py_impl(FUNC_IF, t_if, Immutable, vis, Some(FUNC_IF__));
+ self.register_builtin_py_impl(FUNC_IF, t_if, Immutable, vis.clone(), Some(FUNC_IF__));
self.register_builtin_py_impl(
FUNC_DISCARD,
t_discard,
Immutable,
- vis,
+ vis.clone(),
Some(FUNC_DISCARD__),
);
self.register_builtin_py_impl(
FUNC_IMPORT,
t_import,
Immutable,
- vis,
+ vis.clone(),
Some(FUNDAMENTAL_IMPORT),
);
- self.register_builtin_py_impl(FUNC_LOG, t_log, Immutable, vis, Some(FUNC_PRINT));
- self.register_builtin_py_impl(FUNC_NAT, t_nat, Immutable, vis, Some(FUNC_NAT__));
- self.register_builtin_py_impl(FUNC_PANIC, t_panic, Immutable, vis, Some(FUNC_QUIT));
+ self.register_builtin_py_impl(
+ FUNC_LOG,
+ t_log,
+ Immutable,
+ vis.clone(),
+ Some(FUNC_PRINT),
+ );
+ self.register_builtin_py_impl(
+ FUNC_NAT,
+ t_nat,
+ Immutable,
+ vis.clone(),
+ Some(FUNC_NAT__),
+ );
+ self.register_builtin_py_impl(
+ FUNC_PANIC,
+ t_panic,
+ Immutable,
+ vis.clone(),
+ Some(FUNC_QUIT),
+ );
if cfg!(feature = "debug") {
self.register_builtin_py_impl(
PY,
t_pyimport,
Immutable,
- vis,
+ vis.clone(),
Some(FUNDAMENTAL_IMPORT),
);
}
@@ -319,7 +365,7 @@ impl Context {
PYCOMPILE,
t_pycompile,
Immutable,
- vis,
+ vis.clone(),
Some(FUNC_COMPILE),
);
// TODO: original implementation
@@ -340,7 +386,13 @@ impl Context {
],
poly(RANGE, vec![ty_tp(Int)]),
);
- self.register_builtin_py_impl(FUNC_RANGE, t_range, Immutable, vis, Some(FUNC_RANGE));
+ self.register_builtin_py_impl(
+ FUNC_RANGE,
+ t_range,
+ Immutable,
+ vis.clone(),
+ Some(FUNC_RANGE),
+ );
let t_list = func(
vec![],
None,
@@ -348,7 +400,13 @@ impl Context {
poly(ARRAY, vec![ty_tp(T.clone()), TyParam::erased(Nat)]),
)
.quantify();
- self.register_builtin_py_impl(FUNC_LIST, t_list, Immutable, vis, Some(FUNC_LIST));
+ self.register_builtin_py_impl(
+ FUNC_LIST,
+ t_list,
+ Immutable,
+ vis.clone(),
+ Some(FUNC_LIST),
+ );
let t_dict = func(
vec![],
None,
@@ -365,9 +423,9 @@ impl Context {
pub(super) fn init_builtin_const_funcs(&mut self) {
let vis = if cfg!(feature = "py_compatible") {
- Public
+ Visibility::BUILTIN_PUBLIC
} else {
- Private
+ Visibility::BUILTIN_PRIVATE
};
let class_t = func(
vec![],
@@ -376,7 +434,7 @@ impl Context {
ClassType,
);
let class = ConstSubr::Builtin(BuiltinConstSubr::new(CLASS, class_func, class_t, None));
- self.register_builtin_const(CLASS, vis, ValueObj::Subr(class));
+ self.register_builtin_const(CLASS, vis.clone(), ValueObj::Subr(class));
let inherit_t = func(
vec![kw(KW_SUPER, ClassType)],
None,
@@ -389,7 +447,7 @@ impl Context {
inherit_t,
None,
));
- self.register_builtin_const(INHERIT, vis, ValueObj::Subr(inherit));
+ self.register_builtin_const(INHERIT, vis.clone(), ValueObj::Subr(inherit));
let trait_t = func(
vec![kw(KW_REQUIREMENT, Type)],
None,
@@ -397,7 +455,7 @@ impl Context {
TraitType,
);
let trait_ = ConstSubr::Builtin(BuiltinConstSubr::new(TRAIT, trait_func, trait_t, None));
- self.register_builtin_const(TRAIT, vis, ValueObj::Subr(trait_));
+ self.register_builtin_const(TRAIT, vis.clone(), ValueObj::Subr(trait_));
let subsume_t = func(
vec![kw(KW_SUPER, TraitType)],
None,
@@ -410,14 +468,14 @@ impl Context {
subsume_t,
None,
));
- self.register_builtin_const(SUBSUME, vis, ValueObj::Subr(subsume));
+ self.register_builtin_const(SUBSUME, vis.clone(), ValueObj::Subr(subsume));
let structural = ConstSubr::Builtin(BuiltinConstSubr::new(
STRUCTURAL,
structural_func,
func1(Type, Type),
None,
));
- self.register_builtin_const(STRUCTURAL, vis, ValueObj::Subr(structural));
+ self.register_builtin_const(STRUCTURAL, vis.clone(), ValueObj::Subr(structural));
// decorators
let inheritable_t = func1(ClassType, ClassType);
let inheritable = ConstSubr::Builtin(BuiltinConstSubr::new(
@@ -426,10 +484,10 @@ impl Context {
inheritable_t,
None,
));
- self.register_builtin_const(INHERITABLE, vis, ValueObj::Subr(inheritable));
+ self.register_builtin_const(INHERITABLE, vis.clone(), ValueObj::Subr(inheritable));
// TODO: register Del function object
let t_del = nd_func(vec![kw(KW_OBJ, Obj)], None, NoneType);
- self.register_builtin_erg_impl(DEL, t_del, Immutable, vis);
+ self.register_builtin_erg_impl(DEL, t_del, Immutable, vis.clone());
let patch_t = func(
vec![kw(KW_REQUIREMENT, Type)],
None,
@@ -451,65 +509,65 @@ impl Context {
proj(L, OUTPUT),
)
.quantify();
- self.register_builtin_erg_impl(OP_ADD, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_ADD, op_t, Const, Visibility::BUILTIN_PRIVATE);
let L = mono_q(TY_L, subtypeof(poly(SUB, params.clone())));
let op_t = bin_op(L.clone(), R.clone(), proj(L, OUTPUT)).quantify();
- self.register_builtin_erg_impl(OP_SUB, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_SUB, op_t, Const, Visibility::BUILTIN_PRIVATE);
let L = mono_q(TY_L, subtypeof(poly(MUL, params.clone())));
let op_t = bin_op(L.clone(), R.clone(), proj(L, OUTPUT)).quantify();
- self.register_builtin_erg_impl(OP_MUL, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_MUL, op_t, Const, Visibility::BUILTIN_PRIVATE);
let L = mono_q(TY_L, subtypeof(poly(DIV, params.clone())));
let op_t = bin_op(L.clone(), R.clone(), proj(L, OUTPUT)).quantify();
- self.register_builtin_erg_impl(OP_DIV, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_DIV, op_t, Const, Visibility::BUILTIN_PRIVATE);
let L = mono_q(TY_L, subtypeof(poly(FLOOR_DIV, params)));
let op_t = bin_op(L.clone(), R, proj(L, OUTPUT)).quantify();
- self.register_builtin_erg_impl(OP_FLOOR_DIV, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_FLOOR_DIV, op_t, Const, Visibility::BUILTIN_PRIVATE);
let P = mono_q(TY_P, Constraint::Uninited);
let P = mono_q(TY_P, subtypeof(poly(MUL, vec![ty_tp(P)])));
let op_t = bin_op(P.clone(), P.clone(), proj(P, POW_OUTPUT)).quantify();
// TODO: add bound: M == M.Output
- self.register_builtin_erg_impl(OP_POW, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_POW, op_t, Const, Visibility::BUILTIN_PRIVATE);
let M = mono_q(TY_M, Constraint::Uninited);
let M = mono_q(TY_M, subtypeof(poly(DIV, vec![ty_tp(M)])));
let op_t = bin_op(M.clone(), M.clone(), proj(M, MOD_OUTPUT)).quantify();
- self.register_builtin_erg_impl(OP_MOD, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_MOD, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = nd_proc(vec![kw(KW_LHS, Obj), kw(KW_RHS, Obj)], None, Bool);
- self.register_builtin_erg_impl(OP_IS, op_t.clone(), Const, Private);
- self.register_builtin_erg_impl(OP_IS_NOT, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_IS, op_t.clone(), Const, Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_impl(OP_IS_NOT, op_t, Const, Visibility::BUILTIN_PRIVATE);
let E = mono_q(TY_E, subtypeof(mono(EQ)));
let op_t = bin_op(E.clone(), E, Bool).quantify();
- self.register_builtin_erg_impl(OP_EQ, op_t.clone(), Const, Private);
- self.register_builtin_erg_impl(OP_NE, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_EQ, op_t.clone(), Const, Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_impl(OP_NE, op_t, Const, Visibility::BUILTIN_PRIVATE);
let O = mono_q(TY_O, subtypeof(mono(ORD)));
let op_t = bin_op(O.clone(), O.clone(), Bool).quantify();
- self.register_builtin_erg_impl(OP_LT, op_t.clone(), Const, Private);
- self.register_builtin_erg_impl(OP_LE, op_t.clone(), Const, Private);
- self.register_builtin_erg_impl(OP_GT, op_t.clone(), Const, Private);
- self.register_builtin_erg_impl(OP_GE, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_LT, op_t.clone(), Const, Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_impl(OP_LE, op_t.clone(), Const, Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_impl(OP_GT, op_t.clone(), Const, Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_impl(OP_GE, op_t, Const, Visibility::BUILTIN_PRIVATE);
let BT = mono_q(TY_BT, subtypeof(or(Bool, Type)));
let op_t = bin_op(BT.clone(), BT.clone(), BT).quantify();
- self.register_builtin_erg_impl(OP_AND, op_t.clone(), Const, Private);
- self.register_builtin_erg_impl(OP_OR, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_AND, op_t.clone(), Const, Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_impl(OP_OR, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = bin_op(O.clone(), O.clone(), range(O)).quantify();
- self.register_builtin_erg_decl(OP_RNG, op_t.clone(), Private);
- self.register_builtin_erg_decl(OP_LORNG, op_t.clone(), Private);
- self.register_builtin_erg_decl(OP_RORNG, op_t.clone(), Private);
- self.register_builtin_erg_decl(OP_ORNG, op_t, Private);
+ self.register_builtin_erg_decl(OP_RNG, op_t.clone(), Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_decl(OP_LORNG, op_t.clone(), Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_decl(OP_RORNG, op_t.clone(), Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_decl(OP_ORNG, op_t, Visibility::BUILTIN_PRIVATE);
// TODO: use existential type: |T: Type| (T, In(T)) -> Bool
let T = mono_q(TY_T, instanceof(Type));
let I = mono_q(KW_I, subtypeof(poly(IN, vec![ty_tp(T.clone())])));
let op_t = bin_op(I, T, Bool).quantify();
- self.register_builtin_erg_impl(OP_IN, op_t.clone(), Const, Private);
- self.register_builtin_erg_impl(OP_NOT_IN, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_IN, op_t.clone(), Const, Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_impl(OP_NOT_IN, op_t, Const, Visibility::BUILTIN_PRIVATE);
/* unary */
// TODO: +/- Bool would like to be warned
let M = mono_q(TY_M, subtypeof(mono(MUTIZABLE)));
let op_t = func1(M.clone(), proj(M, MUTABLE_MUT_TYPE)).quantify();
- self.register_builtin_erg_impl(OP_MUTATE, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_MUTATE, op_t, Const, Visibility::BUILTIN_PRIVATE);
let N = mono_q(TY_N, subtypeof(mono(NUM)));
let op_t = func1(N.clone(), N).quantify();
- self.register_builtin_erg_decl(OP_POS, op_t.clone(), Private);
- self.register_builtin_erg_decl(OP_NEG, op_t, Private);
+ self.register_builtin_erg_decl(OP_POS, op_t.clone(), Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_decl(OP_NEG, op_t, Visibility::BUILTIN_PRIVATE);
}
pub(super) fn init_py_builtin_operators(&mut self) {
@@ -525,7 +583,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), O.clone()).quantify()
};
- self.register_builtin_erg_impl(OP_ADD, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_ADD, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__sub__".into()) => fn1_met(Never, R.clone(), O.clone()) },
@@ -533,7 +591,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), O.clone()).quantify()
};
- self.register_builtin_erg_impl(OP_SUB, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_SUB, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__mul__".into()) => fn1_met(Never, R.clone(), O.clone()) },
@@ -541,7 +599,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), O.clone()).quantify()
};
- self.register_builtin_erg_impl(OP_MUL, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_MUL, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__div__".into()) => fn1_met(Never, R.clone(), O.clone()) },
@@ -549,7 +607,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), O.clone()).quantify()
};
- self.register_builtin_erg_impl(OP_DIV, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_DIV, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__floordiv__".into()) => fn1_met(Never, R.clone(), O.clone()) },
@@ -557,7 +615,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), O.clone()).quantify()
};
- self.register_builtin_erg_impl(OP_FLOOR_DIV, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_FLOOR_DIV, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__pow__".into()) => fn1_met(Never, R.clone(), O.clone()) },
@@ -565,7 +623,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), O.clone()).quantify()
};
- self.register_builtin_erg_impl(OP_POW, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_POW, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__mod__".into()) => fn1_met(Never, R.clone(), O.clone()) },
@@ -573,10 +631,10 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), O.clone()).quantify()
};
- self.register_builtin_erg_impl(OP_MOD, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_MOD, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = nd_proc(vec![kw(KW_LHS, Obj), kw(KW_RHS, Obj)], None, Bool);
- self.register_builtin_erg_impl(OP_IS, op_t.clone(), Const, Private);
- self.register_builtin_erg_impl(OP_IS_NOT, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_IS, op_t.clone(), Const, Visibility::BUILTIN_PRIVATE);
+ self.register_builtin_erg_impl(OP_IS_NOT, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__eq__".into()) => fn1_met(Never, R.clone(), Bool) },
@@ -584,7 +642,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), Bool).quantify()
};
- self.register_builtin_erg_impl(OP_EQ, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_EQ, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__ne__".into()) => fn1_met(Never, R.clone(), Bool) },
@@ -592,7 +650,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), Bool).quantify()
};
- self.register_builtin_erg_impl(OP_NE, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_NE, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__lt__".into()) => fn1_met(Never, R.clone(), Bool) },
@@ -600,7 +658,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), Bool).quantify()
};
- self.register_builtin_erg_impl(OP_LT, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_LT, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__le__".into()) => fn1_met(Never, R.clone(), Bool) },
@@ -608,7 +666,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), Bool).quantify()
};
- self.register_builtin_erg_impl(OP_LE, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_LE, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__gt__".into()) => fn1_met(Never, R.clone(), Bool) },
@@ -616,7 +674,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), Bool).quantify()
};
- self.register_builtin_erg_impl(OP_GT, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_GT, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__ge__".into()) => fn1_met(Never, R.clone(), Bool) },
@@ -624,7 +682,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), Bool).quantify()
};
- self.register_builtin_erg_impl(OP_GE, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_GE, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__and__".into()) => fn1_met(Never, R.clone(), O.clone()) },
@@ -632,7 +690,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), O.clone()).quantify()
};
- self.register_builtin_erg_impl(OP_AND, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_AND, op_t, Const, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S = Type::from(
dict! { Field::public("__or__".into()) => fn1_met(Never, R.clone(), O.clone()) },
@@ -640,7 +698,7 @@ impl Context {
.structuralize();
bin_op(S, R.clone(), O).quantify()
};
- self.register_builtin_erg_impl(OP_OR, op_t, Const, Private);
+ self.register_builtin_erg_impl(OP_OR, op_t, Const, Visibility::BUILTIN_PRIVATE);
/* unary */
let op_t = {
let S =
@@ -648,13 +706,13 @@ impl Context {
.structuralize();
func1(S, R.clone()).quantify()
};
- self.register_builtin_erg_decl(OP_POS, op_t, Private);
+ self.register_builtin_erg_decl(OP_POS, op_t, Visibility::BUILTIN_PRIVATE);
let op_t = {
let S =
Type::from(dict! { Field::public("__neg__".into()) => fn0_met(Never, R.clone()) })
.structuralize();
func1(S, R).quantify()
};
- self.register_builtin_erg_decl(OP_NEG, op_t, Private);
+ self.register_builtin_erg_decl(OP_NEG, op_t, Visibility::BUILTIN_PRIVATE);
}
}
diff --git a/mod.rs b/mod.rs
index a164fd1..ca034bf 100644
--- a/mod.rs
+++ b/mod.rs
@@ -11,6 +11,7 @@ pub mod free;
pub mod predicate;
pub mod typaram;
pub mod value;
+pub mod vis;
use std::fmt;
use std::ops::{BitAnd, BitOr, Deref, Not, Range, RangeInclusive};
@@ -22,7 +23,6 @@ use erg_common::fresh::fresh_varname;
use erg_common::log;
use erg_common::set::Set;
use erg_common::traits::{LimitedDisplay, StructuralEq};
-use erg_common::vis::Field;
use erg_common::{enum_unwrap, fmt_option, ref_addr_eq, set, Str};
use erg_parser::token::TokenKind;
@@ -35,6 +35,7 @@ use typaram::{IntervalOp, TyParam};
use value::value_set::*;
use value::ValueObj;
use value::ValueObj::{Inf, NegInf};
+pub use vis::*;
/// cloneのコストがあるためなるべく.ref_tを使うようにすること
/// いくつかの構造体は直接Typeを保持していないので、その場合は.tを使う
@@ -534,9 +535,6 @@ impl LimitedDisplay for RefinementType {
write!(f, "{rhs}, ")?;
}
write!(f, "}}")?;
- if cfg!(feature = "debug") {
- write!(f, "(<: {})", self.t)?;
- }
Ok(())
} else {
write!(f, "{{{}: ", self.var)?;
diff --git a/patches.rs b/patches.rs
index 82c9eb9..9e0d35e 100644
--- a/patches.rs
+++ b/patches.rs
@@ -1,18 +1,16 @@
#[allow(unused_imports)]
use erg_common::log;
-use erg_common::vis::Visibility;
use crate::ty::constructors::*;
use crate::ty::typaram::TyParam;
use crate::ty::value::ValueObj;
-use crate::ty::Type;
+use crate::ty::{Type, Visibility};
use Type::*;
use crate::context::initialize::*;
use crate::context::Context;
use crate::varinfo::Mutability;
use Mutability::*;
-use Visibility::*;
impl Context {
pub(super) fn init_builtin_patches(&mut self) {
@@ -38,10 +36,10 @@ impl Context {
)
.quantify();
let mut interval_add = Self::builtin_methods(Some(impls), 2);
- interval_add.register_builtin_erg_impl("__add__", op_t, Const, Public);
+ interval_add.register_builtin_erg_impl("__add__", op_t, Const, Visibility::BUILTIN_PUBLIC);
interval_add.register_builtin_const(
"Output",
- Public,
+ Visibility::BUILTIN_PUBLIC,
ValueObj::builtin_t(Type::from(m.clone() + o.clone()..=n.clone() + p.clone())),
);
interval.register_trait(class.clone(), interval_add);
@@ -53,18 +51,18 @@ impl Context {
Type::from(m.clone() - p.clone()..=n.clone() - o.clone()),
)
.quantify();
- interval_sub.register_builtin_erg_impl("__sub__", op_t, Const, Public);
+ interval_sub.register_builtin_erg_impl("__sub__", op_t, Const, Visibility::BUILTIN_PUBLIC);
interval_sub.register_builtin_const(
"Output",
- Public,
+ Visibility::BUILTIN_PUBLIC,
ValueObj::builtin_t(Type::from(m - p..=n - o)),
);
interval.register_trait(class, interval_sub);
- self.register_builtin_patch("Interval", interval, Private, Const);
- // eq.register_impl("__ne__", op_t, Const, Public);
- // ord.register_impl("__le__", op_t.clone(), Const, Public);
- // ord.register_impl("__gt__", op_t.clone(), Const, Public);
- // ord.register_impl("__ge__", op_t, Const, Public);
+ self.register_builtin_patch("Interval", interval, Visibility::BUILTIN_PRIVATE, Const);
+ // eq.register_impl("__ne__", op_t, Const, Visibility::BUILTIN_PUBLIC);
+ // ord.register_impl("__le__", op_t.clone(), Const, Visibility::BUILTIN_PUBLIC);
+ // ord.register_impl("__gt__", op_t.clone(), Const, Visibility::BUILTIN_PUBLIC);
+ // ord.register_impl("__ge__", op_t, Const, Visibility::BUILTIN_PUBLIC);
let E = mono_q("E", subtypeof(mono("Eq")));
let base = or(E, NoneType);
let impls = mono("Eq");
@@ -73,8 +71,8 @@ impl Context {
Self::builtin_poly_glue_patch("OptionEq", base.clone(), impls.clone(), params, 1);
let mut option_eq_impl = Self::builtin_methods(Some(impls), 1);
let op_t = fn1_met(base.clone(), base.clone(), Bool).quantify();
- option_eq_impl.register_builtin_erg_impl("__eq__", op_t, Const, Public);
+ option_eq_impl.register_builtin_erg_impl("__eq__", op_t, Const, Visibility::BUILTIN_PUBLIC);
option_eq.register_trait(base, option_eq_impl);
- self.register_builtin_patch("OptionEq", option_eq, Private, Const);
+ self.register_builtin_patch("OptionEq", option_eq, Visibility::BUILTIN_PRIVATE, Const);
}
}
diff --git a/procs.rs b/procs.rs
index 102225b..86499df 100644
--- a/procs.rs
+++ b/procs.rs
@@ -1,24 +1,22 @@
#[allow(unused_imports)]
use erg_common::log;
-use erg_common::vis::Visibility;
use crate::ty::constructors::*;
use crate::ty::typaram::TyParam;
-use crate::ty::Type;
+use crate::ty::{Type, Visibility};
use Type::*;
use crate::context::initialize::*;
use crate::context::Context;
use crate::varinfo::Mutability;
use Mutability::*;
-use Visibility::*;
impl Context {
pub(super) fn init_builtin_procs(&mut self) {
let vis = if cfg!(feature = "py_compatible") {
- Public
+ Visibility::BUILTIN_PUBLIC
} else {
- Private
+ Visibility::BUILTIN_PRIVATE
};
let T = mono_q("T", instanceof(Type));
let U = mono_q("U", instanceof(Type));
@@ -119,32 +117,38 @@ impl Context {
U,
)
.quantify();
- self.register_builtin_py_impl("dir!", t_dir, Immutable, vis, Some("dir"));
+ self.register_builtin_py_impl("dir!", t_dir, Immutable, vis.clone(), Some("dir"));
self.register_py_builtin("print!", t_print, Some("print"), 81);
- self.register_builtin_py_impl("id!", t_id, Immutable, vis, Some("id"));
- self.register_builtin_py_impl("input!", t_input, Immutable, vis, Some("input"));
- self.register_builtin_py_impl("globals!", t_globals, Immutable, vis, Some("globals"));
- self.register_builtin_py_impl("locals!", t_locals, Immutable, vis, Some("locals"));
- self.register_builtin_py_impl("next!", t_next, Immutable, vis, Some("next"));
+ self.register_builtin_py_impl("id!", t_id, Immutable, vis.clone(), Some("id"));
+ self.register_builtin_py_impl("input!", t_input, Immutable, vis.clone(), Some("input"));
+ self.register_builtin_py_impl(
+ "globals!",
+ t_globals,
+ Immutable,
+ vis.clone(),
+ Some("globals"),
+ );
+ self.register_builtin_py_impl("locals!", t_locals, Immutable, vis.clone(), Some("locals"));
+ self.register_builtin_py_impl("next!", t_next, Immutable, vis.clone(), Some("next"));
self.register_py_builtin("open!", t_open, Some("open"), 198);
let name = if cfg!(feature = "py_compatible") {
"if"
} else {
"if__"
};
- self.register_builtin_py_impl("if!", t_if, Immutable, vis, Some(name));
+ self.register_builtin_py_impl("if!", t_if, Immutable, vis.clone(), Some(name));
let name = if cfg!(feature = "py_compatible") {
"for"
} else {
"for__"
};
- self.register_builtin_py_impl("for!", t_for, Immutable, vis, Some(name));
+ self.register_builtin_py_impl("for!", t_for, Immutable, vis.clone(), Some(name));
let name = if cfg!(feature = "py_compatible") {
"while"
} else {
"while__"
};
- self.register_builtin_py_impl("while!", t_while, Immutable, vis, Some(name));
+ self.register_builtin_py_impl("while!", t_while, Immutable, vis.clone(), Some(name));
let name = if cfg!(feature = "py_compatible") {
"with"
} else {
diff --git a/traits.rs b/traits.rs
index dba0f55..8429578 100644
--- a/traits.rs
+++ b/traits.rs
@@ -1,11 +1,10 @@
#[allow(unused_imports)]
use erg_common::log;
-use erg_common::vis::Visibility;
use crate::ty::constructors::*;
use crate::ty::typaram::TyParam;
use crate::ty::value::ValueObj;
-use crate::ty::Type;
+use crate::ty::{Type, Visibility};
use ParamSpec as PS;
use Type::*;
@@ -14,7 +13,6 @@ use crate::context::{ConstTemplate, Context, DefaultInfo, ParamSpec};
use crate::varinfo::Mutability;
use DefaultInfo::*;
use Mutability::*;
-use Visibility::*;
impl Context {
/// see std/prelude.er
@@ -24,9 +22,9 @@ impl Context {
// push_subtype_boundなどはユーザー定義APIの型境界決定のために使用する
pub(super) fn init_builtin_traits(&mut self) {
let vis = if cfg!(feature = "py_compatible") {
- Public
+ Visibility::BUILTIN_PUBLIC
} else {
- Private
+ Visibility::BUILTIN_PRIVATE
};
let unpack = Self::builtin_mono_trait(UNPACK, 2);
let inheritable_type = Self::builtin_mono_trait(INHERITABLE_TYPE, 2);
@@ -36,25 +34,35 @@ impl Context {
let immut_t = proj(Slf.clone(), IMMUT_TYPE);
let f_t = func(vec![kw(KW_OLD, immut_t.clone())], None, vec![], immut_t);
let t = pr1_met(ref_mut(Slf, None), f_t, NoneType).quantify();
- mutable.register_builtin_erg_decl(PROC_UPDATE, t, Public);
+ mutable.register_builtin_erg_decl(PROC_UPDATE, t, Visibility::BUILTIN_PUBLIC);
// REVIEW: Immutatable?
let mut immutizable = Self::builtin_mono_trait(IMMUTIZABLE, 2);
immutizable.register_superclass(mono(MUTABLE), &mutable);
- immutizable.register_builtin_erg_decl(IMMUT_TYPE, Type, Public);
+ immutizable.register_builtin_erg_decl(IMMUT_TYPE, Type, Visibility::BUILTIN_PUBLIC);
// REVIEW: Mutatable?
let mut mutizable = Self::builtin_mono_trait(MUTIZABLE, 2);
- mutizable.register_builtin_erg_decl(MUTABLE_MUT_TYPE, Type, Public);
+ mutizable.register_builtin_erg_decl(MUTABLE_MUT_TYPE, Type, Visibility::BUILTIN_PUBLIC);
let pathlike = Self::builtin_mono_trait(PATH_LIKE, 2);
/* Readable */
let mut readable = Self::builtin_mono_trait(MUTABLE_READABLE, 2);
let Slf = mono_q(SELF, subtypeof(mono(MUTABLE_READABLE)));
let t_read = pr_met(ref_mut(Slf, None), vec![], None, vec![kw(KW_N, Int)], Str).quantify();
- readable.register_builtin_py_decl(PROC_READ, t_read, Public, Some(FUNC_READ));
+ readable.register_builtin_py_decl(
+ PROC_READ,
+ t_read,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_READ),
+ );
/* Writable */
let mut writable = Self::builtin_mono_trait(MUTABLE_WRITABLE, 2);
let Slf = mono_q(SELF, subtypeof(mono(MUTABLE_WRITABLE)));
let t_write = pr1_kw_met(ref_mut(Slf, None), kw("s", Str), Nat).quantify();
- writable.register_builtin_py_decl(PROC_WRITE, t_write, Public, Some(FUNC_WRITE));
+ writable.register_builtin_py_decl(
+ PROC_WRITE,
+ t_write,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNC_WRITE),
+ );
// TODO: Add required methods
let mut filelike = Self::builtin_mono_trait(FILE_LIKE, 2);
filelike.register_superclass(mono(READABLE), &readable);
@@ -65,7 +73,12 @@ impl Context {
let mut show = Self::builtin_mono_trait(SHOW, 2);
let Slf = mono_q(SELF, subtypeof(mono(SHOW)));
let t_show = fn0_met(ref_(Slf), Str).quantify();
- show.register_builtin_py_decl(TO_STR, t_show, Public, Some(FUNDAMENTAL_STR));
+ show.register_builtin_py_decl(
+ TO_STR,
+ t_show,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNDAMENTAL_STR),
+ );
/* In */
let mut in_ = Self::builtin_poly_trait(IN, vec![PS::t_nd(TY_T)], 2);
let params = vec![PS::t_nd(TY_T)];
@@ -75,7 +88,7 @@ impl Context {
let I = mono_q(TY_I, subtypeof(poly(IN, vec![ty_tp(T.clone())])));
in_.register_superclass(poly(INPUT, vec![ty_tp(T.clone())]), &input);
let op_t = fn1_met(T.clone(), I, Bool).quantify();
- in_.register_builtin_erg_decl(OP_IN, op_t, Public);
+ in_.register_builtin_erg_decl(OP_IN, op_t, Visibility::BUILTIN_PUBLIC);
/* Eq */
// Erg does not have a trait equivalent to `PartialEq` in Rust
// This means, Erg's `Float` cannot be compared with other `Float`
@@ -84,13 +97,13 @@ impl Context {
let Slf = mono_q(SELF, subtypeof(mono(EQ)));
// __eq__: |Self <: Eq| (self: Self, other: Self) -> Bool
let op_t = fn1_met(Slf.clone(), Slf, Bool).quantify();
- eq.register_builtin_erg_decl(OP_EQ, op_t, Public);
+ eq.register_builtin_erg_decl(OP_EQ, op_t, Visibility::BUILTIN_PUBLIC);
/* Ord */
let mut ord = Self::builtin_mono_trait(ORD, 2);
ord.register_superclass(mono(EQ), &eq);
let Slf = mono_q(SELF, subtypeof(mono(ORD)));
let op_t = fn1_met(Slf.clone(), Slf, or(mono(ORDERING), NoneType)).quantify();
- ord.register_builtin_erg_decl(OP_CMP, op_t, Public);
+ ord.register_builtin_erg_decl(OP_CMP, op_t, Visibility::BUILTIN_PUBLIC);
// FIXME: poly trait
/* Num */
let num = Self::builtin_mono_trait(NUM, 2);
@@ -104,24 +117,29 @@ impl Context {
seq.register_superclass(poly(OUTPUT, vec![ty_tp(T.clone())]), &output);
let Slf = mono_q(SELF, subtypeof(poly(SEQ, vec![TyParam::erased(Type)])));
let t = fn0_met(Slf.clone(), Nat).quantify();
- seq.register_builtin_erg_decl(FUNC_LEN, t, Public);
+ seq.register_builtin_erg_decl(FUNC_LEN, t, Visibility::BUILTIN_PUBLIC);
let t = fn1_met(Slf, Nat, T.clone()).quantify();
// Seq.get: |Self <: Seq(T)| Self.(Nat) -> T
- seq.register_builtin_erg_decl(FUNC_GET, t, Public);
+ seq.register_builtin_erg_decl(FUNC_GET, t, Visibility::BUILTIN_PUBLIC);
/* Iterable */
let mut iterable = Self::builtin_poly_trait(ITERABLE, vec![PS::t_nd(TY_T)], 2);
iterable.register_superclass(poly(OUTPUT, vec![ty_tp(T.clone())]), &output);
let Slf = mono_q(SELF, subtypeof(poly(ITERABLE, vec![ty_tp(T.clone())])));
let t = fn0_met(Slf.clone(), proj(Slf, ITER)).quantify();
- iterable.register_builtin_py_decl(FUNC_ITER, t, Public, Some(FUNDAMENTAL_ITER));
- iterable.register_builtin_erg_decl(ITER, Type, Public);
+ iterable.register_builtin_py_decl(
+ FUNC_ITER,
+ t,
+ Visibility::BUILTIN_PUBLIC,
+ Some(FUNDAMENTAL_ITER),
+ );
+ iterable.register_builtin_erg_decl(ITER, Type, Visibility::BUILTIN_PUBLIC);
let mut context_manager = Self::builtin_mono_trait(CONTEXT_MANAGER, 2);
let Slf = mono_q(SELF, subtypeof(mono(CONTEXT_MANAGER)));
let t = fn0_met(Slf.clone(), NoneType).quantify();
context_manager.register_builtin_py_decl(
FUNDAMENTAL_ENTER,
t,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNDAMENTAL_ENTER),
);
let t = fn_met(
@@ -139,7 +157,7 @@ impl Context {
context_manager.register_builtin_py_decl(
FUNDAMENTAL_EXIT,
t,
- Public,
+ Visibility::BUILTIN_PUBLIC,
Some(FUNDAMENTAL_EXIT),
);
let R = mono_q(TY_R, instanceof(Type));
@@ -152,111 +170,141 @@ impl Context {
add.register_superclass(poly(OUTPUT, vec![ty_tp(R.clone())]), &output);
let Slf = mono_q(SELF, subtypeof(poly(ADD, ty_params.clone())));
let op_t = fn1_met(Slf.clone(), R.clone(), proj(Slf, OUTPUT)).quantify();
- add.register_builtin_erg_decl(OP_ADD, op_t, Public);
- add.register_builtin_erg_decl(OUTPUT, Type, Public);
+ add.register_builtin_erg_decl(OP_ADD, op_t, Visibility::BUILTIN_PUBLIC);
+ add.register_builtin_erg_decl(OUTPUT, Type, Visibility::BUILTIN_PUBLIC);
/* Sub */
let mut sub = Self::builtin_poly_trait(SUB, params.clone(), 2);
sub.register_superclass(poly(OUTPUT, vec![ty_tp(R.clone())]), &output);
let Slf = mono_q(SELF, subtypeof(poly(SUB, ty_params.clone())));
let op_t = fn1_met(Slf.clone(), R.clone(), proj(Slf, OUTPUT)).quantify();
- sub.register_builtin_erg_decl(OP_SUB, op_t, Public);
- sub.register_builtin_erg_decl(OUTPUT, Type, Public);
+ sub.register_builtin_erg_decl(OP_SUB, op_t, Visibility::BUILTIN_PUBLIC);
+ sub.register_builtin_erg_decl(OUTPUT, Type, Visibility::BUILTIN_PUBLIC);
/* Mul */
let mut mul = Self::builtin_poly_trait(MUL, params.clone(), 2);
mul.register_superclass(poly(OUTPUT, vec![ty_tp(R.clone())]), &output);
let Slf = mono_q(SELF, subtypeof(poly(MUL, ty_params.clone())));
let op_t = fn1_met(Slf.clone(), R.clone(), proj(Slf, OUTPUT)).quantify();
- mul.register_builtin_erg_decl(OP_MUL, op_t, Public);
- mul.register_builtin_erg_decl(OUTPUT, Type, Public);
+ mul.register_builtin_erg_decl(OP_MUL, op_t, Visibility::BUILTIN_PUBLIC);
+ mul.register_builtin_erg_decl(OUTPUT, Type, Visibility::BUILTIN_PUBLIC);
/* Div */
let mut div = Self::builtin_poly_trait(DIV, params.clone(), 2);
div.register_superclass(poly(OUTPUT, vec![ty_tp(R.clone())]), &output);
let Slf = mono_q(SELF, subtypeof(poly(DIV, ty_params.clone())));
let op_t = fn1_met(Slf.clone(), R.clone(), proj(Slf, OUTPUT)).quantify();
- div.register_builtin_erg_decl(OP_DIV, op_t, Public);
- div.register_builtin_erg_decl(OUTPUT, Type, Public);
+ div.register_builtin_erg_decl(OP_DIV, op_t, Visibility::BUILTIN_PUBLIC);
+ div.register_builtin_erg_decl(OUTPUT, Type, Visibility::BUILTIN_PUBLIC);
/* FloorDiv */
let mut floor_div = Self::builtin_poly_trait(FLOOR_DIV, params, 2);
floor_div.register_superclass(poly(OUTPUT, vec![ty_tp(R.clone())]), &output);
let Slf = mono_q(SELF, subtypeof(poly(FLOOR_DIV, ty_params.clone())));
let op_t = fn1_met(Slf.clone(), R, proj(Slf.clone(), OUTPUT)).quantify();
- floor_div.register_builtin_erg_decl(OP_FLOOR_DIV, op_t, Public);
- floor_div.register_builtin_erg_decl(OUTPUT, Type, Public);
+ floor_div.register_builtin_erg_decl(OP_FLOOR_DIV, op_t, Visibility::BUILTIN_PUBLIC);
+ floor_div.register_builtin_erg_decl(OUTPUT, Type, Visibility::BUILTIN_PUBLIC);
/* Pos */
let mut pos = Self::builtin_mono_trait(POS, 2);
let _Slf = mono_q(SELF, subtypeof(mono(POS)));
let op_t = fn0_met(_Slf.clone(), proj(_Slf, OUTPUT)).quantify();
- pos.register_builtin_erg_decl(OP_POS, op_t, Public);
- pos.register_builtin_erg_decl(OUTPUT, Type, Public);
+ pos.register_builtin_erg_decl(OP_POS, op_t, Visibility::BUILTIN_PUBLIC);
+ pos.register_builtin_erg_decl(OUTPUT, Type, Visibility::BUILTIN_PUBLIC);
/* Neg */
let mut neg = Self::builtin_mono_trait(NEG, 2);
let _Slf = mono_q(SELF, subtypeof(mono(NEG)));
let op_t = fn0_met(_Slf.clone(), proj(_Slf, OUTPUT)).quantify();
- neg.register_builtin_erg_decl(OP_NEG, op_t, Public);
- neg.register_builtin_erg_decl(OUTPUT, Type, Public);
- self.register_builtin_type(mono(UNPACK), unpack, vis, Const, None);
+ neg.register_builtin_erg_decl(OP_NEG, op_t, Visibility::BUILTIN_PUBLIC);
+ neg.register_builtin_erg_decl(OUTPUT, Type, Visibility::BUILTIN_PUBLIC);
+ self.register_builtin_type(mono(UNPACK), unpack, vis.clone(), Const, None);
self.register_builtin_type(
mono(INHERITABLE_TYPE),
inheritable_type,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
None,
);
- self.register_builtin_type(mono(NAMED), named, vis, Const, None);
- self.register_builtin_type(mono(MUTABLE), mutable, vis, Const, None);
- self.register_builtin_type(mono(IMMUTIZABLE), immutizable, vis, Const, None);
- self.register_builtin_type(mono(MUTIZABLE), mutizable, vis, Const, None);
- self.register_builtin_type(mono(PATH_LIKE), pathlike, vis, Const, None);
+ self.register_builtin_type(mono(NAMED), named, vis.clone(), Const, None);
+ self.register_builtin_type(mono(MUTABLE), mutable, vis.clone(), Const, None);
+ self.register_builtin_type(mono(IMMUTIZABLE), immutizable, vis.clone(), Const, None);
+ self.register_builtin_type(mono(MUTIZABLE), mutizable, vis.clone(), Const, None);
+ self.register_builtin_type(mono(PATH_LIKE), pathlike, vis.clone(), Const, None);
self.register_builtin_type(
mono(MUTABLE_READABLE),
readable,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(READABLE),
);
self.register_builtin_type(
mono(MUTABLE_WRITABLE),
writable,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
Some(WRITABLE),
);
- self.register_builtin_type(mono(FILE_LIKE), filelike, vis, Const, None);
- self.register_builtin_type(mono(MUTABLE_FILE_LIKE), filelike_mut, vis, Const, None);
- self.register_builtin_type(mono(SHOW), show, vis, Const, None);
+ self.register_builtin_type(mono(FILE_LIKE), filelike, vis.clone(), Const, None);
+ self.register_builtin_type(
+ mono(MUTABLE_FILE_LIKE),
+ filelike_mut,
+ vis.clone(),
+ Const,
+ None,
+ );
+ self.register_builtin_type(mono(SHOW), show, vis.clone(), Const, None);
self.register_builtin_type(
poly(INPUT, vec![ty_tp(T.clone())]),
input,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Const,
None,
);
self.register_builtin_type(
poly(OUTPUT, vec![ty_tp(T.clone())]),
output,
- Private,
+ Visibility::BUILTIN_PRIVATE,
+ Const,
+ None,
+ );
+ self.register_builtin_type(
+ poly(IN, vec![ty_tp(T.clone())]),
+ in_,
+ Visibility::BUILTIN_PRIVATE,
+ Const,
+ None,
+ );
+ self.register_builtin_type(mono(EQ), eq, vis.clone(), Const, None);
+ self.register_builtin_type(mono(ORD), ord, vis.clone(), Const, None);
+ self.register_builtin_type(mono(NUM), num, vis.clone(), Const, None);
+ self.register_builtin_type(
+ poly(SEQ, vec![ty_tp(T.clone())]),
+ seq,
+ Visibility::BUILTIN_PRIVATE,
Const,
None,
);
- self.register_builtin_type(poly(IN, vec![ty_tp(T.clone())]), in_, Private, Const, None);
- self.register_builtin_type(mono(EQ), eq, vis, Const, None);
- self.register_builtin_type(mono(ORD), ord, vis, Const, None);
- self.register_builtin_type(mono(NUM), num, vis, Const, None);
- self.register_builtin_type(poly(SEQ, vec![ty_tp(T.clone())]), seq, Private, Const, None);
self.register_builtin_type(
poly(ITERABLE, vec![ty_tp(T)]),
iterable,
- Private,
+ Visibility::BUILTIN_PRIVATE,
+ Const,
+ None,
+ );
+ self.register_builtin_type(
+ mono(CONTEXT_MANAGER),
+ context_manager,
+ Visibility::BUILTIN_PRIVATE,
+ Const,
+ None,
+ );
+ self.register_builtin_type(poly(ADD, ty_params.clone()), add, vis.clone(), Const, None);
+ self.register_builtin_type(poly(SUB, ty_params.clone()), sub, vis.clone(), Const, None);
+ self.register_builtin_type(poly(MUL, ty_params.clone()), mul, vis.clone(), Const, None);
+ self.register_builtin_type(poly(DIV, ty_params.clone()), div, vis.clone(), Const, None);
+ self.register_builtin_type(
+ poly(FLOOR_DIV, ty_params),
+ floor_div,
+ vis.clone(),
Const,
None,
);
- self.register_builtin_type(mono(CONTEXT_MANAGER), context_manager, Private, Const, None);
- self.register_builtin_type(poly(ADD, ty_params.clone()), add, vis, Const, None);
- self.register_builtin_type(poly(SUB, ty_params.clone()), sub, vis, Const, None);
- self.register_builtin_type(poly(MUL, ty_params.clone()), mul, vis, Const, None);
- self.register_builtin_type(poly(DIV, ty_params.clone()), div, vis, Const, None);
- self.register_builtin_type(poly(FLOOR_DIV, ty_params), floor_div, vis, Const, None);
- self.register_builtin_type(mono(POS), pos, vis, Const, None);
+ self.register_builtin_type(mono(POS), pos, vis.clone(), Const, None);
self.register_builtin_type(mono(NEG), neg, vis, Const, None);
self.register_const_param_defaults(
ADD,
diff --git a/inquire.rs b/inquire.rs
index 11bbd68..3b0f8b0 100644
--- a/inquire.rs
+++ b/inquire.rs
@@ -5,28 +5,27 @@ use std::path::{Path, PathBuf};
use erg_common::config::{ErgConfig, Input};
use erg_common::env::{erg_py_external_lib_path, erg_pystd_path, erg_std_path};
use erg_common::error::{ErrorCore, ErrorKind, Location, SubMessage};
-use erg_common::levenshtein::get_similar_name;
+use erg_common::levenshtein;
use erg_common::pathutil::add_postfix_foreach;
use erg_common::set::Set;
use erg_common::traits::{Locational, NoTypeDisplay, Stream};
-use erg_common::vis::Visibility;
+use erg_common::triple::Triple;
use erg_common::Str;
use erg_common::{
fmt_option, fmt_slice, log, normalize_path, option_enum_unwrap, set, switch_lang,
};
-use Type::*;
-use ast::VarName;
-use erg_parser::ast::{self, Identifier};
+use erg_parser::ast::{self, Identifier, VarName};
use erg_parser::token::Token;
use crate::ty::constructors::{anon, free_var, func, mono, poly, proc, proj, ref_, subr_t};
use crate::ty::free::Constraint;
use crate::ty::typaram::TyParam;
use crate::ty::value::{GenTypeObj, TypeObj, ValueObj};
-use crate::ty::{HasType, ParamTy, SubrKind, SubrType, Type};
+use crate::ty::{HasType, ParamTy, SubrKind, SubrType, Type, Visibility};
+use Type::*;
-use crate::context::instantiate::ConstTemplate;
+use crate::context::instantiate_spec::ConstTemplate;
use crate::context::{Context, RegistrationMode, TraitImpl, TyVarCache, Variance};
use crate::error::{
binop_to_dname, readable_name, unaryop_to_dname, SingleTyCheckResult, TyCheckError,
@@ -36,9 +35,8 @@ use crate::varinfo::{AbsLocation, Mutability, VarInfo, VarKind};
use crate::{feature_error, hir};
use crate::{unreachable_error, AccessKind};
use RegistrationMode::*;
-use Visibility::*;
-use super::instantiate::ParamKind;
+use super::instantiate_spec::ParamKind;
use super::{ContextKind, MethodInfo};
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -105,7 +103,7 @@ impl Context {
pub fn get_singular_ctx_by_hir_expr(
&self,
obj: &hir::Expr,
- namespace: &Str,
+ namespace: &Context,
) -> SingleTyCheckResult<&Context> {
match obj {
hir::Expr::Accessor(hir::Accessor::Ident(ident)) => {
@@ -132,19 +130,22 @@ impl Context {
pub(crate) fn get_singular_ctx_by_ident(
&self,
ident: &ast::Identifier,
- namespace: &Str,
+ namespace: &Context,
) -> SingleTyCheckResult<&Context> {
self.get_mod(ident.inspect())
.or_else(|| self.rec_local_get_type(ident.inspect()).map(|(_, ctx)| ctx))
.or_else(|| self.rec_get_patch(ident.inspect()))
.ok_or_else(|| {
- TyCheckError::no_var_error(
+ let (similar_info, similar_name) =
+ self.get_similar_name_and_info(ident.inspect()).unzip();
+ TyCheckError::detailed_no_var_error(
self.cfg.input.clone(),
line!() as usize,
ident.loc(),
- namespace.into(),
+ namespace.name.to_string(),
ident.inspect(),
- self.get_similar_name(ident.inspect()),
+ similar_name,
+ similar_info,
)
})
}
@@ -170,7 +171,7 @@ impl Context {
pub(crate) fn get_singular_ctx(
&self,
obj: &ast::Expr,
- namespace: &Str,
+ namespace: &Context,
) -> SingleTyCheckResult<&Context> {
match obj {
ast::Expr::Accessor(ast::Accessor::Ident(ident)) => {
@@ -342,16 +343,16 @@ impl Context {
ident: &Identifier,
acc_kind: AccessKind,
input: &Input,
- namespace: &Str,
- ) -> SingleTyCheckResult<VarInfo> {
+ namespace: &Context,
+ ) -> Triple<VarInfo, TyCheckError> {
if let Some(vi) = self.get_current_scope_var(&ident.name) {
match self.validate_visibility(ident, vi, input, namespace) {
Ok(()) => {
- return Ok(vi.clone());
+ return Triple::Ok(vi.clone());
}
Err(err) => {
if !acc_kind.is_local() {
- return Err(err);
+ return Triple::Err(err);
}
}
}
@@ -359,21 +360,21 @@ impl Context {
.future_defined_locals
.get_key_value(&ident.inspect()[..])
{
- return Err(TyCheckError::access_before_def_error(
+ return Triple::Err(TyCheckError::access_before_def_error(
input.clone(),
line!() as usize,
ident.loc(),
- namespace.into(),
+ namespace.name.to_string(),
ident.inspect(),
name.ln_begin().unwrap_or(0),
self.get_similar_name(ident.inspect()),
));
} else if let Some((name, _vi)) = self.deleted_locals.get_key_value(&ident.inspect()[..]) {
- return Err(TyCheckError::access_deleted_var_error(
+ return Triple::Err(TyCheckError::access_deleted_var_error(
input.clone(),
line!() as usize,
ident.loc(),
- namespace.into(),
+ namespace.name.to_string(),
ident.inspect(),
name.ln_begin().unwrap_or(0),
self.get_similar_name(ident.inspect()),
@@ -381,20 +382,22 @@ impl Context {
}
if acc_kind.is_local() {
if let Some(parent) = self.get_outer().or_else(|| self.get_builtins()) {
- return match parent.rec_get_var_info(ident, acc_kind, input, namespace) {
- Ok(vi) => Ok(vi),
- Err(err) => Err(err),
- };
+ return parent.rec_get_var_info(ident, acc_kind, input, namespace);
}
}
- Err(TyCheckError::no_var_error(
+ /*
+ let (similar_info, similar_name) = self.get_similar_name_and_info(ident.inspect()).unzip();
+ Err(TyCheckError::detailed_no_var_error(
input.clone(),
line!() as usize,
ident.loc(),
namespace.into(),
ident.inspect(),
- self.get_similar_name(ident.inspect()),
+ similar_name,
+ similar_info,
))
+ */
+ Triple::None
}
pub(crate) fn rec_get_decl_info(
@@ -402,8 +405,8 @@ impl Context {
ident: &Identifier,
acc_kind: AccessKind,
input: &Input,
- namespace: &Str,
- ) -> SingleTyCheckResult<VarInfo> {
+ namespace: &Context,
+ ) -> Triple<VarInfo, TyCheckError> {
if let Some(vi) = self
.decls
.get(&ident.inspect()[..])
@@ -411,11 +414,11 @@ impl Context {
{
match self.validate_visibility(ident, vi, input, namespace) {
Ok(()) => {
- return Ok(vi.clone());
+ return Triple::Ok(vi.clone());
}
Err(err) => {
if !acc_kind.is_local() {
- return Err(err);
+ return Triple::Err(err);
}
}
}
@@ -425,14 +428,15 @@ impl Context {
return parent.rec_get_decl_info(ident, acc_kind, input, namespace);
}
}
- Err(TyCheckError::no_var_error(
+ /*Err(TyCheckError::no_var_error(
input.clone(),
line!() as usize,
ident.loc(),
namespace.into(),
ident.inspect(),
self.get_similar_name(ident.inspect()),
- ))
+ ))*/
+ Triple::None
}
pub(crate) fn get_attr_info(
@@ -440,42 +444,48 @@ impl Context {
obj: &hir::Expr,
ident: &Identifier,
input: &Input,
- namespace: &Str,
- ) -> SingleTyCheckResult<VarInfo> {
+ namespace: &Context,
+ ) -> Triple<VarInfo, TyCheckError> {
let self_t = obj.t();
- let name = ident.name.token();
- match self.get_attr_info_from_attributive(&self_t, ident, namespace) {
- Ok(vi) => {
- return Ok(vi);
+ match self.get_attr_info_from_attributive(&self_t, ident) {
+ Triple::Ok(vi) => {
+ return Triple::Ok(vi);
}
- Err(e) if e.core.kind == ErrorKind::AttributeError => {}
- Err(e) => {
- return Err(e);
+ Triple::Err(e) => {
+ return Triple::Err(e);
}
+ _ => {}
}
if let Ok(singular_ctx) = self.get_singular_ctx_by_hir_expr(obj, namespace) {
match singular_ctx.rec_get_var_info(ident, AccessKind::Attr, input, namespace) {
- Ok(vi) => {
- return Ok(vi);
+ Triple::Ok(vi) => {
+ return Triple::Ok(vi);
}
- Err(e) if e.core.kind == ErrorKind::NameError => {}
- Err(e) => {
- return Err(e);
+ Triple::Err(e) => {
+ return Triple::Err(e);
}
+ Triple::None => {}
}
}
match self.get_attr_from_nominal_t(obj, ident, input, namespace) {
- Ok(vi) => {
+ Triple::Ok(vi) => {
if let Some(self_t) = vi.t.self_t() {
- self.sub_unify(obj.ref_t(), self_t, obj, Some(&"self".into()))
- .map_err(|mut e| e.remove(0))?;
+ match self
+ .sub_unify(obj.ref_t(), self_t, obj, Some(&"self".into()))
+ .map_err(|mut e| e.remove(0))
+ {
+ Ok(_) => {}
+ Err(e) => {
+ return Triple::Err(e);
+ }
+ }
}
- return Ok(vi);
+ return Triple::Ok(vi);
}
- Err(e) if e.core.kind == ErrorKind::AttributeError => {}
- Err(e) => {
- return Err(e);
+ Triple::Err(e) => {
+ return Triple::Err(e);
}
+ _ => {}
}
for patch in self.find_patches_of(obj.ref_t()) {
if let Some(vi) = patch
@@ -483,8 +493,10 @@ impl Context {
.get(ident.inspect())
.or_else(|| patch.decls.get(ident.inspect()))
{
- self.validate_visibility(ident, vi, input, namespace)?;
- return Ok(vi.clone());
+ return match self.validate_visibility(ident, vi, input, namespace) {
+ Ok(_) => Triple::Ok(vi.clone()),
+ Err(e) => Triple::Err(e),
+ };
}
for (_, methods_ctx) in patch.methods_list.iter() {
if let Some(vi) = methods_ctx
@@ -492,12 +504,15 @@ impl Context {
.get(ident.inspect())
.or_else(|| methods_ctx.decls.get(ident.inspect()))
{
- self.validate_visibility(ident, vi, input, namespace)?;
- return Ok(vi.clone());
+ return match self.validate_visibility(ident, vi, input, namespace) {
+ Ok(_) => Triple::Ok(vi.clone()),
+ Err(e) => Triple::Err(e),
+ };
}
}
}
- Err(TyCheckError::no_attr_error(
+ Triple::None
+ /*Err(TyCheckError::no_attr_error(
input.clone(),
line!() as usize,
name.loc(),
@@ -505,7 +520,7 @@ impl Context {
&self_t,
name.inspect(),
self.get_similar_attr(&self_t, name.inspect()),
- ))
+ ))*/
}
fn get_attr_from_nominal_t(
@@ -513,39 +528,45 @@ impl Context {
obj: &hir::Expr,
ident: &Identifier,
input: &Input,
- namespace: &Str,
- ) -> SingleTyCheckResult<VarInfo> {
+ namespace: &Context,
+ ) -> Triple<VarInfo, TyCheckError> {
let self_t = obj.t();
if let Some(sups) = self.get_nominal_super_type_ctxs(&self_t) {
for ctx in sups {
match ctx.rec_get_var_info(ident, AccessKind::Attr, input, namespace) {
- Ok(vi) => {
- return Ok(vi);
+ Triple::Ok(vi) => {
+ return Triple::Ok(vi);
}
- Err(e) if e.core.kind == ErrorKind::NameError => {}
- Err(e) => {
- return Err(e);
+ Triple::Err(e) => {
+ return Triple::Err(e);
}
+ _ => {}
}
// if self is a methods context
if let Some(ctx) = self.get_same_name_context(&ctx.name) {
match ctx.rec_get_var_info(ident, AccessKind::Method, input, namespace) {
- Ok(vi) => {
- return Ok(vi);
+ Triple::Ok(vi) => {
+ return Triple::Ok(vi);
}
- Err(e) if e.core.kind == ErrorKind::NameError => {}
- Err(e) => {
- return Err(e);
+ Triple::Err(e) => {
+ return Triple::Err(e);
}
+ _ => {}
}
}
}
}
- let coerced = self
+ let coerced = match self
.deref_tyvar(obj.t(), Variance::Covariant, &set! {}, &())
- .map_err(|mut es| es.remove(0))?;
+ .map_err(|mut es| es.remove(0))
+ {
+ Ok(t) => t,
+ Err(e) => {
+ return Triple::Err(e);
+ }
+ };
if obj.ref_t() != &coerced {
- for ctx in self.get_nominal_super_type_ctxs(&coerced).ok_or_else(|| {
+ let ctxs = match self.get_nominal_super_type_ctxs(&coerced).ok_or_else(|| {
TyCheckError::type_not_found(
self.cfg.input.clone(),
line!() as usize,
@@ -553,31 +574,37 @@ impl Context {
self.caused_by(),
&coerced,
)
- })? {
+ }) {
+ Ok(ctxs) => ctxs,
+ Err(e) => {
+ return Triple::Err(e);
+ }
+ };
+ for ctx in ctxs {
match ctx.rec_get_var_info(ident, AccessKind::Attr, input, namespace) {
- Ok(vi) => {
+ Triple::Ok(vi) => {
obj.ref_t().coerce();
- return Ok(vi);
+ return Triple::Ok(vi);
}
- Err(e) if e.core.kind == ErrorKind::NameError => {}
- Err(e) => {
- return Err(e);
+ Triple::Err(e) => {
+ return Triple::Err(e);
}
+ _ => {}
}
if let Some(ctx) = self.get_same_name_context(&ctx.name) {
match ctx.rec_get_var_info(ident, AccessKind::Method, input, namespace) {
- Ok(vi) => {
- return Ok(vi);
+ Triple::Ok(vi) => {
+ return Triple::Ok(vi);
}
- Err(e) if e.core.kind == ErrorKind::NameError => {}
- Err(e) => {
- return Err(e);
+ Triple::Err(e) => {
+ return Triple::Err(e);
}
+ _ => {}
}
}
}
}
- Err(TyCheckError::no_attr_error(
+ /*Err(TyCheckError::no_attr_error(
self.cfg.input.clone(),
line!() as usize,
ident.loc(),
@@ -585,7 +612,8 @@ impl Context {
&self_t,
ident.inspect(),
self.get_similar_attr(&self_t, ident.inspect()),
- ))
+ ))*/
+ Triple::None
}
/// get type from given attributive type (Record).
@@ -594,105 +622,43 @@ impl Context {
&self,
t: &Type,
ident: &Identifier,
- namespace: &Str,
- ) -> SingleTyCheckResult<VarInfo> {
+ ) -> Triple<VarInfo, TyCheckError> {
match t {
// (obj: Never).foo: Never
- Type::Never => Ok(VarInfo::ILLEGAL.clone()),
+ Type::Never => Triple::Ok(VarInfo::ILLEGAL.clone()),
Type::FreeVar(fv) if fv.is_linked() => {
- self.get_attr_info_from_attributive(&fv.crack(), ident, namespace)
+ self.get_attr_info_from_attributive(&fv.crack(), ident)
}
Type::FreeVar(fv) /* if fv.is_unbound() */ => {
let sup = fv.get_super().unwrap();
- self.get_attr_info_from_attributive(&sup, ident, namespace)
+ self.get_attr_info_from_attributive(&sup, ident)
}
- Type::Ref(t) => self.get_attr_info_from_attributive(t, ident, namespace),
+ Type::Ref(t) => self.get_attr_info_from_attributive(t, ident),
Type::RefMut { before, .. } => {
- self.get_attr_info_from_attributive(before, ident, namespace)
+ self.get_attr_info_from_attributive(before, ident)
}
Type::Refinement(refine) => {
- self.get_attr_info_from_attributive(&refine.t, ident, namespace)
+ self.get_attr_info_from_attributive(&refine.t, ident)
}
Type::Record(record) => {
- if let Some(attr_t) = record.get(ident.inspect()) {
+ if let Some((field, attr_t)) = record.get_key_value(ident.inspect()) {
let muty = Mutability::from(&ident.inspect()[..]);
let vi = VarInfo::new(
attr_t.clone(),
muty,
- Public,
+ Visibility::new(field.vis.clone(), Str::ever("<dummy>")),
VarKind::Builtin,
None,
None,
None,
AbsLocation::unknown(),
);
- Ok(vi)
- } else {
- Err(TyCheckError::no_attr_error(
- self.cfg.input.clone(),
- line!() as usize,
- ident.loc(),
- namespace.into(),
- t,
- ident.inspect(),
- self.get_similar_attr(t, ident.inspect()),
- ))
- }
- }
- Type::Structural(t) => self.get_attr_info_from_attributive(t, ident, namespace),
- other => {
- if let Some(v) = self.rec_get_const_obj(&other.local_name()) {
- match v {
- ValueObj::Type(TypeObj::Generated(gen)) => self
- .get_gen_t_require_attr_t(gen, &ident.inspect()[..])
- .map(|attr_t| {
- let muty = Mutability::from(&ident.inspect()[..]);
- VarInfo::new(
- attr_t.clone(),
- muty,
- Public,
- VarKind::Builtin,
- None,
- None,
- None,
- AbsLocation::unknown(),
- )
- })
- .ok_or_else(|| {
- TyCheckError::no_attr_error(
- self.cfg.input.clone(),
- line!() as usize,
- ident.loc(),
- namespace.into(),
- t,
- ident.inspect(),
- self.get_similar_attr(t, ident.inspect()),
- )
- }),
- ValueObj::Type(TypeObj::Builtin(_t)) => {
- // FIXME:
- Err(TyCheckError::no_attr_error(
- self.cfg.input.clone(),
- line!() as usize,
- ident.loc(),
- namespace.into(),
- _t,
- ident.inspect(),
- self.get_similar_attr(_t, ident.inspect()),
- ))
- }
- _other => Err(TyCheckError::no_attr_error(
- self.cfg.input.clone(),
- line!() as usize,
- ident.loc(),
- namespace.into(),
- t,
- ident.inspect(),
- self.get_similar_attr(t, ident.inspect()),
- )),
+ if let Err(err) = self.validate_visibility(ident, &vi, &self.cfg.input, self) {
+ return Triple::Err(err);
}
+ Triple::Ok(vi)
} else {
- Err(TyCheckError::no_attr_error(
+ /*Err(TyCheckError::no_attr_error(
self.cfg.input.clone(),
line!() as usize,
ident.loc(),
@@ -700,9 +666,12 @@ impl Context {
t,
ident.inspect(),
self.get_similar_attr(t, ident.inspect()),
- ))
+ ))*/
+ Triple::None
}
}
+ Type::Structural(t) => self.get_attr_info_from_attributive(t, ident),
+ _other => Triple::None,
}
}
@@ -712,7 +681,7 @@ impl Context {
obj: &hir::Expr,
attr_name: &Option<Identifier>,
input: &Input,
- namespace: &Str,
+ namespace: &Context,
) -> SingleTyCheckResult<VarInfo> {
if obj.ref_t() == Type::FAILURE {
// (...Obj) -> Failure
@@ -750,10 +719,16 @@ impl Context {
obj: &hir::Expr,
attr_name: &Identifier,
input: &Input,
- namespace: &Str,
+ namespace: &Context,
) -> SingleTyCheckResult<VarInfo> {
- if let Ok(vi) = self.get_attr_info_from_attributive(obj.ref_t(), attr_name, namespace) {
- return Ok(vi);
+ match self.get_attr_info_from_attributive(obj.ref_t(), attr_name) {
+ Triple::Ok(vi) => {
+ return Ok(vi);
+ }
+ Triple::Err(e) => {
+ return Err(e);
+ }
+ _ => {}
}
for ctx in self
.get_nominal_super_type_ctxs(obj.ref_t())
@@ -787,13 +762,13 @@ impl Context {
}
if let Some(ctx) = self.get_same_name_context(&ctx.name) {
match ctx.rec_get_var_info(attr_name, AccessKind::Method, input, namespace) {
- Ok(t) => {
+ Triple::Ok(t) => {
return Ok(t);
}
- Err(e) if e.core.kind == ErrorKind::NameError => {}
- Err(e) => {
+ Triple::Err(e) => {
return Err(e);
}
+ Triple::None => {}
}
}
}
@@ -820,7 +795,7 @@ impl Context {
self.cfg.input.clone(),
line!() as usize,
attr_name.loc(),
- namespace.into(),
+ namespace.name.to_string(),
obj.qual_name().unwrap_or("?"),
obj.ref_t(),
attr_name.inspect(),
@@ -863,7 +838,7 @@ impl Context {
self.cfg.input.clone(),
line!() as usize,
attr_name.loc(),
- namespace.into(),
+ namespace.name.to_string(),
obj.ref_t(),
attr_name.inspect(),
self.get_similar_attr(obj.ref_t(), attr_name.inspect()),
@@ -875,34 +850,19 @@ impl Context {
ident: &Identifier,
vi: &VarInfo,
input: &Input,
- namespace: &str,
+ namespace: &Context,
) -> SingleTyCheckResult<()> {
- if ident.vis() != vi.vis {
- Err(TyCheckError::visibility_error(
- input.clone(),
- line!() as usize,
- ident.loc(),
- self.caused_by(),
- ident.inspect(),
- vi.vis,
- ))
- // check if the private variable is loaded from the other scope
- } else if vi.vis.is_private()
- && &self.name[..] != "<builtins>"
- && &self.name[..] != namespace
- && !namespace.contains(&self.name[..])
- {
- log!(err "{namespace}/{}", self.name);
+ if vi.vis.compatible(&ident.acc_kind(), namespace) {
+ Ok(())
+ } else {
Err(TyCheckError::visibility_error(
input.clone(),
line!() as usize,
ident.loc(),
self.caused_by(),
ident.inspect(),
- Private,
+ vi.vis.clone(),
))
- } else {
- Ok(())
}
}
@@ -931,18 +891,20 @@ impl Context {
op: &Token,
args: &[hir::PosArg],
input: &Input,
- namespace: &Str,
+ namespace: &Context,
) -> TyCheckResult<VarInfo> {
erg_common::debug_power_assert!(args.len() == 2);
let cont = binop_to_dname(op.inspect());
// not a `Token::from_str(op.kind, cont)` because ops are defined as symbols
let symbol = Token::symbol(cont);
- let t = self.rec_get_var_info(
- &Identifier::new(None, VarName::new(symbol.clone())),
- AccessKind::Name,
- input,
- namespace,
- )?;
+ let t = self
+ .rec_get_var_info(
+ &Identifier::private_from_token(symbol.clone()),
+ AccessKind::Name,
+ input,
+ namespace,
+ )
+ .unwrap_to_result()?;
let op = hir::Expr::Accessor(hir::Accessor::private(symbol, t));
self.get_call_t(&op, &None, args, &[], input, namespace)
.map_err(|(_, errs)| {
@@ -952,7 +914,7 @@ impl Context {
let vi = op_ident.vi.clone();
let lhs = args[0].expr.clone();
let rhs = args[1].expr.clone();
- let bin = hir::BinOp::new(op_ident.name.into_token(), lhs, rhs, vi);
+ let bin = hir::BinOp::new(op_ident.raw.name.into_token(), lhs, rhs, vi);
let errs = errs
.into_iter()
.map(|e| self.append_loc_info(e, bin.loc()))
@@ -966,17 +928,19 @@ impl Context {
op: &Token,
args: &[hir::PosArg],
input: &Input,
- namespace: &Str,
+ namespace: &Context,
) -> TyCheckResult<VarInfo> {
erg_common::debug_power_assert!(args.len() == 1);
let cont = unaryop_to_dname(op.inspect());
let symbol = Token::symbol(cont);
- let vi = self.rec_get_var_info(
- &Identifier::new(None, VarName::new(symbol.clone())),
- AccessKind::Name,
- input,
- namespace,
- )?;
+ let vi = self
+ .rec_get_var_info(
+ &Identifier::private_from_token(symbol.clone()),
+ AccessKind::Name,
+ input,
+ namespace,
+ )
+ .unwrap_to_result()?;
let op = hir::Expr::Accessor(hir::Accessor::private(symbol, vi));
self.get_call_t(&op, &None, args, &[], input, namespace)
.map_err(|(_, errs)| {
@@ -985,7 +949,7 @@ impl Context {
};
let vi = op_ident.vi.clone();
let expr = args[0].expr.clone();
- let unary = hir::UnaryOp::new(op_ident.name.into_token(), expr, vi);
+ let unary = hir::UnaryOp::new(op_ident.raw.name.into_token(), expr, vi);
let errs = errs
.into_iter()
.map(|e| self.append_loc_info(e, unary.loc()))
@@ -1118,10 +1082,8 @@ impl Context {
if is_method {
obj.clone()
} else {
- let attr = hir::Attribute::new(
- obj.clone(),
- hir::Identifier::bare(ident.dot.clone(), ident.name.clone()),
- );
+ let attr =
+ hir::Attribute::new(obj.clone(), hir::Identifier::bare(ident.clone()));
hir::Expr::Accessor(hir::Accessor::Attr(attr))
}
} else {
@@ -1272,10 +1234,10 @@ impl Context {
}
}
other => {
- let one = self.get_singular_ctx_by_hir_expr(obj, &self.name).ok();
+ let one = self.get_singular_ctx_by_hir_expr(obj, self).ok();
let one = one
.zip(attr_name.as_ref())
- .and_then(|(ctx, attr)| ctx.get_singular_ctx_by_ident(attr, &self.name).ok())
+ .and_then(|(ctx, attr)| ctx.get_singular_ctx_by_ident(attr, self).ok())
.or(one);
let two = obj
.qual_name()
@@ -1354,7 +1316,8 @@ impl Context {
))
} else {
let unknown_arg_errors = unknown_args.into_iter().map(|arg| {
- let similar = get_similar_name(subr_ty.param_names(), arg.keyword.inspect());
+ let similar =
+ levenshtein::get_similar_name(subr_ty.param_names(), arg.keyword.inspect());
TyCheckError::unexpected_kw_arg_error(
self.cfg.input.clone(),
line!() as usize,
@@ -1550,7 +1513,8 @@ impl Context {
)
})?;
} else {
- let similar = get_similar_name(subr_ty.param_names(), arg.keyword.inspect());
+ let similar =
+ levenshtein::get_similar_name(subr_ty.param_names(), arg.keyword.inspect());
return Err(TyCheckErrors::from(TyCheckError::unexpected_kw_arg_error(
self.cfg.input.clone(),
line!() as usize,
@@ -1571,7 +1535,7 @@ impl Context {
pos_args: &[hir::PosArg],
kw_args: &[hir::KwArg],
input: &Input,
- namespace: &Str,
+ namespace: &Context,
) -> Result<VarInfo, (Option<VarInfo>, TyCheckErrors)> {
if let hir::Expr::Accessor(hir::Accessor::Ident(local)) = obj {
if local.vis().is_private() {
@@ -1692,18 +1656,27 @@ impl Context {
}
pub(crate) fn get_similar_name(&self, name: &str) -> Option<&str> {
- get_similar_name(
+ levenshtein::get_similar_name(
self.dir().into_iter().map(|(vn, _)| &vn.inspect()[..]),
name,
)
}
+ pub(crate) fn get_similar_name_and_info(&self, name: &str) -> Option<(&VarInfo, &str)> {
+ levenshtein::get_similar_name_and_some(
+ self.dir()
+ .into_iter()
+ .map(|(vn, vi)| (vi, &vn.inspect()[..])),
+ name,
+ )
+ }
+
pub(crate) fn get_similar_attr_from_singular<'a>(
&'a self,
obj: &hir::Expr,
name: &str,
) -> Option<&'a str> {
- if let Ok(ctx) = self.get_singular_ctx_by_hir_expr(obj, &self.name) {
+ if let Ok(ctx) = self.get_singular_ctx_by_hir_expr(obj, self) {
if let Some(name) = ctx.get_similar_name(name) {
return Some(name);
}
@@ -1720,6 +1693,19 @@ impl Context {
None
}
+ pub(crate) fn get_similar_attr_and_info<'a>(
+ &'a self,
+ self_t: &'a Type,
+ name: &str,
+ ) -> Option<(&'a VarInfo, &'a str)> {
+ for ctx in self.get_nominal_super_type_ctxs(self_t)? {
+ if let Some((vi, name)) = ctx.get_similar_name_and_info(name) {
+ return Some((vi, name));
+ }
+ }
+ None
+ }
+
// Returns what kind of variance the type has for each parameter Type.
// Invariant for types not specified
// selfが示す型が、各パラメータTypeに対してどのような変性Varianceを持つかを返す
@@ -2166,7 +2152,7 @@ impl Context {
{
normalize_path(path)
} else {
- todo!("{} {}", path.display(), add.display())
+ todo!("{} // {}", path.display(), add.display())
}
}
@@ -2423,7 +2409,11 @@ impl Context {
}
}
- fn get_gen_t_require_attr_t<'a>(&'a self, gen: &'a GenTypeObj, attr: &str) -> Option<&'a Type> {
+ fn _get_gen_t_require_attr_t<'a>(
+ &'a self,
+ gen: &'a GenTypeObj,
+ attr: &str,
+ ) -> Option<&'a Type> {
match gen.base_or_sup().map(|req_sup| req_sup.typ()) {
Some(Type::Record(rec)) => {
if let Some(t) = rec.get(attr) {
@@ -2433,7 +2423,7 @@ impl Context {
Some(other) => {
let obj = self.rec_get_const_obj(&other.local_name());
let obj = option_enum_unwrap!(obj, Some:(ValueObj::Type:(TypeObj::Generated:(_))))?;
- if let Some(t) = self.get_gen_t_require_attr_t(obj, attr) {
+ if let Some(t) = self._get_gen_t_require_attr_t(obj, attr) {
return Some(t);
}
}
diff --git a/instantiate.rs b/instantiate.rs
index 3f34bf3..90175fa 100644
--- a/instantiate.rs
+++ b/instantiate.rs
@@ -3,96 +3,24 @@ use std::mem;
use std::option::Option; // conflicting to Type::Option
use erg_common::dict::Dict;
+use erg_common::enum_unwrap;
#[allow(unused)]
use erg_common::log;
use erg_common::set::Set;
-use erg_common::traits::{Locational, Stream};
-use erg_common::vis::Field;
+use erg_common::traits::Locational;
use erg_common::Str;
-use erg_common::{assume_unreachable, dict, enum_unwrap, set, try_map_mut};
-
-use ast::{
- NonDefaultParamSignature, ParamTySpec, PreDeclTypeSpec, SimpleTypeSpec, TypeBoundSpec,
- TypeBoundSpecs, TypeSpec,
-};
-use erg_parser::ast;
-use erg_parser::token::TokenKind;
-use erg_parser::Parser;
use crate::feature_error;
use crate::ty::constructors::*;
-use crate::ty::free::CanbeFree;
use crate::ty::free::{Constraint, HasLevel};
-use crate::ty::typaram::TyParamLambda;
-use crate::ty::typaram::{IntervalOp, OpKind, TyParam, TyParamOrdering};
-use crate::ty::value::ValueObj;
-use crate::ty::SubrType;
-use crate::ty::{HasType, ParamTy, Predicate, SubrKind, Type};
-use crate::type_feature_error;
-use crate::unreachable_error;
-use TyParamOrdering::*;
+use crate::ty::typaram::{TyParam, TyParamLambda};
+use crate::ty::{HasType, Predicate, Type};
+use crate::{type_feature_error, unreachable_error};
use Type::*;
-use crate::context::{Context, DefaultInfo, RegistrationMode};
+use crate::context::Context;
use crate::error::{TyCheckError, TyCheckErrors, TyCheckResult};
use crate::hir;
-use crate::AccessKind;
-use RegistrationMode::*;
-
-pub fn token_kind_to_op_kind(kind: TokenKind) -> Option<OpKind> {
- match kind {
- TokenKind::Plus => Some(OpKind::Add),
- TokenKind::Minus => Some(OpKind::Sub),
- TokenKind::Star => Some(OpKind::Mul),
- TokenKind::Slash => Some(OpKind::Div),
- TokenKind::FloorDiv => Some(OpKind::FloorDiv),
- TokenKind::Mod => Some(OpKind::Mod),
- TokenKind::Pow => Some(OpKind::Pow),
- TokenKind::PrePlus => Some(OpKind::Pos),
- TokenKind::PreMinus => Some(OpKind::Neg),
- TokenKind::PreBitNot => Some(OpKind::Invert),
- TokenKind::Equal => Some(OpKind::Eq),
- TokenKind::NotEq => Some(OpKind::Ne),
- TokenKind::Less => Some(OpKind::Lt),
- TokenKind::LessEq => Some(OpKind::Le),
- TokenKind::Gre => Some(OpKind::Gt),
- TokenKind::GreEq => Some(OpKind::Ge),
- TokenKind::AndOp => Some(OpKind::And),
- TokenKind::OrOp => Some(OpKind::Or),
- TokenKind::BitAnd => Some(OpKind::BitAnd),
- TokenKind::BitOr => Some(OpKind::BitOr),
- TokenKind::BitXor => Some(OpKind::BitXor),
- TokenKind::Shl => Some(OpKind::Shl),
- TokenKind::Shr => Some(OpKind::Shr),
- _ => None,
- }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum ParamKind {
- NonDefault,
- Default(Type),
- VarParams,
- KwParams,
-}
-
-impl ParamKind {
- pub const fn is_var_params(&self) -> bool {
- matches!(self, ParamKind::VarParams)
- }
- pub const fn is_kw_params(&self) -> bool {
- matches!(self, ParamKind::KwParams)
- }
- pub const fn is_default(&self) -> bool {
- matches!(self, ParamKind::Default(_))
- }
- pub const fn default_info(&self) -> DefaultInfo {
- match self {
- ParamKind::Default(_) => DefaultInfo::WithDefault,
- _ => DefaultInfo::NonDefault,
- }
- }
-}
/// Context for instantiating a quantified type
/// For example, cloning each type variable of quantified type `?T -> ?T` would result in `?1 -> ?2`.
@@ -244,1072 +172,7 @@ impl TyVarCache {
}
}
-/// TODO: this struct will be removed when const functions are implemented.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum ConstTemplate {
- Obj(ValueObj),
- App {
- name: Str,
- non_default_args: Vec<Type>,
- default_args: Vec<ConstTemplate>,
- },
-}
-
-impl ConstTemplate {
- pub const fn app(
- name: &'static str,
- non_default_args: Vec<Type>,
- default_args: Vec<ConstTemplate>,
- ) -> Self {
- ConstTemplate::App {
- name: Str::ever(name),
- non_default_args,
- default_args,
- }
- }
-}
-
impl Context {
- pub(crate) fn instantiate_var_sig_t(
- &self,
- t_spec: Option<&TypeSpec>,
- mode: RegistrationMode,
- ) -> TyCheckResult<Type> {
- let mut tmp_tv_cache = TyVarCache::new(self.level, self);
- let spec_t = if let Some(t_spec) = t_spec {
- self.instantiate_typespec(t_spec, None, &mut tmp_tv_cache, mode, false)?
- } else {
- free_var(self.level, Constraint::new_type_of(Type))
- };
- Ok(spec_t)
- }
-
- pub(crate) fn instantiate_sub_sig_t(
- &self,
- sig: &ast::SubrSignature,
- default_ts: Vec<Type>,
- mode: RegistrationMode,
- ) -> Result<Type, (TyCheckErrors, Type)> {
- let mut errs = TyCheckErrors::empty();
- // -> Result<Type, (Type, TyCheckErrors)> {
- let opt_decl_sig_t = match self
- .rec_get_decl_info(&sig.ident, AccessKind::Name, &self.cfg.input, &self.name)
- .ok()
- .map(|vi| vi.t)
- {
- Some(Type::Subr(subr)) => Some(subr),
- Some(Type::FreeVar(fv)) if fv.is_unbound() => return Ok(Type::FreeVar(fv)),
- Some(other) => {
- let err = TyCheckError::unreachable(
- self.cfg.input.clone(),
- "instantiate_sub_sig_t",
- line!(),
- );
- return Err((TyCheckErrors::from(err), other));
- }
- None => None,
- };
- let mut tmp_tv_cache = self
- .instantiate_ty_bounds(&sig.bounds, PreRegister)
- .map_err(|errs| (errs, Type::Failure))?;
- let mut non_defaults = vec![];
- for (n, param) in sig.params.non_defaults.iter().enumerate() {
- let opt_decl_t = opt_decl_sig_t
- .as_ref()
- .and_then(|subr| subr.non_default_params.get(n));
- match self.instantiate_param_ty(
- param,
- opt_decl_t,
- &mut tmp_tv_cache,
- mode,
- ParamKind::NonDefault,
- ) {
- Ok(pt) => non_defaults.push(pt),
- Err(es) => {
- errs.extend(es);
- non_defaults.push(ParamTy::pos(param.inspect().cloned(), Type::Failure));
- }
- }
- }
- let var_args = if let Some(var_args) = sig.params.var_params.as_ref() {
- let opt_decl_t = opt_decl_sig_t
- .as_ref()
- .and_then(|subr| subr.var_params.as_ref().map(|v| v.as_ref()));
- let pt = match self.instantiate_param_ty(
- var_args,
- opt_decl_t,
- &mut tmp_tv_cache,
- mode,
- ParamKind::VarParams,
- ) {
- Ok(pt) => pt,
- Err(es) => {
- errs.extend(es);
- ParamTy::pos(var_args.inspect().cloned(), Type::Failure)
- }
- };
- Some(pt)
- } else {
- None
- };
- let mut defaults = vec![];
- for ((n, p), default_t) in sig.params.defaults.iter().enumerate().zip(default_ts) {
- let opt_decl_t = opt_decl_sig_t
- .as_ref()
- .and_then(|subr| subr.default_params.get(n));
- match self.instantiate_param_ty(
- &p.sig,
- opt_decl_t,
- &mut tmp_tv_cache,
- mode,
- ParamKind::Default(default_t),
- ) {
- Ok(pt) => defaults.push(pt),
- Err(es) => {
- errs.extend(es);
- defaults.push(ParamTy::pos(p.sig.inspect().cloned(), Type::Failure));
- }
- }
- }
- let spec_return_t = if let Some(t_spec) = sig.return_t_spec.as_ref() {
- let opt_decl_t = opt_decl_sig_t
- .as_ref()
- .map(|subr| ParamTy::anonymous(subr.return_t.as_ref().clone()));
- match self.instantiate_typespec(
- t_spec,
- opt_decl_t.as_ref(),
- &mut tmp_tv_cache,
- mode,
- false,
- ) {
- Ok(ty) => ty,
- Err(es) => {
- errs.extend(es);
- Type::Failure
- }
- }
- } else {
- // preregisterならouter scopeで型宣言(see inference.md)
- let level = if mode == PreRegister {
- self.level
- } else {
- self.level + 1
- };
- free_var(level, Constraint::new_type_of(Type))
- };
- let typ = if sig.ident.is_procedural() {
- proc(non_defaults, var_args, defaults, spec_return_t)
- } else {
- func(non_defaults, var_args, defaults, spec_return_t)
- };
- if errs.is_empty() {
- Ok(typ)
- } else {
- Err((errs, typ))
- }
- }
-
- /// spec_t == Noneかつリテラル推論が不可能なら型変数を発行する
- pub(crate) fn instantiate_param_sig_t(
- &self,
- sig: &NonDefaultParamSignature,
- opt_decl_t: Option<&ParamTy>,
- tmp_tv_cache: &mut TyVarCache,
- mode: RegistrationMode,
- kind: ParamKind,
- ) -> TyCheckResult<Type> {
- let gen_free_t = || {
- let level = if mode == PreRegister {
- self.level
- } else {
- self.level + 1
- };
- free_var(level, Constraint::new_type_of(Type))
- };
- let spec_t = if let Some(spec_with_op) = &sig.t_spec {
- self.instantiate_typespec(&spec_with_op.t_spec, opt_decl_t, tmp_tv_cache, mode, false)?
- } else {
- match &sig.pat {
- ast::ParamPattern::Lit(lit) => v_enum(set![self.eval_lit(lit)?]),
- ast::ParamPattern::Discard(_) => Type::Obj,
- ast::ParamPattern::Ref(_) => ref_(gen_free_t()),
- ast::ParamPattern::RefMut(_) => ref_mut(gen_free_t(), None),
- // ast::ParamPattern::VarName(name) if &name.inspect()[..] == "_" => Type::Obj,
- // TODO: Array<Lit>
- _ => gen_free_t(),
- }
- };
- if let Some(decl_pt) = opt_decl_t {
- if kind.is_var_params() {
- let spec_t = unknown_len_array_t(spec_t.clone());
- self.sub_unify(
- decl_pt.typ(),
- &spec_t,
- &sig.t_spec.as_ref().ok_or(sig),
- None,
- )?;
- } else {
- self.sub_unify(
- decl_pt.typ(),
- &spec_t,
- &sig.t_spec.as_ref().ok_or(sig),
- None,
- )?;
- }
- }
- Ok(spec_t)
- }
-
- pub(crate) fn instantiate_param_ty(
- &self,
- sig: &NonDefaultParamSignature,
- opt_decl_t: Option<&ParamTy>,
- tmp_tv_cache: &mut TyVarCache,
- mode: RegistrationMode,
- kind: ParamKind,
- ) -> TyCheckResult<ParamTy> {
- let t = self.instantiate_param_sig_t(sig, opt_decl_t, tmp_tv_cache, mode, kind.clone())?;
- match (sig.inspect(), kind) {
- (Some(name), ParamKind::Default(default_t)) => {
- Ok(ParamTy::kw_default(name.clone(), t, default_t))
- }
- (Some(name), _) => Ok(ParamTy::kw(name.clone(), t)),
- (None, _) => Ok(ParamTy::anonymous(t)),
- }
- }
-
- pub(crate) fn instantiate_predecl_t(
- &self,
- predecl: &PreDeclTypeSpec,
- opt_decl_t: Option<&ParamTy>,
- tmp_tv_cache: &mut TyVarCache,
- not_found_is_qvar: bool,
- ) -> TyCheckResult<Type> {
- match predecl {
- ast::PreDeclTypeSpec::Simple(simple) => {
- self.instantiate_simple_t(simple, opt_decl_t, tmp_tv_cache, not_found_is_qvar)
- }
- ast::PreDeclTypeSpec::Attr { namespace, t } => {
- if let Ok(receiver) = Parser::validate_const_expr(namespace.as_ref().clone()) {
- if let Ok(receiver_t) =
- self.instantiate_const_expr_as_type(&receiver, None, tmp_tv_cache)
- {
- let rhs = t.ident.inspect();
- return Ok(proj(receiver_t, rhs));
- }
- }
- let ctx = self.get_singular_ctx(namespace.as_ref(), &self.name)?;
- if let Some((typ, _)) = ctx.rec_local_get_type(t.ident.inspect()) {
- let vi = ctx
- .rec_get_var_info(&t.ident, AccessKind::Name, &self.cfg.input, &self.name)
- .unwrap();
- self.inc_ref(&vi, &t.ident.name);
- // TODO: visibility check
- Ok(typ.clone())
- } else {
- Err(TyCheckErrors::from(TyCheckError::no_var_error(
- self.cfg.input.clone(),
- line!() as usize,
- t.loc(),
- self.caused_by(),
- t.ident.inspect(),
- self.get_similar_name(t.ident.inspect()),
- )))
- }
- }
- other => type_feature_error!(self, other.loc(), &format!("instantiating type {other}")),
- }
- }
-
- pub(crate) fn instantiate_simple_t(
- &self,
- simple: &SimpleTypeSpec,
- opt_decl_t: Option<&ParamTy>,
- tmp_tv_cache: &mut TyVarCache,
- not_found_is_qvar: bool,
- ) -> TyCheckResult<Type> {
- self.inc_ref_simple_typespec(simple);
- match &simple.ident.inspect()[..] {
- "_" | "Obj" => Ok(Type::Obj),
- "Nat" => Ok(Type::Nat),
- "Int" => Ok(Type::Int),
- "Ratio" => Ok(Type::Ratio),
- "Float" => Ok(Type::Float),
- "Str" => Ok(Type::Str),
- "Bool" => Ok(Type::Bool),
- "NoneType" => Ok(Type::NoneType),
- "Ellipsis" => Ok(Type::Ellipsis),
- "NotImplemented" => Ok(Type::NotImplementedType),
- "Inf" => Ok(Type::Inf),
- "NegInf" => Ok(Type::NegInf),
- "Never" => Ok(Type::Never),
- "ClassType" => Ok(Type::ClassType),
- "TraitType" => Ok(Type::TraitType),
- "Type" => Ok(Type::Type),
- "Array" => {
- // TODO: kw
- let mut args = simple.args.pos_args();
- if let Some(first) = args.next() {
- let t = self.instantiate_const_expr_as_type(&first.expr, None, tmp_tv_cache)?;
- let len = if let Some(len) = args.next() {
- self.instantiate_const_expr(&len.expr, None, tmp_tv_cache)?
- } else {
- TyParam::erased(Nat)
- };
- Ok(array_t(t, len))
- } else {
- Ok(mono("GenericArray"))
- }
- }
- "Ref" => {
- let mut args = simple.args.pos_args();
- let Some(first) = args.next() else {
- return Err(TyCheckErrors::from(TyCheckError::args_missing_error(
- self.cfg.input.clone(),
- line!() as usize,
- simple.args.loc(),
- "Ref",
- self.caused_by(),
- vec![Str::from("T")],
- )));
- };
- let t = self.instantiate_const_expr_as_type(&first.expr, None, tmp_tv_cache)?;
- Ok(ref_(t))
- }
- "RefMut" => {
- // TODO after
- let mut args = simple.args.pos_args();
- let Some(first) = args.next() else {
- return Err(TyCheckErrors::from(TyCheckError::args_missing_error(
- self.cfg.input.clone(),
- line!() as usize,
- simple.args.loc(),
- "RefMut",
- self.caused_by(),
- vec![Str::from("T")],
- )));
- };
- let t = self.instantiate_const_expr_as_type(&first.expr, None, tmp_tv_cache)?;
- Ok(ref_mut(t, None))
- }
- "Structural" => {
- let mut args = simple.args.pos_args();
- let Some(first) = args.next() else {
- return Err(TyCheckErrors::from(TyCheckError::args_missing_error(
- self.cfg.input.clone(),
- line!() as usize,
- simple.args.loc(),
- "Structural",
- self.caused_by(),
- vec![Str::from("Type")],
- )));
- };
- let t = self.instantiate_const_expr_as_type(&first.expr, None, tmp_tv_cache)?;
- Ok(t.structuralize())
- }
- "Self" => self.rec_get_self_t().ok_or_else(|| {
- TyCheckErrors::from(TyCheckError::unreachable(
- self.cfg.input.clone(),
- erg_common::fn_name_full!(),
- line!(),
- ))
- }),
- other if simple.args.is_empty() => {
- if let Some(t) = tmp_tv_cache.get_tyvar(other) {
- return Ok(t.clone());
- } else if let Some(tp) = tmp_tv_cache.get_typaram(other) {
- let t = enum_unwrap!(tp, TyParam::Type);
- return Ok(t.as_ref().clone());
- }
- if let Some(tv_cache) = &self.tv_cache {
- if let Some(t) = tv_cache.get_tyvar(other) {
- return Ok(t.clone());
- } else if let Some(tp) = tv_cache.get_typaram(other) {
- let t = enum_unwrap!(tp, TyParam::Type);
- return Ok(t.as_ref().clone());
- }
- }
- if let Some(outer) = &self.outer {
- if let Ok(t) = outer.instantiate_simple_t(
- simple,
- opt_decl_t,
- tmp_tv_cache,
- not_found_is_qvar,
- ) {
- return Ok(t);
- }
- }
- if let Some(decl_t) = opt_decl_t {
- return Ok(decl_t.typ().clone());
- }
- if let Some((typ, _)) = self.get_type(simple.ident.inspect()) {
- Ok(typ.clone())
- } else if not_found_is_qvar {
- let tyvar = named_free_var(Str::rc(other), self.level, Constraint::Uninited);
- tmp_tv_cache.push_or_init_tyvar(simple.ident.inspect(), &tyvar);
- Ok(tyvar)
- } else {
- Err(TyCheckErrors::from(TyCheckError::no_type_error(
- self.cfg.input.clone(),
- line!() as usize,
- simple.loc(),
- self.caused_by(),
- other,
- self.get_similar_name(other),
- )))
- }
- }
- other => {
- let ctx = if let Some((_, ctx)) = self.get_type(&Str::rc(other)) {
- ctx
- } else {
- return Err(TyCheckErrors::from(TyCheckError::no_type_error(
- self.cfg.input.clone(),
- line!() as usize,
- simple.ident.loc(),
- self.caused_by(),
- other,
- self.get_similar_name(other),
- )));
- };
- // FIXME: kw args
- let mut new_params = vec![];
- for (i, arg) in simple.args.pos_args().enumerate() {
- let params =
- self.instantiate_const_expr(&arg.expr, Some((ctx, i)), tmp_tv_cache);
- let params = params.or_else(|e| {
- if not_found_is_qvar {
- let name = arg.expr.to_string();
- // FIXME: handle `::` as a right way
- let name = Str::rc(name.trim_start_matches("::"));
- let tp = TyParam::named_free_var(
- name.clone(),
- self.level,
- Constraint::Uninited,
- );
- tmp_tv_cache.push_or_init_typaram(&name, &tp);
- Ok(tp)
- } else {
- Err(e)
- }
- })?;
- new_params.push(params);
- }
- // FIXME: non-builtin
- Ok(poly(Str::rc(other), new_params))
- }
- }
- }
-
- fn instantiate_local(
- &self,
- name: &Str,
- erased_idx: Option<(&Context, usize)>,
- tmp_tv_cache: &mut TyVarCache,
- loc: &impl Locational,
- ) -> TyCheckResult<TyParam> {
- if &name[..] == "_" {
- let t = if let Some((ctx, i)) = erased_idx {
- ctx.params[i].1.t.clone()
- } else {
- Type::Uninited
- };
- return Ok(TyParam::erased(t));
- }
- if let Some(tp) = tmp_tv_cache.get_typaram(name) {
- return Ok(tp.clone());
- } else if let Some(t) = tmp_tv_cache.get_tyvar(name) {
- return Ok(TyParam::t(t.clone()));
- }
- if let Some(tv_ctx) = &self.tv_cache {
- if let Some(t) = tv_ctx.get_tyvar(name) {
- return Ok(TyParam::t(t.clone()));
- } else if let Some(tp) = tv_ctx.get_typaram(name) {
- return Ok(tp.clone());
- }
- }
- if let Some(value) = self.rec_get_const_obj(name) {
- return Ok(TyParam::Value(value.clone()));
- }
- Err(TyCheckErrors::from(TyCheckError::no_var_error(
- self.cfg.input.clone(),
- line!() as usize,
- loc.loc(),
- self.caused_by(),
- name,
- self.get_similar_name(name),
- )))
- }
-
- pub(crate) fn instantiate_const_expr(
- &self,
- expr: &ast::ConstExpr,
- erased_idx: Option<(&Context, usize)>,
- tmp_tv_cache: &mut TyVarCache,
- ) -> TyCheckResult<TyParam> {
- match expr {
- ast::ConstExpr::Lit(lit) => Ok(TyParam::Value(self.eval_lit(lit)?)),
- ast::ConstExpr::Accessor(ast::ConstAccessor::Attr(attr)) => {
- let obj = self.instantiate_const_expr(&attr.obj, erased_idx, tmp_tv_cache)?;
- Ok(obj.proj(attr.name.inspect()))
- }
- ast::ConstExpr::Accessor(ast::ConstAccessor::Local(local)) => {
- self.inc_ref_const_local(local);
- self.instantiate_local(local.inspect(), erased_idx, tmp_tv_cache, local)
- }
- ast::ConstExpr::Array(array) => {
- let mut tp_arr = vec![];
- for (i, elem) in array.elems.pos_args().enumerate() {
- let el =
- self.instantiate_const_expr(&elem.expr, Some((self, i)), tmp_tv_cache)?;
- tp_arr.push(el);
- }
- Ok(TyParam::Array(tp_arr))
- }
- ast::ConstExpr::Set(set) => {
- let mut tp_set = set! {};
- for (i, elem) in set.elems.pos_args().enumerate() {
- let el =
- self.instantiate_const_expr(&elem.expr, Some((self, i)), tmp_tv_cache)?;
- tp_set.insert(el);
- }
- Ok(TyParam::Set(tp_set))
- }
- ast::ConstExpr::Dict(dict) => {
- let mut tp_dict = dict! {};
- for (i, elem) in dict.kvs.iter().enumerate() {
- let key =
- self.instantiate_const_expr(&elem.key, Some((self, i)), tmp_tv_cache)?;
- let val =
- self.instantiate_const_expr(&elem.value, Some((self, i)), tmp_tv_cache)?;
- tp_dict.insert(key, val);
- }
- Ok(TyParam::Dict(tp_dict))
- }
- ast::ConstExpr::Tuple(tuple) => {
- let mut tp_tuple = vec![];
- for (i, elem) in tuple.elems.pos_args().enumerate() {
- let el =
- self.instantiate_const_expr(&elem.expr, Some((self, i)), tmp_tv_cache)?;
- tp_tuple.push(el);
- }
- Ok(TyParam::Tuple(tp_tuple))
- }
- ast::ConstExpr::Record(rec) => {
- let mut tp_rec = dict! {};
- for attr in rec.attrs.iter() {
- let field = Field::new(attr.ident.vis(), attr.ident.inspect().clone());
- let val = self.instantiate_const_expr(
- attr.body.block.get(0).unwrap(),
- None,
- tmp_tv_cache,
- )?;
- tp_rec.insert(field, val);
- }
- Ok(TyParam::Record(tp_rec))
- }
- ast::ConstExpr::Lambda(lambda) => {
- let mut _tmp_tv_cache =
- self.instantiate_ty_bounds(&lambda.sig.bounds, RegistrationMode::Normal)?;
- let tmp_tv_cache = if tmp_tv_cache.is_empty() {
- &mut _tmp_tv_cache
- } else {
- // TODO: prohibit double quantification
- tmp_tv_cache
- };
- let mut nd_params = Vec::with_capacity(lambda.sig.params.non_defaults.len());
- for sig in lambda.sig.params.non_defaults.iter() {
- let pt = self.instantiate_param_ty(
- sig,
- None,
- tmp_tv_cache,
- RegistrationMode::Normal,
- ParamKind::NonDefault,
- )?;
- nd_params.push(pt);
- }
- let var_params = if let Some(p) = lambda.sig.params.var_params.as_ref() {
- let pt = self.instantiate_param_ty(
- p,
- None,
- tmp_tv_cache,
- RegistrationMode::Normal,
- ParamKind::VarParams,
- )?;
- Some(pt)
- } else {
- None
- };
- let mut d_params = Vec::with_capacity(lambda.sig.params.defaults.len());
- for sig in lambda.sig.params.defaults.iter() {
- let expr = self.eval_const_expr(&sig.default_val)?;
- let pt = self.instantiate_param_ty(
- &sig.sig,
- None,
- tmp_tv_cache,
- RegistrationMode::Normal,
- ParamKind::Default(expr.t()),
- )?;
- d_params.push(pt);
- }
- let mut body = vec![];
- for expr in lambda.body.iter() {
- let param = self.instantiate_const_expr(expr, None, tmp_tv_cache)?;
- body.push(param);
- }
- Ok(TyParam::Lambda(TyParamLambda::new(
- lambda.clone(),
- nd_params,
- var_params,
- d_params,
- body,
- )))
- }
- ast::ConstExpr::BinOp(bin) => {
- let Some(op) = token_kind_to_op_kind(bin.op.kind) else {
- return type_feature_error!(
- self,
- bin.loc(),
- &format!("instantiating const expression {bin}")
- )
- };
- let lhs = self.instantiate_const_expr(&bin.lhs, erased_idx, tmp_tv_cache)?;
- let rhs = self.instantiate_const_expr(&bin.rhs, erased_idx, tmp_tv_cache)?;
- Ok(TyParam::bin(op, lhs, rhs))
- }
- ast::ConstExpr::UnaryOp(unary) => {
- let Some(op) = token_kind_to_op_kind(unary.op.kind) else {
- return type_feature_error!(
- self,
- unary.loc(),
- &format!("instantiating const expression {unary}")
- )
- };
- let val = self.instantiate_const_expr(&unary.expr, erased_idx, tmp_tv_cache)?;
- Ok(TyParam::unary(op, val))
- }
- ast::ConstExpr::TypeAsc(tasc) => {
- let tp = self.instantiate_const_expr(&tasc.expr, erased_idx, tmp_tv_cache)?;
- let spec_t = self.instantiate_typespec(
- &tasc.t_spec.t_spec,
- None,
- tmp_tv_cache,
- RegistrationMode::Normal,
- false,
- )?;
- if self.subtype_of(&self.get_tp_t(&tp)?, &spec_t) {
- Ok(tp)
- } else {
- Err(TyCheckErrors::from(TyCheckError::subtyping_error(
- self.cfg.input.clone(),
- line!() as usize,
- &self.get_tp_t(&tp)?,
- &spec_t,
- tasc.loc(),
- self.caused_by(),
- )))
- }
- }
- other => type_feature_error!(
- self,
- other.loc(),
- &format!("instantiating const expression {other}")
- ),
- }
- }
-
- pub(crate) fn instantiate_const_expr_as_type(
- &self,
- expr: &ast::ConstExpr,
- erased_idx: Option<(&Context, usize)>,
- tmp_tv_cache: &mut TyVarCache,
- ) -> TyCheckResult<Type> {
- let tp = self.instantiate_const_expr(expr, erased_idx, tmp_tv_cache)?;
- self.instantiate_tp_as_type(tp, expr)
- }
-
- fn instantiate_tp_as_type(&self, tp: TyParam, loc: &impl Locational) -> TyCheckResult<Type> {
- match tp {
- TyParam::FreeVar(fv) if fv.is_linked() => {
- self.instantiate_tp_as_type(fv.crack().clone(), loc)
- }
- TyParam::Type(t) => Ok(*t),
- TyParam::Value(ValueObj::Type(t)) => Ok(t.into_typ()),
- TyParam::Set(set) => {
- let t = set
- .iter()
- .next()
- .and_then(|tp| self.get_tp_t(tp).ok())
- .unwrap_or(Type::Never);
- Ok(tp_enum(t, set))
- }
- TyParam::Tuple(ts) => {
- let mut tps = vec![];
- for tp in ts {
- let t = self.instantiate_tp_as_type(tp, loc)?;
- tps.push(t);
- }
- Ok(tuple_t(tps))
- }
- TyParam::Record(rec) => {
- let mut rec_t = dict! {};
- for (field, tp) in rec {
- let t = self.instantiate_tp_as_type(tp, loc)?;
- rec_t.insert(field, t);
- }
- Ok(Type::Record(rec_t))
- }
- TyParam::Lambda(lambda) => {
- let return_t = self
- .instantiate_tp_as_type(lambda.body.last().unwrap().clone(), &lambda.const_)?;
- let subr = SubrType::new(
- SubrKind::from(lambda.const_.op.kind),
- lambda.nd_params,
- lambda.var_params,
- lambda.d_params,
- return_t,
- );
- Ok(Type::Subr(subr))
- }
- other => {
- type_feature_error!(self, loc.loc(), &format!("instantiate `{other}` as type"))
- }
- }
- }
-
- fn instantiate_func_param_spec(
- &self,
- p: &ParamTySpec,
- opt_decl_t: Option<&ParamTy>,
- default_t: Option<&TypeSpec>,
- tmp_tv_cache: &mut TyVarCache,
- mode: RegistrationMode,
- ) -> TyCheckResult<ParamTy> {
- let t = self.instantiate_typespec(&p.ty, opt_decl_t, tmp_tv_cache, mode, false)?;
- if let Some(default_t) = default_t {
- Ok(ParamTy::kw_default(
- p.name.as_ref().unwrap().inspect().to_owned(),
- t,
- self.instantiate_typespec(default_t, opt_decl_t, tmp_tv_cache, mode, false)?,
- ))
- } else {
- Ok(ParamTy::pos(
- p.name.as_ref().map(|t| t.inspect().to_owned()),
- t,
- ))
- }
- }
-
- pub(crate) fn instantiate_typespec(
- &self,
- t_spec: &TypeSpec,
- opt_decl_t: Option<&ParamTy>,
- tmp_tv_cache: &mut TyVarCache,
- mode: RegistrationMode,
- not_found_is_qvar: bool,
- ) -> TyCheckResult<Type> {
- match t_spec {
- TypeSpec::Infer(_) => Ok(free_var(self.level, Constraint::new_type_of(Type))),
- TypeSpec::PreDeclTy(predecl) => Ok(self.instantiate_predecl_t(
- predecl,
- opt_decl_t,
- tmp_tv_cache,
- not_found_is_qvar,
- )?),
- TypeSpec::And(lhs, rhs) => Ok(self.intersection(
- &self.instantiate_typespec(
- lhs,
- opt_decl_t,
- tmp_tv_cache,
- mode,
- not_found_is_qvar,
- )?,
- &self.instantiate_typespec(
- rhs,
- opt_decl_t,
- tmp_tv_cache,
- mode,
- not_found_is_qvar,
- )?,
- )),
- TypeSpec::Or(lhs, rhs) => Ok(self.union(
- &self.instantiate_typespec(
- lhs,
- opt_decl_t,
- tmp_tv_cache,
- mode,
- not_found_is_qvar,
- )?,
- &self.instantiate_typespec(
- rhs,
- opt_decl_t,
- tmp_tv_cache,
- mode,
- not_found_is_qvar,
- )?,
- )),
- TypeSpec::Not(ty) => Ok(self.complement(&self.instantiate_typespec(
- ty,
- opt_decl_t,
- tmp_tv_cache,
- mode,
- not_found_is_qvar,
- )?)),
- TypeSpec::Array(arr) => {
- let elem_t = self.instantiate_typespec(
- &arr.ty,
- opt_decl_t,
- tmp_tv_cache,
- mode,
- not_found_is_qvar,
- )?;
- let mut len = self.instantiate_const_expr(&arr.len, None, tmp_tv_cache)?;
- if let TyParam::Erased(t) = &mut len {
- *t.as_mut() = Type::Nat;
- }
- Ok(array_t(elem_t, len))
- }
- TypeSpec::SetWithLen(set) => {
- let elem_t = self.instantiate_typespec(
- &set.ty,
- opt_decl_t,
- tmp_tv_cache,
- mode,
- not_found_is_qvar,
- )?;
- let mut len = self.instantiate_const_expr(&set.len, None, tmp_tv_cache)?;
- if let TyParam::Erased(t) = &mut len {
- *t.as_mut() = Type::Nat;
- }
- Ok(set_t(elem_t, len))
- }
- TypeSpec::Tuple(tup) => {
- let mut inst_tys = vec![];
- for spec in tup.tys.iter() {
- inst_tys.push(self.instantiate_typespec(
- spec,
- opt_decl_t,
- tmp_tv_cache,
- mode,
- not_found_is_qvar,
- )?);
- }
- Ok(tuple_t(inst_tys))
- }
- TypeSpec::Dict(dict) => {
- let mut inst_tys = dict! {};
- for (k, v) in dict {
- inst_tys.insert(
- self.instantiate_typespec(
- k,
- opt_decl_t,
- tmp_tv_cache,
- mode,
- not_found_is_qvar,
- )?,
- self.instantiate_typespec(
- v,
- opt_decl_t,
- tmp_tv_cache,
- mode,
- not_found_is_qvar,
- )?,
- );
- }
- Ok(dict_t(inst_tys.into()))
- }
- TypeSpec::Record(rec) => {
- let mut inst_tys = dict! {};
- for (k, v) in rec {
- inst_tys.insert(
- k.into(),
- self.instantiate_typespec(
- v,
- opt_decl_t,
- tmp_tv_cache,
- mode,
- not_found_is_qvar,
- )?,
- );
- }
- Ok(Type::Record(inst_tys))
- }
- // TODO: エラー処理(リテラルでない)はパーサーにやらせる
- TypeSpec::Enum(set) => {
- let mut new_set = set! {};
- for arg in set.pos_args() {
- new_set.insert(self.instantiate_const_expr(&arg.expr, None, tmp_tv_cache)?);
- }
- let ty = new_set.iter().fold(Type::Never, |t, tp| {
- self.union(&t, &self.get_tp_t(tp).unwrap())
- });
- Ok(tp_enum(ty, new_set))
- }
- TypeSpec::Interval { op, lhs, rhs } => {
- let op = match op.kind {
- TokenKind::Closed => IntervalOp::Closed,
- TokenKind::LeftOpen => IntervalOp::LeftOpen,
- TokenKind::RightOpen => IntervalOp::RightOpen,
- TokenKind::Open => IntervalOp::Open,
- _ => assume_unreachable!(),
- };
- let l = self.instantiate_const_expr(lhs, None, tmp_tv_cache)?;
- let l = self.eval_tp(l)?;
- let r = self.instantiate_const_expr(rhs, None, tmp_tv_cache)?;
- let r = self.eval_tp(r)?;
- if let Some(Greater) = self.try_cmp(&l, &r) {
- panic!("{l}..{r} is not a valid interval type (should be lhs <= rhs)")
- }
- Ok(int_interval(op, l, r))
- }
- TypeSpec::Subr(subr) => {
- let mut inner_tv_ctx = if !subr.bounds.is_empty() {
- let tv_cache = self.instantiate_ty_bounds(&subr.bounds, mode)?;
- Some(tv_cache)
- } else {
- None
- };
- if let Some(inner) = &mut inner_tv_ctx {
- inner.merge(tmp_tv_cache);
- }
- let tmp_tv_ctx = if let Some(inner) = &mut inner_tv_ctx {
- inner
- } else {
- tmp_tv_cache
- };
- let non_defaults = try_map_mut(subr.non_defaults.iter(), |p| {
- self.instantiate_func_param_spec(p, opt_decl_t, None, tmp_tv_ctx, mode)
- })?;
- let var_params = subr
- .var_params
- .as_ref()
- .map(|p| {
- self.instantiate_func_param_spec(p, opt_decl_t, None, tmp_tv_ctx, mode)
- })
- .transpose()?;
- let defaults = try_map_mut(subr.defaults.iter(), |p| {
- self.instantiate_func_param_spec(
- &p.param,
- opt_decl_t,
- Some(&p.default),
- tmp_tv_ctx,
- mode,
- )
- })?
- .into_iter()
- .collect();
- let return_t = self.instantiate_typespec(
- &subr.return_t,
- opt_decl_t,
- tmp_tv_ctx,
- mode,
- not_found_is_qvar,
- )?;
- Ok(subr_t(
- SubrKind::from(subr.arrow.kind),
- non_defaults,
- var_params,
- defaults,
- return_t,
- ))
- }
- TypeSpec::TypeApp { spec, args } => {
- type_feature_error!(
- self,
- t_spec.loc(),
- &format!("instantiating type spec {spec}{args}")
- )
- }
- }
- }
-
- pub(crate) fn instantiate_ty_bound(
- &self,
- bound: &TypeBoundSpec,
- tv_cache: &mut TyVarCache,
- mode: RegistrationMode,
- ) -> TyCheckResult<()> {
- // REVIEW: 型境界の左辺に来れるのは型変数だけか?
- // TODO: 高階型変数
- match bound {
- TypeBoundSpec::Omitted(name) => {
- // TODO: other than type `Type`
- let constr = Constraint::new_type_of(Type);
- let tv = named_free_var(name.inspect().clone(), self.level, constr);
- tv_cache.push_or_init_tyvar(name.inspect(), &tv);
- Ok(())
- }
- TypeBoundSpec::NonDefault { lhs, spec } => {
- let constr =
- match spec.op.kind {
- TokenKind::SubtypeOf => Constraint::new_subtype_of(
- self.instantiate_typespec(&spec.t_spec, None, tv_cache, mode, true)?,
- ),
- TokenKind::SupertypeOf => Constraint::new_supertype_of(
- self.instantiate_typespec(&spec.t_spec, None, tv_cache, mode, true)?,
- ),
- TokenKind::Colon => Constraint::new_type_of(self.instantiate_typespec(
- &spec.t_spec,
- None,
- tv_cache,
- mode,
- true,
- )?),
- _ => unreachable!(),
- };
- if constr.get_sub_sup().is_none() {
- let tp = TyParam::named_free_var(lhs.inspect().clone(), self.level, constr);
- tv_cache.push_or_init_typaram(lhs.inspect(), &tp);
- } else {
- let tv = named_free_var(lhs.inspect().clone(), self.level, constr);
- tv_cache.push_or_init_tyvar(lhs.inspect(), &tv);
- }
- Ok(())
- }
- TypeBoundSpec::WithDefault { .. } => type_feature_error!(
- self,
- bound.loc(),
- "type boundary specification with default"
- ),
- }
- }
-
- pub(crate) fn instantiate_ty_bounds(
- &self,
- bounds: &TypeBoundSpecs,
- mode: RegistrationMode,
- ) -> TyCheckResult<TyVarCache> {
- let mut tv_cache = TyVarCache::new(self.level, self);
- for bound in bounds.iter() {
- self.instantiate_ty_bound(bound, &mut tv_cache, mode)?;
- }
- for tv in tv_cache.tyvar_instances.values() {
- if tv.constraint().map(|c| c.is_uninited()).unwrap_or(false) {
- return Err(TyCheckErrors::from(TyCheckError::no_var_error(
- self.cfg.input.clone(),
- line!() as usize,
- bounds.loc(),
- self.caused_by(),
- &tv.local_name(),
- self.get_similar_name(&tv.local_name()),
- )));
- }
- }
- for tp in tv_cache.typaram_instances.values() {
- if tp.constraint().map(|c| c.is_uninited()).unwrap_or(false) {
- return Err(TyCheckErrors::from(TyCheckError::no_var_error(
- self.cfg.input.clone(),
- line!() as usize,
- bounds.loc(),
- self.caused_by(),
- &tp.to_string(),
- self.get_similar_name(&tp.to_string()),
- )));
- }
- }
- Ok(tv_cache)
- }
-
fn instantiate_tp(
&self,
quantified: TyParam,
diff --git a/instantiate_spec.rs b/instantiate_spec.rs
index 8cbd6b1..c919e30 100644
--- a/instantiate_spec.rs
+++ b/instantiate_spec.rs
@@ -0,0 +1,1212 @@
+use std::option::Option; // conflicting to Type::Option
+
+#[allow(unused)]
+use erg_common::log;
+use erg_common::traits::{Locational, Stream};
+use erg_common::Str;
+use erg_common::{assume_unreachable, dict, enum_unwrap, set, try_map_mut};
+
+use ast::{
+ NonDefaultParamSignature, ParamTySpec, PreDeclTypeSpec, SimpleTypeSpec, TypeBoundSpec,
+ TypeBoundSpecs, TypeSpec,
+};
+use erg_parser::ast::{self, Identifier, VisModifierSpec, VisRestriction};
+use erg_parser::token::TokenKind;
+use erg_parser::Parser;
+
+use crate::feature_error;
+use crate::ty::free::{CanbeFree, Constraint};
+use crate::ty::typaram::{IntervalOp, OpKind, TyParam, TyParamLambda, TyParamOrdering};
+use crate::ty::value::ValueObj;
+use crate::ty::{constructors::*, VisibilityModifier};
+use crate::ty::{Field, HasType, ParamTy, SubrKind, SubrType, Type};
+use crate::type_feature_error;
+use TyParamOrdering::*;
+use Type::*;
+
+use crate::context::instantiate::TyVarCache;
+use crate::context::{Context, DefaultInfo, RegistrationMode};
+use crate::error::{TyCheckError, TyCheckErrors, TyCheckResult};
+use crate::AccessKind;
+use RegistrationMode::*;
+
+pub fn token_kind_to_op_kind(kind: TokenKind) -> Option<OpKind> {
+ match kind {
+ TokenKind::Plus => Some(OpKind::Add),
+ TokenKind::Minus => Some(OpKind::Sub),
+ TokenKind::Star => Some(OpKind::Mul),
+ TokenKind::Slash => Some(OpKind::Div),
+ TokenKind::FloorDiv => Some(OpKind::FloorDiv),
+ TokenKind::Mod => Some(OpKind::Mod),
+ TokenKind::Pow => Some(OpKind::Pow),
+ TokenKind::PrePlus => Some(OpKind::Pos),
+ TokenKind::PreMinus => Some(OpKind::Neg),
+ TokenKind::PreBitNot => Some(OpKind::Invert),
+ TokenKind::Equal => Some(OpKind::Eq),
+ TokenKind::NotEq => Some(OpKind::Ne),
+ TokenKind::Less => Some(OpKind::Lt),
+ TokenKind::LessEq => Some(OpKind::Le),
+ TokenKind::Gre => Some(OpKind::Gt),
+ TokenKind::GreEq => Some(OpKind::Ge),
+ TokenKind::AndOp => Some(OpKind::And),
+ TokenKind::OrOp => Some(OpKind::Or),
+ TokenKind::BitAnd => Some(OpKind::BitAnd),
+ TokenKind::BitOr => Some(OpKind::BitOr),
+ TokenKind::BitXor => Some(OpKind::BitXor),
+ TokenKind::Shl => Some(OpKind::Shl),
+ TokenKind::Shr => Some(OpKind::Shr),
+ _ => None,
+ }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum ParamKind {
+ NonDefault,
+ Default(Type),
+ VarParams,
+ KwParams,
+}
+
+impl ParamKind {
+ pub const fn is_var_params(&self) -> bool {
+ matches!(self, ParamKind::VarParams)
+ }
+ pub const fn is_kw_params(&self) -> bool {
+ matches!(self, ParamKind::KwParams)
+ }
+ pub const fn is_default(&self) -> bool {
+ matches!(self, ParamKind::Default(_))
+ }
+ pub const fn default_info(&self) -> DefaultInfo {
+ match self {
+ ParamKind::Default(_) => DefaultInfo::WithDefault,
+ _ => DefaultInfo::NonDefault,
+ }
+ }
+}
+
+/// TODO: this struct will be removed when const functions are implemented.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum ConstTemplate {
+ Obj(ValueObj),
+ App {
+ name: Str,
+ non_default_args: Vec<Type>,
+ default_args: Vec<ConstTemplate>,
+ },
+}
+
+impl ConstTemplate {
+ pub const fn app(
+ name: &'static str,
+ non_default_args: Vec<Type>,
+ default_args: Vec<ConstTemplate>,
+ ) -> Self {
+ ConstTemplate::App {
+ name: Str::ever(name),
+ non_default_args,
+ default_args,
+ }
+ }
+}
+
+impl Context {
+ pub(crate) fn instantiate_ty_bound(
+ &self,
+ bound: &TypeBoundSpec,
+ tv_cache: &mut TyVarCache,
+ mode: RegistrationMode,
+ ) -> TyCheckResult<()> {
+ // REVIEW: 型境界の左辺に来れるのは型変数だけか?
+ // TODO: 高階型変数
+ match bound {
+ TypeBoundSpec::Omitted(name) => {
+ // TODO: other than type `Type`
+ let constr = Constraint::new_type_of(Type);
+ let tv = named_free_var(name.inspect().clone(), self.level, constr);
+ tv_cache.push_or_init_tyvar(name.inspect(), &tv);
+ Ok(())
+ }
+ TypeBoundSpec::NonDefault { lhs, spec } => {
+ let constr =
+ match spec.op.kind {
+ TokenKind::SubtypeOf => Constraint::new_subtype_of(
+ self.instantiate_typespec(&spec.t_spec, None, tv_cache, mode, true)?,
+ ),
+ TokenKind::SupertypeOf => Constraint::new_supertype_of(
+ self.instantiate_typespec(&spec.t_spec, None, tv_cache, mode, true)?,
+ ),
+ TokenKind::Colon => Constraint::new_type_of(self.instantiate_typespec(
+ &spec.t_spec,
+ None,
+ tv_cache,
+ mode,
+ true,
+ )?),
+ _ => unreachable!(),
+ };
+ if constr.get_sub_sup().is_none() {
+ let tp = TyParam::named_free_var(lhs.inspect().clone(), self.level, constr);
+ tv_cache.push_or_init_typaram(lhs.inspect(), &tp);
+ } else {
+ let tv = named_free_var(lhs.inspect().clone(), self.level, constr);
+ tv_cache.push_or_init_tyvar(lhs.inspect(), &tv);
+ }
+ Ok(())
+ }
+ TypeBoundSpec::WithDefault { .. } => type_feature_error!(
+ self,
+ bound.loc(),
+ "type boundary specification with default"
+ ),
+ }
+ }
+
+ pub(crate) fn instantiate_ty_bounds(
+ &self,
+ bounds: &TypeBoundSpecs,
+ mode: RegistrationMode,
+ ) -> TyCheckResult<TyVarCache> {
+ let mut tv_cache = TyVarCache::new(self.level, self);
+ for bound in bounds.iter() {
+ self.instantiate_ty_bound(bound, &mut tv_cache, mode)?;
+ }
+ for tv in tv_cache.tyvar_instances.values() {
+ if tv.constraint().map(|c| c.is_uninited()).unwrap_or(false) {
+ return Err(TyCheckErrors::from(TyCheckError::no_var_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ bounds.loc(),
+ self.caused_by(),
+ &tv.local_name(),
+ self.get_similar_name(&tv.local_name()),
+ )));
+ }
+ }
+ for tp in tv_cache.typaram_instances.values() {
+ if tp.constraint().map(|c| c.is_uninited()).unwrap_or(false) {
+ return Err(TyCheckErrors::from(TyCheckError::no_var_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ bounds.loc(),
+ self.caused_by(),
+ &tp.to_string(),
+ self.get_similar_name(&tp.to_string()),
+ )));
+ }
+ }
+ Ok(tv_cache)
+ }
+
+ pub(crate) fn instantiate_var_sig_t(
+ &self,
+ t_spec: Option<&TypeSpec>,
+ mode: RegistrationMode,
+ ) -> TyCheckResult<Type> {
+ let mut tmp_tv_cache = TyVarCache::new(self.level, self);
+ let spec_t = if let Some(t_spec) = t_spec {
+ self.instantiate_typespec(t_spec, None, &mut tmp_tv_cache, mode, false)?
+ } else {
+ free_var(self.level, Constraint::new_type_of(Type))
+ };
+ Ok(spec_t)
+ }
+
+ pub(crate) fn instantiate_sub_sig_t(
+ &self,
+ sig: &ast::SubrSignature,
+ default_ts: Vec<Type>,
+ mode: RegistrationMode,
+ ) -> Result<Type, (TyCheckErrors, Type)> {
+ let mut errs = TyCheckErrors::empty();
+ // -> Result<Type, (Type, TyCheckErrors)> {
+ let opt_decl_sig_t = match self
+ .rec_get_decl_info(&sig.ident, AccessKind::Name, &self.cfg.input, self)
+ .ok()
+ .map(|vi| vi.t)
+ {
+ Some(Type::Subr(subr)) => Some(subr),
+ Some(Type::FreeVar(fv)) if fv.is_unbound() => return Ok(Type::FreeVar(fv)),
+ Some(other) => {
+ let err = TyCheckError::unreachable(
+ self.cfg.input.clone(),
+ "instantiate_sub_sig_t",
+ line!(),
+ );
+ return Err((TyCheckErrors::from(err), other));
+ }
+ None => None,
+ };
+ let mut tmp_tv_cache = self
+ .instantiate_ty_bounds(&sig.bounds, PreRegister)
+ .map_err(|errs| (errs, Type::Failure))?;
+ let mut non_defaults = vec![];
+ for (n, param) in sig.params.non_defaults.iter().enumerate() {
+ let opt_decl_t = opt_decl_sig_t
+ .as_ref()
+ .and_then(|subr| subr.non_default_params.get(n));
+ match self.instantiate_param_ty(
+ param,
+ opt_decl_t,
+ &mut tmp_tv_cache,
+ mode,
+ ParamKind::NonDefault,
+ ) {
+ Ok(pt) => non_defaults.push(pt),
+ Err(es) => {
+ errs.extend(es);
+ non_defaults.push(ParamTy::pos(param.inspect().cloned(), Type::Failure));
+ }
+ }
+ }
+ let var_args = if let Some(var_args) = sig.params.var_params.as_ref() {
+ let opt_decl_t = opt_decl_sig_t
+ .as_ref()
+ .and_then(|subr| subr.var_params.as_ref().map(|v| v.as_ref()));
+ let pt = match self.instantiate_param_ty(
+ var_args,
+ opt_decl_t,
+ &mut tmp_tv_cache,
+ mode,
+ ParamKind::VarParams,
+ ) {
+ Ok(pt) => pt,
+ Err(es) => {
+ errs.extend(es);
+ ParamTy::pos(var_args.inspect().cloned(), Type::Failure)
+ }
+ };
+ Some(pt)
+ } else {
+ None
+ };
+ let mut defaults = vec![];
+ for ((n, p), default_t) in sig.params.defaults.iter().enumerate().zip(default_ts) {
+ let opt_decl_t = opt_decl_sig_t
+ .as_ref()
+ .and_then(|subr| subr.default_params.get(n));
+ match self.instantiate_param_ty(
+ &p.sig,
+ opt_decl_t,
+ &mut tmp_tv_cache,
+ mode,
+ ParamKind::Default(default_t),
+ ) {
+ Ok(pt) => defaults.push(pt),
+ Err(es) => {
+ errs.extend(es);
+ defaults.push(ParamTy::pos(p.sig.inspect().cloned(), Type::Failure));
+ }
+ }
+ }
+ let spec_return_t = if let Some(t_spec) = sig.return_t_spec.as_ref() {
+ let opt_decl_t = opt_decl_sig_t
+ .as_ref()
+ .map(|subr| ParamTy::anonymous(subr.return_t.as_ref().clone()));
+ match self.instantiate_typespec(
+ t_spec,
+ opt_decl_t.as_ref(),
+ &mut tmp_tv_cache,
+ mode,
+ false,
+ ) {
+ Ok(ty) => ty,
+ Err(es) => {
+ errs.extend(es);
+ Type::Failure
+ }
+ }
+ } else {
+ // preregisterならouter scopeで型宣言(see inference.md)
+ let level = if mode == PreRegister {
+ self.level
+ } else {
+ self.level + 1
+ };
+ free_var(level, Constraint::new_type_of(Type))
+ };
+ let typ = if sig.ident.is_procedural() {
+ proc(non_defaults, var_args, defaults, spec_return_t)
+ } else {
+ func(non_defaults, var_args, defaults, spec_return_t)
+ };
+ if errs.is_empty() {
+ Ok(typ)
+ } else {
+ Err((errs, typ))
+ }
+ }
+
+ /// spec_t == Noneかつリテラル推論が不可能なら型変数を発行する
+ pub(crate) fn instantiate_param_sig_t(
+ &self,
+ sig: &NonDefaultParamSignature,
+ opt_decl_t: Option<&ParamTy>,
+ tmp_tv_cache: &mut TyVarCache,
+ mode: RegistrationMode,
+ kind: ParamKind,
+ ) -> TyCheckResult<Type> {
+ let gen_free_t = || {
+ let level = if mode == PreRegister {
+ self.level
+ } else {
+ self.level + 1
+ };
+ free_var(level, Constraint::new_type_of(Type))
+ };
+ let spec_t = if let Some(spec_with_op) = &sig.t_spec {
+ self.instantiate_typespec(&spec_with_op.t_spec, opt_decl_t, tmp_tv_cache, mode, false)?
+ } else {
+ match &sig.pat {
+ ast::ParamPattern::Lit(lit) => v_enum(set![self.eval_lit(lit)?]),
+ ast::ParamPattern::Discard(_) => Type::Obj,
+ ast::ParamPattern::Ref(_) => ref_(gen_free_t()),
+ ast::ParamPattern::RefMut(_) => ref_mut(gen_free_t(), None),
+ // ast::ParamPattern::VarName(name) if &name.inspect()[..] == "_" => Type::Obj,
+ // TODO: Array<Lit>
+ _ => gen_free_t(),
+ }
+ };
+ if let Some(decl_pt) = opt_decl_t {
+ if kind.is_var_params() {
+ let spec_t = unknown_len_array_t(spec_t.clone());
+ self.sub_unify(
+ decl_pt.typ(),
+ &spec_t,
+ &sig.t_spec.as_ref().ok_or(sig),
+ None,
+ )?;
+ } else {
+ self.sub_unify(
+ decl_pt.typ(),
+ &spec_t,
+ &sig.t_spec.as_ref().ok_or(sig),
+ None,
+ )?;
+ }
+ }
+ Ok(spec_t)
+ }
+
+ pub(crate) fn instantiate_param_ty(
+ &self,
+ sig: &NonDefaultParamSignature,
+ opt_decl_t: Option<&ParamTy>,
+ tmp_tv_cache: &mut TyVarCache,
+ mode: RegistrationMode,
+ kind: ParamKind,
+ ) -> TyCheckResult<ParamTy> {
+ let t = self.instantiate_param_sig_t(sig, opt_decl_t, tmp_tv_cache, mode, kind.clone())?;
+ match (sig.inspect(), kind) {
+ (Some(name), ParamKind::Default(default_t)) => {
+ Ok(ParamTy::kw_default(name.clone(), t, default_t))
+ }
+ (Some(name), _) => Ok(ParamTy::kw(name.clone(), t)),
+ (None, _) => Ok(ParamTy::anonymous(t)),
+ }
+ }
+
+ pub(crate) fn instantiate_predecl_t(
+ &self,
+ predecl: &PreDeclTypeSpec,
+ opt_decl_t: Option<&ParamTy>,
+ tmp_tv_cache: &mut TyVarCache,
+ not_found_is_qvar: bool,
+ ) -> TyCheckResult<Type> {
+ match predecl {
+ ast::PreDeclTypeSpec::Simple(simple) => {
+ self.instantiate_simple_t(simple, opt_decl_t, tmp_tv_cache, not_found_is_qvar)
+ }
+ ast::PreDeclTypeSpec::Attr { namespace, t } => {
+ if let Ok(receiver) = Parser::validate_const_expr(namespace.as_ref().clone()) {
+ if let Ok(receiver_t) =
+ self.instantiate_const_expr_as_type(&receiver, None, tmp_tv_cache)
+ {
+ let rhs = t.ident.inspect();
+ return Ok(proj(receiver_t, rhs));
+ }
+ }
+ let ctx = self.get_singular_ctx(namespace.as_ref(), self)?;
+ if let Some((typ, _)) = ctx.rec_local_get_type(t.ident.inspect()) {
+ let vi = ctx
+ .rec_get_var_info(&t.ident, AccessKind::Name, &self.cfg.input, self)
+ .unwrap();
+ self.inc_ref(&vi, &t.ident.name);
+ // TODO: visibility check
+ Ok(typ.clone())
+ } else {
+ Err(TyCheckErrors::from(TyCheckError::no_var_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ t.loc(),
+ self.caused_by(),
+ t.ident.inspect(),
+ self.get_similar_name(t.ident.inspect()),
+ )))
+ }
+ }
+ other => type_feature_error!(self, other.loc(), &format!("instantiating type {other}")),
+ }
+ }
+
+ pub(crate) fn instantiate_simple_t(
+ &self,
+ simple: &SimpleTypeSpec,
+ opt_decl_t: Option<&ParamTy>,
+ tmp_tv_cache: &mut TyVarCache,
+ not_found_is_qvar: bool,
+ ) -> TyCheckResult<Type> {
+ self.inc_ref_simple_typespec(simple);
+ match &simple.ident.inspect()[..] {
+ "_" | "Obj" => Ok(Type::Obj),
+ "Nat" => Ok(Type::Nat),
+ "Int" => Ok(Type::Int),
+ "Ratio" => Ok(Type::Ratio),
+ "Float" => Ok(Type::Float),
+ "Str" => Ok(Type::Str),
+ "Bool" => Ok(Type::Bool),
+ "NoneType" => Ok(Type::NoneType),
+ "Ellipsis" => Ok(Type::Ellipsis),
+ "NotImplemented" => Ok(Type::NotImplementedType),
+ "Inf" => Ok(Type::Inf),
+ "NegInf" => Ok(Type::NegInf),
+ "Never" => Ok(Type::Never),
+ "ClassType" => Ok(Type::ClassType),
+ "TraitType" => Ok(Type::TraitType),
+ "Type" => Ok(Type::Type),
+ "Array" => {
+ // TODO: kw
+ let mut args = simple.args.pos_args();
+ if let Some(first) = args.next() {
+ let t = self.instantiate_const_expr_as_type(&first.expr, None, tmp_tv_cache)?;
+ let len = if let Some(len) = args.next() {
+ self.instantiate_const_expr(&len.expr, None, tmp_tv_cache)?
+ } else {
+ TyParam::erased(Nat)
+ };
+ Ok(array_t(t, len))
+ } else {
+ Ok(mono("GenericArray"))
+ }
+ }
+ "Ref" => {
+ let mut args = simple.args.pos_args();
+ let Some(first) = args.next() else {
+ return Err(TyCheckErrors::from(TyCheckError::args_missing_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ simple.args.loc(),
+ "Ref",
+ self.caused_by(),
+ vec![Str::from("T")],
+ )));
+ };
+ let t = self.instantiate_const_expr_as_type(&first.expr, None, tmp_tv_cache)?;
+ Ok(ref_(t))
+ }
+ "RefMut" => {
+ // TODO after
+ let mut args = simple.args.pos_args();
+ let Some(first) = args.next() else {
+ return Err(TyCheckErrors::from(TyCheckError::args_missing_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ simple.args.loc(),
+ "RefMut",
+ self.caused_by(),
+ vec![Str::from("T")],
+ )));
+ };
+ let t = self.instantiate_const_expr_as_type(&first.expr, None, tmp_tv_cache)?;
+ Ok(ref_mut(t, None))
+ }
+ "Structural" => {
+ let mut args = simple.args.pos_args();
+ let Some(first) = args.next() else {
+ return Err(TyCheckErrors::from(TyCheckError::args_missing_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ simple.args.loc(),
+ "Structural",
+ self.caused_by(),
+ vec![Str::from("Type")],
+ )));
+ };
+ let t = self.instantiate_const_expr_as_type(&first.expr, None, tmp_tv_cache)?;
+ Ok(t.structuralize())
+ }
+ "Self" => self.rec_get_self_t().ok_or_else(|| {
+ TyCheckErrors::from(TyCheckError::unreachable(
+ self.cfg.input.clone(),
+ erg_common::fn_name_full!(),
+ line!(),
+ ))
+ }),
+ other if simple.args.is_empty() => {
+ if let Some(t) = tmp_tv_cache.get_tyvar(other) {
+ return Ok(t.clone());
+ } else if let Some(tp) = tmp_tv_cache.get_typaram(other) {
+ let t = enum_unwrap!(tp, TyParam::Type);
+ return Ok(t.as_ref().clone());
+ }
+ if let Some(tv_cache) = &self.tv_cache {
+ if let Some(t) = tv_cache.get_tyvar(other) {
+ return Ok(t.clone());
+ } else if let Some(tp) = tv_cache.get_typaram(other) {
+ let t = enum_unwrap!(tp, TyParam::Type);
+ return Ok(t.as_ref().clone());
+ }
+ }
+ if let Some(outer) = &self.outer {
+ if let Ok(t) = outer.instantiate_simple_t(
+ simple,
+ opt_decl_t,
+ tmp_tv_cache,
+ not_found_is_qvar,
+ ) {
+ return Ok(t);
+ }
+ }
+ if let Some(decl_t) = opt_decl_t {
+ return Ok(decl_t.typ().clone());
+ }
+ if let Some((typ, _)) = self.get_type(simple.ident.inspect()) {
+ Ok(typ.clone())
+ } else if not_found_is_qvar {
+ let tyvar = named_free_var(Str::rc(other), self.level, Constraint::Uninited);
+ tmp_tv_cache.push_or_init_tyvar(simple.ident.inspect(), &tyvar);
+ Ok(tyvar)
+ } else {
+ Err(TyCheckErrors::from(TyCheckError::no_type_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ simple.loc(),
+ self.caused_by(),
+ other,
+ self.get_similar_name(other),
+ )))
+ }
+ }
+ other => {
+ let ctx = if let Some((_, ctx)) = self.get_type(&Str::rc(other)) {
+ ctx
+ } else {
+ return Err(TyCheckErrors::from(TyCheckError::no_type_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ simple.ident.loc(),
+ self.caused_by(),
+ other,
+ self.get_similar_name(other),
+ )));
+ };
+ // FIXME: kw args
+ let mut new_params = vec![];
+ for (i, arg) in simple.args.pos_args().enumerate() {
+ let params =
+ self.instantiate_const_expr(&arg.expr, Some((ctx, i)), tmp_tv_cache);
+ let params = params.or_else(|e| {
+ if not_found_is_qvar {
+ let name = arg.expr.to_string();
+ // FIXME: handle `::` as a right way
+ let name = Str::rc(name.trim_start_matches("::"));
+ let tp = TyParam::named_free_var(
+ name.clone(),
+ self.level,
+ Constraint::Uninited,
+ );
+ tmp_tv_cache.push_or_init_typaram(&name, &tp);
+ Ok(tp)
+ } else {
+ Err(e)
+ }
+ })?;
+ new_params.push(params);
+ }
+ // FIXME: non-builtin
+ Ok(poly(Str::rc(other), new_params))
+ }
+ }
+ }
+
+ fn instantiate_local(
+ &self,
+ name: &Str,
+ erased_idx: Option<(&Context, usize)>,
+ tmp_tv_cache: &mut TyVarCache,
+ loc: &impl Locational,
+ ) -> TyCheckResult<TyParam> {
+ if &name[..] == "_" {
+ let t = if let Some((ctx, i)) = erased_idx {
+ ctx.params[i].1.t.clone()
+ } else {
+ Type::Uninited
+ };
+ return Ok(TyParam::erased(t));
+ }
+ if let Some(tp) = tmp_tv_cache.get_typaram(name) {
+ return Ok(tp.clone());
+ } else if let Some(t) = tmp_tv_cache.get_tyvar(name) {
+ return Ok(TyParam::t(t.clone()));
+ }
+ if let Some(tv_ctx) = &self.tv_cache {
+ if let Some(t) = tv_ctx.get_tyvar(name) {
+ return Ok(TyParam::t(t.clone()));
+ } else if let Some(tp) = tv_ctx.get_typaram(name) {
+ return Ok(tp.clone());
+ }
+ }
+ if let Some(value) = self.rec_get_const_obj(name) {
+ return Ok(TyParam::Value(value.clone()));
+ }
+ Err(TyCheckErrors::from(TyCheckError::no_var_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ loc.loc(),
+ self.caused_by(),
+ name,
+ self.get_similar_name(name),
+ )))
+ }
+
+ pub(crate) fn instantiate_const_expr(
+ &self,
+ expr: &ast::ConstExpr,
+ erased_idx: Option<(&Context, usize)>,
+ tmp_tv_cache: &mut TyVarCache,
+ ) -> TyCheckResult<TyParam> {
+ match expr {
+ ast::ConstExpr::Lit(lit) => Ok(TyParam::Value(self.eval_lit(lit)?)),
+ ast::ConstExpr::Accessor(ast::ConstAccessor::Attr(attr)) => {
+ let obj = self.instantiate_const_expr(&attr.obj, erased_idx, tmp_tv_cache)?;
+ Ok(obj.proj(attr.name.inspect()))
+ }
+ ast::ConstExpr::Accessor(ast::ConstAccessor::Local(local)) => {
+ self.inc_ref_const_local(local);
+ self.instantiate_local(local.inspect(), erased_idx, tmp_tv_cache, local)
+ }
+ ast::ConstExpr::Array(array) => {
+ let mut tp_arr = vec![];
+ for (i, elem) in array.elems.pos_args().enumerate() {
+ let el =
+ self.instantiate_const_expr(&elem.expr, Some((self, i)), tmp_tv_cache)?;
+ tp_arr.push(el);
+ }
+ Ok(TyParam::Array(tp_arr))
+ }
+ ast::ConstExpr::Set(set) => {
+ let mut tp_set = set! {};
+ for (i, elem) in set.elems.pos_args().enumerate() {
+ let el =
+ self.instantiate_const_expr(&elem.expr, Some((self, i)), tmp_tv_cache)?;
+ tp_set.insert(el);
+ }
+ Ok(TyParam::Set(tp_set))
+ }
+ ast::ConstExpr::Dict(dict) => {
+ let mut tp_dict = dict! {};
+ for (i, elem) in dict.kvs.iter().enumerate() {
+ let key =
+ self.instantiate_const_expr(&elem.key, Some((self, i)), tmp_tv_cache)?;
+ let val =
+ self.instantiate_const_expr(&elem.value, Some((self, i)), tmp_tv_cache)?;
+ tp_dict.insert(key, val);
+ }
+ Ok(TyParam::Dict(tp_dict))
+ }
+ ast::ConstExpr::Tuple(tuple) => {
+ let mut tp_tuple = vec![];
+ for (i, elem) in tuple.elems.pos_args().enumerate() {
+ let el =
+ self.instantiate_const_expr(&elem.expr, Some((self, i)), tmp_tv_cache)?;
+ tp_tuple.push(el);
+ }
+ Ok(TyParam::Tuple(tp_tuple))
+ }
+ ast::ConstExpr::Record(rec) => {
+ let mut tp_rec = dict! {};
+ for attr in rec.attrs.iter() {
+ let field = self.instantiate_field(&attr.ident)?;
+ let val = self.instantiate_const_expr(
+ attr.body.block.get(0).unwrap(),
+ None,
+ tmp_tv_cache,
+ )?;
+ tp_rec.insert(field, val);
+ }
+ Ok(TyParam::Record(tp_rec))
+ }
+ ast::ConstExpr::Lambda(lambda) => {
+ let mut _tmp_tv_cache =
+ self.instantiate_ty_bounds(&lambda.sig.bounds, RegistrationMode::Normal)?;
+ let tmp_tv_cache = if tmp_tv_cache.is_empty() {
+ &mut _tmp_tv_cache
+ } else {
+ // TODO: prohibit double quantification
+ tmp_tv_cache
+ };
+ let mut nd_params = Vec::with_capacity(lambda.sig.params.non_defaults.len());
+ for sig in lambda.sig.params.non_defaults.iter() {
+ let pt = self.instantiate_param_ty(
+ sig,
+ None,
+ tmp_tv_cache,
+ RegistrationMode::Normal,
+ ParamKind::NonDefault,
+ )?;
+ nd_params.push(pt);
+ }
+ let var_params = if let Some(p) = lambda.sig.params.var_params.as_ref() {
+ let pt = self.instantiate_param_ty(
+ p,
+ None,
+ tmp_tv_cache,
+ RegistrationMode::Normal,
+ ParamKind::VarParams,
+ )?;
+ Some(pt)
+ } else {
+ None
+ };
+ let mut d_params = Vec::with_capacity(lambda.sig.params.defaults.len());
+ for sig in lambda.sig.params.defaults.iter() {
+ let expr = self.eval_const_expr(&sig.default_val)?;
+ let pt = self.instantiate_param_ty(
+ &sig.sig,
+ None,
+ tmp_tv_cache,
+ RegistrationMode::Normal,
+ ParamKind::Default(expr.t()),
+ )?;
+ d_params.push(pt);
+ }
+ let mut body = vec![];
+ for expr in lambda.body.iter() {
+ let param = self.instantiate_const_expr(expr, None, tmp_tv_cache)?;
+ body.push(param);
+ }
+ Ok(TyParam::Lambda(TyParamLambda::new(
+ lambda.clone(),
+ nd_params,
+ var_params,
+ d_params,
+ body,
+ )))
+ }
+ ast::ConstExpr::BinOp(bin) => {
+ let Some(op) = token_kind_to_op_kind(bin.op.kind) else {
+ return type_feature_error!(
+ self,
+ bin.loc(),
+ &format!("instantiating const expression {bin}")
+ )
+ };
+ let lhs = self.instantiate_const_expr(&bin.lhs, erased_idx, tmp_tv_cache)?;
+ let rhs = self.instantiate_const_expr(&bin.rhs, erased_idx, tmp_tv_cache)?;
+ Ok(TyParam::bin(op, lhs, rhs))
+ }
+ ast::ConstExpr::UnaryOp(unary) => {
+ let Some(op) = token_kind_to_op_kind(unary.op.kind) else {
+ return type_feature_error!(
+ self,
+ unary.loc(),
+ &format!("instantiating const expression {unary}")
+ )
+ };
+ let val = self.instantiate_const_expr(&unary.expr, erased_idx, tmp_tv_cache)?;
+ Ok(TyParam::unary(op, val))
+ }
+ ast::ConstExpr::TypeAsc(tasc) => {
+ let tp = self.instantiate_const_expr(&tasc.expr, erased_idx, tmp_tv_cache)?;
+ let spec_t = self.instantiate_typespec(
+ &tasc.t_spec.t_spec,
+ None,
+ tmp_tv_cache,
+ RegistrationMode::Normal,
+ false,
+ )?;
+ if self.subtype_of(&self.get_tp_t(&tp)?, &spec_t) {
+ Ok(tp)
+ } else {
+ Err(TyCheckErrors::from(TyCheckError::subtyping_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ &self.get_tp_t(&tp)?,
+ &spec_t,
+ tasc.loc(),
+ self.caused_by(),
+ )))
+ }
+ }
+ other => type_feature_error!(
+ self,
+ other.loc(),
+ &format!("instantiating const expression {other}")
+ ),
+ }
+ }
+
+ pub(crate) fn instantiate_const_expr_as_type(
+ &self,
+ expr: &ast::ConstExpr,
+ erased_idx: Option<(&Context, usize)>,
+ tmp_tv_cache: &mut TyVarCache,
+ ) -> TyCheckResult<Type> {
+ let tp = self.instantiate_const_expr(expr, erased_idx, tmp_tv_cache)?;
+ self.instantiate_tp_as_type(tp, expr)
+ }
+
+ fn instantiate_tp_as_type(&self, tp: TyParam, loc: &impl Locational) -> TyCheckResult<Type> {
+ match tp {
+ TyParam::FreeVar(fv) if fv.is_linked() => {
+ self.instantiate_tp_as_type(fv.crack().clone(), loc)
+ }
+ TyParam::Type(t) => Ok(*t),
+ TyParam::Value(ValueObj::Type(t)) => Ok(t.into_typ()),
+ TyParam::Set(set) => {
+ let t = set
+ .iter()
+ .next()
+ .and_then(|tp| self.get_tp_t(tp).ok())
+ .unwrap_or(Type::Never);
+ Ok(tp_enum(t, set))
+ }
+ TyParam::Tuple(ts) => {
+ let mut tps = vec![];
+ for tp in ts {
+ let t = self.instantiate_tp_as_type(tp, loc)?;
+ tps.push(t);
+ }
+ Ok(tuple_t(tps))
+ }
+ TyParam::Record(rec) => {
+ let mut rec_t = dict! {};
+ for (field, tp) in rec {
+ let t = self.instantiate_tp_as_type(tp, loc)?;
+ rec_t.insert(field, t);
+ }
+ Ok(Type::Record(rec_t))
+ }
+ TyParam::Lambda(lambda) => {
+ let return_t = self
+ .instantiate_tp_as_type(lambda.body.last().unwrap().clone(), &lambda.const_)?;
+ let subr = SubrType::new(
+ SubrKind::from(lambda.const_.op.kind),
+ lambda.nd_params,
+ lambda.var_params,
+ lambda.d_params,
+ return_t,
+ );
+ Ok(Type::Subr(subr))
+ }
+ other => {
+ type_feature_error!(self, loc.loc(), &format!("instantiate `{other}` as type"))
+ }
+ }
+ }
+
+ fn instantiate_func_param_spec(
+ &self,
+ p: &ParamTySpec,
+ opt_decl_t: Option<&ParamTy>,
+ default_t: Option<&TypeSpec>,
+ tmp_tv_cache: &mut TyVarCache,
+ mode: RegistrationMode,
+ ) -> TyCheckResult<ParamTy> {
+ let t = self.instantiate_typespec(&p.ty, opt_decl_t, tmp_tv_cache, mode, false)?;
+ if let Some(default_t) = default_t {
+ Ok(ParamTy::kw_default(
+ p.name.as_ref().unwrap().inspect().to_owned(),
+ t,
+ self.instantiate_typespec(default_t, opt_decl_t, tmp_tv_cache, mode, false)?,
+ ))
+ } else {
+ Ok(ParamTy::pos(
+ p.name.as_ref().map(|t| t.inspect().to_owned()),
+ t,
+ ))
+ }
+ }
+
+ pub(crate) fn instantiate_typespec(
+ &self,
+ t_spec: &TypeSpec,
+ opt_decl_t: Option<&ParamTy>,
+ tmp_tv_cache: &mut TyVarCache,
+ mode: RegistrationMode,
+ not_found_is_qvar: bool,
+ ) -> TyCheckResult<Type> {
+ match t_spec {
+ TypeSpec::Infer(_) => Ok(free_var(self.level, Constraint::new_type_of(Type))),
+ TypeSpec::PreDeclTy(predecl) => Ok(self.instantiate_predecl_t(
+ predecl,
+ opt_decl_t,
+ tmp_tv_cache,
+ not_found_is_qvar,
+ )?),
+ TypeSpec::And(lhs, rhs) => Ok(self.intersection(
+ &self.instantiate_typespec(
+ lhs,
+ opt_decl_t,
+ tmp_tv_cache,
+ mode,
+ not_found_is_qvar,
+ )?,
+ &self.instantiate_typespec(
+ rhs,
+ opt_decl_t,
+ tmp_tv_cache,
+ mode,
+ not_found_is_qvar,
+ )?,
+ )),
+ TypeSpec::Or(lhs, rhs) => Ok(self.union(
+ &self.instantiate_typespec(
+ lhs,
+ opt_decl_t,
+ tmp_tv_cache,
+ mode,
+ not_found_is_qvar,
+ )?,
+ &self.instantiate_typespec(
+ rhs,
+ opt_decl_t,
+ tmp_tv_cache,
+ mode,
+ not_found_is_qvar,
+ )?,
+ )),
+ TypeSpec::Not(ty) => Ok(self.complement(&self.instantiate_typespec(
+ ty,
+ opt_decl_t,
+ tmp_tv_cache,
+ mode,
+ not_found_is_qvar,
+ )?)),
+ TypeSpec::Array(arr) => {
+ let elem_t = self.instantiate_typespec(
+ &arr.ty,
+ opt_decl_t,
+ tmp_tv_cache,
+ mode,
+ not_found_is_qvar,
+ )?;
+ let mut len = self.instantiate_const_expr(&arr.len, None, tmp_tv_cache)?;
+ if let TyParam::Erased(t) = &mut len {
+ *t.as_mut() = Type::Nat;
+ }
+ Ok(array_t(elem_t, len))
+ }
+ TypeSpec::SetWithLen(set) => {
+ let elem_t = self.instantiate_typespec(
+ &set.ty,
+ opt_decl_t,
+ tmp_tv_cache,
+ mode,
+ not_found_is_qvar,
+ )?;
+ let mut len = self.instantiate_const_expr(&set.len, None, tmp_tv_cache)?;
+ if let TyParam::Erased(t) = &mut len {
+ *t.as_mut() = Type::Nat;
+ }
+ Ok(set_t(elem_t, len))
+ }
+ TypeSpec::Tuple(tup) => {
+ let mut inst_tys = vec![];
+ for spec in tup.tys.iter() {
+ inst_tys.push(self.instantiate_typespec(
+ spec,
+ opt_decl_t,
+ tmp_tv_cache,
+ mode,
+ not_found_is_qvar,
+ )?);
+ }
+ Ok(tuple_t(inst_tys))
+ }
+ TypeSpec::Dict(dict) => {
+ let mut inst_tys = dict! {};
+ for (k, v) in dict {
+ inst_tys.insert(
+ self.instantiate_typespec(
+ k,
+ opt_decl_t,
+ tmp_tv_cache,
+ mode,
+ not_found_is_qvar,
+ )?,
+ self.instantiate_typespec(
+ v,
+ opt_decl_t,
+ tmp_tv_cache,
+ mode,
+ not_found_is_qvar,
+ )?,
+ );
+ }
+ Ok(dict_t(inst_tys.into()))
+ }
+ TypeSpec::Record(rec) => {
+ let mut inst_tys = dict! {};
+ for (k, v) in rec {
+ inst_tys.insert(
+ self.instantiate_field(k)?,
+ self.instantiate_typespec(
+ v,
+ opt_decl_t,
+ tmp_tv_cache,
+ mode,
+ not_found_is_qvar,
+ )?,
+ );
+ }
+ Ok(Type::Record(inst_tys))
+ }
+ // TODO: エラー処理(リテラルでない)はパーサーにやらせる
+ TypeSpec::Enum(set) => {
+ let mut new_set = set! {};
+ for arg in set.pos_args() {
+ new_set.insert(self.instantiate_const_expr(&arg.expr, None, tmp_tv_cache)?);
+ }
+ let ty = new_set.iter().fold(Type::Never, |t, tp| {
+ self.union(&t, &self.get_tp_t(tp).unwrap())
+ });
+ Ok(tp_enum(ty, new_set))
+ }
+ TypeSpec::Interval { op, lhs, rhs } => {
+ let op = match op.kind {
+ TokenKind::Closed => IntervalOp::Closed,
+ TokenKind::LeftOpen => IntervalOp::LeftOpen,
+ TokenKind::RightOpen => IntervalOp::RightOpen,
+ TokenKind::Open => IntervalOp::Open,
+ _ => assume_unreachable!(),
+ };
+ let l = self.instantiate_const_expr(lhs, None, tmp_tv_cache)?;
+ let l = self.eval_tp(l)?;
+ let r = self.instantiate_const_expr(rhs, None, tmp_tv_cache)?;
+ let r = self.eval_tp(r)?;
+ if let Some(Greater) = self.try_cmp(&l, &r) {
+ panic!("{l}..{r} is not a valid interval type (should be lhs <= rhs)")
+ }
+ Ok(int_interval(op, l, r))
+ }
+ TypeSpec::Subr(subr) => {
+ let mut inner_tv_ctx = if !subr.bounds.is_empty() {
+ let tv_cache = self.instantiate_ty_bounds(&subr.bounds, mode)?;
+ Some(tv_cache)
+ } else {
+ None
+ };
+ if let Some(inner) = &mut inner_tv_ctx {
+ inner.merge(tmp_tv_cache);
+ }
+ let tmp_tv_ctx = if let Some(inner) = &mut inner_tv_ctx {
+ inner
+ } else {
+ tmp_tv_cache
+ };
+ let non_defaults = try_map_mut(subr.non_defaults.iter(), |p| {
+ self.instantiate_func_param_spec(p, opt_decl_t, None, tmp_tv_ctx, mode)
+ })?;
+ let var_params = subr
+ .var_params
+ .as_ref()
+ .map(|p| {
+ self.instantiate_func_param_spec(p, opt_decl_t, None, tmp_tv_ctx, mode)
+ })
+ .transpose()?;
+ let defaults = try_map_mut(subr.defaults.iter(), |p| {
+ self.instantiate_func_param_spec(
+ &p.param,
+ opt_decl_t,
+ Some(&p.default),
+ tmp_tv_ctx,
+ mode,
+ )
+ })?
+ .into_iter()
+ .collect();
+ let return_t = self.instantiate_typespec(
+ &subr.return_t,
+ opt_decl_t,
+ tmp_tv_ctx,
+ mode,
+ not_found_is_qvar,
+ )?;
+ Ok(subr_t(
+ SubrKind::from(subr.arrow.kind),
+ non_defaults,
+ var_params,
+ defaults,
+ return_t,
+ ))
+ }
+ TypeSpec::TypeApp { spec, args } => {
+ type_feature_error!(
+ self,
+ t_spec.loc(),
+ &format!("instantiating type spec {spec}{args}")
+ )
+ }
+ }
+ }
+
+ pub fn instantiate_field(&self, ident: &Identifier) -> TyCheckResult<Field> {
+ let vis = self.instantiate_vis_modifier(&ident.vis)?;
+ Ok(Field::new(vis, ident.inspect().clone()))
+ }
+
+ pub fn instantiate_vis_modifier(
+ &self,
+ spec: &VisModifierSpec,
+ ) -> TyCheckResult<VisibilityModifier> {
+ match spec {
+ VisModifierSpec::Auto => unreachable!(),
+ VisModifierSpec::Private | VisModifierSpec::ExplicitPrivate(_) => {
+ Ok(VisibilityModifier::Private)
+ }
+ VisModifierSpec::Public(_) => Ok(VisibilityModifier::Public),
+ VisModifierSpec::Restricted(rest) => match &rest {
+ VisRestriction::Namespaces(namespace) => {
+ let mut namespaces = set! {};
+ for ns in namespace.iter() {
+ let ast::Accessor::Ident(ident) = ns else {
+ return feature_error!(TyCheckErrors, TyCheckError, self, ns.loc(), "namespace accessors");
+ };
+ let vi = self
+ .rec_get_var_info(ident, AccessKind::Name, &self.cfg.input, self)
+ .none_or_result(|| {
+ TyCheckError::no_var_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ ident.loc(),
+ self.caused_by(),
+ ident.inspect(),
+ None,
+ )
+ })?;
+ let name = Str::from(format!(
+ "{}{}{}",
+ vi.vis.def_namespace,
+ vi.vis.modifier.display_as_accessor(),
+ ident.inspect()
+ ));
+ namespaces.insert(name);
+ }
+ Ok(VisibilityModifier::Restricted(namespaces))
+ }
+ VisRestriction::SubtypeOf(typ) => {
+ let mut dummy_tv_cache = TyVarCache::new(self.level, self);
+ let t = self.instantiate_typespec(
+ typ,
+ None,
+ &mut dummy_tv_cache,
+ RegistrationMode::Normal,
+ false,
+ )?;
+ Ok(VisibilityModifier::SubtypeRestricted(t))
+ }
+ },
+ }
+ }
+}
diff --git a/register.rs b/register.rs
index 47674fb..4b79c60 100644
--- a/register.rs
+++ b/register.rs
@@ -11,7 +11,7 @@ use erg_common::levenshtein::get_similar_name;
use erg_common::python_util::BUILTIN_PYTHON_MODS;
use erg_common::set::Set;
use erg_common::traits::{Locational, Stream};
-use erg_common::vis::Visibility;
+use erg_common::triple::Triple;
use erg_common::Str;
use erg_common::{enum_unwrap, get_hash, log, set};
@@ -23,7 +23,7 @@ use crate::ty::constructors::{
};
use crate::ty::free::{Constraint, FreeKind, HasLevel};
use crate::ty::value::{GenTypeObj, TypeObj, ValueObj};
-use crate::ty::{HasType, ParamTy, SubrType, Type};
+use crate::ty::{HasType, ParamTy, SubrType, Type, Visibility};
use crate::build_hir::HIRBuilder;
use crate::context::{
@@ -38,9 +38,9 @@ use crate::varinfo::{AbsLocation, Mutability, VarInfo, VarKind};
use crate::{feature_error, hir};
use Mutability::*;
use RegistrationMode::*;
-use Visibility::*;
-use super::instantiate::{ParamKind, TyVarCache};
+use super::instantiate::TyVarCache;
+use super::instantiate_spec::ParamKind;
/// format:
/// ```python
@@ -133,7 +133,7 @@ impl Context {
}
other => unreachable!("{other}"),
};
- let vis = ident.vis();
+ let vis = self.instantiate_vis_modifier(&ident.vis)?;
let kind = id.map_or(VarKind::Declared, VarKind::Defined);
let sig_t = self.instantiate_var_sig_t(sig.t_spec.as_ref(), PreRegister)?;
let py_name = if let ContextKind::PatchMethodDefs(_base) = &self.kind {
@@ -153,7 +153,7 @@ impl Context {
let vi = VarInfo::new(
sig_t,
muty,
- vis,
+ Visibility::new(vis, self.name.clone()),
kind,
None,
self.impl_of(),
@@ -172,7 +172,7 @@ impl Context {
id: Option<DefId>,
) -> TyCheckResult<()> {
let name = sig.ident.inspect();
- let vis = sig.ident.vis();
+ let vis = self.instantiate_vis_modifier(&sig.ident.vis)?;
let muty = Mutability::from(&name[..]);
let kind = id.map_or(VarKind::Declared, VarKind::Defined);
let comptime_decos = sig
@@ -199,7 +199,7 @@ impl Context {
let vi = VarInfo::new(
t,
muty,
- vis,
+ Visibility::new(vis, self.name.clone()),
kind,
Some(comptime_decos),
self.impl_of(),
@@ -238,18 +238,19 @@ impl Context {
ast::VarPattern::Discard(_) => {
return Ok(VarInfo {
t: body_t.clone(),
- ..VarInfo::const_default()
+ ..VarInfo::const_default_private()
});
}
- _ => todo!(),
+ _ => unreachable!(),
};
+ let vis = self.instantiate_vis_modifier(&ident.vis)?;
// already defined as const
if sig.is_const() {
let vi = self.decls.remove(ident.inspect()).unwrap_or_else(|| {
VarInfo::new(
body_t.clone(),
Mutability::Const,
- sig.vis(),
+ Visibility::new(vis, self.name.clone()),
VarKind::Declared,
None,
self.impl_of(),
@@ -270,7 +271,6 @@ impl Context {
} else {
py_name
};
- let vis = ident.vis();
let kind = if id.0 == 0 {
VarKind::Declared
} else {
@@ -279,14 +279,14 @@ impl Context {
let vi = VarInfo::new(
body_t.clone(),
muty,
- vis,
+ Visibility::new(vis, self.name.clone()),
kind,
None,
self.impl_of(),
py_name,
self.absolutize(ident.name.loc()),
);
- log!(info "Registered {}::{}: {}", self.name, ident.name, vi);
+ log!(info "Registered {}{}: {}", self.name, ident, vi);
self.locals.insert(ident.name.clone(), vi.clone());
Ok(vi)
}
@@ -300,9 +300,9 @@ impl Context {
kind: ParamKind,
) -> TyCheckResult<()> {
let vis = if cfg!(feature = "py_compatible") {
- Public
+ Visibility::BUILTIN_PUBLIC
} else {
- Private
+ Visibility::private(self.name.clone())
};
let default = kind.default_info();
let is_var_params = kind.is_var_params();
@@ -622,6 +622,7 @@ impl Context {
self.locals.insert(sig.ident.name.clone(), vi.clone());
return Ok(vi);
}
+ let vis = self.instantiate_vis_modifier(&sig.ident.vis)?;
let muty = if sig.ident.is_const() {
Mutability::Const
} else {
@@ -717,7 +718,7 @@ impl Context {
let vi = VarInfo::new(
found_t,
muty,
- sig.ident.vis(),
+ Visibility::new(vis, self.name.clone()),
VarKind::Defined(id),
Some(comptime_decos),
self.impl_of(),
@@ -746,6 +747,7 @@ impl Context {
return Ok(());
}
}
+ let vis = self.instantiate_vis_modifier(&ident.vis)?;
let muty = if ident.is_const() {
Mutability::Const
} else {
@@ -765,7 +767,7 @@ impl Context {
let vi = VarInfo::new(
failure_t,
muty,
- ident.vis(),
+ Visibility::new(vis, self.name.clone()),
VarKind::DoesNotExist,
Some(comptime_decos),
self.impl_of(),
@@ -814,7 +816,7 @@ impl Context {
ast::Signature::Subr(sig) => {
if sig.is_const() {
let tv_cache = self.instantiate_ty_bounds(&sig.bounds, PreRegister)?;
- let vis = def.sig.vis();
+ let vis = self.instantiate_vis_modifier(sig.vis())?;
self.grow(__name__, ContextKind::Proc, vis, Some(tv_cache));
let (obj, const_t) = match self.eval_const_block(&def.body.block) {
Ok(obj) => (obj.clone(), v_enum(set! {obj})),
@@ -852,7 +854,8 @@ impl Context {
ast::Signature::Var(sig) => {
if sig.is_const() {
let kind = ContextKind::from(def.def_kind());
- self.grow(__name__, kind, sig.vis(), None);
+ let vis = self.instantiate_vis_modifier(sig.vis())?;
+ self.grow(__name__, kind, vis, None);
let (obj, const_t) = match self.eval_const_block(&def.body.block) {
Ok(obj) => (obj.clone(), v_enum(set! {obj})),
Err(errs) => {
@@ -1048,7 +1051,8 @@ impl Context {
ident: &Identifier,
obj: ValueObj,
) -> CompileResult<()> {
- if self.rec_get_const_obj(ident.inspect()).is_some() && ident.vis().is_private() {
+ let vis = self.instantiate_vis_modifier(&ident.vis)?;
+ if self.rec_get_const_obj(ident.inspect()).is_some() && vis.is_private() {
Err(CompileErrors::from(CompileError::reassign_error(
self.cfg.input.clone(),
line!() as usize,
@@ -1068,7 +1072,7 @@ impl Context {
let vi = VarInfo::new(
v_enum(set! {other.clone()}),
Const,
- ident.vis(),
+ Visibility::new(vis, self.name.clone()),
VarKind::Defined(id),
None,
self.impl_of(),
@@ -1111,6 +1115,7 @@ impl Context {
field.clone(),
t.clone(),
self.impl_of(),
+ ctx.name.clone(),
);
ctx.decls.insert(varname, vi);
}
@@ -1120,7 +1125,7 @@ impl Context {
"base",
other.typ().clone(),
Immutable,
- Private,
+ Visibility::BUILTIN_PRIVATE,
None,
)?;
}
@@ -1133,12 +1138,18 @@ impl Context {
"__new__",
new_t.clone(),
Immutable,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Some("__call__".into()),
)?;
// 必要なら、ユーザーが独自に上書きする
// users can override this if necessary
- methods.register_auto_impl("new", new_t, Immutable, Public, None)?;
+ methods.register_auto_impl(
+ "new",
+ new_t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ None,
+ )?;
ctx.methods_list
.push((ClassDefType::Simple(gen.typ().clone()), methods));
self.register_gen_mono_type(ident, gen, ctx, Const)
@@ -1189,6 +1200,7 @@ impl Context {
field.clone(),
t.clone(),
self.impl_of(),
+ ctx.name.clone(),
);
ctx.decls.insert(varname, vi);
}
@@ -1202,11 +1214,17 @@ impl Context {
"__new__",
new_t.clone(),
Immutable,
- Private,
+ Visibility::BUILTIN_PRIVATE,
Some("__call__".into()),
)?;
// 必要なら、ユーザーが独自に上書きする
- methods.register_auto_impl("new", new_t, Immutable, Public, None)?;
+ methods.register_auto_impl(
+ "new",
+ new_t,
+ Immutable,
+ Visibility::BUILTIN_PUBLIC,
+ None,
+ )?;
ctx.methods_list
.push((ClassDefType::Simple(gen.typ().clone()), methods));
self.register_gen_mono_type(ident, gen, ctx, Const)
@@ -1242,7 +1260,12 @@ impl Context {
);
let Some(TypeObj::Builtin(Type::Record(req))) = gen.base_or_sup() else { todo!("{gen}") };
for (field, t) in req.iter() {
- let vi = VarInfo::instance_attr(field.clone(), t.clone(), self.impl_of());
+ let vi = VarInfo::instance_attr(
+ field.clone(),
+ t.clone(),
+ self.impl_of(),
+ ctx.name.clone(),
+ );
ctx.decls
.insert(VarName::from_str(field.symbol.clone()), vi);
}
@@ -1273,8 +1296,12 @@ impl Context {
);
if let Some(additional) = additional {
for (field, t) in additional.iter() {
- let vi =
- VarInfo::instance_attr(field.clone(), t.clone(), self.impl_of());
+ let vi = VarInfo::instance_attr(
+ field.clone(),
+ t.clone(),
+ self.impl_of(),
+ ctx.name.clone(),
+ );
ctx.decls
.insert(VarName::from_str(field.symbol.clone()), vi);
}
@@ -1330,6 +1357,7 @@ impl Context {
}
pub(crate) fn register_type_alias(&mut self, ident: &Identifier, t: Type) -> CompileResult<()> {
+ let vis = self.instantiate_vis_modifier(&ident.vis)?;
if self.mono_types.contains_key(ident.inspect()) {
Err(CompileErrors::from(CompileError::reassign_error(
self.cfg.input.clone(),
@@ -1338,7 +1366,7 @@ impl Context {
self.caused_by(),
ident.inspect(),
)))
- } else if self.rec_get_const_obj(ident.inspect()).is_some() && ident.vis().is_private() {
+ } else if self.rec_get_const_obj(ident.inspect()).is_some() && vis.is_private() {
// TODO: display where defined
Err(CompileErrors::from(CompileError::reassign_error(
self.cfg.input.clone(),
@@ -1354,7 +1382,7 @@ impl Context {
let vi = VarInfo::new(
Type::Type,
muty,
- ident.vis(),
+ Visibility::new(vis, self.name.clone()),
VarKind::Defined(id),
None,
self.impl_of(),
@@ -1376,6 +1404,7 @@ impl Context {
ctx: Self,
muty: Mutability,
) -> CompileResult<()> {
+ let vis = self.instantiate_vis_modifier(&ident.vis)?;
// FIXME: recursive search
if self.mono_types.contains_key(ident.inspect()) {
Err(CompileErrors::from(CompileError::reassign_error(
@@ -1385,7 +1414,7 @@ impl Context {
self.caused_by(),
ident.inspect(),
)))
- } else if self.rec_get_const_obj(ident.inspect()).is_some() && ident.vis().is_private() {
+ } else if self.rec_get_const_obj(ident.inspect()).is_some() && vis.is_private() {
Err(CompileErrors::from(CompileError::reassign_error(
self.cfg.input.clone(),
line!() as usize,
@@ -1401,7 +1430,7 @@ impl Context {
let vi = VarInfo::new(
meta_t,
muty,
- ident.vis(),
+ Visibility::new(vis, self.name.clone()),
VarKind::Defined(id),
None,
self.impl_of(),
@@ -1454,6 +1483,7 @@ impl Context {
ctx: Self,
muty: Mutability,
) -> CompileResult<()> {
+ let vis = self.instantiate_vis_modifier(&ident.vis)?;
// FIXME: recursive search
if self.patches.contains_key(ident.inspect()) {
Err(CompileErrors::from(CompileError::reassign_error(
@@ -1463,7 +1493,7 @@ impl Context {
self.caused_by(),
ident.inspect(),
)))
- } else if self.rec_get_const_obj(ident.inspect()).is_some() && ident.vis().is_private() {
+ } else if self.rec_get_const_obj(ident.inspect()).is_some() && vis.is_private() {
Err(CompileErrors::from(CompileError::reassign_error(
self.cfg.input.clone(),
line!() as usize,
@@ -1481,7 +1511,7 @@ impl Context {
VarInfo::new(
meta_t,
muty,
- ident.vis(),
+ Visibility::new(vis, self.name.clone()),
VarKind::Defined(id),
None,
self.impl_of(),
@@ -1758,7 +1788,7 @@ impl Context {
)))
} else if self.locals.get(ident.inspect()).is_some() {
let vi = self.locals.remove(ident.inspect()).unwrap();
- self.deleted_locals.insert(ident.name.clone(), vi);
+ self.deleted_locals.insert(ident.raw.name.clone(), vi);
Ok(())
} else {
Err(TyCheckErrors::from(TyCheckError::no_var_error(
@@ -1831,7 +1861,7 @@ impl Context {
#[allow(clippy::single_match)]
match acc {
hir::Accessor::Ident(ident) => {
- if let Some(vi) = self.get_mut_current_scope_var(&ident.name) {
+ if let Some(vi) = self.get_mut_current_scope_var(&ident.raw.name) {
vi.t = t;
} else {
return Err(TyCheckErrors::from(TyCheckError::feature_error(
@@ -1850,22 +1880,22 @@ impl Context {
}
pub(crate) fn inc_ref_simple_typespec(&self, simple: &SimpleTypeSpec) {
- if let Ok(vi) = self.rec_get_var_info(
+ if let Triple::Ok(vi) = self.rec_get_var_info(
&simple.ident,
crate::compile::AccessKind::Name,
&self.cfg.input,
- &self.name,
+ self,
) {
self.inc_ref(&vi, &simple.ident.name);
}
}
pub(crate) fn inc_ref_const_local(&self, local: &ConstIdentifier) {
- if let Ok(vi) = self.rec_get_var_info(
+ if let Triple::Ok(vi) = self.rec_get_var_info(
local,
crate::compile::AccessKind::Name,
&self.cfg.input,
- &self.name,
+ self,
) {
self.inc_ref(&vi, &local.name);
}
diff --git a/declare.rs b/declare.rs
index 4bbf902..df4fe67 100644
--- a/declare.rs
+++ b/declare.rs
@@ -9,7 +9,7 @@ use crate::lower::ASTLowerer;
use crate::ty::constructors::mono;
use crate::ty::free::HasLevel;
use crate::ty::value::{GenTypeObj, TypeObj};
-use crate::ty::{HasType, Type};
+use crate::ty::{HasType, Type, Visibility};
use crate::compile::AccessKind;
use crate::context::RegistrationMode;
@@ -73,7 +73,7 @@ impl ASTLowerer {
.assign_var_sig(&sig, found_body_t, id, py_name.clone())?;
}
// FIXME: Identifier::new should be used
- let mut ident = hir::Identifier::bare(ident.dot.clone(), ident.name.clone());
+ let mut ident = hir::Identifier::bare(ident.clone());
ident.vi.t = found_body_t.clone();
ident.vi.py_name = py_name;
let sig = hir::VarSignature::new(ident, sig.t_spec);
@@ -127,20 +127,15 @@ impl ASTLowerer {
let vi = self
.module
.context
- .rec_get_var_info(
- &ident,
- AccessKind::Name,
- self.input(),
- &self.module.context.name,
- )
+ .rec_get_var_info(&ident, AccessKind::Name, self.input(), &self.module.context)
.unwrap_or(VarInfo::default());
- let ident = hir::Identifier::new(ident.dot, ident.name, None, vi);
+ let ident = hir::Identifier::new(ident, None, vi);
let acc = hir::Accessor::Ident(ident);
Ok(acc)
}
ast::Accessor::Attr(attr) => {
let obj = self.fake_lower_expr(*attr.obj)?;
- let ident = hir::Identifier::bare(attr.ident.dot, attr.ident.name);
+ let ident = hir::Identifier::bare(attr.ident);
Ok(obj.attr(ident))
}
other => Err(LowerErrors::from(LowerError::declare_error(
@@ -177,9 +172,7 @@ impl ASTLowerer {
fn fake_lower_call(&self, call: ast::Call) -> LowerResult<hir::Call> {
let obj = self.fake_lower_expr(*call.obj)?;
- let attr_name = call
- .attr_name
- .map(|ident| hir::Identifier::bare(ident.dot, ident.name));
+ let attr_name = call.attr_name.map(hir::Identifier::bare);
let args = self.fake_lower_args(call.args)?;
Ok(hir::Call::new(obj, attr_name, args))
}
@@ -247,12 +240,12 @@ impl ASTLowerer {
match sig {
ast::Signature::Var(var) => {
let ident = var.ident().unwrap().clone();
- let ident = hir::Identifier::bare(ident.dot, ident.name);
+ let ident = hir::Identifier::bare(ident);
let sig = hir::VarSignature::new(ident, var.t_spec);
Ok(hir::Signature::Var(sig))
}
ast::Signature::Subr(subr) => {
- let ident = hir::Identifier::bare(subr.ident.dot, subr.ident.name);
+ let ident = hir::Identifier::bare(subr.ident);
let params = self.fake_lower_params(subr.params)?;
let sig = hir::SubrSignature::new(ident, subr.bounds, params, subr.return_t_spec);
Ok(hir::Signature::Subr(sig))
@@ -454,19 +447,19 @@ impl ASTLowerer {
self.declare_subtype(&ident, &t)?;
}
let muty = Mutability::from(&ident.inspect()[..]);
- let vis = ident.vis();
+ let vis = self.module.context.instantiate_vis_modifier(&ident.vis)?;
let py_name = Str::rc(ident.inspect().trim_end_matches('!'));
let vi = VarInfo::new(
t,
muty,
- vis,
+ Visibility::new(vis, self.module.context.name.clone()),
VarKind::Declared,
None,
None,
Some(py_name),
self.module.context.absolutize(ident.loc()),
);
- let ident = hir::Identifier::new(ident.dot, ident.name, None, vi);
+ let ident = hir::Identifier::new(ident, None, vi);
let t_spec_expr = self.fake_lower_expr(*tasc.t_spec.t_spec_as_expr)?;
let t_spec = hir::TypeSpecWithOp::new(
tasc.t_spec.op,
@@ -488,11 +481,10 @@ impl ASTLowerer {
RegistrationMode::Normal,
false,
)?;
- let namespace = self.module.context.name.clone();
let ctx = self
.module
.context
- .get_mut_singular_ctx(attr.obj.as_ref(), &namespace)?;
+ .get_mut_singular_ctx(attr.obj.as_ref(), &self.module.context.name.clone())?;
ctx.assign_var_sig(
&ast::VarSignature::new(ast::VarPattern::Ident(attr.ident.clone()), None),
&t,
@@ -501,19 +493,22 @@ impl ASTLowerer {
)?;
let obj = self.fake_lower_expr(*attr.obj)?;
let muty = Mutability::from(&attr.ident.inspect()[..]);
- let vis = attr.ident.vis();
+ let vis = self
+ .module
+ .context
+ .instantiate_vis_modifier(&attr.ident.vis)?;
let py_name = Str::rc(attr.ident.inspect().trim_end_matches('!'));
let vi = VarInfo::new(
t,
muty,
- vis,
+ Visibility::new(vis, self.module.context.name.clone()),
VarKind::Declared,
None,
None,
Some(py_name),
self.module.context.absolutize(attr.ident.loc()),
);
- let ident = hir::Identifier::new(attr.ident.dot, attr.ident.name, None, vi);
+ let ident = hir::Identifier::new(attr.ident, None, vi);
let attr = obj.attr_expr(ident);
let t_spec_expr = self.fake_lower_expr(*tasc.t_spec.t_spec_as_expr)?;
let t_spec = hir::TypeSpecWithOp::new(
@@ -544,10 +539,11 @@ impl ASTLowerer {
return Ok(());
}
if ident.is_const() {
+ let vis = self.module.context.instantiate_vis_modifier(&ident.vis)?;
let vi = VarInfo::new(
t.clone(),
Mutability::Const,
- ident.vis(),
+ Visibility::new(vis, self.module.context.name.clone()),
VarKind::Declared,
None,
None,
diff --git a/effectcheck.rs b/effectcheck.rs
index 04b9638..c8d7749 100644
--- a/effectcheck.rs
+++ b/effectcheck.rs
@@ -5,15 +5,12 @@
use erg_common::config::ErgConfig;
use erg_common::log;
use erg_common::traits::{Locational, Stream};
-use erg_common::vis::Visibility;
use erg_common::Str;
use erg_parser::token::TokenKind;
-use Visibility::*;
-
-use crate::ty::HasType;
use crate::error::{EffectError, EffectErrors};
use crate::hir::{Array, Def, Dict, Expr, Params, Set, Signature, Tuple, HIR};
+use crate::ty::{HasType, Visibility};
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
enum BlockKind {
@@ -36,7 +33,7 @@ use BlockKind::*;
#[derive(Debug)]
pub struct SideEffectChecker {
cfg: ErgConfig,
- path_stack: Vec<(Str, Visibility)>,
+ path_stack: Vec<Visibility>,
block_stack: Vec<BlockKind>,
errs: EffectErrors,
}
@@ -52,15 +49,13 @@ impl SideEffectChecker {
}
fn full_path(&self) -> String {
- self.path_stack
- .iter()
- .fold(String::new(), |acc, (path, vis)| {
- if vis.is_public() {
- acc + "." + &path[..]
- } else {
- acc + "::" + &path[..]
- }
- })
+ self.path_stack.iter().fold(String::new(), |acc, vis| {
+ if vis.is_public() {
+ acc + "." + &vis.def_namespace[..]
+ } else {
+ acc + "::" + &vis.def_namespace[..]
+ }
+ })
}
/// It is permitted to define a procedure in a function,
@@ -85,7 +80,7 @@ impl SideEffectChecker {
}
pub fn check(mut self, hir: HIR) -> Result<HIR, (HIR, EffectErrors)> {
- self.path_stack.push((hir.name.clone(), Private));
+ self.path_stack.push(Visibility::private(hir.name.clone()));
self.block_stack.push(Module);
log!(info "the side-effects checking process has started.{RESET}");
// At the top level, there is no problem with side effects, only check for purity violations.
@@ -150,7 +145,8 @@ impl SideEffectChecker {
}
},
Expr::Record(rec) => {
- self.path_stack.push((Str::ever("<record>"), Private));
+ self.path_stack
+ .push(Visibility::private(Str::ever("<record>")));
self.block_stack.push(Instant);
for attr in rec.attrs.iter() {
self.check_def(attr);
@@ -184,10 +180,12 @@ impl SideEffectChecker {
Expr::Lambda(lambda) => {
let is_proc = lambda.is_procedural();
if is_proc {
- self.path_stack.push((Str::ever("<lambda!>"), Private));
+ self.path_stack
+ .push(Visibility::private(Str::ever("<lambda!>")));
self.block_stack.push(Proc);
} else {
- self.path_stack.push((Str::ever("<lambda>"), Private));
+ self.path_stack
+ .push(Visibility::private(Str::ever("<lambda>")));
self.block_stack.push(Func);
}
lambda.body.iter().for_each(|chunk| self.check_expr(chunk));
@@ -244,10 +242,7 @@ impl SideEffectChecker {
}
fn check_def(&mut self, def: &Def) {
- let name_and_vis = match &def.sig {
- Signature::Var(var) => (var.inspect().clone(), var.vis()),
- Signature::Subr(subr) => (subr.ident.inspect().clone(), subr.ident.vis()),
- };
+ let name_and_vis = Visibility::new(def.sig.vis().clone(), def.sig.inspect().clone());
self.path_stack.push(name_and_vis);
let is_procedural = def.sig.is_procedural();
let is_subr = def.sig.is_subr();
@@ -360,7 +355,8 @@ impl SideEffectChecker {
}
},
Expr::Record(record) => {
- self.path_stack.push((Str::ever("<record>"), Private));
+ self.path_stack
+ .push(Visibility::private(Str::ever("<record>")));
self.block_stack.push(Instant);
for attr in record.attrs.iter() {
self.check_def(attr);
@@ -433,10 +429,12 @@ impl SideEffectChecker {
Expr::Lambda(lambda) => {
let is_proc = lambda.is_procedural();
if is_proc {
- self.path_stack.push((Str::ever("<lambda!>"), Private));
+ self.path_stack
+ .push(Visibility::private(Str::ever("<lambda!>")));
self.block_stack.push(Proc);
} else {
- self.path_stack.push((Str::ever("<lambda>"), Private));
+ self.path_stack
+ .push(Visibility::private(Str::ever("<lambda>")));
self.block_stack.push(Func);
}
self.check_params(&lambda.params);
diff --git a/lower.rs b/lower.rs
index bb3b0ea..2083771 100644
--- a/lower.rs
+++ b/lower.rs
@@ -9,10 +9,10 @@ use erg_common::error::{Location, MultiErrorDisplay};
use erg_common::set;
use erg_common::set::Set;
use erg_common::traits::{Locational, NoTypeDisplay, Runnable, Stream};
-use erg_common::vis::Visibility;
+use erg_common::triple::Triple;
use erg_common::{fmt_option, fn_name, log, option_enum_unwrap, switch_lang, Str};
-use erg_parser::ast;
+use erg_parser::ast::{self, VisModifierSpec};
use erg_parser::ast::{OperationKind, TypeSpecWithOp, VarName, AST};
use erg_parser::build_ast::ASTBuilder;
use erg_parser::token::{Token, TokenKind};
@@ -27,7 +27,7 @@ use crate::ty::constructors::{
use crate::ty::free::Constraint;
use crate::ty::typaram::TyParam;
use crate::ty::value::{GenTypeObj, TypeObj, ValueObj};
-use crate::ty::{HasType, ParamTy, Type};
+use crate::ty::{HasType, ParamTy, Type, VisibilityModifier};
use crate::context::{
ClassDefType, Context, ContextKind, ContextProvider, ModuleContext, RegistrationMode,
@@ -43,7 +43,8 @@ use crate::reorder::Reorderer;
use crate::varinfo::{VarInfo, VarKind};
use crate::AccessKind;
use crate::{feature_error, unreachable_error};
-use Visibility::*;
+
+use VisibilityModifier::*;
/// Checks & infers types of an AST, and convert (lower) it into a HIR
#[derive(Debug)]
@@ -624,14 +625,40 @@ impl ASTLowerer {
}
ast::Accessor::Attr(attr) => {
let obj = self.lower_expr(*attr.obj)?;
- let vi = self.module.context.get_attr_info(
+ let vi = match self.module.context.get_attr_info(
&obj,
&attr.ident,
&self.cfg.input,
- &self.module.context.name,
- )?;
+ &self.module.context,
+ ) {
+ Triple::Ok(vi) => vi,
+ Triple::Err(errs) => {
+ self.errs.push(errs);
+ VarInfo::ILLEGAL.clone()
+ }
+ Triple::None => {
+ let self_t = obj.t();
+ let (similar_info, similar_name) = self
+ .module
+ .context
+ .get_similar_attr_and_info(&self_t, attr.ident.inspect())
+ .unzip();
+ let err = LowerError::detailed_no_attr_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ attr.ident.loc(),
+ self.module.context.caused_by(),
+ &self_t,
+ attr.ident.inspect(),
+ similar_name,
+ similar_info,
+ );
+ self.errs.push(err);
+ VarInfo::ILLEGAL.clone()
+ }
+ };
self.inc_ref(&vi, &attr.ident.name);
- let ident = hir::Identifier::new(attr.ident.dot, attr.ident.name, None, vi);
+ let ident = hir::Identifier::new(attr.ident, None, vi);
let acc = hir::Accessor::Attr(hir::Attribute::new(obj, ident));
Ok(acc)
}
@@ -649,7 +676,7 @@ impl ASTLowerer {
fn lower_ident(&mut self, ident: ast::Identifier) -> LowerResult<hir::Identifier> {
// `match` is a special form, typing is magic
- let (vi, __name__) = if ident.vis().is_private()
+ let (vi, __name__) = if ident.vis.is_private()
&& (&ident.inspect()[..] == "match" || &ident.inspect()[..] == "match!")
{
(
@@ -660,22 +687,47 @@ impl ASTLowerer {
None,
)
} else {
+ let res = match self.module.context.rec_get_var_info(
+ &ident,
+ AccessKind::Name,
+ &self.cfg.input,
+ &self.module.context,
+ ) {
+ Triple::Ok(vi) => vi,
+ Triple::Err(err) => {
+ self.errs.push(err);
+ VarInfo::ILLEGAL.clone()
+ }
+ Triple::None => {
+ let (similar_info, similar_name) = self
+ .module
+ .context
+ .get_similar_name_and_info(ident.inspect())
+ .unzip();
+ let err = LowerError::detailed_no_var_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ ident.loc(),
+ self.module.context.caused_by(),
+ ident.inspect(),
+ similar_name,
+ similar_info,
+ );
+ self.errs.push(err);
+ VarInfo::ILLEGAL.clone()
+ }
+ };
(
- self.module.context.rec_get_var_info(
- &ident,
- AccessKind::Name,
- &self.cfg.input,
- &self.module.context.name,
- )?,
+ res,
self.module
.context
- .get_singular_ctx_by_ident(&ident, &self.module.context.name)
+ .get_singular_ctx_by_ident(&ident, &self.module.context)
.ok()
.map(|ctx| ctx.name.clone()),
)
};
self.inc_ref(&vi, &ident.name);
- let ident = hir::Identifier::new(ident.dot, ident.name, __name__, vi);
+ let ident = hir::Identifier::new(ident, __name__, vi);
Ok(ident)
}
@@ -700,7 +752,7 @@ impl ASTLowerer {
let t = self
.module
.context
- .get_binop_t(&bin.op, &args, &self.cfg.input, &self.module.context.name)
+ .get_binop_t(&bin.op, &args, &self.cfg.input, &self.module.context)
.unwrap_or_else(|errs| {
self.errs.extend(errs);
VarInfo::ILLEGAL.clone()
@@ -724,7 +776,7 @@ impl ASTLowerer {
let t = self
.module
.context
- .get_unaryop_t(&unary.op, &args, &self.cfg.input, &self.module.context.name)
+ .get_unaryop_t(&unary.op, &args, &self.cfg.input, &self.module.context)
.unwrap_or_else(|errs| {
self.errs.extend(errs);
VarInfo::ILLEGAL.clone()
@@ -824,7 +876,7 @@ impl ASTLowerer {
&hir_args.pos_args,
&hir_args.kw_args,
&self.cfg.input,
- &self.module.context.name,
+ &self.module.context,
) {
Ok(vi) => vi,
Err((vi, es)) => {
@@ -835,12 +887,7 @@ impl ASTLowerer {
};
let attr_name = if let Some(attr_name) = call.attr_name {
self.inc_ref(&vi, &attr_name.name);
- Some(hir::Identifier::new(
- attr_name.dot,
- attr_name.name,
- None,
- vi,
- ))
+ Some(hir::Identifier::new(attr_name, None, vi))
} else {
*obj.ref_mut_t() = vi.t;
None
@@ -904,17 +951,17 @@ impl ASTLowerer {
let args = self.lower_record(pack.args)?;
let args = vec![hir::PosArg::new(hir::Expr::Record(args))];
let attr_name = ast::Identifier::new(
- Some(Token::new(
+ VisModifierSpec::Public(Token::new(
TokenKind::Dot,
Str::ever("."),
- pack.connector.lineno,
- pack.connector.col_begin,
+ pack.connector.ln_begin().unwrap(),
+ pack.connector.col_begin().unwrap(),
)),
ast::VarName::new(Token::new(
TokenKind::Symbol,
Str::ever("new"),
- pack.connector.lineno,
- pack.connector.col_begin,
+ pack.connector.ln_begin().unwrap(),
+ pack.connector.col_begin().unwrap(),
)),
);
let vi = match self.module.context.get_call_t(
@@ -923,7 +970,7 @@ impl ASTLowerer {
&args,
&[],
&self.cfg.input,
- &self.module.context.name,
+ &self.module.context,
) {
Ok(vi) => vi,
Err((vi, errs)) => {
@@ -932,7 +979,7 @@ impl ASTLowerer {
}
};
let args = hir::Args::pos_only(args, None);
- let attr_name = hir::Identifier::new(attr_name.dot, attr_name.name, None, vi);
+ let attr_name = hir::Identifier::new(attr_name, None, vi);
Ok(hir::Call::new(class, Some(attr_name), args))
}
@@ -1209,7 +1256,10 @@ impl ASTLowerer {
));
}
let kind = ContextKind::from(def.def_kind());
- let vis = def.sig.vis();
+ let vis = self
+ .module
+ .context
+ .instantiate_vis_modifier(def.sig.vis())?;
let res = match def.sig {
ast::Signature::Subr(sig) => {
let tv_cache = self
@@ -1263,7 +1313,7 @@ impl ASTLowerer {
let ident = match &sig.pat {
ast::VarPattern::Ident(ident) => ident.clone(),
ast::VarPattern::Discard(token) => {
- ast::Identifier::new(None, VarName::new(token.clone()))
+ ast::Identifier::private_from_token(token.clone())
}
_ => unreachable!(),
};
@@ -1287,7 +1337,7 @@ impl ASTLowerer {
body.id,
None,
)?;
- let ident = hir::Identifier::new(ident.dot, ident.name, None, vi);
+ let ident = hir::Identifier::new(ident, None, vi);
let sig = hir::VarSignature::new(ident, sig.t_spec);
let body = hir::DefBody::new(body.op, block, body.id);
Ok(hir::Def::new(hir::Signature::Var(sig), body))
@@ -1358,7 +1408,7 @@ impl ASTLowerer {
);
self.warns.push(warn);
}
- let ident = hir::Identifier::new(sig.ident.dot, sig.ident.name, None, vi);
+ let ident = hir::Identifier::new(sig.ident, None, vi);
let sig =
hir::SubrSignature::new(ident, sig.bounds, params, sig.return_t_spec);
let body = hir::DefBody::new(body.op, block, body.id);
@@ -1371,7 +1421,7 @@ impl ASTLowerer {
&Type::Failure,
)?;
self.errs.extend(errs);
- let ident = hir::Identifier::new(sig.ident.dot, sig.ident.name, None, vi);
+ let ident = hir::Identifier::new(sig.ident, None, vi);
let sig =
hir::SubrSignature::new(ident, sig.bounds, params, sig.return_t_spec);
let block =
@@ -1396,7 +1446,7 @@ impl ASTLowerer {
.unwrap()
.fake_subr_assign(&sig.ident, &sig.decorators, Type::Failure)?;
let block = self.lower_block(body.block)?;
- let ident = hir::Identifier::bare(sig.ident.dot, sig.ident.name);
+ let ident = hir::Identifier::bare(sig.ident);
let sig = hir::SubrSignature::new(ident, sig.bounds, params, sig.return_t_spec);
let body = hir::DefBody::new(body.op, block, body.id);
Ok(hir::Def::new(hir::Signature::Subr(sig), body))
@@ -1439,12 +1489,12 @@ impl ASTLowerer {
let kind = ContextKind::MethodDefs(impl_trait.as_ref().map(|(t, _)| t.clone()));
self.module
.context
- .grow(&class.local_name(), kind, hir_def.sig.vis(), None);
+ .grow(&class.local_name(), kind, hir_def.sig.vis().clone(), None);
for attr in methods.attrs.iter_mut() {
match attr {
ast::ClassAttr::Def(def) => {
- if methods.vis.is(TokenKind::Dot) {
- def.sig.ident_mut().unwrap().dot = Some(Token::new(
+ if methods.vis.is_public() {
+ def.sig.ident_mut().unwrap().vis = VisModifierSpec::Public(Token::new(
TokenKind::Dot,
".",
def.sig.ln_begin().unwrap_or(0),
@@ -1641,14 +1691,17 @@ impl ASTLowerer {
let mut hir_methods = hir::Block::empty();
for mut methods in class_def.methods_list.into_iter() {
let kind = ContextKind::PatchMethodDefs(base_t.clone());
- self.module
- .context
- .grow(hir_def.sig.ident().inspect(), kind, hir_def.sig.vis(), None);
+ self.module.context.grow(
+ hir_def.sig.ident().inspect(),
+ kind,
+ hir_def.sig.vis().clone(),
+ None,
+ );
for attr in methods.attrs.iter_mut() {
match attr {
ast::ClassAttr::Def(def) => {
- if methods.vis.is(TokenKind::Dot) {
- def.sig.ident_mut().unwrap().dot = Some(Token::new(
+ if methods.vis.is_public() {
+ def.sig.ident_mut().unwrap().vis = VisModifierSpec::Public(Token::new(
TokenKind::Dot,
".",
def.sig.ln_begin().unwrap(),
@@ -2037,7 +2090,7 @@ impl ASTLowerer {
let ctx = self
.module
.context
- .get_singular_ctx_by_hir_expr(&expr, &self.module.context.name)?;
+ .get_singular_ctx_by_hir_expr(&expr, &self.module.context)?;
// REVIEW: need to use subtype_of?
if ctx.super_traits.iter().all(|trait_| trait_ != &spec_t)
&& ctx.super_classes.iter().all(|class| class != &spec_t)
@@ -2089,14 +2142,30 @@ impl ASTLowerer {
&ident,
AccessKind::Name,
&self.cfg.input,
- &self.module.context.name,
+ &self.module.context,
)
- .or_else(|_e| {
+ .none_or_else(|| {
self.module.context.rec_get_var_info(
&ident,
AccessKind::Name,
&self.cfg.input,
- &self.module.context.name,
+ &self.module.context,
+ )
+ })
+ .none_or_result(|| {
+ let (similar_info, similar_name) = self
+ .module
+ .context
+ .get_similar_name_and_info(ident.inspect())
+ .unzip();
+ LowerError::detailed_no_var_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ ident.loc(),
+ self.module.context.caused_by(),
+ ident.inspect(),
+ similar_name,
+ similar_info,
)
})?;
if is_instance_ascription {
@@ -2119,10 +2188,10 @@ impl ASTLowerer {
let qual_name = self
.module
.context
- .get_singular_ctx_by_ident(&ident, &self.module.context.name)
+ .get_singular_ctx_by_ident(&ident, &self.module.context)
.ok()
.map(|ctx| ctx.name.clone());
- let ident = hir::Identifier::new(ident.dot, ident.name, qual_name, ident_vi);
+ let ident = hir::Identifier::new(ident, qual_name, ident_vi);
let expr = hir::Expr::Accessor(hir::Accessor::Ident(ident));
let t_spec = self.lower_type_spec_with_op(tasc.t_spec, spec_t)?;
Ok(expr.type_asc(t_spec))
diff --git a/hir.rs b/hir.rs
index 7da2e28..fdef553 100644
--- a/hir.rs
+++ b/hir.rs
@@ -6,7 +6,6 @@ use erg_common::error::Location;
#[allow(unused_imports)]
use erg_common::log;
use erg_common::traits::{Locational, NestedDisplay, NoTypeDisplay, Stream};
-use erg_common::vis::{Field, Visibility};
use erg_common::Str;
use erg_common::{
enum_unwrap, fmt_option, fmt_vec, impl_display_for_enum, impl_display_from_nested,
@@ -23,7 +22,7 @@ use erg_parser::token::{Token, TokenKind, DOT};
use crate::ty::constructors::{array_t, dict_t, set_t, tuple_t};
use crate::ty::typaram::TyParam;
use crate::ty::value::{GenTypeObj, ValueObj};
-use crate::ty::{HasType, Type};
+use crate::ty::{Field, HasType, Type, VisibilityModifier};
use crate::context::eval::type_from_token_kind;
use crate::error::readable_name;
@@ -381,22 +380,14 @@ impl Args {
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Identifier {
- pub dot: Option<Token>,
- pub name: VarName,
+ pub raw: ast::Identifier,
pub qual_name: Option<Str>,
pub vi: VarInfo,
}
impl NestedDisplay for Identifier {
fn fmt_nest(&self, f: &mut fmt::Formatter<'_>, _level: usize) -> fmt::Result {
- match &self.dot {
- Some(_dot) => {
- write!(f, ".{}", self.name)?;
- }
- None => {
- write!(f, "::{}", self.name)?;
- }
- }
+ write!(f, "{}", self.raw)?;
if let Some(qn) = &self.qual_name {
write!(f, "(qual_name: {qn})")?;
}
@@ -409,10 +400,7 @@ impl NestedDisplay for Identifier {
impl NoTypeDisplay for Identifier {
fn to_string_notype(&self) -> String {
- match &self.dot {
- Some(_dot) => format!(".{}", self.name),
- None => format!("::{}", self.name),
- }
+ self.raw.to_string()
}
}
@@ -439,56 +427,50 @@ impl HasType for Identifier {
impl Locational for Identifier {
fn loc(&self) -> Location {
- if let Some(dot) = &self.dot {
- Location::concat(dot, &self.name)
- } else {
- self.name.loc()
- }
+ self.raw.loc()
}
}
impl From<&Identifier> for Field {
fn from(ident: &Identifier) -> Self {
- Self::new(ident.vis(), ident.inspect().clone())
+ Self::new(ident.vis().clone(), ident.inspect().clone())
}
}
impl Identifier {
- pub const fn new(
- dot: Option<Token>,
- name: VarName,
- qual_name: Option<Str>,
- vi: VarInfo,
- ) -> Self {
- Self {
- dot,
- name,
- qual_name,
- vi,
- }
+ pub const fn new(raw: ast::Identifier, qual_name: Option<Str>, vi: VarInfo) -> Self {
+ Self { raw, qual_name, vi }
}
pub fn public(name: &'static str) -> Self {
- Self::bare(
- Some(Token::from_str(TokenKind::Dot, ".")),
- VarName::from_static(name),
- )
+ let ident = ast::Identifier::public_from_token(
+ Token::from_str(TokenKind::Dot, "."),
+ Token::static_symbol(name),
+ );
+ Self::bare(ident)
}
pub fn private(name: &'static str) -> Self {
- Self::bare(None, VarName::from_static(name))
+ let ident = ast::Identifier::private_from_token(Token::static_symbol(name));
+ Self::bare(ident)
}
pub fn private_with_line(name: Str, line: u32) -> Self {
- Self::bare(None, VarName::from_str_and_line(name, line))
+ let ident = ast::Identifier::private_from_token(Token::symbol_with_line(&name, line));
+ Self::bare(ident)
}
pub fn public_with_line(dot: Token, name: Str, line: u32) -> Self {
- Self::bare(Some(dot), VarName::from_str_and_line(name, line))
+ let ident = ast::Identifier::public_from_token(dot, Token::symbol_with_line(&name, line));
+ Self::bare(ident)
}
- pub const fn bare(dot: Option<Token>, name: VarName) -> Self {
- Self::new(dot, name, None, VarInfo::const_default())
+ pub const fn bare(ident: ast::Identifier) -> Self {
+ if ident.vis.is_public() {
+ Self::new(ident, None, VarInfo::const_default_public())
+ } else {
+ Self::new(ident, None, VarInfo::const_default_private())
+ }
}
pub fn is_py_api(&self) -> bool {
@@ -496,18 +478,15 @@ impl Identifier {
}
pub fn is_const(&self) -> bool {
- self.name.is_const()
+ self.raw.is_const()
}
- pub const fn vis(&self) -> Visibility {
- match &self.dot {
- Some(_) => Visibility::Public,
- None => Visibility::Private,
- }
+ pub fn vis(&self) -> &VisibilityModifier {
+ &self.vi.vis.modifier
}
pub const fn inspect(&self) -> &Str {
- self.name.inspect()
+ self.raw.inspect()
}
/// show dot + name (no qual_name & type)
@@ -516,11 +495,11 @@ impl Identifier {
}
pub fn is_procedural(&self) -> bool {
- self.name.is_procedural()
+ self.raw.is_procedural()
}
- pub fn downcast(self) -> erg_parser::ast::Identifier {
- erg_parser::ast::Identifier::new(self.dot, self.name)
+ pub fn downcast(self) -> ast::Identifier {
+ self.raw
}
}
@@ -598,12 +577,20 @@ impl Accessor {
Self::Ident(Identifier::public_with_line(DOT, name, line))
}
- pub const fn private(name: Token, vi: VarInfo) -> Self {
- Self::Ident(Identifier::new(None, VarName::new(name), None, vi))
+ pub fn private(name: Token, vi: VarInfo) -> Self {
+ Self::Ident(Identifier::new(
+ ast::Identifier::private_from_token(name),
+ None,
+ vi,
+ ))
}
pub fn public(name: Token, vi: VarInfo) -> Self {
- Self::Ident(Identifier::new(Some(DOT), VarName::new(name), None, vi))
+ Self::Ident(Identifier::new(
+ ast::Identifier::public_from_token(DOT, name),
+ None,
+ vi,
+ ))
}
pub fn attr(obj: Expr, ident: Identifier) -> Self {
@@ -655,12 +642,12 @@ impl Accessor {
seps.remove(seps.len() - 1)
})
.or_else(|| {
- let mut raw_parts = ident.name.inspect().split_with(&["'"]);
+ let mut raw_parts = ident.inspect().split_with(&["'"]);
// "'aaa'".split_with(&["'"]) == ["", "aaa", ""]
if raw_parts.len() == 3 || raw_parts.len() == 4 {
Some(raw_parts.remove(1))
} else {
- Some(ident.name.inspect())
+ Some(ident.inspect())
}
}),
_ => None,
@@ -1580,9 +1567,13 @@ impl VarSignature {
self.ident.inspect()
}
- pub fn vis(&self) -> Visibility {
+ pub fn vis(&self) -> &VisibilityModifier {
self.ident.vis()
}
+
+ pub const fn name(&self) -> &VarName {
+ &self.ident.raw.name
+ }
}
/// Once the default_value is set to Some, all subsequent values must be Some
@@ -1864,6 +1855,10 @@ impl SubrSignature {
pub fn is_procedural(&self) -> bool {
self.ident.is_procedural()
}
+
+ pub const fn name(&self) -> &VarName {
+ &self.ident.raw.name
+ }
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -1947,13 +1942,20 @@ impl Signature {
}
}
- pub const fn vis(&self) -> Visibility {
+ pub fn vis(&self) -> &VisibilityModifier {
match self {
Self::Var(v) => v.ident.vis(),
Self::Subr(s) => s.ident.vis(),
}
}
+ pub const fn inspect(&self) -> &Str {
+ match self {
+ Self::Var(v) => v.ident.inspect(),
+ Self::Subr(s) => s.ident.inspect(),
+ }
+ }
+
pub const fn ident(&self) -> &Identifier {
match self {
Self::Var(v) => &v.ident,
@@ -1975,6 +1977,13 @@ impl Signature {
}
}
+ pub const fn name(&self) -> &VarName {
+ match self {
+ Self::Var(v) => v.name(),
+ Self::Subr(s) => s.name(),
+ }
+ }
+
pub fn t_spec(&self) -> Option<&TypeSpec> {
match self {
Self::Var(v) => v.t_spec.as_ref(),
diff --git a/ownercheck.rs b/ownercheck.rs
index e06a79e..6151647 100644
--- a/ownercheck.rs
+++ b/ownercheck.rs
@@ -6,13 +6,11 @@ use erg_common::error::Location;
use erg_common::set::Set;
use erg_common::style::colors::DEBUG_MAIN;
use erg_common::traits::{Locational, Stream};
-use erg_common::vis::Visibility;
use erg_common::Str;
use erg_common::{impl_display_from_debug, log};
use erg_parser::ast::{ParamPattern, VarName};
-use Visibility::*;
-use crate::ty::{HasType, Ownership};
+use crate::ty::{HasType, Ownership, Visibility};
use crate::error::{OwnershipError, OwnershipErrors};
use crate::hir::{self, Accessor, Array, Block, Def, Expr, Identifier, Signature, Tuple, HIR};
@@ -39,7 +37,7 @@ impl_display_from_debug!(LocalVars);
#[derive(Debug)]
pub struct OwnershipChecker {
cfg: ErgConfig,
- path_stack: Vec<(Str, Visibility)>,
+ path_stack: Vec<Visibility>,
dict: Dict<Str, LocalVars>,
errs: OwnershipErrors,
}
@@ -55,15 +53,13 @@ impl OwnershipChecker {
}
fn full_path(&self) -> String {
- self.path_stack
- .iter()
- .fold(String::new(), |acc, (path, vis)| {
- if vis.is_public() {
- acc + "." + &path[..]
- } else {
- acc + "::" + &path[..]
- }
- })
+ self.path_stack.iter().fold(String::new(), |acc, vis| {
+ if vis.is_public() {
+ acc + "." + &vis.def_namespace[..]
+ } else {
+ acc + "::" + &vis.def_namespace[..]
+ }
+ })
}
// moveされた後の変数が使用されていないかチェックする
@@ -71,7 +67,7 @@ impl OwnershipChecker {
pub fn check(&mut self, hir: HIR) -> Result<HIR, (HIR, OwnershipErrors)> {
log!(info "the ownership checking process has started.{RESET}");
if self.full_path() != ("::".to_string() + &hir.name[..]) {
- self.path_stack.push((hir.name.clone(), Private));
+ self.path_stack.push(Visibility::private(hir.name.clone()));
self.dict
.insert(Str::from(self.full_path()), LocalVars::default());
}
@@ -106,7 +102,8 @@ impl OwnershipChecker {
Signature::Var(var) => var.inspect().clone(),
Signature::Subr(subr) => subr.ident.inspect().clone(),
};
- self.path_stack.push((name, def.sig.vis()));
+ self.path_stack
+ .push(Visibility::new(def.sig.vis().clone(), name));
self.dict
.insert(Str::from(self.full_path()), LocalVars::default());
if let Signature::Subr(subr) = &def.sig {
@@ -247,7 +244,8 @@ impl OwnershipChecker {
},
// TODO: capturing
Expr::Lambda(lambda) => {
- let name_and_vis = (Str::from(format!("<lambda_{}>", lambda.id)), Private);
+ let name_and_vis =
+ Visibility::private(Str::from(format!("<lambda_{}>", lambda.id)));
self.path_stack.push(name_and_vis);
self.dict
.insert(Str::from(self.full_path()), LocalVars::default());
@@ -289,11 +287,11 @@ impl OwnershipChecker {
fn nth_outer_scope(&mut self, n: usize) -> &mut LocalVars {
let path = self.path_stack.iter().take(self.path_stack.len() - n).fold(
String::new(),
- |acc, (path, vis)| {
+ |acc, vis| {
if vis.is_public() {
- acc + "." + &path[..]
+ acc + "." + &vis.def_namespace[..]
} else {
- acc + "::" + &path[..]
+ acc + "::" + &vis.def_namespace[..]
}
},
);
diff --git a/reorder.rs b/reorder.rs
index 00082eb..897bad4 100644
--- a/reorder.rs
+++ b/reorder.rs
@@ -123,7 +123,6 @@ impl Reorderer {
/// ```
fn flatten_method_decls(&mut self, new: &mut Vec<Expr>, methods: Methods) {
let class = methods.class_as_expr.as_ref();
- let vis = methods.vis();
for method in methods.attrs.into_iter() {
match method {
ClassAttr::Decl(decl) => {
@@ -138,11 +137,7 @@ impl Reorderer {
));
continue;
};
- let attr = if vis.is_public() {
- Identifier::new(Some(methods.vis.clone()), ident.name)
- } else {
- Identifier::new(None, ident.name)
- };
+ let attr = Identifier::new(methods.vis.clone(), ident.name);
let expr = class.clone().attr_expr(attr);
let decl = TypeAscription::new(expr, decl.t_spec);
new.push(Expr::TypeAscription(decl));
diff --git a/transpile.rs b/transpile.rs
index 7fee16c..0fab885 100644
--- a/transpile.rs
+++ b/transpile.rs
@@ -787,9 +787,9 @@ impl ScriptGenerator {
if let Some(py_name) = ident.vi.py_name {
return demangle(&py_name);
}
- let name = ident.name.into_token().content.to_string();
+ let name = ident.inspect().to_string();
let name = replace_non_symbolic(name);
- if ident.dot.is_some() {
+ if ident.vis().is_public() {
name
} else {
format!("{name}__")
@@ -941,7 +941,7 @@ impl ScriptGenerator {
demangle(&patch_def.sig.ident().to_string_notype()),
demangle(&def.sig.ident().to_string_notype()),
);
- def.sig.ident_mut().name = VarName::from_str(Str::from(name));
+ def.sig.ident_mut().raw.name = VarName::from_str(Str::from(name));
code += &" ".repeat(self.level);
code += &self.transpile_def(def);
code.push('\\n');
diff --git a/typaram.rs b/typaram.rs
index 95d2eb7..d55a2f0 100644
--- a/typaram.rs
+++ b/typaram.rs
@@ -7,7 +7,6 @@ use erg_common::dict::Dict;
use erg_common::set;
use erg_common::set::Set;
use erg_common::traits::{LimitedDisplay, StructuralEq};
-use erg_common::vis::Field;
use erg_common::Str;
use erg_common::{dict, log};
@@ -19,7 +18,7 @@ use super::free::{
};
use super::value::ValueObj;
use super::Type;
-use super::{ConstSubr, ParamTy, UserConstSubr};
+use super::{ConstSubr, Field, ParamTy, UserConstSubr};
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[repr(u8)]
diff --git a/value.rs b/value.rs
index 5ae836e..a24afc3 100644
--- a/value.rs
+++ b/value.rs
@@ -16,7 +16,6 @@ use erg_common::python_util::PythonVersion;
use erg_common::serialize::*;
use erg_common::set::Set;
use erg_common::shared::Shared;
-use erg_common::vis::Field;
use erg_common::{dict, fmt_iter, impl_display_from_debug, log, switch_lang};
use erg_common::{RcArray, Str};
use erg_parser::ast::{ConstArgs, ConstExpr};
@@ -28,7 +27,7 @@ use self::value_set::inner_class;
use super::codeobj::CodeObj;
use super::constructors::{array_t, dict_t, mono, poly, refinement, set_t, tuple_t};
use super::typaram::TyParam;
-use super::{ConstSubr, HasType, Predicate, Type};
+use super::{ConstSubr, Field, HasType, Predicate, Type};
pub struct EvalValueError(pub Box<ErrorCore>);
@@ -1311,11 +1310,11 @@ impl ValueObj {
}
Self::Subr(subr) => subr.as_type().map(TypeObj::Builtin),
Self::Array(elems) | Self::Tuple(elems) => {
- erg_common::log!(err "as_type({})", erg_common::fmt_vec(elems));
+ log!(err "as_type({})", erg_common::fmt_vec(elems));
None
}
Self::Dict(elems) => {
- erg_common::log!(err "as_type({elems})");
+ log!(err "as_type({elems})");
None
}
_other => None,
diff --git a/varinfo.rs b/varinfo.rs
index b80f9e3..9a5c1ef 100644
--- a/varinfo.rs
+++ b/varinfo.rs
@@ -3,14 +3,12 @@ use std::path::PathBuf;
use erg_common::error::Location;
use erg_common::set::Set;
-use erg_common::vis::{Field, Visibility};
use erg_common::Str;
-use Visibility::*;
use erg_parser::ast::DefId;
use crate::context::DefaultInfo;
-use crate::ty::{HasType, Type};
+use crate::ty::{Field, HasType, Type, Visibility};
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[repr(u8)]
@@ -200,18 +198,31 @@ impl HasType for VarInfo {
impl Default for VarInfo {
fn default() -> Self {
- Self::const_default()
+ Self::const_default_private()
}
}
impl VarInfo {
- pub const ILLEGAL: &'static Self = &Self::const_default();
+ pub const ILLEGAL: &'static Self = &Self::const_default_private();
- pub const fn const_default() -> Self {
+ pub const fn const_default_private() -> Self {
Self::new(
Type::Failure,
Immutable,
- Private,
+ Visibility::DUMMY_PRIVATE,
+ VarKind::DoesNotExist,
+ None,
+ None,
+ None,
+ AbsLocation::unknown(),
+ )
+ }
+
+ pub const fn const_default_public() -> Self {
+ Self::new(
+ Type::Failure,
+ Immutable,
+ Visibility::DUMMY_PUBLIC,
VarKind::DoesNotExist,
None,
None,
@@ -250,16 +261,25 @@ impl VarInfo {
}
}
- pub fn nd_parameter(t: Type, def_loc: AbsLocation) -> Self {
+ pub fn nd_parameter(t: Type, def_loc: AbsLocation, namespace: Str) -> Self {
let kind = VarKind::Parameter {
def_id: DefId(0),
var: false,
default: DefaultInfo::NonDefault,
};
- Self::new(t, Immutable, Private, kind, None, None, None, def_loc)
+ Self::new(
+ t,
+ Immutable,
+ Visibility::private(namespace),
+ kind,
+ None,
+ None,
+ None,
+ def_loc,
+ )
}
- pub fn instance_attr(field: Field, t: Type, impl_of: Option<Type>) -> Self {
+ pub fn instance_attr(field: Field, t: Type, impl_of: Option<Type>, namespace: Str) -> Self {
let muty = if field.is_const() {
Mutability::Const
} else {
@@ -269,7 +289,7 @@ impl VarInfo {
Self::new(
t,
muty,
- field.vis,
+ Visibility::new(field.vis, namespace),
kind,
None,
impl_of,
diff --git a/ast.rs b/ast.rs
index 1ab64a9..de2508d 100644
--- a/ast.rs
+++ b/ast.rs
@@ -7,7 +7,6 @@ use erg_common::error::Location;
use erg_common::set::Set as HashSet;
// use erg_common::dict::Dict as HashMap;
use erg_common::traits::{Locational, NestedDisplay, Stream};
-use erg_common::vis::{Field, Visibility};
use erg_common::{
fmt_option, fmt_vec, impl_display_for_enum, impl_display_for_single_struct,
impl_display_from_nested, impl_displayable_stream_for_wrapper, impl_from_trait_for_enum,
@@ -493,11 +492,31 @@ impl_locational_for_enum!(Accessor; Ident, Attr, TupleAttr, Subscr, TypeApp);
impl Accessor {
pub const fn local(symbol: Token) -> Self {
- Self::Ident(Identifier::new(None, VarName::new(symbol)))
+ Self::Ident(Identifier::new(
+ VisModifierSpec::Private,
+ VarName::new(symbol),
+ ))
}
pub const fn public(dot: Token, symbol: Token) -> Self {
- Self::Ident(Identifier::new(Some(dot), VarName::new(symbol)))
+ Self::Ident(Identifier::new(
+ VisModifierSpec::Public(dot),
+ VarName::new(symbol),
+ ))
+ }
+
+ pub const fn explicit_local(dcolon: Token, symbol: Token) -> Self {
+ Self::Ident(Identifier::new(
+ VisModifierSpec::ExplicitPrivate(dcolon),
+ VarName::new(symbol),
+ ))
+ }
+
+ pub const fn restricted(rest: VisRestriction, symbol: Token) -> Self {
+ Self::Ident(Identifier::new(
+ VisModifierSpec::Restricted(rest),
+ VarName::new(symbol),
+ ))
}
pub fn attr(obj: Expr, ident: Identifier) -> Self {
@@ -1201,7 +1220,7 @@ impl Call {
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub struct DataPack {
pub class: Box<Expr>,
- pub connector: Token,
+ pub connector: VisModifierSpec,
pub args: Record,
}
@@ -1220,7 +1239,7 @@ impl Locational for DataPack {
}
impl DataPack {
- pub fn new(class: Expr, connector: Token, args: Record) -> Self {
+ pub fn new(class: Expr, connector: VisModifierSpec, args: Record) -> Self {
Self {
class: Box::new(class),
connector,
@@ -1392,7 +1411,10 @@ impl_locational_for_enum!(ConstAccessor; Local, SelfDot, Attr, TupleAttr, Subscr
impl ConstAccessor {
pub const fn local(symbol: Token) -> Self {
- Self::Local(ConstIdentifier::new(None, VarName::new(symbol)))
+ Self::Local(ConstIdentifier::new(
+ VisModifierSpec::Private,
+ VarName::new(symbol),
+ ))
}
pub fn attr(obj: ConstExpr, name: ConstIdentifier) -> Self {
@@ -2655,18 +2677,108 @@ impl VarName {
}
}
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct Namespaces(Vec<Accessor>);
+
+impl_displayable_stream_for_wrapper!(Namespaces, Accessor);
+
+impl NestedDisplay for Namespaces {
+ fn fmt_nest(&self, f: &mut fmt::Formatter<'_>, _level: usize) -> fmt::Result {
+ for (i, ns) in self.iter().enumerate() {
+ if i > 0 {
+ write!(f, ", ")?;
+ }
+ write!(f, "{ns}")?;
+ }
+ Ok(())
+ }
+}
+
+impl Locational for Namespaces {
+ fn loc(&self) -> Location {
+ Location::concat(self.first().unwrap(), self.last().unwrap())
+ }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum VisRestriction {
+ Namespaces(Namespaces),
+ SubtypeOf(Box<TypeSpec>),
+}
+
+impl_locational_for_enum!(VisRestriction; Namespaces, SubtypeOf);
+impl_display_from_nested!(VisRestriction);
+
+impl NestedDisplay for VisRestriction {
+ fn fmt_nest(&self, f: &mut fmt::Formatter<'_>, _level: usize) -> fmt::Result {
+ match self {
+ Self::Namespaces(ns) => write!(f, "{ns}"),
+ Self::SubtypeOf(ty) => write!(f, "<: {ty}"),
+ }
+ }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum VisModifierSpec {
+ Private,
+ Auto,
+ Public(Token),
+ ExplicitPrivate(Token),
+ Restricted(VisRestriction),
+}
+
+impl NestedDisplay for VisModifierSpec {
+ fn fmt_nest(&self, f: &mut fmt::Formatter<'_>, _level: usize) -> fmt::Result {
+ match self {
+ Self::Private => Ok(()),
+ Self::Auto => write!(f, ":auto:"),
+ Self::Public(_token) => write!(f, "."),
+ Self::ExplicitPrivate(_token) => write!(f, "::"),
+ Self::Restricted(rest) => write!(f, "::[{rest}]"),
+ }
+ }
+}
+
+impl_display_from_nested!(VisModifierSpec);
+
+impl Locational for VisModifierSpec {
+ fn loc(&self) -> Location {
+ match self {
+ Self::Private | Self::Auto => Location::Unknown,
+ Self::Public(token) => token.loc(),
+ Self::ExplicitPrivate(token) => token.loc(),
+ Self::Restricted(rest) => rest.loc(),
+ }
+ }
+}
+
+impl VisModifierSpec {
+ pub const fn is_public(&self) -> bool {
+ matches!(self, Self::Public(_))
+ }
+
+ pub const fn is_private(&self) -> bool {
+ matches!(self, Self::Private | Self::ExplicitPrivate(_))
+ }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum AccessModifier {
+ Private, // `::`
+ Public, // `.`
+ Auto, // record unpacking
+ Force, // can access any identifiers
+}
+
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Identifier {
- pub dot: Option<Token>,
+ pub vis: VisModifierSpec,
pub name: VarName,
}
impl NestedDisplay for Identifier {
fn fmt_nest(&self, f: &mut fmt::Formatter<'_>, _level: usize) -> fmt::Result {
- match &self.dot {
- Some(_dot) => write!(f, ".{}", self.name),
- None => write!(f, "::{}", self.name),
- }
+ write!(f, "{}{}", self.vis, self.name)
}
}
@@ -2674,24 +2786,16 @@ impl_display_from_nested!(Identifier);
impl Locational for Identifier {
fn loc(&self) -> Location {
- if let Some(dot) = &self.dot {
- if dot.loc().is_unknown() {
- self.name.loc()
- } else {
- Location::concat(dot, &self.name)
+ match &self.vis {
+ VisModifierSpec::Private | VisModifierSpec::Auto => self.name.loc(),
+ VisModifierSpec::ExplicitPrivate(token) | VisModifierSpec::Public(token) => {
+ Location::concat(token, &self.name)
}
- } else {
- self.name.loc()
+ VisModifierSpec::Restricted(args) => Location::concat(args, &self.name),
}
}
}
-impl From<&Identifier> for Field {
- fn from(ident: &Identifier) -> Self {
- Self::new(ident.vis(), ident.inspect().clone())
- }
-}
-
impl From<Identifier> for Expr {
fn from(ident: Identifier) -> Self {
Self::Accessor(Accessor::Ident(ident))
@@ -2699,34 +2803,52 @@ impl From<Identifier> for Expr {
}
impl Identifier {
- pub const fn new(dot: Option<Token>, name: VarName) -> Self {
- Self { dot, name }
+ pub const fn new(vis: VisModifierSpec, name: VarName) -> Self {
+ Self { vis, name }
}
pub fn static_public(name: &'static str) -> Self {
Self::new(
- Some(Token::from_str(TokenKind::Dot, ".")),
+ VisModifierSpec::Public(Token::from_str(TokenKind::Dot, ".")),
VarName::from_static(name),
)
}
pub fn public(name: Str) -> Self {
Self::new(
- Some(Token::from_str(TokenKind::Dot, ".")),
+ VisModifierSpec::Public(Token::from_str(TokenKind::Dot, ".")),
VarName::from_str(name),
)
}
pub fn private(name: Str) -> Self {
- Self::new(None, VarName::from_str(name))
+ Self::new(VisModifierSpec::Private, VarName::from_str(name))
+ }
+
+ pub fn private_from_token(symbol: Token) -> Self {
+ Self::new(VisModifierSpec::Private, VarName::new(symbol))
+ }
+
+ pub fn private_from_varname(name: VarName) -> Self {
+ Self::new(VisModifierSpec::Private, name)
}
pub fn private_with_line(name: Str, line: u32) -> Self {
- Self::new(None, VarName::from_str_and_line(name, line))
+ Self::new(
+ VisModifierSpec::Private,
+ VarName::from_str_and_line(name, line),
+ )
}
pub fn public_with_line(dot: Token, name: Str, line: u32) -> Self {
- Self::new(Some(dot), VarName::from_str_and_line(name, line))
+ Self::new(
+ VisModifierSpec::Public(dot),
+ VarName::from_str_and_line(name, line),
+ )
+ }
+
+ pub fn public_from_token(dot: Token, symbol: Token) -> Self {
+ Self::new(VisModifierSpec::Public(dot), VarName::new(symbol))
}
pub fn is_const(&self) -> bool {
@@ -2737,10 +2859,13 @@ impl Identifier {
self.name.is_raw()
}
- pub const fn vis(&self) -> Visibility {
- match &self.dot {
- Some(_) => Visibility::Public,
- None => Visibility::Private,
+ pub fn acc_kind(&self) -> AccessModifier {
+ match &self.vis {
+ VisModifierSpec::Auto => AccessModifier::Auto,
+ VisModifierSpec::Public(_) => AccessModifier::Public,
+ VisModifierSpec::ExplicitPrivate(_)
+ | VisModifierSpec::Restricted(_)
+ | VisModifierSpec::Private => AccessModifier::Private,
}
}
@@ -2983,11 +3108,11 @@ impl VarPattern {
}
}
- pub const fn vis(&self) -> Visibility {
+ pub fn vis(&self) -> &VisModifierSpec {
match self {
- Self::Ident(ident) => ident.vis(),
+ Self::Ident(ident) => &ident.vis,
// TODO: `[.x, .y]`?
- _ => Visibility::Private,
+ _ => &VisModifierSpec::Private,
}
}
@@ -3036,7 +3161,7 @@ impl VarSignature {
self.pat.is_const()
}
- pub const fn vis(&self) -> Visibility {
+ pub fn vis(&self) -> &VisModifierSpec {
self.pat.vis()
}
@@ -3493,8 +3618,8 @@ impl SubrSignature {
self.ident.is_const()
}
- pub const fn vis(&self) -> Visibility {
- self.ident.vis()
+ pub fn vis(&self) -> &VisModifierSpec {
+ &self.ident.vis
}
}
@@ -3693,7 +3818,7 @@ impl Signature {
matches!(self, Self::Subr(_))
}
- pub const fn vis(&self) -> Visibility {
+ pub fn vis(&self) -> &VisModifierSpec {
match self {
Self::Var(var) => var.vis(),
Self::Subr(subr) => subr.vis(),
@@ -3893,13 +4018,13 @@ impl ReDef {
pub struct Methods {
pub class: TypeSpec,
pub class_as_expr: Box<Expr>,
- pub vis: Token, // `.` or `::`
+ pub vis: VisModifierSpec, // `.` or `::`
pub attrs: ClassAttrs,
}
impl NestedDisplay for Methods {
fn fmt_nest(&self, f: &mut fmt::Formatter<'_>, level: usize) -> fmt::Result {
- writeln!(f, "{}{}", self.class, self.vis.content)?;
+ writeln!(f, "{}{}", self.class, self.vis)?;
self.attrs.fmt_nest(f, level + 1)
}
}
@@ -3908,7 +4033,12 @@ impl_display_from_nested!(Methods);
impl_locational!(Methods, class, attrs);
impl Methods {
- pub fn new(class: TypeSpec, class_as_expr: Expr, vis: Token, attrs: ClassAttrs) -> Self {
+ pub fn new(
+ class: TypeSpec,
+ class_as_expr: Expr,
+ vis: VisModifierSpec,
+ attrs: ClassAttrs,
+ ) -> Self {
Self {
class,
class_as_expr: Box::new(class_as_expr),
@@ -3916,14 +4046,6 @@ impl Methods {
attrs,
}
}
-
- pub fn vis(&self) -> Visibility {
- if self.vis.is(TokenKind::Dot) {
- Visibility::Public
- } else {
- Visibility::Private
- }
- }
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
diff --git a/desugar.rs b/desugar.rs
index 4890976..a17012f 100644
--- a/desugar.rs
+++ b/desugar.rs
@@ -16,7 +16,7 @@ use crate::ast::{
ParamPattern, ParamRecordAttr, Params, PatchDef, PosArg, ReDef, Record, RecordAttrOrIdent,
RecordAttrs, Set as astSet, SetWithLength, Signature, SubrSignature, Tuple, TupleTypeSpec,
TypeAppArgs, TypeAppArgsKind, TypeBoundSpecs, TypeSpec, TypeSpecWithOp, UnaryOp, VarName,
- VarPattern, VarRecordAttr, VarSignature,
+ VarPattern, VarRecordAttr, VarSignature, VisModifierSpec,
};
use crate::token::{Token, TokenKind, COLON, DOT};
@@ -636,7 +636,10 @@ impl Desugarer {
r_brace,
)
}
- BufIndex::Record(attr) => obj.attr(attr.clone()),
+ BufIndex::Record(attr) => {
+ let attr = Identifier::new(VisModifierSpec::Auto, attr.name.clone());
+ obj.attr(attr)
+ }
};
let id = DefId(get_hash(&(&acc, buf_name)));
let block = Block::new(vec![Expr::Accessor(acc)]);
@@ -1001,7 +1004,10 @@ impl Desugarer {
r_brace,
)
}
- BufIndex::Record(attr) => obj.attr(attr.clone()),
+ BufIndex::Record(attr) => {
+ let attr = Identifier::new(VisModifierSpec::Auto, attr.name.clone());
+ obj.attr(attr)
+ }
};
let id = DefId(get_hash(&(&acc, buf_name)));
let block = Block::new(vec![Expr::Accessor(acc)]);
@@ -1166,7 +1172,7 @@ impl Desugarer {
}
*/
ParamPattern::VarName(name) => {
- let ident = Identifier::new(None, name.clone());
+ let ident = Identifier::new(VisModifierSpec::Private, name.clone());
let v = VarSignature::new(
VarPattern::Ident(ident),
sig.t_spec.as_ref().map(|ts| ts.t_spec.clone()),
diff --git a/parse.rs b/parse.rs
index 0de720c..b4602c8 100644
--- a/parse.rs
+++ b/parse.rs
@@ -560,6 +560,37 @@ impl Parser {
Ok(TypeAppArgs::new(l_vbar, args, r_vbar))
}
+ fn try_reduce_restriction(&mut self) -> ParseResult<VisRestriction> {
+ debug_call_info!(self);
+ expect_pop!(self, LSqBr);
+ let rest = match self.peek_kind() {
+ Some(SubtypeOf) => {
+ self.lpop();
+ let t_spec_as_expr = self
+ .try_reduce_expr(false, true, false, false)
+ .map_err(|_| self.stack_dec(fn_name!()))?;
+ match Parser::expr_to_type_spec(t_spec_as_expr) {
+ Ok(t_spec) => VisRestriction::SubtypeOf(Box::new(t_spec)),
+ Err(err) => {
+ self.errs.push(err);
+ debug_exit_info!(self);
+ return Err(());
+ }
+ }
+ }
+ _ => {
+ // FIXME: reduce namespaces
+ let acc = self
+ .try_reduce_acc_lhs()
+ .map_err(|_| self.stack_dec(fn_name!()))?;
+ VisRestriction::Namespaces(Namespaces::new(vec![acc]))
+ }
+ };
+ expect_pop!(self, RSqBr);
+ debug_exit_info!(self);
+ Ok(rest)
+ }
+
fn try_reduce_acc_lhs(&mut self) -> ParseResult<Accessor> {
debug_call_info!(self);
let acc = match self.peek_kind() {
@@ -576,6 +607,19 @@ impl Parser {
return Err(());
}
}
+ Some(DblColon) => {
+ let dbl_colon = self.lpop();
+ if let Some(LSqBr) = self.peek_kind() {
+ let rest = self
+ .try_reduce_restriction()
+ .map_err(|_| self.stack_dec(fn_name!()))?;
+ let symbol = expect_pop!(self, Symbol);
+ Accessor::restricted(rest, symbol)
+ } else {
+ let symbol = expect_pop!(self, Symbol);
+ Accessor::explicit_local(dbl_colon, symbol)
+ }
+ }
_ => {
let err = self.skip_and_throw_syntax_err(caused_by!());
self.errs.push(err);
@@ -1000,7 +1044,11 @@ impl Parser {
}
}
- fn try_reduce_method_defs(&mut self, class: Expr, vis: Token) -> ParseResult<Methods> {
+ fn try_reduce_method_defs(
+ &mut self,
+ class: Expr,
+ vis: VisModifierSpec,
+ ) -> ParseResult<Methods> {
debug_call_info!(self);
expect_pop!(self, fail_next Indent);
while self.cur_is(Newline) {
@@ -1205,7 +1253,7 @@ impl Parser {
));
}
Some(t) if t.is(DblColon) => {
- let vis = self.lpop();
+ let vis = VisModifierSpec::ExplicitPrivate(self.lpop());
match self.lpop() {
symbol if symbol.is(Symbol) => {
let Some(ExprOrOp::Expr(obj)) = stack.pop() else {
@@ -1219,11 +1267,13 @@ impl Parser {
.transpose()
.map_err(|_| self.stack_dec(fn_name!()))?
{
- let ident = Identifier::new(None, VarName::new(symbol));
+ let ident =
+ Identifier::new(VisModifierSpec::Private, VarName::new(symbol));
let call = Call::new(obj, Some(ident), args);
stack.push(ExprOrOp::Expr(Expr::Call(call)));
} else {
- let ident = Identifier::new(None, VarName::new(symbol));
+ let ident =
+ Identifier::new(VisModifierSpec::Private, VarName::new(symbol));
stack.push(ExprOrOp::Expr(obj.attr_expr(ident)));
}
}
@@ -1267,7 +1317,7 @@ impl Parser {
}
}
Some(t) if t.is(Dot) => {
- let vis = self.lpop();
+ let dot = self.lpop();
match self.lpop() {
symbol if symbol.is(Symbol) => {
let Some(ExprOrOp::Expr(obj)) = stack.pop() else {
@@ -1281,15 +1331,16 @@ impl Parser {
.transpose()
.map_err(|_| self.stack_dec(fn_name!()))?
{
- let ident = Identifier::new(Some(vis), VarName::new(symbol));
+ let ident = Identifier::public_from_token(dot, symbol);
let call = Expr::Call(Call::new(obj, Some(ident), args));
stack.push(ExprOrOp::Expr(call));
} else {
- let ident = Identifier::new(Some(vis), VarName::new(symbol));
+ let ident = Identifier::public_from_token(dot, symbol);
stack.push(ExprOrOp::Expr(obj.attr_expr(ident)));
}
}
line_break if line_break.is(Newline) => {
+ let vis = VisModifierSpec::Public(dot);
let maybe_class = enum_unwrap!(stack.pop(), Some:(ExprOrOp::Expr:(_)));
let defs = self
.try_reduce_method_defs(maybe_class, vis)
@@ -1488,11 +1539,17 @@ impl Parser {
.transpose()
.map_err(|_| self.stack_dec(fn_name!()))?
{
- let ident = Identifier::new(Some(vis), VarName::new(symbol));
+ let ident = Identifier::new(
+ VisModifierSpec::Public(vis),
+ VarName::new(symbol),
+ );
let call = Call::new(obj, Some(ident), args);
stack.push(ExprOrOp::Expr(Expr::Call(call)));
} else {
- let ident = Identifier::new(Some(vis), VarName::new(symbol));
+ let ident = Identifier::new(
+ VisModifierSpec::Public(vis),
+ VarName::new(symbol),
+ );
stack.push(ExprOrOp::Expr(obj.attr_expr(ident)));
}
}
@@ -1696,7 +1753,7 @@ impl Parser {
}
}
}
- Some(t) if t.is(Symbol) || t.is(Dot) || t.is(UBar) => {
+ Some(t) if t.is(Symbol) || t.is(Dot) || t.is(DblColon) || t.is(UBar) => {
let call_or_acc = self
.try_reduce_call_or_acc(in_type_args)
.map_err(|_| self.stack_dec(fn_name!()))?;
@@ -1861,7 +1918,8 @@ impl Parser {
let token = self.lpop();
match token.kind {
Symbol => {
- let ident = Identifier::new(Some(vis), VarName::new(token));
+ let ident =
+ Identifier::new(VisModifierSpec::Public(vis), VarName::new(token));
obj = obj.attr_expr(ident);
}
NatLit => {
@@ -1895,7 +1953,10 @@ impl Parser {
let token = self.lpop();
match token.kind {
Symbol => {
- let ident = Identifier::new(None, VarName::new(token));
+ let ident = Identifier::new(
+ VisModifierSpec::ExplicitPrivate(vis),
+ VarName::new(token),
+ );
obj = obj.attr_expr(ident);
}
LBrace => {
@@ -1905,6 +1966,7 @@ impl Parser {
.map_err(|_| self.stack_dec(fn_name!()))?;
match args {
BraceContainer::Record(args) => {
+ let vis = VisModifierSpec::ExplicitPrivate(vis);
obj = Expr::DataPack(DataPack::new(obj, vis, args));
}
other => {
@@ -2023,15 +2085,15 @@ impl Parser {
}
// Empty brace literals
- if let Some(first) = self.peek() {
- if first.is(RBrace) {
+ match self.peek_kind() {
+ Some(RBrace) => {
let r_brace = self.lpop();
let arg = Args::empty();
let set = NormalSet::new(l_brace, r_brace, arg);
debug_exit_info!(self);
return Ok(BraceContainer::Set(Set::Normal(set)));
}
- if first.is(Equal) {
+ Some(Equal) => {
let _eq = self.lpop();
if let Some(t) = self.peek() {
if t.is(RBrace) {
@@ -2045,7 +2107,7 @@ impl Parser {
debug_exit_info!(self);
return Err(());
}
- if first.is(Colon) {
+ Some(Colon) => {
let _colon = self.lpop();
if let Some(t) = self.peek() {
if t.is(RBrace) {
@@ -2060,6 +2122,7 @@ impl Parser {
debug_exit_info!(self);
return Err(());
}
+ _ => {}
}
let first = self
@@ -2541,7 +2604,8 @@ impl Parser {
.transpose()
.map_err(|_| self.stack_dec(fn_name!()))?
{
- let ident = Identifier::new(Some(vis), VarName::new(symbol));
+ let ident =
+ Identifier::new(VisModifierSpec::Public(vis), VarName::new(symbol));
let mut call = Expr::Call(Call::new(obj, Some(ident), args));
while let Some(res) = self.opt_reduce_args(false) {
let args = res.map_err(|_| self.stack_dec(fn_name!()))?;
diff --git a/typespec.rs b/typespec.rs
index 3a3c66f..bd141a5 100644
--- a/typespec.rs
+++ b/typespec.rs
@@ -229,11 +229,12 @@ impl Parser {
(ParamPattern::VarName(name), Some(t_spec_with_op)) => {
ParamTySpec::new(Some(name.into_token()), t_spec_with_op.t_spec)
}
- (ParamPattern::VarName(name), None) => {
- ParamTySpec::anonymous(TypeSpec::PreDeclTy(PreDeclTypeSpec::Simple(
- SimpleTypeSpec::new(Identifier::new(None, name), ConstArgs::empty()),
- )))
- }
+ (ParamPattern::VarName(name), None) => ParamTySpec::anonymous(TypeSpec::PreDeclTy(
+ PreDeclTypeSpec::Simple(SimpleTypeSpec::new(
+ Identifier::new(VisModifierSpec::Private, name),
+ ConstArgs::empty(),
+ )),
+ )),
_ => todo!(),
};
non_defaults.push(param);
@@ -247,11 +248,12 @@ impl Parser {
(ParamPattern::VarName(name), Some(t_spec_with_op)) => {
ParamTySpec::new(Some(name.into_token()), t_spec_with_op.t_spec)
}
- (ParamPattern::VarName(name), None) => {
- ParamTySpec::anonymous(TypeSpec::PreDeclTy(PreDeclTypeSpec::Simple(
- SimpleTypeSpec::new(Identifier::new(None, name), ConstArgs::empty()),
- )))
- }
+ (ParamPattern::VarName(name), None) => ParamTySpec::anonymous(
+ TypeSpec::PreDeclTy(PreDeclTypeSpec::Simple(SimpleTypeSpec::new(
+ Identifier::new(VisModifierSpec::Private, name),
+ ConstArgs::empty(),
+ ))),
+ ),
_ => todo!(),
});
let mut defaults = vec![];
diff --git a/class.er b/class.er
index 65ebf37..351e8ae 100644
--- a/class.er
+++ b/class.er
@@ -4,7 +4,7 @@ print! empty
# Inheritance is prohibited by default. Remove this decorator and check for errors.
@Inheritable
-Point2D = Class {x = Int; y = Int}
+Point2D = Class {::[<: Self]x = Int; ::[<: Self]y = Int}
Point2D::
one = 1
Point2D.
diff --git a/unpack.er b/unpack.er
index 22fc7a0..f5314f6 100644
--- a/unpack.er
+++ b/unpack.er
@@ -1,5 +1,5 @@
-UnpackPoint2D = Class {x = Int; y = Int}, Impl := Unpack
+UnpackPoint2D = Class {.x = Int; .y = Int}, Impl := Unpack
-q = UnpackPoint2D::{x = 1; y = 2}
+q = UnpackPoint2D::{.x = 1; .y = 2}
UnpackPoint2D::{x; y} = q
print! x, y
diff --git a/visibility.er b/visibility.er
index 6d534ac..9f8a9b7 100644
--- a/visibility.er
+++ b/visibility.er
@@ -0,0 +1,25 @@
+@Inheritable
+Point2D = Class {::[<: Self]x = Int; ::[<: Self]y = Int}
+Point2D.
+ norm self = self::x**2 + self::y**2 #OK
+
+Point3D = Inherit Point2D, Additional := {z = Int}
+Point3D.
+ @Override
+ norm self = self::x**2 + self::y**2 + self::z**2 #OK
+
+C = Class()
+C.
+ method point: Point2D = point::x # ERR
+
+p = Point3D.new {x = 1; y = 2; z = 3}
+p::x # ERR
+p.x # ERR
+p::z # ERR
+
+rec = {
+ ::[f] x = 1
+}
+
+f x = rec::x + x # OK
+g x = rec::x + x # ERR
diff --git a/pattern.er b/pattern.er
index 624c07f..fc7bfc8 100644
--- a/pattern.er
+++ b/pattern.er
@@ -1,6 +1,6 @@
-f {x; y}, [_], (_, _) = x + y
+f {.x; .y}, [_], (_, _) = x + y
-x = f {x = 1; y = 2}, [3], (4, 5)
+x = f {.x = 1; .y = 2}, [3], (4, 5)
assert x == 3
#[
diff --git a/test.rs b/test.rs
index c170826..a6ccbaf 100644
--- a/test.rs
+++ b/test.rs
@@ -306,6 +306,11 @@ fn exec_var_args_err() -> Result<(), ()> {
expect_failure("tests/should_err/var_args.er", 3)
}
+#[test]
+fn exec_visibility() -> Result<(), ()> {
+ expect_failure("tests/should_err/visibility.er", 5)
+}
+
#[test]
fn exec_move() -> Result<(), ()> {
expect_failure("tests/should_err/move.er", 1)
|
|
refactor(api): remove unnecessary `select` from set operations (#9438)
|
88a278577224659412b1d27d897de639c9debc4f
|
refactor
|
https://github.com/ibis-project/ibis/commit/88a278577224659412b1d27d897de639c9debc4f
|
remove unnecessary `select` from set operations (#9438)
|
diff --git a/out.sql b/out.sql
index 701e911..53e08b1 100644
--- a/out.sql
+++ b/out.sql
@@ -18,12 +18,8 @@ WITH "t1" AS (
)
SELECT
*
-FROM (
- SELECT
- *
- FROM "t5" AS "t6"
- UNION ALL
- SELECT
- *
- FROM "t5" AS "t7"
-) AS "t8"
\\ No newline at end of file
+FROM "t5" AS "t6"
+UNION ALL
+SELECT
+ *
+FROM "t5" AS "t7"
\\ No newline at end of file
diff --git a/result.sql b/result.sql
index eb969d5..da63359 100644
--- a/result.sql
+++ b/result.sql
@@ -2,20 +2,16 @@ SELECT
*
FROM (
SELECT
- *
- FROM (
- SELECT
- CAST("t0"."diag" + CAST(1 AS TINYINT) AS INT) AS "diag",
- "t0"."status"
- FROM "aids2_one" AS "t0"
- ) AS "t2"
- UNION ALL
+ CAST("t0"."diag" + CAST(1 AS TINYINT) AS INT) AS "diag",
+ "t0"."status"
+ FROM "aids2_one" AS "t0"
+) AS "t2"
+UNION ALL
+SELECT
+ *
+FROM (
SELECT
- *
- FROM (
- SELECT
- CAST("t1"."diag" + CAST(1 AS TINYINT) AS INT) AS "diag",
- "t1"."status"
- FROM "aids2_two" AS "t1"
- ) AS "t3"
-) AS "t4"
\\ No newline at end of file
+ CAST("t1"."diag" + CAST(1 AS TINYINT) AS INT) AS "diag",
+ "t1"."status"
+ FROM "aids2_two" AS "t1"
+) AS "t3"
\\ No newline at end of file
diff --git a/union_repr.txt b/union_repr.txt
index afaef44..940bc8a 100644
--- a/union_repr.txt
+++ b/union_repr.txt
@@ -8,8 +8,4 @@ r1 := UnboundTable: t2
r2 := Union[r0, r1, distinct=False]
-r3 := Project[r2]
- a: r2.a
- b: r2.b
-
-CountStar(): CountStar(r3)
\\ No newline at end of file
+CountStar(): CountStar(r2)
\\ No newline at end of file
diff --git a/relations.py b/relations.py
index 8dbe3f0..a0148b2 100644
--- a/relations.py
+++ b/relations.py
@@ -1693,7 +1693,7 @@ class Table(Expr, _FixedTextJupyterMixin):
queue.append(node)
result = queue.popleft()
assert not queue, "items left in queue"
- return result.to_expr().select(*self.columns)
+ return result.to_expr()
def union(self, table: Table, *rest: Table, distinct: bool = False) -> Table:
"""Compute the set union of multiple table expressions.
@@ -1883,7 +1883,7 @@ class Table(Expr, _FixedTextJupyterMixin):
node = ops.Difference(self, table, distinct=distinct)
for table in rest:
node = ops.Difference(node, table, distinct=distinct)
- return node.to_expr().select(self.columns)
+ return node.to_expr()
@deprecated(as_of="9.0", instead="use table.as_scalar() instead")
def to_array(self) -> ir.Column:
diff --git a/test_benchmarks.py b/test_benchmarks.py
index cd035b7..638677b 100644
--- a/test_benchmarks.py
+++ b/test_benchmarks.py
@@ -850,12 +850,12 @@ def test_column_access(benchmark, many_cols, getter):
benchmark(getter, many_cols)
[email protected](scope="module")
-def many_tables():
[email protected](scope="module", params=[1000, 10000])
+def many_tables(request):
num_cols = 10
- num_tables = 1000
return [
- ibis.table({f"c{i}": "int" for i in range(num_cols)}) for _ in range(num_tables)
+ ibis.table({f"c{i}": "int" for i in range(num_cols)})
+ for _ in range(request.param)
]
@@ -863,6 +863,7 @@ def test_large_union_construct(benchmark, many_tables):
assert benchmark(lambda args: ibis.union(*args), many_tables) is not None
[email protected](180)
def test_large_union_compile(benchmark, many_tables):
expr = ibis.union(*many_tables)
assert benchmark(ibis.to_sql, expr) is not None
diff --git a/test_set_operations.py b/test_set_operations.py
index d65baef..40596ab 100644
--- a/test_set_operations.py
+++ b/test_set_operations.py
@@ -51,13 +51,13 @@ def test_operation_supports_schemas_with_different_field_order(method):
assert u1.schema() == a.schema()
- u1 = u1.op().parent
+ u1 = u1.op()
assert u1.left == a.op()
assert u1.right == b.op()
# a selection is added to ensure that the field order of the right table
# matches the field order of the left table
- u2 = u2.op().parent
+ u2 = u2.op()
assert u2.schema == a.schema()
assert u2.left == a.op()
diff --git a/test_table.py b/test_table.py
index 74c0b7b..0bed579 100644
--- a/test_table.py
+++ b/test_table.py
@@ -1420,11 +1420,11 @@ def test_union(
setops_relation_error_message,
):
result = setops_table_foo.union(setops_table_bar)
- assert isinstance(result.op().parent, ops.Union)
- assert not result.op().parent.distinct
+ assert isinstance(result.op(), ops.Union)
+ assert not result.op().distinct
result = setops_table_foo.union(setops_table_bar, distinct=True)
- assert result.op().parent.distinct
+ assert result.op().distinct
with pytest.raises(RelationError, match=setops_relation_error_message):
setops_table_foo.union(setops_table_baz)
@@ -1437,7 +1437,7 @@ def test_intersection(
setops_relation_error_message,
):
result = setops_table_foo.intersect(setops_table_bar)
- assert isinstance(result.op().parent, ops.Intersection)
+ assert isinstance(result.op(), ops.Intersection)
with pytest.raises(RelationError, match=setops_relation_error_message):
setops_table_foo.intersect(setops_table_baz)
@@ -1450,7 +1450,7 @@ def test_difference(
setops_relation_error_message,
):
result = setops_table_foo.difference(setops_table_bar)
- assert isinstance(result.op().parent, ops.Difference)
+ assert isinstance(result.op(), ops.Difference)
with pytest.raises(RelationError, match=setops_relation_error_message):
setops_table_foo.difference(setops_table_baz)
|
|
fix(core): detect early deletes for compound unique constraints
Closes #4305
|
f9530e4b24bd806e33f1997d4e1ef548e02b6b90
|
fix
|
https://github.com/mikro-orm/mikro-orm/commit/f9530e4b24bd806e33f1997d4e1ef548e02b6b90
|
detect early deletes for compound unique constraints
Closes #4305
|
diff --git a/typings.ts b/typings.ts
index 4a7cf30..26aea03 100644
--- a/typings.ts
+++ b/typings.ts
@@ -398,6 +398,7 @@ export class EntityMetadata<T = any> {
return !prop.inherited && prop.hydrate !== false && !discriminator && !prop.embedded && !onlyGetter;
});
this.selfReferencing = this.relations.some(prop => [this.className, this.root.className].includes(prop.type));
+ this.hasUniqueProps = this.uniques.length + this.uniqueProps.length > 0;
this.virtual = !!this.expression;
if (this.virtual) {
@@ -546,6 +547,7 @@ export interface EntityMetadata<T = any> {
filters: Dictionary<FilterDef>;
comment?: string;
selfReferencing?: boolean;
+ hasUniqueProps?: boolean;
readonly?: boolean;
polymorphs?: EntityMetadata[];
root: EntityMetadata<T>;
diff --git a/UnitOfWork.ts b/UnitOfWork.ts
index 10afdf6..040a254 100644
--- a/UnitOfWork.ts
+++ b/UnitOfWork.ts
@@ -586,17 +586,42 @@ export class UnitOfWork {
private expandUniqueProps<T extends object>(entity: T): string[] {
const wrapped = helper(entity);
- return wrapped.__meta.uniqueProps.map(prop => {
- if (entity[prop.name]) {
+ if (!wrapped.__meta.hasUniqueProps) {
+ return [];
+ }
+
+ const simpleUniqueHashes = wrapped.__meta.uniqueProps.map(prop => {
+ if (entity[prop.name] != null) {
return prop.reference === ReferenceType.SCALAR || prop.mapToPk ? entity[prop.name] : helper(entity[prop.name]).getSerializedPrimaryKey();
}
- if (wrapped.__originalEntityData?.[prop.name as string]) {
+ if (wrapped.__originalEntityData?.[prop.name as string] != null) {
return Utils.getPrimaryKeyHash(Utils.asArray(wrapped.__originalEntityData![prop.name as string]));
}
return undefined;
}).filter(i => i) as string[];
+
+ const compoundUniqueHashes = wrapped.__meta.uniques.map(unique => {
+ const props = Utils.asArray(unique.properties);
+
+ if (props.every(prop => entity[prop] != null)) {
+ return Utils.getPrimaryKeyHash(props.map(p => {
+ const prop = wrapped.__meta.properties[p];
+ return prop.reference === ReferenceType.SCALAR || prop.mapToPk ? entity[prop.name] : helper(entity[prop.name]).getSerializedPrimaryKey();
+ }) as any);
+ }
+
+ if (props.every(prop => wrapped.__originalEntityData?.[prop as string] != null)) {
+ return Utils.getPrimaryKeyHash(props.map(p => {
+ return wrapped.__originalEntityData![p as string];
+ }));
+ }
+
+ return undefined;
+ }).filter(i => i) as string[];
+
+ return simpleUniqueHashes.concat(compoundUniqueHashes);
}
private initIdentifier<T extends object>(entity: T): void {
diff --git a/GH4305.test.ts b/GH4305.test.ts
index dbd1b73..0d0bf2a 100644
--- a/GH4305.test.ts
+++ b/GH4305.test.ts
@@ -0,0 +1,69 @@
+import { Collection, Entity, ManyToOne, OneToMany, PrimaryKey, Property, Unique } from '@mikro-orm/core';
+import { MikroORM } from '@mikro-orm/sqlite';
+
+@Entity()
+class Author {
+
+ @PrimaryKey()
+ id!: number;
+
+ @OneToMany(() => Book, book => book.author, { orphanRemoval: true })
+ books = new Collection<Book>(this);
+
+}
+
+@Unique({ properties: ['type', 'title'] })
+@Entity()
+class Book {
+
+ @PrimaryKey()
+ id!: number;
+
+ @ManyToOne(() => Author)
+ author!: Author;
+
+ @Property()
+ type!: string;
+
+ @Property()
+ title!: string;
+
+ @Property()
+ color!: string;
+
+}
+
+let orm: MikroORM;
+
+beforeAll(async () => {
+ orm = await MikroORM.init({
+ entities: [Author],
+ dbName: `:memory:`,
+ });
+
+ await orm.schema.createSchema();
+
+ const author = new Author();
+ const book1 = new Book();
+ book1.title = 'book1';
+ book1.type = 't1';
+ book1.color = 'c1';
+ author.books.add(book1);
+ await orm.em.persistAndFlush(author);
+ orm.em.clear();
+});
+
+afterAll(() => orm.close(true));
+
+test('#4305', async () => {
+ const author = await orm.em.findOne(Author, { id: 1 }, {
+ populate: ['books'],
+ });
+
+ const newBook = new Book();
+ newBook.title = 'book1';
+ newBook.type = 't1';
+ newBook.color = 'c2';
+ author!.books.set([newBook]);
+ await orm.em.flush();
+});
|
|
feat(sql): add support for bigint (#389)
Adds BigIntType custom type that can be used to handle bigints.
Closes #361
|
5ddd5734c1bc7e51ec36c2b75aa3056223feb279
|
feat
|
https://github.com/mikro-orm/mikro-orm/commit/5ddd5734c1bc7e51ec36c2b75aa3056223feb279
|
add support for bigint (#389)
Adds BigIntType custom type that can be used to handle bigints.
Closes #361
|
diff --git a/defining-entities.md b/defining-entities.md
index d26b4e5..951664c 100644
--- a/defining-entities.md
+++ b/defining-entities.md
@@ -416,6 +416,24 @@ export class Book {
}
```
+### Using BigInt as primary key (MySQL and PostgreSQL)
+
+You can use `BigIntType` to support `bigint`s. By default it will represent the value as
+a `string`.
+
+```typescript
+@Entity()
+export class Book {
+
+ @PrimaryKey({ type: BigIntType })
+ id: string;
+
+}
+```
+
+If you want to use native `bigint`s, read the following guide: [Using native BigInt PKs](using-bigint-pks.md).
+
+
### Example of Mongo entity
```typescript
diff --git a/using-bigint-pks.md b/using-bigint-pks.md
index 83d18e1..9863396 100644
--- a/using-bigint-pks.md
+++ b/using-bigint-pks.md
@@ -0,0 +1,37 @@
+---
+title: Using native BigInt PKs (MySQL and PostgreSQL)
+---
+
+You can use `BigIntType` to support `bigint`s. By default it will represent the value as
+a `string`.
+
+```typescript
+@Entity()
+export class Book {
+
+ @PrimaryKey({ type: BigIntType })
+ id: string;
+
+}
+```
+
+If you want to use native `bigint` type, you will need to create new type based on the
+`BigIntType`:
+
+```typescript
+export class NativeBigIntType extends BigIntType {
+
+ convertToJSValue(value: any): any {
+ return BigInt(value);
+ }
+
+}
+
+@Entity()
+export class Book {
+
+ @PrimaryKey({ type: NativeBigIntType })
+ id: bigint;
+
+}
+```
diff --git a/sidebars.js b/sidebars.js
index cfdacf1..0d641bc 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -48,6 +48,7 @@ module.exports = {
'usage-with-js',
'custom-driver',
'multiple-schemas',
+ 'using-bigint-pks',
],
'Example Integrations': [
{ type: 'link', label: 'Express + MongoDB + TypeScript', href: 'https://github.com/mikro-orm/express-ts-example-app' },
diff --git a/MySqlConnection.ts b/MySqlConnection.ts
index e05394d..964088d 100644
--- a/MySqlConnection.ts
+++ b/MySqlConnection.ts
@@ -22,6 +22,8 @@ export class MySqlConnection extends AbstractSqlConnection {
ret.timezone = 'Z';
}
+ ret.supportBigNumbers = true;
+
return ret;
}
diff --git a/EntityAssigner.ts b/EntityAssigner.ts
index 7ff28b3..472e4ff 100644
--- a/EntityAssigner.ts
+++ b/EntityAssigner.ts
@@ -1,3 +1,4 @@
+import { inspect } from 'util';
import { Collection } from './Collection';
import { SCALAR_TYPES } from './EntityFactory';
import { EntityManager } from '../EntityManager';
@@ -110,7 +111,7 @@ export class EntityAssigner {
if (invalid.length > 0) {
const name = entity.constructor.name;
- throw new Error(`Invalid collection values provided for '${name}.${prop.name}' in ${name}.assign(): ${JSON.stringify(invalid)}`);
+ throw new Error(`Invalid collection values provided for '${name}.${prop.name}' in ${name}.assign(): ${inspect(invalid)}`);
}
collection.hydrate(items, true);
diff --git a/MetadataDiscovery.ts b/MetadataDiscovery.ts
index 97eb689..f5781ff 100644
--- a/MetadataDiscovery.ts
+++ b/MetadataDiscovery.ts
@@ -471,6 +471,12 @@ export class MetadataDiscovery {
const meta = this.metadata.get(prop.type);
const pk = meta.properties[meta.primaryKey];
this.initCustomType(pk);
+
+ if (pk.customType) {
+ prop.columnType = pk.customType.getColumnType(pk, this.platform);
+ return;
+ }
+
prop.columnType = this.schemaHelper.getTypeDefinition(pk);
}
@@ -491,14 +497,14 @@ export class MetadataDiscovery {
if (prop.reference === ReferenceType.MANY_TO_ONE || prop.reference === ReferenceType.ONE_TO_ONE) {
const meta2 = this.metadata.get(prop.type);
const pk = meta2.properties[meta2.primaryKey];
- prop.unsigned = pk.type === 'number';
+ prop.unsigned = pk.type === 'number' || this.platform.isBigIntProperty(pk);
prop.referenceColumnName = pk.fieldName;
prop.referencedTableName = meta2.collection;
return;
}
- prop.unsigned = (prop.primary || prop.unsigned) && prop.type === 'number';
+ prop.unsigned = (prop.primary || prop.unsigned) && (prop.type === 'number' || this.platform.isBigIntProperty(prop));
}
private getEntityClassOrSchema(path: string, name: string) {
diff --git a/Platform.ts b/Platform.ts
index b0d5ad2..511fff8 100644
--- a/Platform.ts
+++ b/Platform.ts
@@ -1,5 +1,5 @@
import { NamingStrategy, UnderscoreNamingStrategy } from '../naming-strategy';
-import { IPrimaryKey, Primary } from '../typings';
+import { EntityProperty, IPrimaryKey, Primary } from '../typings';
import { SchemaHelper } from '../schema';
export abstract class Platform {
@@ -78,4 +78,12 @@ export abstract class Platform {
return 'regexp';
}
+ isBigIntProperty(prop: EntityProperty): boolean {
+ return prop.columnType === 'bigint';
+ }
+
+ getBigIntTypeDeclarationSQL(): string {
+ return 'bigint';
+ }
+
}
diff --git a/PostgreSqlPlatform.ts b/PostgreSqlPlatform.ts
index acf1839..5eb8b30 100644
--- a/PostgreSqlPlatform.ts
+++ b/PostgreSqlPlatform.ts
@@ -1,5 +1,6 @@
import { Platform } from './Platform';
import { PostgreSqlSchemaHelper } from '../schema/PostgreSqlSchemaHelper';
+import { EntityProperty } from '../typings';
export class PostgreSqlPlatform extends Platform {
@@ -25,4 +26,8 @@ export class PostgreSqlPlatform extends Platform {
return '~';
}
+ isBigIntProperty(prop: EntityProperty): boolean {
+ return super.isBigIntProperty(prop) || prop.columnType === 'bigserial';
+ }
+
}
diff --git a/QueryBuilder.ts b/QueryBuilder.ts
index 8c39471..96928a1 100644
--- a/QueryBuilder.ts
+++ b/QueryBuilder.ts
@@ -1,4 +1,4 @@
-import { QueryBuilder as KnexQueryBuilder, Raw, Transaction } from 'knex';
+import { QueryBuilder as KnexQueryBuilder, Raw, Transaction, Value } from 'knex';
import { Utils, ValidationError } from '../utils';
import { QueryBuilderHelper } from './QueryBuilderHelper';
import { SmartQueryHelper } from './SmartQueryHelper';
@@ -223,7 +223,7 @@ export class QueryBuilder<T extends AnyEntity<T> = AnyEntity> {
return this.getKnexQuery().toSQL().toNative().sql;
}
- getParams(): any[] {
+ getParams(): readonly Value[] {
return this.getKnexQuery().toSQL().toNative().bindings;
}
diff --git a/DatabaseTable.ts b/DatabaseTable.ts
index 6cc2c55..72fb8da 100644
--- a/DatabaseTable.ts
+++ b/DatabaseTable.ts
@@ -24,6 +24,7 @@ export class DatabaseTable {
v.unique = index.some(i => i.unique && !i.primary);
v.fk = fks[v.name];
v.indexes = index.filter(i => !i.primary);
+ v.defaultValue = v.defaultValue && v.defaultValue.toString().startsWith('nextval(') ? null : v.defaultValue;
o[v.name] = v;
return o;
@@ -41,7 +42,7 @@ export interface Column {
unique: boolean;
nullable: boolean;
maxLength: number;
- defaultValue: string;
+ defaultValue: string | null;
}
export interface ForeignKey {
diff --git a/MySqlSchemaHelper.ts b/MySqlSchemaHelper.ts
index 9c29d85..dec48b9 100644
--- a/MySqlSchemaHelper.ts
+++ b/MySqlSchemaHelper.ts
@@ -8,13 +8,12 @@ export class MySqlSchemaHelper extends SchemaHelper {
static readonly TYPES = {
boolean: ['tinyint(1)', 'tinyint'],
- number: ['int(?)', 'int', 'float', 'double', 'tinyint', 'smallint', 'bigint'],
+ number: ['int(?)', 'int', 'float', 'double', 'tinyint', 'smallint'],
float: ['float'],
double: ['double'],
tinyint: ['tinyint'],
smallint: ['smallint'],
- bigint: ['bigint'],
- string: ['varchar(?)', 'varchar', 'text', 'enum'],
+ string: ['varchar(?)', 'varchar', 'text', 'enum', 'bigint'],
Date: ['datetime(?)', 'timestamp(?)', 'datetime', 'timestamp'],
date: ['datetime(?)', 'timestamp(?)', 'datetime', 'timestamp'],
text: ['text'],
diff --git a/PostgreSqlSchemaHelper.ts b/PostgreSqlSchemaHelper.ts
index b472837..fe35282 100644
--- a/PostgreSqlSchemaHelper.ts
+++ b/PostgreSqlSchemaHelper.ts
@@ -7,13 +7,12 @@ export class PostgreSqlSchemaHelper extends SchemaHelper {
static readonly TYPES = {
boolean: ['bool', 'boolean'],
- number: ['int4', 'integer', 'int8', 'int2', 'int', 'float', 'float8', 'double', 'double precision', 'bigint', 'smallint', 'decimal', 'numeric', 'real'],
+ number: ['int4', 'integer', 'int2', 'int', 'float', 'float8', 'double', 'double precision', 'bigint', 'smallint', 'decimal', 'numeric', 'real'],
float: ['float'],
double: ['double precision', 'float8'],
tinyint: ['int2'],
smallint: ['int2'],
- bigint: ['bigint'],
- string: ['varchar(?)', 'character varying', 'text', 'character', 'char', 'uuid', 'enum'],
+ string: ['varchar(?)', 'character varying', 'text', 'character', 'char', 'uuid', 'enum', 'bigint', 'int8'],
Date: ['timestamptz(?)', 'timestamp(?)', 'datetime(?)', 'timestamp with time zone', 'timestamp without time zone', 'datetimetz', 'time', 'date', 'timetz', 'datetz'],
date: ['timestamptz(?)', 'timestamp(?)', 'datetime(?)', 'timestamp with time zone', 'timestamp without time zone', 'datetimetz', 'time', 'date', 'timetz', 'datetz'],
text: ['text'],
diff --git a/SchemaGenerator.ts b/SchemaGenerator.ts
index 8e37e79..2d1caa8 100644
--- a/SchemaGenerator.ts
+++ b/SchemaGenerator.ts
@@ -271,6 +271,10 @@ export class SchemaGenerator {
}
private createTableColumn(table: TableBuilder, meta: EntityMetadata, prop: EntityProperty, alter?: IsSame): ColumnBuilder {
+ if (prop.primary && !meta.compositePK && this.platform.isBigIntProperty(prop)) {
+ return table.bigIncrements(prop.fieldName);
+ }
+
if (prop.primary && !meta.compositePK && prop.type === 'number') {
return table.increments(prop.fieldName);
}
diff --git a/BigIntType.ts b/BigIntType.ts
index ab8ca49..c0d499a 100644
--- a/BigIntType.ts
+++ b/BigIntType.ts
@@ -0,0 +1,22 @@
+import { Type } from './Type';
+import { Platform } from '../platforms';
+import { EntityProperty } from '../typings';
+
+/**
+ * This type will automatically convert string values returned from the database to native JS bigints.
+ */
+export class BigIntType extends Type {
+
+ convertToDatabaseValue(value: any, platform: Platform): any {
+ return '' + value;
+ }
+
+ convertToJSValue(value: any, platform: Platform): any {
+ return '' + value;
+ }
+
+ getColumnType(prop: EntityProperty, platform: Platform) {
+ return platform.getBigIntTypeDeclarationSQL();
+ }
+
+}
diff --git a/index.ts b/index.ts
index 136f59f..2a7c869 100644
--- a/index.ts
+++ b/index.ts
@@ -1,3 +1,4 @@
export * from './Type';
export * from './DateType';
export * from './TimeType';
+export * from './BigIntType';
diff --git a/typings.ts b/typings.ts
index f383d7a..4896db8 100644
--- a/typings.ts
+++ b/typings.ts
@@ -29,10 +29,10 @@ export type Primary<T> = T extends { [PrimaryKeyType]: infer PK }
? PK | string : T extends { uuid: infer PK }
? PK : T extends { id: infer PK }
? PK : never;
-export type IPrimaryKeyValue = number | string | { toHexString(): string };
+export type IPrimaryKeyValue = number | string | bigint | { toHexString(): string };
export type IPrimaryKey<T extends IPrimaryKeyValue = IPrimaryKeyValue> = T;
-export type IsEntity<T> = T extends Reference<T> | { [PrimaryKeyType]: any } | { _id: any } | { uuid: string } | { id: number | string } ? true : never;
+export type IsEntity<T> = T extends Reference<T> | { [PrimaryKeyType]: any } | { _id: any } | { uuid: string } | { id: number | string | bigint } ? true : never;
export type UnionOfArrays<T> = T extends infer T1 | infer T2 | infer T3 | infer T4 | infer T5 | infer T6 | infer T7 | infer T8 | infer T9 | infer T10
? T1[] | T2[] | T3[] | T4[] | T5[] | T6[] | T7[] | T8[] | T9[] | T10[] : T extends infer T1 | infer T2 | infer T3 | infer T4 | infer T5 | infer T6 | infer T7 | infer T8 | infer T9
@@ -96,7 +96,7 @@ export interface IWrappedEntity<T, PK extends keyof T> {
export type AnyEntity<T = any, PK extends keyof T = keyof T> = { [K in PK]?: T[K] } & { [PrimaryKeyType]?: T[PK] };
export type WrappedEntity<T, PK extends keyof T> = IWrappedEntity<T, PK> & AnyEntity<T, PK>;
-export type IdEntity<T extends { id: number | string }> = AnyEntity<T, 'id'>;
+export type IdEntity<T extends { id: number | string | bigint }> = AnyEntity<T, 'id'>;
export type UuidEntity<T extends { uuid: string }> = AnyEntity<T, 'uuid'>;
export type MongoEntity<T extends { _id: IPrimaryKey; id: string }> = AnyEntity<T, 'id' | '_id'>;
export type EntityClass<T extends AnyEntity<T>> = Function & { prototype: T };
diff --git a/package.json b/package.json
index a931c9c..9abcfd9 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
"fast-deep-equal": "^3.0.0",
"fs-extra": "^8.0.0",
"globby": "^10.0.0",
- "knex": "^0.20.8",
+ "knex": "^0.20.11",
"reflect-metadata": "^0.1.13",
"ts-morph": "^4.3.3",
"umzug": "^2.2.0",
diff --git a/EntityHelper.mongo.test.ts b/EntityHelper.mongo.test.ts
index 75ac2fc..11a24ce 100644
--- a/EntityHelper.mongo.test.ts
+++ b/EntityHelper.mongo.test.ts
@@ -138,7 +138,7 @@ describe('EntityAssignerMongo', () => {
EntityAssigner.assign(book, { tags: [wrap(tag2).toObject()] });
expect(book.tags.getIdentifiers('_id')).toMatchObject([tag2._id]);
expect(book.tags.isDirty()).toBe(true);
- expect(() => EntityAssigner.assign(book, { tags: [false] } as EntityData<Book>)).toThrowError(`Invalid collection values provided for 'Book.tags' in Book.assign(): [false]`);
+ expect(() => EntityAssigner.assign(book, { tags: [false] } as EntityData<Book>)).toThrowError(`Invalid collection values provided for 'Book.tags' in Book.assign(): [ false ]`);
expect(() => EntityAssigner.assign(book, { publisher: [{ foo: 'bar' }] } as EntityData<Book>)).toThrowError(`Invalid reference value provided for 'Book.publisher' in Book.assign(): [{"foo":"bar"}]`);
});
diff --git a/EntityManager.mysql.test.ts b/EntityManager.mysql.test.ts
index ecdde69..742b79c 100644
--- a/EntityManager.mysql.test.ts
+++ b/EntityManager.mysql.test.ts
@@ -41,6 +41,7 @@ describe('EntityManagerMySql', () => {
port: 3308,
user: 'user',
timezone: 'Z',
+ supportBigNumbers: true,
});
});
@@ -125,7 +126,7 @@ describe('EntityManagerMySql', () => {
created_at: '2019-06-09T07:50:25.722Z',
author_id: 123,
publisher_id: 321,
- tags: [1, 2, 3],
+ tags: ['1', '2', '3'],
})!;
expect(book.uuid).toBe('123-dsa');
expect(book.title).toBe('name');
@@ -137,9 +138,9 @@ describe('EntityManagerMySql', () => {
expect(book.publisher!.id).toBe(321);
expect(book.tags.length).toBe(3);
expect(book.tags[0]).toBeInstanceOf(BookTag2);
- expect(book.tags[0].id).toBe(1);
- expect(book.tags[1].id).toBe(2);
- expect(book.tags[2].id).toBe(3);
+ expect(book.tags[0].id).toBe('1'); // bigint as string
+ expect(book.tags[1].id).toBe('2');
+ expect(book.tags[2].id).toBe('3');
expect(repo.getReference(book.uuid)).toBe(book);
});
@@ -848,11 +849,11 @@ describe('EntityManagerMySql', () => {
orm.em.persist(book2);
await orm.em.persistAndFlush(book3);
- expect(tag1.id).toBeDefined();
- expect(tag2.id).toBeDefined();
- expect(tag3.id).toBeDefined();
- expect(tag4.id).toBeDefined();
- expect(tag5.id).toBeDefined();
+ expect(typeof tag1.id).toBe('string');
+ expect(typeof tag2.id).toBe('string');
+ expect(typeof tag3.id).toBe('string');
+ expect(typeof tag4.id).toBe('string');
+ expect(typeof tag5.id).toBe('string');
// test inverse side
const tagRepository = orm.em.getRepository(BookTag2);
@@ -937,6 +938,17 @@ describe('EntityManagerMySql', () => {
expect(book.tags.count()).toBe(0);
});
+ test('bigint support', async () => {
+ const t = new BookTag2('test');
+ t.id = '9223372036854775807';
+ await orm.em.persistAndFlush(t);
+ expect(t.id).toBe('9223372036854775807');
+ orm.em.clear();
+
+ const t2 = await orm.em.findOneOrFail(BookTag2, t.id);
+ expect(t2.id).toBe('9223372036854775807');
+ });
+
test('many to many working with inverse side', async () => {
const author = new Author2('Jon Snow', '[email protected]');
const book1 = new Book2('My Life on The Wall, part 1', author);
diff --git a/EntityManager.postgre.test.ts b/EntityManager.postgre.test.ts
index 37b5cb8..6b1684f 100644
--- a/EntityManager.postgre.test.ts
+++ b/EntityManager.postgre.test.ts
@@ -685,11 +685,11 @@ describe('EntityManagerPostgre', () => {
await orm.em.persist(book2);
await orm.em.persistAndFlush(book3);
- expect(tag1.id).toBeDefined();
- expect(tag2.id).toBeDefined();
- expect(tag3.id).toBeDefined();
- expect(tag4.id).toBeDefined();
- expect(tag5.id).toBeDefined();
+ expect(typeof tag1.id).toBe('string');
+ expect(typeof tag2.id).toBe('string');
+ expect(typeof tag3.id).toBe('string');
+ expect(typeof tag4.id).toBe('string');
+ expect(typeof tag5.id).toBe('string');
// test inverse side
const tagRepository = orm.em.getRepository(BookTag2);
@@ -774,6 +774,17 @@ describe('EntityManagerPostgre', () => {
expect(book.tags.count()).toBe(0);
});
+ test('bigint support', async () => {
+ const t = new BookTag2('test');
+ t.id = '9223372036854775807';
+ await orm.em.persistAndFlush(t);
+ expect(t.id).toBe('9223372036854775807');
+ orm.em.clear();
+
+ const t2 = await orm.em.findOneOrFail(BookTag2, t.id);
+ expect(t2.id).toBe('9223372036854775807');
+ });
+
test('populating many to many relation', async () => {
const p1 = new Publisher2('foo');
expect(p1.tests).toBeInstanceOf(Collection);
diff --git a/SchemaGenerator.test.ts b/SchemaGenerator.test.ts
index b95c8a6..4e75eac 100644
--- a/SchemaGenerator.test.ts
+++ b/SchemaGenerator.test.ts
@@ -165,8 +165,8 @@ describe('SchemaGenerator', () => {
authorMeta.properties.born.nullable = false;
authorMeta.properties.born.default = 42;
authorMeta.properties.age.default = 42;
- authorMeta.properties.favouriteAuthor.type = 'BookTag2';
- authorMeta.properties.favouriteAuthor.referencedTableName = 'book_tag2';
+ authorMeta.properties.favouriteAuthor.type = 'FooBar2';
+ authorMeta.properties.favouriteAuthor.referencedTableName = 'foo_bar2';
await expect(generator.getUpdateSchemaSQL(false)).resolves.toMatchSnapshot('mysql-update-schema-alter-column');
await generator.updateSchema();
@@ -370,8 +370,8 @@ describe('SchemaGenerator', () => {
authorMeta.properties.name.nullable = false;
authorMeta.properties.name.default = 42;
authorMeta.properties.age.default = 42;
- authorMeta.properties.favouriteAuthor.type = 'BookTag2';
- authorMeta.properties.favouriteAuthor.referencedTableName = 'book_tag2';
+ authorMeta.properties.favouriteAuthor.type = 'FooBar2';
+ authorMeta.properties.favouriteAuthor.referencedTableName = 'foo_bar2';
await expect(generator.getUpdateSchemaSQL(false)).resolves.toMatchSnapshot('postgres-update-schema-alter-column');
await generator.updateSchema();
diff --git a/EntityGenerator.test.ts.snap b/EntityGenerator.test.ts.snap
index 791b8d8..070d6e8 100644
--- a/EntityGenerator.test.ts.snap
+++ b/EntityGenerator.test.ts.snap
@@ -139,8 +139,8 @@ export class Book2ToBookTag2 {
@Entity()
export class BookTag2 {
- @PrimaryKey()
- id!: number;
+ @PrimaryKey({ type: 'bigint' })
+ id!: string;
@Property({ length: 50 })
name!: string;
@@ -419,8 +419,8 @@ export class Book2ToBookTag2 {
@Entity()
export class BookTag2 {
- @PrimaryKey()
- id!: number;
+ @PrimaryKey({ type: 'int8' })
+ id!: string;
@Property({ length: 50 })
name!: string;
diff --git a/SchemaGenerator.test.ts.snap b/SchemaGenerator.test.ts.snap
index 9b4addd..b89b7f8 100644
--- a/SchemaGenerator.test.ts.snap
+++ b/SchemaGenerator.test.ts.snap
@@ -22,7 +22,7 @@ alter table \\`book2\\` add primary key \\`book2_pkey\\`(\\`uuid_pk\\`);
alter table \\`book2\\` add index \\`book2_author_id_index\\`(\\`author_id\\`);
alter table \\`book2\\` add index \\`book2_publisher_id_index\\`(\\`publisher_id\\`);
-create table \\`book_tag2\\` (\\`id\\` int unsigned not null auto_increment primary key, \\`name\\` varchar(50) not null) default character set utf8 engine = InnoDB;
+create table \\`book_tag2\\` (\\`id\\` bigint unsigned not null auto_increment primary key, \\`name\\` varchar(50) not null) default character set utf8 engine = InnoDB;
create table \\`publisher2\\` (\\`id\\` int unsigned not null auto_increment primary key, \\`name\\` varchar(255) not null, \\`type\\` enum('local', 'global') not null, \\`type2\\` enum('LOCAL', 'GLOBAL') not null, \\`enum1\\` tinyint null, \\`enum2\\` tinyint null, \\`enum3\\` tinyint null, \\`enum4\\` enum('a', 'b', 'c') null) default character set utf8 engine = InnoDB;
@@ -48,11 +48,11 @@ alter table \\`author2_to_author2\\` add index \\`author2_to_author2_author2_1_id_i
alter table \\`author2_to_author2\\` add index \\`author2_to_author2_author2_2_id_index\\`(\\`author2_2_id\\`);
alter table \\`author2_to_author2\\` add primary key \\`author2_to_author2_pkey\\`(\\`author2_1_id\\`, \\`author2_2_id\\`);
-create table \\`book2_to_book_tag2\\` (\\`order\\` int unsigned not null auto_increment primary key, \\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` int(11) unsigned not null) default character set utf8 engine = InnoDB;
+create table \\`book2_to_book_tag2\\` (\\`order\\` int unsigned not null auto_increment primary key, \\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` bigint unsigned not null) default character set utf8 engine = InnoDB;
alter table \\`book2_to_book_tag2\\` add index \\`book2_to_book_tag2_book2_uuid_pk_index\\`(\\`book2_uuid_pk\\`);
alter table \\`book2_to_book_tag2\\` add index \\`book2_to_book_tag2_book_tag2_id_index\\`(\\`book_tag2_id\\`);
-create table \\`book_to_tag_unordered\\` (\\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` int(11) unsigned not null) default character set utf8 engine = InnoDB;
+create table \\`book_to_tag_unordered\\` (\\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` bigint unsigned not null) default character set utf8 engine = InnoDB;
alter table \\`book_to_tag_unordered\\` add index \\`book_to_tag_unordered_book2_uuid_pk_index\\`(\\`book2_uuid_pk\\`);
alter table \\`book_to_tag_unordered\\` add index \\`book_to_tag_unordered_book_tag2_id_index\\`(\\`book_tag2_id\\`);
alter table \\`book_to_tag_unordered\\` add primary key \\`book_to_tag_unordered_pkey\\`(\\`book2_uuid_pk\\`, \\`book_tag2_id\\`);
@@ -147,7 +147,7 @@ alter table \\`book2\\` add primary key \\`book2_pkey\\`(\\`uuid_pk\\`);
alter table \\`book2\\` add index \\`book2_author_id_index\\`(\\`author_id\\`);
alter table \\`book2\\` add index \\`book2_publisher_id_index\\`(\\`publisher_id\\`);
-create table \\`book_tag2\\` (\\`id\\` int unsigned not null auto_increment primary key, \\`name\\` varchar(50) not null) default character set utf8 engine = InnoDB;
+create table \\`book_tag2\\` (\\`id\\` bigint unsigned not null auto_increment primary key, \\`name\\` varchar(50) not null) default character set utf8 engine = InnoDB;
create table \\`publisher2\\` (\\`id\\` int unsigned not null auto_increment primary key, \\`name\\` varchar(255) not null, \\`type\\` enum('local', 'global') not null, \\`type2\\` enum('LOCAL', 'GLOBAL') not null, \\`enum1\\` tinyint null, \\`enum2\\` tinyint null, \\`enum3\\` tinyint null, \\`enum4\\` enum('a', 'b', 'c') null) default character set utf8 engine = InnoDB;
@@ -173,11 +173,11 @@ alter table \\`author2_to_author2\\` add index \\`author2_to_author2_author2_1_id_i
alter table \\`author2_to_author2\\` add index \\`author2_to_author2_author2_2_id_index\\`(\\`author2_2_id\\`);
alter table \\`author2_to_author2\\` add primary key \\`author2_to_author2_pkey\\`(\\`author2_1_id\\`, \\`author2_2_id\\`);
-create table \\`book2_to_book_tag2\\` (\\`order\\` int unsigned not null auto_increment primary key, \\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` int(11) unsigned not null) default character set utf8 engine = InnoDB;
+create table \\`book2_to_book_tag2\\` (\\`order\\` int unsigned not null auto_increment primary key, \\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` bigint unsigned not null) default character set utf8 engine = InnoDB;
alter table \\`book2_to_book_tag2\\` add index \\`book2_to_book_tag2_book2_uuid_pk_index\\`(\\`book2_uuid_pk\\`);
alter table \\`book2_to_book_tag2\\` add index \\`book2_to_book_tag2_book_tag2_id_index\\`(\\`book_tag2_id\\`);
-create table \\`book_to_tag_unordered\\` (\\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` int(11) unsigned not null) default character set utf8 engine = InnoDB;
+create table \\`book_to_tag_unordered\\` (\\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` bigint unsigned not null) default character set utf8 engine = InnoDB;
alter table \\`book_to_tag_unordered\\` add index \\`book_to_tag_unordered_book2_uuid_pk_index\\`(\\`book2_uuid_pk\\`);
alter table \\`book_to_tag_unordered\\` add index \\`book_to_tag_unordered_book_tag2_id_index\\`(\\`book_tag2_id\\`);
alter table \\`book_to_tag_unordered\\` add primary key \\`book_to_tag_unordered_pkey\\`(\\`book2_uuid_pk\\`, \\`book_tag2_id\\`);
@@ -250,7 +250,7 @@ alter table \\\\"author2\\\\" add constraint \\\\"author2_name_email_unique\\\\" unique
create table \\\\"book2\\\\" (\\\\"uuid_pk\\\\" varchar(36) not null, \\\\"created_at\\\\" timestamptz(3) not null default current_timestamp(3), \\\\"title\\\\" varchar(255) null, \\\\"perex\\\\" text null, \\\\"price\\\\" float null, \\\\"double\\\\" double precision null, \\\\"meta\\\\" json null, \\\\"author_id\\\\" int4 not null, \\\\"publisher_id\\\\" int4 null);
alter table \\\\"book2\\\\" add constraint \\\\"book2_pkey\\\\" primary key (\\\\"uuid_pk\\\\");
-create table \\\\"book_tag2\\\\" (\\\\"id\\\\" serial primary key, \\\\"name\\\\" varchar(50) not null);
+create table \\\\"book_tag2\\\\" (\\\\"id\\\\" bigserial primary key, \\\\"name\\\\" varchar(50) not null);
create table \\\\"publisher2\\\\" (\\\\"id\\\\" serial primary key, \\\\"name\\\\" varchar(255) not null, \\\\"type\\\\" text check (\\\\"type\\\\" in ('local', 'global')) not null, \\\\"type2\\\\" text check (\\\\"type2\\\\" in ('LOCAL', 'GLOBAL')) not null, \\\\"enum1\\\\" int2 null, \\\\"enum2\\\\" int2 null, \\\\"enum3\\\\" int2 null, \\\\"enum4\\\\" text check (\\\\"enum4\\\\" in ('a', 'b', 'c')) null);
@@ -272,9 +272,9 @@ alter table \\\\"author_to_friend\\\\" add constraint \\\\"author_to_friend_pkey\\\\" pr
create table \\\\"author2_to_author2\\\\" (\\\\"author2_1_id\\\\" int4 not null, \\\\"author2_2_id\\\\" int4 not null);
alter table \\\\"author2_to_author2\\\\" add constraint \\\\"author2_to_author2_pkey\\\\" primary key (\\\\"author2_1_id\\\\", \\\\"author2_2_id\\\\");
-create table \\\\"book2_to_book_tag2\\\\" (\\\\"order\\\\" serial primary key, \\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" int4 not null);
+create table \\\\"book2_to_book_tag2\\\\" (\\\\"order\\\\" serial primary key, \\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" bigint not null);
-create table \\\\"book_to_tag_unordered\\\\" (\\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" int4 not null);
+create table \\\\"book_to_tag_unordered\\\\" (\\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" bigint not null);
alter table \\\\"book_to_tag_unordered\\\\" add constraint \\\\"book_to_tag_unordered_pkey\\\\" primary key (\\\\"book2_uuid_pk\\\\", \\\\"book_tag2_id\\\\");
create table \\\\"publisher2_to_test2\\\\" (\\\\"id\\\\" serial primary key, \\\\"publisher2_id\\\\" int4 not null, \\\\"test2_id\\\\" int4 not null);
@@ -363,7 +363,7 @@ alter table \\\\"author2\\\\" add constraint \\\\"author2_name_email_unique\\\\" unique
create table \\\\"book2\\\\" (\\\\"uuid_pk\\\\" varchar(36) not null, \\\\"created_at\\\\" timestamptz(3) not null default current_timestamp(3), \\\\"title\\\\" varchar(255) null, \\\\"perex\\\\" text null, \\\\"price\\\\" float null, \\\\"double\\\\" double precision null, \\\\"meta\\\\" json null, \\\\"author_id\\\\" int4 not null, \\\\"publisher_id\\\\" int4 null);
alter table \\\\"book2\\\\" add constraint \\\\"book2_pkey\\\\" primary key (\\\\"uuid_pk\\\\");
-create table \\\\"book_tag2\\\\" (\\\\"id\\\\" serial primary key, \\\\"name\\\\" varchar(50) not null);
+create table \\\\"book_tag2\\\\" (\\\\"id\\\\" bigserial primary key, \\\\"name\\\\" varchar(50) not null);
create table \\\\"publisher2\\\\" (\\\\"id\\\\" serial primary key, \\\\"name\\\\" varchar(255) not null, \\\\"type\\\\" text check (\\\\"type\\\\" in ('local', 'global')) not null, \\\\"type2\\\\" text check (\\\\"type2\\\\" in ('LOCAL', 'GLOBAL')) not null, \\\\"enum1\\\\" int2 null, \\\\"enum2\\\\" int2 null, \\\\"enum3\\\\" int2 null, \\\\"enum4\\\\" text check (\\\\"enum4\\\\" in ('a', 'b', 'c')) null);
@@ -385,9 +385,9 @@ alter table \\\\"author_to_friend\\\\" add constraint \\\\"author_to_friend_pkey\\\\" pr
create table \\\\"author2_to_author2\\\\" (\\\\"author2_1_id\\\\" int4 not null, \\\\"author2_2_id\\\\" int4 not null);
alter table \\\\"author2_to_author2\\\\" add constraint \\\\"author2_to_author2_pkey\\\\" primary key (\\\\"author2_1_id\\\\", \\\\"author2_2_id\\\\");
-create table \\\\"book2_to_book_tag2\\\\" (\\\\"order\\\\" serial primary key, \\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" int4 not null);
+create table \\\\"book2_to_book_tag2\\\\" (\\\\"order\\\\" serial primary key, \\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" bigint not null);
-create table \\\\"book_to_tag_unordered\\\\" (\\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" int4 not null);
+create table \\\\"book_to_tag_unordered\\\\" (\\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" bigint not null);
alter table \\\\"book_to_tag_unordered\\\\" add constraint \\\\"book_to_tag_unordered_pkey\\\\" primary key (\\\\"book2_uuid_pk\\\\", \\\\"book_tag2_id\\\\");
create table \\\\"publisher2_to_test2\\\\" (\\\\"id\\\\" serial primary key, \\\\"publisher2_id\\\\" int4 not null, \\\\"test2_id\\\\" int4 not null);
@@ -717,7 +717,7 @@ alter table \\`book2\\` add primary key \\`book2_pkey\\`(\\`uuid_pk\\`);
alter table \\`book2\\` add index \\`book2_author_id_index\\`(\\`author_id\\`);
alter table \\`book2\\` add index \\`book2_publisher_id_index\\`(\\`publisher_id\\`);
-create table \\`book_tag2\\` (\\`id\\` int unsigned not null auto_increment primary key, \\`name\\` varchar(50) not null) default character set utf8 engine = InnoDB;
+create table \\`book_tag2\\` (\\`id\\` bigint unsigned not null auto_increment primary key, \\`name\\` varchar(50) not null) default character set utf8 engine = InnoDB;
create table \\`publisher2\\` (\\`id\\` int unsigned not null auto_increment primary key, \\`name\\` varchar(255) not null, \\`type\\` enum('local', 'global') not null, \\`type2\\` enum('LOCAL', 'GLOBAL') not null, \\`enum1\\` tinyint null, \\`enum2\\` tinyint null, \\`enum3\\` tinyint null, \\`enum4\\` enum('a', 'b', 'c') null) default character set utf8 engine = InnoDB;
@@ -743,11 +743,11 @@ alter table \\`author2_to_author2\\` add index \\`author2_to_author2_author2_1_id_i
alter table \\`author2_to_author2\\` add index \\`author2_to_author2_author2_2_id_index\\`(\\`author2_2_id\\`);
alter table \\`author2_to_author2\\` add primary key \\`author2_to_author2_pkey\\`(\\`author2_1_id\\`, \\`author2_2_id\\`);
-create table \\`book2_to_book_tag2\\` (\\`order\\` int unsigned not null auto_increment primary key, \\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` int(11) unsigned not null) default character set utf8 engine = InnoDB;
+create table \\`book2_to_book_tag2\\` (\\`order\\` int unsigned not null auto_increment primary key, \\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` bigint unsigned not null) default character set utf8 engine = InnoDB;
alter table \\`book2_to_book_tag2\\` add index \\`book2_to_book_tag2_book2_uuid_pk_index\\`(\\`book2_uuid_pk\\`);
alter table \\`book2_to_book_tag2\\` add index \\`book2_to_book_tag2_book_tag2_id_index\\`(\\`book_tag2_id\\`);
-create table \\`book_to_tag_unordered\\` (\\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` int(11) unsigned not null) default character set utf8 engine = InnoDB;
+create table \\`book_to_tag_unordered\\` (\\`book2_uuid_pk\\` varchar(36) not null, \\`book_tag2_id\\` bigint unsigned not null) default character set utf8 engine = InnoDB;
alter table \\`book_to_tag_unordered\\` add index \\`book_to_tag_unordered_book2_uuid_pk_index\\`(\\`book2_uuid_pk\\`);
alter table \\`book_to_tag_unordered\\` add index \\`book_to_tag_unordered_book_tag2_id_index\\`(\\`book_tag2_id\\`);
alter table \\`book_to_tag_unordered\\` add primary key \\`book_to_tag_unordered_pkey\\`(\\`book2_uuid_pk\\`, \\`book_tag2_id\\`);
@@ -804,7 +804,7 @@ alter table \\\\"author2\\\\" add constraint \\\\"author2_name_email_unique\\\\" unique
create table \\\\"book2\\\\" (\\\\"uuid_pk\\\\" varchar(36) not null, \\\\"created_at\\\\" timestamptz(3) not null default current_timestamp(3), \\\\"title\\\\" varchar(255) null, \\\\"perex\\\\" text null, \\\\"price\\\\" float null, \\\\"double\\\\" double precision null, \\\\"meta\\\\" json null, \\\\"author_id\\\\" int4 not null, \\\\"publisher_id\\\\" int4 null);
alter table \\\\"book2\\\\" add constraint \\\\"book2_pkey\\\\" primary key (\\\\"uuid_pk\\\\");
-create table \\\\"book_tag2\\\\" (\\\\"id\\\\" serial primary key, \\\\"name\\\\" varchar(50) not null);
+create table \\\\"book_tag2\\\\" (\\\\"id\\\\" bigserial primary key, \\\\"name\\\\" varchar(50) not null);
create table \\\\"publisher2\\\\" (\\\\"id\\\\" serial primary key, \\\\"name\\\\" varchar(255) not null, \\\\"type\\\\" text check (\\\\"type\\\\" in ('local', 'global')) not null, \\\\"type2\\\\" text check (\\\\"type2\\\\" in ('LOCAL', 'GLOBAL')) not null, \\\\"enum1\\\\" int2 null, \\\\"enum2\\\\" int2 null, \\\\"enum3\\\\" int2 null, \\\\"enum4\\\\" text check (\\\\"enum4\\\\" in ('a', 'b', 'c')) null);
@@ -826,9 +826,9 @@ alter table \\\\"author_to_friend\\\\" add constraint \\\\"author_to_friend_pkey\\\\" pr
create table \\\\"author2_to_author2\\\\" (\\\\"author2_1_id\\\\" int4 not null, \\\\"author2_2_id\\\\" int4 not null);
alter table \\\\"author2_to_author2\\\\" add constraint \\\\"author2_to_author2_pkey\\\\" primary key (\\\\"author2_1_id\\\\", \\\\"author2_2_id\\\\");
-create table \\\\"book2_to_book_tag2\\\\" (\\\\"order\\\\" serial primary key, \\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" int4 not null);
+create table \\\\"book2_to_book_tag2\\\\" (\\\\"order\\\\" serial primary key, \\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" bigint not null);
-create table \\\\"book_to_tag_unordered\\\\" (\\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" int4 not null);
+create table \\\\"book_to_tag_unordered\\\\" (\\\\"book2_uuid_pk\\\\" varchar(36) not null, \\\\"book_tag2_id\\\\" bigint not null);
alter table \\\\"book_to_tag_unordered\\\\" add constraint \\\\"book_to_tag_unordered_pkey\\\\" primary key (\\\\"book2_uuid_pk\\\\", \\\\"book_tag2_id\\\\");
create table \\\\"publisher2_to_test2\\\\" (\\\\"id\\\\" serial primary key, \\\\"publisher2_id\\\\" int4 not null, \\\\"test2_id\\\\" int4 not null);
@@ -910,7 +910,7 @@ exports[`SchemaGenerator update schema [mysql]: mysql-update-schema-alter-column
"alter table \\`author2\\` modify \\`age\\` int(11) null default 42, modify \\`born\\` int not null default 42;
alter table \\`author2\\` drop foreign key \\`author2_favourite_author_id_foreign\\`;
alter table \\`author2\\` drop index \\`author2_favourite_author_id_index\\`;
-alter table \\`author2\\` add constraint \\`author2_favourite_author_id_foreign\\` foreign key (\\`favourite_author_id\\`) references \\`book_tag2\\` (\\`id\\`) on update cascade on delete set null;
+alter table \\`author2\\` add constraint \\`author2_favourite_author_id_foreign\\` foreign key (\\`favourite_author_id\\`) references \\`foo_bar2\\` (\\`id\\`) on update cascade on delete set null;
"
`;
@@ -977,7 +977,7 @@ alter table \\\\"author2\\\\" alter column \\\\"age\\\\" drop not null;
alter table \\\\"author2\\\\" alter column \\\\"age\\\\" type int4 using (\\\\"age\\\\"::int4);
alter table \\\\"author2\\\\" alter column \\\\"age\\\\" set default 42;
alter table \\\\"author2\\\\" drop constraint \\\\"author2_favourite_author_id_foreign\\\\";
-alter table \\\\"author2\\\\" add constraint \\\\"author2_favourite_author_id_foreign\\\\" foreign key (\\\\"favourite_author_id\\\\") references \\\\"book_tag2\\\\" (\\\\"id\\\\") on update cascade on delete set null;
+alter table \\\\"author2\\\\" add constraint \\\\"author2_favourite_author_id_foreign\\\\" foreign key (\\\\"favourite_author_id\\\\") references \\\\"foo_bar2\\\\" (\\\\"id\\\\") on update cascade on delete set null;
"
`;
diff --git a/BookTag2.ts b/BookTag2.ts
index 07a77bb..0cc3810 100644
--- a/BookTag2.ts
+++ b/BookTag2.ts
@@ -1,9 +1,12 @@
-import { Collection, Entity, ManyToMany, Property } from '../../lib';
+import { BigIntType, Collection, Entity, ManyToMany, PrimaryKey, Property, ReferenceType } from '../../lib';
import { Book2 } from './Book2';
-import { BaseEntity2 } from './BaseEntity2';
+import { MetadataStorage } from '../../lib/metadata';
@Entity()
-export class BookTag2 extends BaseEntity2 {
+export class BookTag2 {
+
+ @PrimaryKey({ type: BigIntType })
+ id!: string;
@Property({ length: 50 })
name: string;
@@ -15,7 +18,15 @@ export class BookTag2 extends BaseEntity2 {
booksUnordered!: Collection<Book2>;
constructor(name: string) {
- super();
+ const meta = MetadataStorage.getMetadata(this.constructor.name);
+ const props = meta.properties;
+
+ Object.keys(props).forEach(prop => {
+ if ([ReferenceType.ONE_TO_MANY, ReferenceType.MANY_TO_MANY].includes(props[prop].reference)) {
+ (this as any)[prop] = new Collection(this);
+ }
+ });
+
this.name = name;
}
diff --git a/mysql-schema.sql b/mysql-schema.sql
index c771ad7..50e0734 100644
--- a/mysql-schema.sql
+++ b/mysql-schema.sql
@@ -28,7 +28,7 @@ alter table `book2` add primary key `book2_pkey`(`uuid_pk`);
alter table `book2` add index `book2_author_id_index`(`author_id`);
alter table `book2` add index `book2_publisher_id_index`(`publisher_id`);
-create table `book_tag2` (`id` int unsigned not null auto_increment primary key, `name` varchar(50) not null) default character set utf8 engine = InnoDB;
+create table `book_tag2` (`id` bigint unsigned not null auto_increment primary key, `name` varchar(50) not null) default character set utf8 engine = InnoDB;
create table `publisher2` (`id` int unsigned not null auto_increment primary key, `name` varchar(255) not null, `type` enum('local', 'global') not null, `type2` enum('LOCAL', 'GLOBAL') not null, `enum1` tinyint(2) null, `enum2` tinyint(2) null, `enum3` tinyint(2) null, `enum4` enum('a', 'b', 'c') null) default character set utf8 engine = InnoDB;
@@ -56,11 +56,11 @@ alter table `author2_to_author2` add index `author2_to_author2_author2_1_id_inde
alter table `author2_to_author2` add index `author2_to_author2_author2_2_id_index`(`author2_2_id`);
alter table `author2_to_author2` add primary key `author2_to_author2_pkey`(`author2_1_id`, `author2_2_id`);
-create table `book2_to_book_tag2` (`order` int unsigned not null auto_increment primary key, `book2_uuid_pk` varchar(36) not null, `book_tag2_id` int(11) unsigned not null) default character set utf8 engine = InnoDB;
+create table `book2_to_book_tag2` (`order` int unsigned not null auto_increment primary key, `book2_uuid_pk` varchar(36) not null, `book_tag2_id` bigint unsigned not null) default character set utf8 engine = InnoDB;
alter table `book2_to_book_tag2` add index `book2_to_book_tag2_book2_uuid_pk_index`(`book2_uuid_pk`);
alter table `book2_to_book_tag2` add index `book2_to_book_tag2_book_tag2_id_index`(`book_tag2_id`);
-create table `book_to_tag_unordered` (`book2_uuid_pk` varchar(36) not null, `book_tag2_id` int(11) unsigned not null) default character set utf8 engine = InnoDB;
+create table `book_to_tag_unordered` (`book2_uuid_pk` varchar(36) not null, `book_tag2_id` bigint unsigned not null) default character set utf8 engine = InnoDB;
alter table `book_to_tag_unordered` add index `book_to_tag_unordered_book2_uuid_pk_index`(`book2_uuid_pk`);
alter table `book_to_tag_unordered` add index `book_to_tag_unordered_book_tag2_id_index`(`book_tag2_id`);
alter table `book_to_tag_unordered` add primary key `book_to_tag_unordered_pkey`(`book2_uuid_pk`, `book_tag2_id`);
diff --git a/postgre-schema.sql b/postgre-schema.sql
index 0b63d82..afe1ff3 100644
--- a/postgre-schema.sql
+++ b/postgre-schema.sql
@@ -25,7 +25,7 @@ create index "author2_terms_accepted_index" on "author2" ("terms_accepted");
create table "book2" ("uuid_pk" character varying(36) not null, "created_at" timestamptz(3) not null default current_timestamp(3), "title" varchar(255) null, "perex" text null, "price" float null, "double" numeric null, "meta" json null, "author_id" int4 not null, "publisher_id" int4 null, "foo" varchar(255) null);
alter table "book2" add constraint "book2_pkey" primary key ("uuid_pk");
-create table "book_tag2" ("id" serial primary key, "name" varchar(50) not null);
+create table "book_tag2" ("id" bigserial primary key, "name" varchar(50) not null);
create table "publisher2" ("id" serial primary key, "name" varchar(255) not null, "type" text check ("type" in ('local', 'global')) not null, "type2" text check ("type2" in ('LOCAL', 'GLOBAL')) not null, "enum1" int2 null, "enum2" int2 null, "enum3" int2 null, "enum4" text check ("enum4" in ('a', 'b', 'c')) null);
@@ -44,9 +44,9 @@ alter table "author_to_friend" add constraint "author_to_friend_pkey" primary ke
create table "author2_to_author2" ("author2_1_id" int4 not null, "author2_2_id" int4 not null);
alter table "author2_to_author2" add constraint "author2_to_author2_pkey" primary key ("author2_1_id", "author2_2_id");
-create table "book2_to_book_tag2" ("order" serial primary key, "book2_uuid_pk" varchar(36) not null, "book_tag2_id" int4 not null);
+create table "book2_to_book_tag2" ("order" serial primary key, "book2_uuid_pk" varchar(36) not null, "book_tag2_id" bigint not null);
-create table "book_to_tag_unordered" ("book2_uuid_pk" varchar(36) not null, "book_tag2_id" int4 not null, primary key ("book2_uuid_pk", "book_tag2_id"));
+create table "book_to_tag_unordered" ("book2_uuid_pk" varchar(36) not null, "book_tag2_id" bigint not null, primary key ("book2_uuid_pk", "book_tag2_id"));
create table "publisher2_to_test2" ("id" serial primary key, "publisher2_id" int4 not null, "test2_id" int4 not null);
diff --git a/types.test.ts b/types.test.ts
index 273f31f..5c856b9 100644
--- a/types.test.ts
+++ b/types.test.ts
@@ -28,6 +28,10 @@ describe('check typings', () => {
// object id allows string
assert<IsExact<Primary<Author>, ObjectId | string>>(true);
assert<IsExact<Primary<Author>, number>>(false);
+
+ // bigint support
+ assert<IsExact<Primary<BookTag2>, string>>(true);
+ assert<IsExact<Primary<BookTag2>, number>>(false);
});
test('EntityOrPrimary', async () => {
@@ -206,7 +210,10 @@ describe('check typings', () => {
assert<Has<FilterQuery<Book2>, { author: { favouriteBook?: { title?: string } } }>>(true);
assert<IsAssignable<FilterQuery<Book2>, { author: { favouriteBook: { tags: FilterValue<BookTag2> } } }>>(true);
assert<IsAssignable<FilterQuery<Book2>, { author: { favouriteBook: { tags: BookTag2[] } } }>>(true);
- assert<IsAssignable<FilterQuery<Book2>, { author: { favouriteBook: { tags: number[] } } }>>(true);
+ assert<IsAssignable<FilterQuery<Book2>, { author: { favouriteBook: { tags: string[] } } }>>(true);
+ assert<IsAssignable<FilterQuery<Book2>, { tags: string[] }>>(true);
+ assert<IsAssignable<FilterQuery<Book2>, { tags: string }>>(true);
+ assert<IsAssignable<FilterQuery<Author2>, { books: { tags: bigint[] } }>>(true);
});
test('FilterQuery ok assignments', async () => {
@@ -222,7 +229,7 @@ describe('check typings', () => {
ok01 = { books: { author: { born: new Date() } } };
ok01 = { books: { author: { born: new Date() } }, favouriteBook: {} as Book2 };
ok01 = { books: { tags: { name: 'asd' } } };
- ok01 = { books: { tags: 1 } };
+ ok01 = { books: { tags: '1' } };
ok01 = { books: { tags: { books: { title: 'asd' } } } };
ok01 = { name: 'asd' };
ok01 = { $or: [{ name: 'asd' }, { age: 18 }] };
diff --git a/yarn.lock b/yarn.lock
index 9475b57..2e2cb53 100644
--- a/yarn.lock
+++ b/yarn.lock
Binary files a/yarn.lock and b/yarn.lock differ
|
|
feat: async presets
fix: fixed various README.md files
feat: all components uses a property for init instead of events
|
86f3038bfc336744e88bb3d6ab7dfd4a36ada4e6
|
feat
|
https://github.com/tsparticles/tsparticles/commit/86f3038bfc336744e88bb3d6ab7dfd4a36ada4e6
|
async presets
fix: fixed various README.md files
feat: all components uses a property for init instead of events
|
diff --git a/.babelrc b/.babelrc
index 1c5cf21..0a5d0d1 100644
--- a/.babelrc
+++ b/.babelrc
@@ -30,6 +30,7 @@
{
"loose": true
}
- ]
+ ],
+ "@babel/transform-runtime"
]
}
diff --git a/package.json b/package.json
index 164e7d5..0aadac3 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"scripts": {
"build": "rollup -c rollup.config.js",
"dev": "rollup -c rollup.config.js -w",
- "start": "sirv public",
+ "start": "sirv public --host 127.0.0.1",
"validate": "svelte-check"
},
"license": "MIT",
diff --git a/IParticlesProps.ts b/IParticlesProps.ts
index b53d0f1..9a8fd92 100644
--- a/IParticlesProps.ts
+++ b/IParticlesProps.ts
@@ -12,6 +12,6 @@ export interface IParticlesProps {
className?: string;
canvasClassName?: string;
container?: { current: Container };
- init?: (tsParticles: Main) => void;
+ init?: (tsParticles: Main) => Promise<void>;
loaded?: (container: Container) => void;
}
diff --git a/Particles.tsx b/Particles.tsx
index 4cd64a7..5b4071a 100644
--- a/Particles.tsx
+++ b/Particles.tsx
@@ -5,6 +5,7 @@ import {
createMemo,
createSignal,
onCleanup,
+ onMount,
JSX,
} from "solid-js";
@@ -16,13 +17,10 @@ interface MutableRefObject<T> {
* @param (props:IParticlesProps) Particles component properties
*/
const Particles = (props: IParticlesProps): JSX.Element => {
+ const [init, setInit] = createSignal(false);
+
try {
const id = props.id ?? "tsparticles";
-
- if (props.init) {
- props.init(tsParticles);
- }
-
const options = createMemo(() => props.params ?? props.options ?? {});
const refContainer = props.container as MutableRefObject<
@@ -45,16 +43,38 @@ const Particles = (props: IParticlesProps): JSX.Element => {
}
};
- createEffect(() => {
- const container = tsParticles.dom().find((t) => t.id === containerId());
+ onMount(() => {
+ if (props.init) {
+ console.log("props.init present");
+
+ props.init(tsParticles).then(() => {
+ console.log("then init");
+
+ setInit(true);
+ });
+ } else {
+ setInit(true);
+ }
+ });
+
+ createEffect(async () => {
+ if (!init()) {
+ console.log("not initialized");
+
+ return;
+ }
+
+ let container = tsParticles.dom().find((t) => t.id === containerId());
container?.destroy();
if (url) {
- tsParticles.loadJSON(id, url).then(cb);
+ container = await tsParticles.loadJSON(id, url);
} else {
- tsParticles.load(id, options()).then(cb);
+ container = await tsParticles.load(id, options());
}
+
+ cb(container);
});
onCleanup(() => {
@@ -78,6 +98,8 @@ const Particles = (props: IParticlesProps): JSX.Element => {
</div>
);
} catch (e) {
+ console.log(e);
+
return <div></div>;
}
};
diff --git a/yarn.lock b/yarn.lock
index adec62e..59cfcc1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -847,6 +847,18 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
+"@babel/plugin-transform-runtime@^7.16.4":
+ version "7.16.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.4.tgz#f9ba3c7034d429c581e1bd41b4952f3db3c2c7e8"
+ integrity sha512-pru6+yHANMTukMtEZGC4fs7XPwg35v8sj5CIEmE+gEkFljFiVJxEWxx/7ZDkTK+iZRYo1bFXBtfIN95+K3cJ5A==
+ dependencies:
+ "@babel/helper-module-imports" "^7.16.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ babel-plugin-polyfill-corejs2 "^0.3.0"
+ babel-plugin-polyfill-corejs3 "^0.4.0"
+ babel-plugin-polyfill-regenerator "^0.3.0"
+ semver "^6.3.0"
+
"@babel/plugin-transform-shorthand-properties@^7.16.0":
version "7.16.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d"
diff --git a/README.md b/README.md
index d7197c9..5c628c4 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ This script **MUST** be placed after the `tsParticles` one.
A bundled script can also be used, this will include every needed plugin needed by the preset.
```html
-<script src="https://cdn.jsdelivr.net/npm/tsparticles-preset-triangles/dist/tsparticles.preset.triangles.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/tsparticles-preset-triangles/tsparticles.preset.triangles.bundle.min.js"></script>
```
### Usage
diff --git a/Particles.svelte b/Particles.svelte
index ebffe03..b8dd31a 100644
--- a/Particles.svelte
+++ b/Particles.svelte
@@ -1,54 +1,63 @@
<script lang="ts">
- import { afterUpdate, createEventDispatcher } from "svelte";
- import { Container, tsParticles } from "tsparticles-engine";
-
- export let options = {};
- export let url = "";
- export let id = "tsparticles";
-
- const dispatch = createEventDispatcher();
- const particlesInitEvent = "particlesInit";
- const particlesLoadedEvent = "particlesLoaded";
-
- let oldId = id;
-
- afterUpdate(() => {
- tsParticles.init();
-
- dispatch(particlesInitEvent, tsParticles);
-
- if (oldId) {
- const oldContainer = tsParticles.dom().find((c) => c.id === oldId);
-
- if (oldContainer) {
- oldContainer.destroy();
- }
- }
-
- if (id) {
- const cb = (container) => {
- dispatch(particlesLoadedEvent, {
- particles: container,
- });
-
- oldId = id;
- };
-
- if (url) {
- tsParticles.loadJSON(id, url).then(cb);
- } else if (options) {
- tsParticles.load(id, options).then(cb);
- } else {
- console.error("You must specify options or url to load tsParticles");
- }
- } else {
- dispatch(particlesLoadedEvent, {
- particles: undefined,
- });
- }
- });
+ import { afterUpdate, createEventDispatcher } from "svelte";
+ import { tsParticles } from "tsparticles-engine";
+
+ export let options = {};
+ export let url = "";
+ export let id = "tsparticles";
+ export let particlesInit;
+
+ const dispatch = createEventDispatcher();
+
+ const particlesLoadedEvent = "particlesLoaded";
+
+ let oldId = id;
+
+ afterUpdate(async () => {
+ tsParticles.init();
+
+ if (particlesInit) {
+ await particlesInit(tsParticles);
+ }
+
+ if (oldId) {
+ const oldContainer = tsParticles.dom().find((c) => c.id === oldId);
+
+ if (oldContainer) {
+ oldContainer.destroy();
+ }
+ }
+
+ if (id) {
+ const cb = (container) => {
+ dispatch(particlesLoadedEvent, {
+ particles: container,
+ });
+
+ oldId = id;
+ };
+
+ let container;
+
+ if (url) {
+ container = await tsParticles.loadJSON(id, url);
+ } else if (options) {
+ container = await tsParticles.load(id, options);
+ } else {
+ console.error("You must specify options or url to load tsParticles");
+
+ return;
+ }
+
+ cb(container);
+ } else {
+ dispatch(particlesLoadedEvent, {
+ particles: undefined,
+ });
+ }
+ });
</script>
-<svelte:options accessors={true} />
+<svelte:options accessors={true}/>
-<div {id} />
+<div {id}/>
diff --git a/Particles.vue b/Particles.vue
index 91faf2c..27e9562 100644
--- a/Particles.vue
+++ b/Particles.vue
@@ -36,11 +36,11 @@ export default class Particles extends Vue {
private options?: IParticlesProps;
private url?: string;
private particlesLoaded?: (container: Container) => void;
- private particlesInit?: (tsParticles: Main) => void;
+ private particlesInit?: (tsParticles: Main) => Promise<void>;
private container?: Container;
public mounted(): void {
- nextTick(() => {
+ nextTick(async () => {
if (!this.id) {
throw new Error("Prop 'id' is required!");
}
@@ -48,7 +48,7 @@ export default class Particles extends Vue {
tsParticles.init();
if (this.particlesInit) {
- this.particlesInit(tsParticles);
+ await this.particlesInit(tsParticles);
}
const cb = (container?: Container) => {
@@ -59,15 +59,9 @@ export default class Particles extends Vue {
}
};
- if (this.url) {
- tsParticles
- .loadJSON(this.id, this.url)
- .then(cb);
- } else {
- tsParticles
- .load(this.id, this.options ?? {})
- .then(cb);
- }
+ const container = await (this.url ? tsParticles.loadJSON(this.id, this.url) : tsParticles.load(this.id, this.options ?? {}));
+
+ cb(container);
});
}
diff --git a/my-component.riot b/my-component.riot
index 7ba7bdc..537b3d0 100644
--- a/my-component.riot
+++ b/my-component.riot
@@ -20,14 +20,14 @@
<script>
import RiotParticles from "riot-particles";
- import {loadFull} from "tsparticles";
+ import { loadFull } from "tsparticles";
export default {
components: {
RiotParticles
},
- particlesInit: (main) => {
- loadFull(main);
+ particlesInit: async (main) => {
+ await loadFull(main);
}
}
</script>
diff --git a/App.tsx b/App.tsx
index 82c89de..3861fce 100644
--- a/App.tsx
+++ b/App.tsx
@@ -4,15 +4,15 @@ import Particles from "solid-particles";
import type { Main } from "tsparticles-engine";
import { loadFull } from "tsparticles";
-function particlesInit(main: Main): void {
- loadFull(main);
+async function particlesInit(main: Main): Promise<void> {
+ await loadFull(main);
}
function App() {
return (
<div class="App">
<header class="App-header">
- <img src={ logo } class="App-logo" alt="logo"/>
+ <img src={logo} class="App-logo" alt="logo"/>
<p>
Edit <code>src/App.tsx</code> and save to reload.
</p>
@@ -25,7 +25,7 @@ function App() {
Learn Solid
</a>
</header>
- <Particles id="tsparticles" options={ {
+ <Particles id="tsparticles" options={{
background: {
color: "#000"
},
@@ -40,7 +40,7 @@ function App() {
enable: true
}
}
- } } init={ particlesInit }/>
+ }} init={particlesInit}/>
</div>
);
}
diff --git a/App.svelte b/App.svelte
index 209f275..c40e613 100644
--- a/App.svelte
+++ b/App.svelte
@@ -26,17 +26,11 @@
console.log(container);
- // use container to call it's methods
+ // use container to call its methods
}
- let handleParticlesInit = (e) => {
- console.log(e);
-
- const main = e.detail;
-
- loadFull(main);
-
- // use container to call it's methods
+ let particlesInit = async (main) => {
+ await loadFull(main);
}
</script>
@@ -44,7 +38,7 @@
<h1>Hello {name}!</h1>
<p>Visit the <a href="https://svelte.dev/tutorial">Svelte tutorial</a> to learn how to build Svelte apps.</p>
<Particles id="tsparticles" options={particlesConfig} on:particlesLoaded={handleParticlesLoaded}
- on:particlesInit={handleParticlesInit}/>
+ particlesInit={particlesInit}/>
</main>
<style>
diff --git a/App.vue b/App.vue
index 4479d39..d101e26 100644
--- a/App.vue
+++ b/App.vue
@@ -1,24 +1,24 @@
<template>
<div>
<h1
- class="app__title"
- align="center"
+ class="app__title"
+ align="center"
>
Welcome to tsParticles Vue3 Demo
</h1>
<CodeViewer
- :code="codeStringified"
- :optionSelected="optionSelected"
- :optionsList="optionsList"
- @change-option="changeOption"
+ :code="codeStringified"
+ :optionSelected="optionSelected"
+ :optionsList="optionsList"
+ @change-option="changeOption"
/>
-
+
<Particles
- id="tsparticles"
- :options="options"
- :key="optionSelected"
- :particlesInit="particlesInit"
+ id="tsparticles"
+ :options="options"
+ :key="optionSelected"
+ :particlesInit="particlesInit"
/>
</div>
</template>
@@ -37,10 +37,10 @@ import { loadFull } from "tsparticles";
},
})
export default class App extends Vue {
- particlesInit(main: Main) {
- loadFull(main);
+ async particlesInit(main: Main) {
+ await loadFull(main);
}
-
+
optionSelected = 'crazyParticles'
changeOption(newValue: string) {
@@ -50,7 +50,7 @@ export default class App extends Vue {
get codeStringified() {
return stringifyObject(optionsMap[this.optionSelected], {
indent: ' ',
- singleQuotes: false,
+ singleQuotes: false,
});
}
diff --git a/index.ts b/index.ts
index d14e7e1..1be9dcb 100644
--- a/index.ts
+++ b/index.ts
@@ -7,13 +7,13 @@ import { loadOpacityUpdater } from "tsparticles-updater-opacity";
import { loadOutModesUpdater } from "tsparticles-updater-out-modes";
import { loadSizeUpdater } from "tsparticles-updater-size";
-export function loadBigCirclesPreset(tsParticles: Main): void {
- loadCircleShape(tsParticles);
- loadColorUpdater(tsParticles);
- loadSizeUpdater(tsParticles);
- loadOpacityUpdater(tsParticles);
- loadOutModesUpdater(tsParticles);
- loadEmittersPlugin(tsParticles);
+export async function loadBigCirclesPreset(tsParticles: Main): Promise<void> {
+ await loadCircleShape(tsParticles);
+ await loadColorUpdater(tsParticles);
+ await loadSizeUpdater(tsParticles);
+ await loadOpacityUpdater(tsParticles);
+ await loadOutModesUpdater(tsParticles);
+ await loadEmittersPlugin(tsParticles);
tsParticles.addPreset("bigCircles", options);
tsParticles.addPreset("big-circles", options);
|
|
feat: `Scheme::try_from(&str)` (#450)
|
d40f6e1f34eb3f4664caec36727bf0aa3a396a33
|
feat
|
https://github.com/Byron/gitoxide/commit/d40f6e1f34eb3f4664caec36727bf0aa3a396a33
|
`Scheme::try_from(&str)` (#450)
|
diff --git a/lib.rs b/lib.rs
index 0464262..7ac9a59 100644
--- a/lib.rs
+++ b/lib.rs
@@ -8,11 +8,8 @@
#![deny(rust_2018_idioms, missing_docs)]
#![forbid(unsafe_code)]
+use std::convert::TryFrom;
use std::path::PathBuf;
-use std::{
- convert::TryFrom,
- fmt::{self},
-};
use bstr::{BStr, BString};
@@ -26,39 +23,8 @@ pub mod expand_path;
#[doc(inline)]
pub use expand_path::expand_path;
-/// A scheme for use in a [`Url`]
-#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
-#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
-#[allow(missing_docs)]
-pub enum Scheme {
- File,
- Git,
- Ssh,
- Http,
- Https,
- Ext(&'static str),
-}
-
-impl Scheme {
- /// Return ourselves parseable name.
- pub fn as_str(&self) -> &'static str {
- use Scheme::*;
- match self {
- File => "file",
- Git => "git",
- Ssh => "ssh",
- Http => "http",
- Https => "https",
- Ext(name) => name,
- }
- }
-}
-
-impl fmt::Display for Scheme {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- f.write_str(self.as_str())
- }
-}
+mod scheme;
+pub use scheme::Scheme;
/// A URL with support for specialized git related capabilities.
///
diff --git a/parse.rs b/parse.rs
index bc6806d..6a3b599 100644
--- a/parse.rs
+++ b/parse.rs
@@ -1,5 +1,5 @@
use std::borrow::Cow;
-use std::convert::Infallible;
+use std::convert::{Infallible, TryFrom};
use bstr::{BStr, ByteSlice};
@@ -29,14 +29,8 @@ impl From<Infallible> for Error {
}
fn str_to_protocol(s: &str) -> Result<Scheme, Error> {
- Ok(match s {
- "ssh" => Scheme::Ssh,
- "file" => Scheme::File,
- "git" => Scheme::Git,
- "http" => Scheme::Http,
- "https" => Scheme::Https,
- "rad" => Scheme::Ext("rad"),
- _ => return Err(Error::UnsupportedProtocol { protocol: s.into() }),
+ Scheme::try_from(s).map_err(|invalid| Error::UnsupportedProtocol {
+ protocol: invalid.into(),
})
}
diff --git a/scheme.rs b/scheme.rs
index d1ee19b..712a835 100644
--- a/scheme.rs
+++ b/scheme.rs
@@ -0,0 +1,51 @@
+use std::convert::TryFrom;
+
+/// A scheme for use in a [`Url`]
+#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
+#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
+#[allow(missing_docs)]
+pub enum Scheme {
+ File,
+ Git,
+ Ssh,
+ Http,
+ Https,
+ Ext(&'static str),
+}
+
+impl<'a> TryFrom<&'a str> for Scheme {
+ type Error = &'a str;
+
+ fn try_from(value: &'a str) -> Result<Self, Self::Error> {
+ Ok(match value {
+ "ssh" => Scheme::Ssh,
+ "file" => Scheme::File,
+ "git" => Scheme::Git,
+ "http" => Scheme::Http,
+ "https" => Scheme::Https,
+ "rad" => Scheme::Ext("rad"),
+ unknown => return Err(unknown),
+ })
+ }
+}
+
+impl Scheme {
+ /// Return ourselves parseable name.
+ pub fn as_str(&self) -> &'static str {
+ use Scheme::*;
+ match self {
+ File => "file",
+ Git => "git",
+ Ssh => "ssh",
+ Http => "http",
+ Https => "https",
+ Ext(name) => name,
+ }
+ }
+}
+
+impl std::fmt::Display for Scheme {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ f.write_str(self.as_str())
+ }
+}
|
|
fix(polars): handle the case of an empty `InValues` list
|
b26aa5593694db405c6c77ffc29f1f08e7b89333
|
fix
|
https://github.com/ibis-project/ibis/commit/b26aa5593694db405c6c77ffc29f1f08e7b89333
|
handle the case of an empty `InValues` list
|
diff --git a/compiler.py b/compiler.py
index 6ada29d..d8f9b82 100644
--- a/compiler.py
+++ b/compiler.py
@@ -431,6 +431,8 @@ def in_column(op, **kw):
def in_values(op, **kw):
value = translate(op.value, **kw)
options = list(map(translate, op.options))
+ if not options:
+ return pl.lit(False)
return pl.any_horizontal([value == option for option in options])
|
|
feat(pandas): implement zeroifnull
|
48e8ed10c7062bedb351585785991980406b2eda
|
feat
|
https://github.com/ibis-project/ibis/commit/48e8ed10c7062bedb351585785991980406b2eda
|
implement zeroifnull
|
diff --git a/generic.py b/generic.py
index f0122af..930fbd3 100644
--- a/generic.py
+++ b/generic.py
@@ -1214,3 +1214,19 @@ def execute_rowid(op, *args, **kwargs):
@execute_node.register(ops.TableArrayView, pd.DataFrame)
def execute_table_array_view(op, _, **kwargs):
return execute(op.table).squeeze()
+
+
+@execute_node.register(ops.ZeroIfNull, pd.Series)
+def execute_zero_if_null_series(op, data, **kwargs):
+ zero = op.arg.type().to_pandas().type(0)
+ return data.replace({np.nan: zero, None: zero, pd.NA: zero})
+
+
+@execute_node.register(
+ ops.ZeroIfNull,
+ (type(None), type(pd.NA), numbers.Real, np.integer, np.floating),
+)
+def execute_zero_if_null_scalar(op, data, **kwargs):
+ if data is None or pd.isna(data) or math.isnan(data) or np.isnan(data):
+ return op.arg.type().to_pandas().type(0)
+ return data
|
|
fix: ignore undefined values in "Globals.assign"
And categorize more globals as required
|
645c49d415c38b7c5a866990cb03b2695f16db15
|
fix
|
https://github.com/pmndrs/react-spring/commit/645c49d415c38b7c5a866990cb03b2695f16db15
|
ignore undefined values in "Globals.assign"
And categorize more globals as required
|
diff --git a/globals.ts b/globals.ts
index 4442ded..39aa62f 100644
--- a/globals.ts
+++ b/globals.ts
@@ -1,4 +1,5 @@
import { SpringInterpolator, InterpolatorConfig } from './types'
+import { ElementType } from 'react'
declare const window: {
requestAnimationFrame: (cb: (time: number) => void) => number
@@ -16,8 +17,12 @@ export interface AnimatedRef<T> {
// Required
//
+export let defaultElement: string | ElementType
+
export let applyAnimatedValues: (node: any, props: Props) => boolean | void
+export let createAnimatedInterpolation: SpringInterpolator
+
export let createStringInterpolator: (
config: InterpolatorConfig<string>
) => (input: number) => string
@@ -35,17 +40,15 @@ export let frameLoop: {
export let now = () => Date.now()
-export let colorNames: { [key: string]: number } | undefined
+export let colorNames: { [key: string]: number } | null = null as any
export let skipAnimation = false
-export let defaultElement: any
-
-export let createAnimatedStyle: ((style: any) => any) | undefined
+export let createAnimatedStyle: ((style: any) => any) | null = null as any
-export let createAnimatedTransform: ((transform: any) => any) | undefined
-
-export let createAnimatedInterpolation: SpringInterpolator
+export let createAnimatedTransform:
+ | ((transform: any) => any)
+ | null = null as any
export let createAnimatedRef: <T extends React.ElementType>(
node: React.MutableRefObject<T>,
@@ -53,10 +56,10 @@ export let createAnimatedRef: <T extends React.ElementType>(
forceUpdate: () => void
) => T | AnimatedRef<T> = node => node.current
-export let requestAnimationFrame =
- typeof window !== 'undefined' ? window.requestAnimationFrame : () => {}
+export let requestAnimationFrame: typeof window.requestAnimationFrame =
+ typeof window !== 'undefined' ? window.requestAnimationFrame : () => -1
-export let cancelAnimationFrame =
+export let cancelAnimationFrame: typeof window.cancelAnimationFrame =
typeof window !== 'undefined' ? window.cancelAnimationFrame : () => {}
//
@@ -110,5 +113,14 @@ export const assign = (globals: AnimatedGlobals): AnimatedGlobals =>
requestAnimationFrame,
cancelAnimationFrame,
},
- globals
+ pluckDefined(globals)
))
+
+// Ignore undefined values
+function pluckDefined(globals: any) {
+ const defined: any = {}
+ for (const key in globals) {
+ if (globals[key] !== void 0) defined[key] = globals[key]
+ }
+ return defined
+}
|
|
build: changed tsconfig target from es6 to es2019 (less transpilation to a reasonable target)
|
31897bbbdfad272aca69bc1d6e5190d9643a91d7
|
build
|
https://github.com/tsparticles/tsparticles/commit/31897bbbdfad272aca69bc1d6e5190d9643a91d7
|
changed tsconfig target from es6 to es2019 (less transpilation to a reasonable target)
|
diff --git a/.browserslistrc b/.browserslistrc
index 11c0f44..94dcb08 100644
--- a/.browserslistrc
+++ b/.browserslistrc
@@ -0,0 +1,2 @@
+since 2019
+not dead
diff --git a/tsconfig.json b/tsconfig.json
index 0e96517..59a3011 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,8 @@
{
"extends": "./tsconfig.base.json",
"compilerOptions": {
- "module": "commonjs",
+ "target": "ES2015",
+ "module": "CommonJS",
"outDir": "./dist"
}
}
diff --git a/tsconfig.types.json b/tsconfig.types.json
index ed5de18..89f2e6a 100644
--- a/tsconfig.types.json
+++ b/tsconfig.types.json
@@ -0,0 +1,9 @@
+{
+ "extends": "./tsconfig.base.json",
+ "compilerOptions": {
+ "target": "ESNext",
+ "module": "ESNext",
+ "declaration": true,
+ "emitDeclarationOnly": true
+ }
+}
diff --git a/tsconfig.browser.json b/tsconfig.browser.json
index 71547ae..904e849 100644
--- a/tsconfig.browser.json
+++ b/tsconfig.browser.json
@@ -1,7 +1,7 @@
{
"extends": "./tsconfig.base.json",
"compilerOptions": {
- "module": "esnext",
+ "module": "ESNext",
"outDir": "./dist/browser",
"removeComments": false
}
diff --git a/tsconfig.module.json b/tsconfig.module.json
index 9b407db..b515a84 100644
--- a/tsconfig.module.json
+++ b/tsconfig.module.json
@@ -1,7 +1,7 @@
{
"extends": "./tsconfig.base.json",
"compilerOptions": {
- "module": "esnext",
+ "module": "ESNext",
"outDir": "./dist/esm"
}
}
diff --git a/tsconfig.schema.json b/tsconfig.schema.json
index edbdbcb..e8a6982 100644
--- a/tsconfig.schema.json
+++ b/tsconfig.schema.json
@@ -1,8 +1,8 @@
{
"extends": "./tsconfig.base.json",
"compilerOptions": {
- "target": "esnext",
- "module": "esnext",
+ "target": "ESNext",
+ "module": "ESNext",
"noEmit": true
}
}
diff --git a/tsconfig.test.json b/tsconfig.test.json
index 683847e..a8749ef 100644
--- a/tsconfig.test.json
+++ b/tsconfig.test.json
@@ -1,6 +1,6 @@
{
"compilerOptions": {
- "target": "es2017",
+ "target": "ES2017",
"lib": [
"ESNext",
"ES2020",
diff --git a/tsconfig.umd.json b/tsconfig.umd.json
index 08b1966..7f88f9d 100644
--- a/tsconfig.umd.json
+++ b/tsconfig.umd.json
@@ -0,0 +1,7 @@
+{
+ "extends": "./tsconfig.base.json",
+ "compilerOptions": {
+ "module": "UMD",
+ "outDir": "./dist/umd"
+ }
+}
diff --git a/tsconfig.base.json b/tsconfig.base.json
index a51f390..ec071ff 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -2,12 +2,20 @@
"compilerOptions": {
/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
- "target": "es6",
+ "target": "ES2019",
/* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
- "module": "esnext",
+ "module": "ESNext",
/* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
"lib": [
+ "ESNext",
+ "ES2021",
+ "ES2020",
+ "ES2019",
+ "ES2018",
+ "ES2017",
+ "ES2016",
"ES2015",
+ "ES5",
"DOM"
],
/* Specify library files to be included in the compilation. */
@@ -40,13 +48,17 @@
/* Raise error on expressions and declarations with an implied 'any' type. */
"strictNullChecks": true,
/* Enable strict null checks. */
- // "strictFunctionTypes": true, /* Enable strict checking of function types. */
- // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+ "strictFunctionTypes": true,
+ /* Enable strict checking of function types. */
+ "strictBindCallApply": true,
+ /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
"strictPropertyInitialization": true,
/* Enable strict checking of property initialization in classes. */
- // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
+ "noImplicitThis": true,
+ /* Raise error on 'this' expressions with an implied 'any' type. */
"alwaysStrict": true,
/* Parse in strict mode and emit "use strict" for each source file. */
+ "useUnknownInCatchVariables": true,
/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
@@ -62,7 +74,8 @@
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
- "types": [], /* Type declaration files to be included in compilation. */
+ "types": [],
+ /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true,
/* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
|
|
test: add failing test case for projection that removes sorting
|
b9fb231447f1987b5d1763d8793865c5ba0279d5
|
test
|
https://github.com/rohankumardubey/ibis/commit/b9fb231447f1987b5d1763d8793865c5ba0279d5
|
add failing test case for projection that removes sorting
|
diff --git a/test_ddl.py b/test_ddl.py
index ffafd7b..533f25b 100644
--- a/test_ddl.py
+++ b/test_ddl.py
@@ -32,11 +32,8 @@ def awards_players_csv_connector_configs():
def test_list_tables(con):
- assert len(con.list_tables()) == 4
- assert (
- len(con.list_tables(catalog="default_catalog", database="default_database"))
- == 4
- )
+ assert len(con.list_tables())
+ assert con.list_tables(catalog="default_catalog", database="default_database")
def test_create_table_from_schema(
@@ -47,38 +44,26 @@ def test_create_table_from_schema(
schema=awards_players_schema,
tbl_properties=awards_players_csv_connector_configs,
)
- assert len(con.list_tables()) == 5
assert temp_table in con.list_tables()
assert new_table.schema() == awards_players_schema
-def test_drop_table(
- con, awards_players_schema, temp_table, awards_players_csv_connector_configs
[email protected]("temp", [True, False])
+def test_create_table(
+ con, awards_players_schema, temp_table, awards_players_csv_connector_configs, temp
):
con.create_table(
temp_table,
schema=awards_players_schema,
tbl_properties=awards_players_csv_connector_configs,
+ temp=temp,
)
- assert len(con.list_tables()) == 5
- con.drop_table(temp_table)
- assert len(con.list_tables()) == 4
- assert temp_table not in con.list_tables()
+ assert temp_table in con.list_tables()
+ if temp:
+ with pytest.raises(Py4JJavaError):
+ con.drop_table(temp_table)
+
+ con.drop_table(temp_table, temp=temp)
-def test_temp_table(
- con, awards_players_schema, temp_table, awards_players_csv_connector_configs
-):
- con.create_table(
- temp_table,
- schema=awards_players_schema,
- tbl_properties=awards_players_csv_connector_configs,
- temp=True,
- )
- assert len(con.list_tables()) == 5
- assert temp_table in con.list_tables()
- with pytest.raises(Py4JJavaError):
- con.drop_table(temp_table)
- con.drop_table(temp_table, temp=True)
- assert len(con.list_tables()) == 4
assert temp_table not in con.list_tables()
diff --git a/test_dot_sql.py b/test_dot_sql.py
index 86e7449..8ca0ded 100644
--- a/test_dot_sql.py
+++ b/test_dot_sql.py
@@ -292,3 +292,20 @@ def test_con_dot_sql_transpile(backend, con, dialect, df):
result = expr.execute()
expected = df.int_col.add(1).rename("x")
backend.assert_series_equal(result.x, expected)
+
+
+@dot_sql_notimpl
+@dot_sql_notyet
+@dot_sql_never
[email protected](["druid", "flink", "impala", "polars", "pyspark"])
+def test_order_by_no_projection(backend):
+ con = backend.connection
+ astronauts = con.table("astronauts")
+ expr = (
+ astronauts.group_by("name")
+ .agg(nbr_missions=_.count())
+ .order_by(_.nbr_missions.desc())
+ )
+
+ result = con.sql(ibis.to_sql(expr)).execute().name.iloc[:2]
+ assert set(result) == {"Ross, Jerry L.", "Chang-Diaz, Franklin R."}
|
|
build: updated websites
|
a896c47e6267bf832b8057caaf6d75a5fdb3a46d
|
build
|
https://github.com/tsparticles/tsparticles/commit/a896c47e6267bf832b8057caaf6d75a5fdb3a46d
|
updated websites
|
diff --git a/index.html b/index.html
index 1cd88c3..b11441b 100644
--- a/index.html
+++ b/index.html
@@ -737,62 +737,62 @@
></script>
<script async defer src="https://buttons.github.io/buttons.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.attract.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.bounce.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.bubble.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.connect.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.grab.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.pause.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.push.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.remove.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.repulse.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.attract.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.collisions.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.links.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.parallax.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.pjs.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.image.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.line.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.polygon.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.square.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.star.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.text.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.angle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.life.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.stroke-color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.slim.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.trail.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.absorbers.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.polygon-mask.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.roll.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.tilt.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.twinkle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.wobble.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.infection.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.hsvColor.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.light.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.repulse.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.gradient.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.orbit.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.path.curves.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.path.polygon.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.path.perlin.noise.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.path.simplex.noise.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.links.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.bubble.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.heart.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.multiline-text.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.rounded-rect.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.spiral.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.attract.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.bounce.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.bubble.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.connect.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.grab.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.pause.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.push.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.remove.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.repulse.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.attract.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.collisions.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.links.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.parallax.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.pjs.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.image.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.line.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.polygon.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.square.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.star.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.text.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.angle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.life.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.stroke-color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.slim.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.trail.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.absorbers.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.polygon-mask.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.roll.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.tilt.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.twinkle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.wobble.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.infection.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.hsvColor.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.light.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.repulse.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.gradient.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.orbit.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.path.curves.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.path.polygon.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.path.perlin.noise.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.path.simplex.noise.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.links.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.bubble.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.heart.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.multiline-text.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.rounded-rect.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.spiral.min.js"></script>
<script src="../js/demo.min.js"></script>
</body>
diff --git a/404.html b/404.html
index 14d41f7..e77057e 100644
--- a/404.html
+++ b/404.html
@@ -169,46 +169,46 @@
integrity="sha256-NP9NujdEzS5m4ZxvNqkcbxyHB0dTRy9hG13RwTVBGwo="
crossorigin="anonymous"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.attract.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.bounce.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.bubble.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.connect.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.grab.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.pause.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.push.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.remove.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.repulse.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.attract.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.collisions.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.links.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.parallax.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.pjs.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.image.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.line.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.polygon.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.square.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.star.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.text.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.angle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.life.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.stroke-color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.slim.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.trail.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.absorbers.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.polygon-mask.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.roll.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.tilt.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.twinkle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.wobble.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.attract.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.bounce.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.bubble.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.connect.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.grab.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.pause.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.push.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.remove.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.repulse.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.attract.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.collisions.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.links.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.parallax.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.pjs.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.image.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.line.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.polygon.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.square.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.star.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.text.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.angle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.life.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.stroke-color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.slim.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.trail.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.absorbers.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.polygon-mask.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.roll.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.tilt.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.twinkle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.wobble.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.min.js"></script>
<script src="/js/404.min.js"></script>
</body>
</html>
diff --git a/demo.js b/demo.js
index 028b581..52f4a4a 100644
--- a/demo.js
+++ b/demo.js
@@ -299,7 +299,7 @@
<div id="tsparticles"></div>`,
css: ``,
js: `tsParticles.load("tsparticles", ${JSON.stringify(container.options)});`,
- js_external: "https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.bundle.min.js",
+ js_external: "https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.bundle.min.js",
title: "tsParticles example",
description: "This pen was created with tsParticles from https://particles.js.org",
tags: "tsparticles, javascript, typescript, design, animation",
diff --git a/demo.min.js b/demo.min.js
index 010423e..971fd17 100644
--- a/demo.min.js
+++ b/demo.min.js
@@ -1 +1 @@
-!function(){let t,e={};const o=new Stats;o.addPanel("count","#ff8",0,(()=>{const t=tsParticles.domItem(0);if(t)return n=Math.max(t.particles.count,n),{value:t.particles.count,maxValue:n}}));let n=0;o.showPanel(2),o.dom.style.position="absolute",o.dom.style.left="3px",o.dom.style.top="3px",o.dom.id="stats-graph";function a(t,e,o){return o.indexOf(t)===e}let i=function(t,o,n){const s=o[n],r=function(t,o,n){if(t)if(t.type)switch(t.type){case"boolean":return["true","false"];case"number":case"string":return t.enum;case"array":return getSchemaValuesFromProp(t.items)}else{if(t.$ref){const a=t.$ref.split("/"),s=a[a.length-1],r=e.definitions[s];return i(r,o,n+(/I[A-Z]/.exec(s)?1:0))}if(t.anyOf){let e=[];for(const a of t.anyOf){const t=getSchemaValuesFromProp(a,o,n);for(const o of t)e.push(o)}return e.filter(a)}}}(t.properties?t.properties[s]:t,o,n);return r},s=function(t,o,n,a){try{switch(n){case"field":break;case"value":return i(e,o,0).filter((function(e){return e.includes(t)}))}}catch(t){}return null},r=function(t){tsParticles.domItem(0).refresh().then((()=>{t&&"function"==typeof t&&t()}))},c=function(){const t=document.body.querySelector(".caret-right"),e=document.body.querySelector(".caret-left"),o=document.getElementById("sidebar");o.hasAttribute("hidden")?(t.setAttribute("hidden",""),e.removeAttribute("hidden"),o.removeAttribute("hidden"),o.classList.add("d-md-block")):(e.setAttribute("hidden",""),t.removeAttribute("hidden"),o.setAttribute("hidden",""),o.classList.remove("d-md-block")),r()},d=function(){const t=tsParticles.domItem(0);t&&t.exportImage((function(t){const e=document.body.querySelector("#exportModal .modal-body .modal-body-content"),o=document.getElementById("tsparticles");e.innerHTML="",e.style.backgroundColor=o.style.backgroundColor,e.style.backgroundImage=o.style.backgroundImage,e.style.backgroundPosition=o.style.backgroundPosition,e.style.backgroundRepeat=o.style.backgroundRepeat,e.style.backgroundSize=o.style.backgroundSize;const n=new Image;n.className="img-fluid",n.onload=()=>URL.revokeObjectURL(n.src);const a=URL.createObjectURL(t);n.src=a,e.appendChild(n);new bootstrap.Modal(document.getElementById("exportModal")).show()}))},l=function(){const t=tsParticles.domItem(0);if(t){const e=document.body.querySelector("#exportModal .modal-body .modal-body-content"),o=document.createElement("div");tsParticles.set("tmp",o,{}).then((o=>{const n={};_.assignIn(n,o.options),o.destroy();const a=function t(e,o){return _.transform(e,(function(e,n,a){_.isEqual(n,o[a])||(e[a]=_.isObject(n)&&_.isObject(o[a])?t(n,o[a]):n)}))}(t.options,n);const i=JSON.stringify(a,void 0,2);e.innerHTML=`<pre style="max-height: 70vh">${i}</pre>`;const s=document.querySelector("#exportConfigCopy"),r=document.querySelector("#exportConfigDownload");s.onclick=function(){navigator.clipboard&&navigator.clipboard.writeText(i)},r.onclick=function(){const t="application/json",e=new Blob([i],{type:t}),o=URL.createObjectURL(e),n=document.createElement("a");n.download="particles.json",n.href=o,n.dataset.downloadUrl=[t,n.download,n.href].join(":");const a=document.createEvent("MouseEvents");a.initMouseEvent("click",!0,!1,window,0,0,0,0,0,!1,!1,!1,!1,0,null),n.dispatchEvent(a)};new bootstrap.Modal(document.getElementById("exportModal")).show()}))}},u=function(){const t=tsParticles.domItem(0);if(t){const e=document.getElementById("code-pen-form"),o=document.getElementById("code-pen-data"),n=(document.getElementById("tsparticles"),{html:'\\x3c!-- tsParticles - https://particles.js.org - https://github.com/matteobruni/tsparticles --\\x3e\\n<div id="tsparticles"></div>',css:"",js:`tsParticles.load("tsparticles", ${JSON.stringify(t.options)});`,js_external:"https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.bundle.min.js",title:"tsParticles example",description:"This pen was created with tsParticles from https://particles.js.org",tags:"tsparticles, javascript, typescript, design, animation",editors:"001"}),a=JSON.stringify(n).replace(/"/g,""").replace(/'/g,"'");o.value=a,e.submit()}},m=function(){const t=document.body.querySelector("#stats");t.hasAttribute("hidden")?t.removeAttribute("hidden"):t.setAttribute("hidden","")},p=function(){tsParticles.domItem(0).options.load(t.get()),r((()=>{}))},h=function(e){localStorage.presetId;localStorage.presetId=e,window.location.hash=e,function(t){const e=document.body.querySelectorAll(".preset-item"),o=e[Math.floor(Math.random()*e.length)].dataset.preset,n=localStorage.presetId||o;document.getElementById("repulse-div").className="divRepulse"===n?"d-block":"d-none",tsParticles.loadJSON("tsparticles",`../presets/${n}.json`).then((e=>{localStorage.presetId=n,window.location.hash=n,t.set(e.options),t.expandAll()}))}(t)},g=function(){h(this.dataset.preset)};window.addEventListener("hashchange",(function(){const t=document.body.querySelectorAll(".preset-item");if(window.location.hash)for(let e=0;e<t.length;e++)if(t[e].dataset.preset===window.location.hash.replace("#",""))return localStorage.presetId=window.location.hash.replace("#",""),void h(localStorage.presetId)})),window.addEventListener("load",(async()=>{const n=document.getElementById("editor");t=new JSONEditor(n,{mode:"form",modes:["code","form","view","preview","text"],autocomplete:{filter:"contain",trigger:"focus",getOptions:s},onError:function(t){alert(t.toString())},onModeChange:function(t,e){},onChange:function(){}});const a=document.body.querySelectorAll(".preset-item");if(window.location.hash)for(let t=0;t<a.length;t++)if(a[t].dataset.preset===window.location.hash.replace("#","")){localStorage.presetId=window.location.hash.replace("#","");break}localStorage.presetId||(localStorage.presetId=a[Math.floor(Math.random()*a.length)].dataset.preset),h(localStorage.presetId),fetch("../schema/options.schema.json").then((function(o){o.json().then((function(o){e=o,t.setSchema(e)}))})),document.getElementById("btnUpdate").addEventListener("click",p),document.getElementById("btnNavUpdate").addEventListener("click",p),document.getElementById("stats").appendChild(o.dom),document.getElementById("toggle-stats").addEventListener("click",m),document.getElementById("nav-toggle-stats").addEventListener("click",m),document.body.querySelector(".toggle-sidebar").addEventListener("click",c);for(const t of a)t.addEventListener("click",g);document.getElementById("export-image").addEventListener("click",d),document.getElementById("nav-export-image").addEventListener("click",d),document.getElementById("export-config").addEventListener("click",l),document.getElementById("nav-export-config").addEventListener("click",l),document.getElementById("codepen-export").addEventListener("click",u),document.getElementById("nav-codepen-export").addEventListener("click",u),function(){const t=document.body.querySelector(".caret-right"),e=document.body.querySelector(".caret-left");document.getElementById("sidebar").hasAttribute("hidden")?(e.setAttribute("hidden",""),t.removeAttribute("hidden")):(t.setAttribute("hidden",""),e.removeAttribute("hidden"))}(),function(){const t=function(){o.begin(),o.end(),requestAnimationFrame(t)};requestAnimationFrame(t)}(),await loadFull(tsParticles),await loadInfectionPlugin(tsParticles),await loadHsvColorPlugin(tsParticles),await loadLightInteraction(tsParticles),await loadParticlesRepulseInteraction(tsParticles),await loadGradientUpdater(tsParticles),await loadOrbitUpdater(tsParticles),await loadCurvesPath(tsParticles),await loadPolygonPath(tsParticles),await loadPerlinNoisePath(tsParticles),await loadSimplexNoisePath(tsParticles),await loadBubbleShape(tsParticles),await loadHeartShape(tsParticles),await loadMultilineTextShape(tsParticles),await loadRoundedRectShape(tsParticles),await loadSpiralShape(tsParticles)}))}();
+!function(){let t,e={};const o=new Stats;o.addPanel("count","#ff8",0,(()=>{const t=tsParticles.domItem(0);if(t)return n=Math.max(t.particles.count,n),{value:t.particles.count,maxValue:n}}));let n=0;o.showPanel(2),o.dom.style.position="absolute",o.dom.style.left="3px",o.dom.style.top="3px",o.dom.id="stats-graph";function a(t,e,o){return o.indexOf(t)===e}let i=function(t,o,n){const s=o[n],r=function(t,o,n){if(t)if(t.type)switch(t.type){case"boolean":return["true","false"];case"number":case"string":return t.enum;case"array":return getSchemaValuesFromProp(t.items)}else{if(t.$ref){const a=t.$ref.split("/"),s=a[a.length-1],r=e.definitions[s];return i(r,o,n+(/I[A-Z]/.exec(s)?1:0))}if(t.anyOf){let e=[];for(const a of t.anyOf){const t=getSchemaValuesFromProp(a,o,n);for(const o of t)e.push(o)}return e.filter(a)}}}(t.properties?t.properties[s]:t,o,n);return r},s=function(t,o,n,a){try{switch(n){case"field":break;case"value":return i(e,o,0).filter((function(e){return e.includes(t)}))}}catch(t){}return null},r=function(t){tsParticles.domItem(0).refresh().then((()=>{t&&"function"==typeof t&&t()}))},c=function(){const t=document.body.querySelector(".caret-right"),e=document.body.querySelector(".caret-left"),o=document.getElementById("sidebar");o.hasAttribute("hidden")?(t.setAttribute("hidden",""),e.removeAttribute("hidden"),o.removeAttribute("hidden"),o.classList.add("d-md-block")):(e.setAttribute("hidden",""),t.removeAttribute("hidden"),o.setAttribute("hidden",""),o.classList.remove("d-md-block")),r()},d=function(){const t=tsParticles.domItem(0);t&&t.exportImage((function(t){const e=document.body.querySelector("#exportModal .modal-body .modal-body-content"),o=document.getElementById("tsparticles");e.innerHTML="",e.style.backgroundColor=o.style.backgroundColor,e.style.backgroundImage=o.style.backgroundImage,e.style.backgroundPosition=o.style.backgroundPosition,e.style.backgroundRepeat=o.style.backgroundRepeat,e.style.backgroundSize=o.style.backgroundSize;const n=new Image;n.className="img-fluid",n.onload=()=>URL.revokeObjectURL(n.src);const a=URL.createObjectURL(t);n.src=a,e.appendChild(n);new bootstrap.Modal(document.getElementById("exportModal")).show()}))},l=function(){const t=tsParticles.domItem(0);if(t){const e=document.body.querySelector("#exportModal .modal-body .modal-body-content"),o=document.createElement("div");tsParticles.set("tmp",o,{}).then((o=>{const n={};_.assignIn(n,o.options),o.destroy();const a=function t(e,o){return _.transform(e,(function(e,n,a){_.isEqual(n,o[a])||(e[a]=_.isObject(n)&&_.isObject(o[a])?t(n,o[a]):n)}))}(t.options,n);const i=JSON.stringify(a,void 0,2);e.innerHTML=`<pre style="max-height: 70vh">${i}</pre>`;const s=document.querySelector("#exportConfigCopy"),r=document.querySelector("#exportConfigDownload");s.onclick=function(){navigator.clipboard&&navigator.clipboard.writeText(i)},r.onclick=function(){const t="application/json",e=new Blob([i],{type:t}),o=URL.createObjectURL(e),n=document.createElement("a");n.download="particles.json",n.href=o,n.dataset.downloadUrl=[t,n.download,n.href].join(":");const a=document.createEvent("MouseEvents");a.initMouseEvent("click",!0,!1,window,0,0,0,0,0,!1,!1,!1,!1,0,null),n.dispatchEvent(a)};new bootstrap.Modal(document.getElementById("exportModal")).show()}))}},u=function(){const t=tsParticles.domItem(0);if(t){const e=document.getElementById("code-pen-form"),o=document.getElementById("code-pen-data"),n=(document.getElementById("tsparticles"),{html:'\\x3c!-- tsParticles - https://particles.js.org - https://github.com/matteobruni/tsparticles --\\x3e\\n<div id="tsparticles"></div>',css:"",js:`tsParticles.load("tsparticles", ${JSON.stringify(t.options)});`,js_external:"https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.bundle.min.js",title:"tsParticles example",description:"This pen was created with tsParticles from https://particles.js.org",tags:"tsparticles, javascript, typescript, design, animation",editors:"001"}),a=JSON.stringify(n).replace(/"/g,""").replace(/'/g,"'");o.value=a,e.submit()}},m=function(){const t=document.body.querySelector("#stats");t.hasAttribute("hidden")?t.removeAttribute("hidden"):t.setAttribute("hidden","")},p=function(){tsParticles.domItem(0).options.load(t.get()),r((()=>{}))},h=function(e){localStorage.presetId;localStorage.presetId=e,window.location.hash=e,function(t){const e=document.body.querySelectorAll(".preset-item"),o=e[Math.floor(Math.random()*e.length)].dataset.preset,n=localStorage.presetId||o;document.getElementById("repulse-div").className="divRepulse"===n?"d-block":"d-none",tsParticles.loadJSON("tsparticles",`../presets/${n}.json`).then((e=>{localStorage.presetId=n,window.location.hash=n,t.set(e.options),t.expandAll()}))}(t)},g=function(){h(this.dataset.preset)};window.addEventListener("hashchange",(function(){const t=document.body.querySelectorAll(".preset-item");if(window.location.hash)for(let e=0;e<t.length;e++)if(t[e].dataset.preset===window.location.hash.replace("#",""))return localStorage.presetId=window.location.hash.replace("#",""),void h(localStorage.presetId)})),window.addEventListener("load",(async()=>{const n=document.getElementById("editor");t=new JSONEditor(n,{mode:"form",modes:["code","form","view","preview","text"],autocomplete:{filter:"contain",trigger:"focus",getOptions:s},onError:function(t){alert(t.toString())},onModeChange:function(t,e){},onChange:function(){}});const a=document.body.querySelectorAll(".preset-item");if(window.location.hash)for(let t=0;t<a.length;t++)if(a[t].dataset.preset===window.location.hash.replace("#","")){localStorage.presetId=window.location.hash.replace("#","");break}localStorage.presetId||(localStorage.presetId=a[Math.floor(Math.random()*a.length)].dataset.preset),h(localStorage.presetId),fetch("../schema/options.schema.json").then((function(o){o.json().then((function(o){e=o,t.setSchema(e)}))})),document.getElementById("btnUpdate").addEventListener("click",p),document.getElementById("btnNavUpdate").addEventListener("click",p),document.getElementById("stats").appendChild(o.dom),document.getElementById("toggle-stats").addEventListener("click",m),document.getElementById("nav-toggle-stats").addEventListener("click",m),document.body.querySelector(".toggle-sidebar").addEventListener("click",c);for(const t of a)t.addEventListener("click",g);document.getElementById("export-image").addEventListener("click",d),document.getElementById("nav-export-image").addEventListener("click",d),document.getElementById("export-config").addEventListener("click",l),document.getElementById("nav-export-config").addEventListener("click",l),document.getElementById("codepen-export").addEventListener("click",u),document.getElementById("nav-codepen-export").addEventListener("click",u),function(){const t=document.body.querySelector(".caret-right"),e=document.body.querySelector(".caret-left");document.getElementById("sidebar").hasAttribute("hidden")?(e.setAttribute("hidden",""),t.removeAttribute("hidden")):(t.setAttribute("hidden",""),e.removeAttribute("hidden"))}(),function(){const t=function(){o.begin(),o.end(),requestAnimationFrame(t)};requestAnimationFrame(t)}(),await loadFull(tsParticles),await loadInfectionPlugin(tsParticles),await loadHsvColorPlugin(tsParticles),await loadLightInteraction(tsParticles),await loadParticlesRepulseInteraction(tsParticles),await loadGradientUpdater(tsParticles),await loadOrbitUpdater(tsParticles),await loadCurvesPath(tsParticles),await loadPolygonPath(tsParticles),await loadPerlinNoisePath(tsParticles),await loadSimplexNoisePath(tsParticles),await loadBubbleShape(tsParticles),await loadHeartShape(tsParticles),await loadMultilineTextShape(tsParticles),await loadRoundedRectShape(tsParticles),await loadSpiralShape(tsParticles)}))}();
diff --git a/bigCircles.html b/bigCircles.html
index 7341571..1bb4fa0 100644
--- a/bigCircles.html
+++ b/bigCircles.html
@@ -149,15 +149,15 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.bigCircles.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.bigCircles.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/highlight.min.js"></script>
<script type="text/javascript">
(async () => {
diff --git a/bubbles.html b/bubbles.html
index 485be09..2365e49 100644
--- a/bubbles.html
+++ b/bubbles.html
@@ -145,15 +145,15 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.bubbles.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.bubbles.min.js"></script>
<script type="text/javascript">
(async () => {
await loadBubblesPreset(tsParticles);
diff --git a/confetti.html b/confetti.html
index 5d32a6f..ffc2d84 100644
--- a/confetti.html
+++ b/confetti.html
@@ -148,21 +148,21 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.square.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.angle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.life.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.roll.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.tilt.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.wobble.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.confetti.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.square.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.angle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.life.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.roll.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.tilt.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.wobble.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.confetti.min.js"></script>
<script type="text/javascript">
(async () => {
await loadConfettiPreset(tsParticles);
diff --git a/fire.html b/fire.html
index 5fe31ec..eb7dfe7 100644
--- a/fire.html
+++ b/fire.html
@@ -145,15 +145,15 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.push.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.fire.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.push.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.fire.min.js"></script>
<script type="text/javascript">
(async () => {
await loadFirePreset(tsParticles);
diff --git a/firefly.html b/firefly.html
index eb4aa7b..0c57bda 100644
--- a/firefly.html
+++ b/firefly.html
@@ -145,16 +145,16 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.trail.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.life.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.firefly.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.external.trail.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.life.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.firefly.min.js"></script>
<script type="text/javascript">
(async () => {
await loadFireflyPreset(tsParticles);
diff --git a/fireworks.html b/fireworks.html
index d26f2eb..5624f02 100644
--- a/fireworks.html
+++ b/fireworks.html
@@ -145,19 +145,19 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.line.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.angle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.life.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.stroke-color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.fireworks.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.line.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.angle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.life.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.stroke-color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.fireworks.min.js"></script>
<script type="text/javascript">
(async () => {
await loadFireworksPreset(tsParticles);
diff --git a/fountain.html b/fountain.html
index 2ab287b..5f9e85b 100644
--- a/fountain.html
+++ b/fountain.html
@@ -145,15 +145,15 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.fountain.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.fountain.min.js"></script>
<script type="text/javascript">
(async () => {
await loadFountainPreset(tsParticles);
diff --git a/links.html b/links.html
index 857e286..d6b6c2b 100644
--- a/links.html
+++ b/links.html
@@ -145,15 +145,15 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.links.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.links.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.links.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.links.min.js"></script>
<script type="text/javascript">
(async () => {
await loadLinksPreset(tsParticles);
diff --git a/seaAnemone.html b/seaAnemone.html
index 542658c..50161df 100644
--- a/seaAnemone.html
+++ b/seaAnemone.html
@@ -145,16 +145,16 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.path.curves.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.seaAnemone.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.path.curves.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.plugin.emitters.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.seaAnemone.min.js"></script>
<script type="text/javascript">
(async () => {
await loadSeaAnemonePreset(tsParticles);
diff --git a/snow.html b/snow.html
index b980e53..80b328d 100644
--- a/snow.html
+++ b/snow.html
@@ -147,15 +147,15 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.wobble.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.snow.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.wobble.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.snow.min.js"></script>
<script type="text/javascript">
(async () => {
await loadSnowPreset(tsParticles);
diff --git a/stars.html b/stars.html
index 6152f7f..f00c36d 100644
--- a/stars.html
+++ b/stars.html
@@ -145,14 +145,14 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.stars.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.stars.min.js"></script>
<script type="text/javascript">
(async () => {
await loadStarsPreset(tsParticles);
diff --git a/triangles.html b/triangles.html
index def9cf1..d21f471 100644
--- a/triangles.html
+++ b/triangles.html
@@ -145,15 +145,15 @@
src="//cdn.carbonads.com/carbon.js?serve=CEAI6KJL&placement=particlesjsorg"
id="_carbonads_js"
></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.links.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
- <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.triangles.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.engine.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.interaction.particles.links.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.move.base.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.shape.circle.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.color.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.opacity.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.out-modes.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.updater.size.min.js"></script>
+ <script src="https://cdn.jsdelivr.net/npm/[email protected]/tsparticles.preset.triangles.min.js"></script>
<script type="text/javascript">
(async () => {
await loadTrianglesPreset(tsParticles);
|
|
chore(deps): regenerate conda lock files
|
a7c3fabb8cde9ccd71686d23c1263fa9e0665534
|
chore
|
https://github.com/rohankumardubey/ibis/commit/a7c3fabb8cde9ccd71686d23c1263fa9e0665534
|
regenerate conda lock files
|
diff --git a/generate.sh b/generate.sh
index 5445f0c..2ba5ceb 100644
--- a/generate.sh
+++ b/generate.sh
@@ -29,6 +29,13 @@ extras=(
-e decompiler
)
template="conda-lock/{platform}-${python_version}.lock"
+
+linux_osx_extras=()
+if [ "${python_version}" != "3.11" ]; then
+ # clickhouse cityhash doesn't exist for python 3.11
+ linux_osx_extras+=(-e clickhouse)
+fi
+
conda lock \\
--file pyproject.toml \\
--file "${python_version_file}" \\
@@ -39,7 +46,7 @@ conda lock \\
--filter-extras \\
--mamba \\
--category dev --category test --category docs \\
- "${extras[@]}" -e clickhouse -e datafusion
+ "${extras[@]}" "${linux_osx_extras[@]}" -e datafusion
conda lock \\
--file pyproject.toml \\
diff --git a/linux-64-3.10.lock b/linux-64-3.10.lock
index b85ab38..701de19 100644
--- a/linux-64-3.10.lock
+++ b/linux-64-3.10.lock
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
-# input_hash: e337489aade475fb935c479cfe01d96113b1761afe68842e83a6c5e39aabf36b
+# input_hash: 364563baaac42851c70ea73b6bfb72cdfc33e70700bffeaedfc5f63a8fead819
@EXPLICIT
https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.12.7-ha878542_0.conda#ff9f73d45c4a07d6f424495288a26080
@@ -13,14 +13,14 @@ https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-12.2.0-h337968e_19.
https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-12.2.0-h46fd767_19.tar.bz2#1030b1f38c129f2634eae026f704fe60
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.10-3_cp310.conda#4eb33d14d794b0f4be116443ffed3853
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-12.2.0-h69a702a_19.tar.bz2#cd7a806282c16e1f2d39a7e80d3a3e0d
https://conda.anaconda.org/conda-forge/linux-64/libgomp-12.2.0-h65d4601_19.tar.bz2#cedcee7c064c01c403f962c9e8d3c373
https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2#73aaf86a425cc6e73fcf236a5a46396d
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-12.2.0-h65d4601_19.tar.bz2#e4c94f80aef025c17ab0828cd85ef535
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.6.2-h7f98852_0.tar.bz2#ce69a062b3080485b760378841240634
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.8.14-h0b41bf4_0.conda#2512d4aa4007fdf7b705713d73bf6967
https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2#a1fd65c7ccbf10880423d82bca54eb54
https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.18.1-h7f98852_0.tar.bz2#f26ef8098fab1f719c91eb760d63381a
https://conda.anaconda.org/conda-forge/linux-64/expat-2.5.0-h27087fc_0.tar.bz2#c4fbad8d4bddeb3c085f18cbf97fbfad
@@ -29,7 +29,7 @@ https://conda.anaconda.org/conda-forge/linux-64/fribidi-1.0.10-h36c2ea0_0.tar.bz
https://conda.anaconda.org/conda-forge/linux-64/geos-3.11.1-h27087fc_0.tar.bz2#917b9a50001fffdd89b321b5dba31e55
https://conda.anaconda.org/conda-forge/linux-64/gettext-0.21.1-h27087fc_0.tar.bz2#14947d8770185e5153fdd04d4673ed37
https://conda.anaconda.org/conda-forge/linux-64/gflags-2.2.2-he1b5a44_1004.tar.bz2#cddaf2c63ea4a5901cf09524c490ecdc
-https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h36c2ea0_2.tar.bz2#626e68ae9cc5912d6adb79d318cf962d
+https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h0b41bf4_3.conda#96f3b11872ef6fad973eac856cd2624f
https://conda.anaconda.org/conda-forge/linux-64/gmp-6.2.1-h58526e2_0.tar.bz2#b94cf2db16066b242ebd26db2facbd56
https://conda.anaconda.org/conda-forge/linux-64/graphite2-1.3.13-h58526e2_1001.tar.bz2#8c54672728e8ec6aa6db90cf2806d220
https://conda.anaconda.org/conda-forge/linux-64/icu-70.1-h27087fc_0.tar.bz2#87473a15119779e021c314249d4b4aed
@@ -37,14 +37,16 @@ https://conda.anaconda.org/conda-forge/linux-64/jpeg-9e-h0b41bf4_3.conda#c7a0692
https://conda.anaconda.org/conda-forge/linux-64/json-c-0.16-hc379101_0.tar.bz2#0e2bca6857cb73acec30387fef7c3142
https://conda.anaconda.org/conda-forge/linux-64/keyutils-1.6.1-h166bdaf_0.tar.bz2#30186d27e2c9fa62b45fb1476b7200e3
https://conda.anaconda.org/conda-forge/linux-64/lerc-4.0.0-h27087fc_0.tar.bz2#76bbff344f0134279f225174e9064c8f
-https://conda.anaconda.org/conda-forge/linux-64/libabseil-20220623.0-cxx17_h05df665_6.conda#39f6394ae835f0b16f01cbbd3bb1e8e2
+https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230125.0-cxx17_hcb278e6_1.conda#a1c65f83198fd8d0328c0a6482c6f31b
+https://conda.anaconda.org/conda-forge/linux-64/libaec-1.0.6-hcb278e6_1.conda#0f683578378cddb223e7fd24f785ab2a
https://conda.anaconda.org/conda-forge/linux-64/libbrotlicommon-1.0.9-h166bdaf_8.tar.bz2#9194c9bf9428035a05352d031462eae4
https://conda.anaconda.org/conda-forge/linux-64/libcrc32c-1.1.2-h9c3ff4c_0.tar.bz2#c965a5aa0d5c1c37ffc62dff36e28400
-https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.14-h166bdaf_0.tar.bz2#fc84a0446e4e4fb882e78d786cfb9734
+https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.17-h0b41bf4_0.conda#5cc781fd91968b11a8a7fdbee0982676
https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-h516909a_1.tar.bz2#6f8720dff19e17ce5d48cfe7f3d2f0a3
https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2#d645c6d2ac96843a2bfaccd2d62b3ac3
https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2#b62b52da46c39ee2bc3c162ac7f1804d
https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.0-h7f98852_0.tar.bz2#39b1328babf85c7c3a61636d9cd50206
+https://conda.anaconda.org/conda-forge/linux-64/libnuma-2.0.16-h0b41bf4_1.conda#28bfe2cb11357ccc5be21101a6b7ce86
https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.21-pthreads_h78a6416_3.tar.bz2#8c5963a49b6035c40646a763293fbb35
https://conda.anaconda.org/conda-forge/linux-64/libsodium-1.0.18-h36c2ea0_1.tar.bz2#c3788462a6fbddafdb413a9f9053e58d
https://conda.anaconda.org/conda-forge/linux-64/libspatialindex-1.9.3-h9c3ff4c_4.tar.bz2#d87fbe9c0ff589e802ff13872980bfd9
@@ -56,81 +58,85 @@ https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h166bdaf_4.tar.bz
https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.9.4-hcb278e6_0.conda#318b08df404f9c9be5712aaa5a6f0bb0
https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.3-h27087fc_1.tar.bz2#4acfc691e64342b9dae57cf2adc63238
https://conda.anaconda.org/conda-forge/linux-64/nspr-4.35-h27087fc_0.conda#da0ec11a6454ae19bff5b02ed881a2b1
-https://conda.anaconda.org/conda-forge/linux-64/openssl-1.1.1t-h0b41bf4_0.conda#a35dc66c4cee8c4399507d14cf1501b1
+https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-h0b41bf4_0.conda#2d833be81a21128e317325a01326d36f
https://conda.anaconda.org/conda-forge/linux-64/pixman-0.40.0-h36c2ea0_0.tar.bz2#660e72c82f2e75a6b3fe6a6e75c79f19
https://conda.anaconda.org/conda-forge/linux-64/pthread-stubs-0.4-h36c2ea0_1001.tar.bz2#22dad4df6e8630e8dff2428f6f6a7036
-https://conda.anaconda.org/conda-forge/linux-64/re2-2022.06.01-h27087fc_1.conda#68070cd09c67755f37e0db13f00a008b
-https://conda.anaconda.org/conda-forge/linux-64/snappy-1.1.9-hbd366e4_2.tar.bz2#48018e187dacc6002d3ede9c824238ac
-https://conda.anaconda.org/conda-forge/linux-64/tzcode-2022g-h166bdaf_0.conda#229620ecbc0bf2f9f04b888fd3478f79
+https://conda.anaconda.org/conda-forge/linux-64/re2-2023.02.02-hcb278e6_0.conda#ecfc7890f1bd597ba55fbda1396f46fe
+https://conda.anaconda.org/conda-forge/linux-64/snappy-1.1.10-h9fff704_0.conda#e6d228cd0bb74a51dd18f5bfce0b4115
+https://conda.anaconda.org/conda-forge/linux-64/tzcode-2023b-h0b41bf4_0.conda#54e266a59d6da0d119461e830a41f1db
https://conda.anaconda.org/conda-forge/linux-64/xorg-kbproto-1.0.7-h7f98852_1002.tar.bz2#4b230e8381279d76131116660f5a241a
https://conda.anaconda.org/conda-forge/linux-64/xorg-libice-1.0.10-h7f98852_0.tar.bz2#d6b0b50b49eccfe0be0373be628be0f3
https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.9-h7f98852_0.tar.bz2#bf6f803a544f26ebbdc3bfff272eb179
https://conda.anaconda.org/conda-forge/linux-64/xorg-libxdmcp-1.1.3-h7f98852_0.tar.bz2#be93aabceefa2fac576e971aef407908
https://conda.anaconda.org/conda-forge/linux-64/xorg-renderproto-0.11.1-h7f98852_1002.tar.bz2#06feff3d2634e3097ce2fe681474b534
-https://conda.anaconda.org/conda-forge/linux-64/xorg-xextproto-7.3.0-h7f98852_1002.tar.bz2#1e15f6ad85a7d743a2ac68dae6c82b98
+https://conda.anaconda.org/conda-forge/linux-64/xorg-xextproto-7.3.0-h0b41bf4_1003.conda#bce9f945da8ad2ae9b1d7165a64d0f87
https://conda.anaconda.org/conda-forge/linux-64/xorg-xproto-7.0.31-h7f98852_1007.tar.bz2#b4a4381d54784606820704f7b5f05a15
https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2#2161070d867d1b1204ea749c8eec4ef0
https://conda.anaconda.org/conda-forge/linux-64/yaml-0.2.5-h7f98852_2.tar.bz2#4cb3ad778ec2d5a7acbdf254eb1c42ae
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-cal-0.5.11-h95a6274_0.tar.bz2#d4e7b241fb22dd3d7be1171f813d5da3
-https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.11-ha31a3da_7.tar.bz2#2fdb96aaab883abc0766ff76c0a34483
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-cal-0.5.21-h48707d8_2.conda#de2efba4b6f1635d5682728460808487
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-compression-0.2.16-h03acc5a_5.conda#6bc5d85dbafdd7acbcc243793ae8fa05
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-sdkutils-0.1.8-h03acc5a_0.conda#347cdfafa34723feda1beed53ac7d092
+https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.14-h03acc5a_5.conda#621ec569388ccd005e974a8cb66ab869
https://conda.anaconda.org/conda-forge/linux-64/glog-0.6.0-h6f12383_0.tar.bz2#b31f3565cb84435407594e548a2fb7b2
https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-16_linux64_openblas.tar.bz2#d9b7a8639171f6c6fa0a983edabcfe2b
https://conda.anaconda.org/conda-forge/linux-64/libbrotlidec-1.0.9-h166bdaf_8.tar.bz2#4ae4d7795d33e02bd20f6b23d91caf82
https://conda.anaconda.org/conda-forge/linux-64/libbrotlienc-1.0.9-h166bdaf_8.tar.bz2#04bac51ba35ea023dc48af73c1c88c25
https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20191231-he28a2e2_2.tar.bz2#4d331e44109e3f0e19b4cb8f9b82f3e1
-https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-h9b69904_4.tar.bz2#390026683aef81db27ff1b8570ca1336
-https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.51.0-hdcd2b5c_0.conda#c42b460bae0365fb9777b1ff9d09a554
+https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-h28343ad_4.tar.bz2#4a049fc560e00e43151dc51368915fdd
+https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.52.0-h61bc06f_0.conda#613955a50485812985c059e7b269f42e
https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.39-h753d276_0.conda#e1c890aebdebbfbf87e2c917187b4416
-https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-3.20.2-h6239696_0.tar.bz2#dd9c398d02aa82219a4ea5fa69739ae7
+https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-3.21.12-h3eb15da_0.conda#4b36c68184c6c85d88c6e595a32a1ede
https://conda.anaconda.org/conda-forge/linux-64/librttopo-1.1.0-ha49c73b_12.tar.bz2#d2047c6de84b07a1db9cbe1683939956
https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.40.0-h753d276_0.tar.bz2#2e5f9a37d487e1019fd4d8113adb2f9f
-https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.10.0-haa6b8db_3.tar.bz2#89acee135f0809a18a1f4537390aa2dd
+https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.10.0-hf14f497_3.tar.bz2#d85acad4b47dff4e3def14a769a97906
https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1004.tar.bz2#b3653fdc58d03face9724f602218a904
-https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-h7463322_0.tar.bz2#3b933ea47ef8f330c4c068af25fcd6a8
-https://conda.anaconda.org/conda-forge/linux-64/libzip-1.9.2-hc869a4a_1.tar.bz2#7a268cf1386d271e576e35ae82149ef2
-https://conda.anaconda.org/conda-forge/linux-64/pandoc-2.19.2-h32600fe_1.tar.bz2#35a82883468c85ac8bf41f083c1933cf
+https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-hca2bb57_4.conda#bb808b654bdc3c783deaf107a2ffb503
+https://conda.anaconda.org/conda-forge/linux-64/libzip-1.9.2-hc929e4a_1.tar.bz2#5b122b50e738c4be5c3f2899f010d7cf
+https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.1.1-h32600fe_0.conda#68dcea6605bcebb17215d2b4efb3e1cf
https://conda.anaconda.org/conda-forge/linux-64/pcre2-10.40-hc3806b6_0.tar.bz2#69e2c796349cd9b273890bee0febfe1b
-https://conda.anaconda.org/conda-forge/linux-64/readline-8.1.2-h0f457ee_0.tar.bz2#db2ebbe2943aae81ed051a6a9af8e0fa
-https://conda.anaconda.org/conda-forge/linux-64/s2n-1.0.10-h9b69904_0.tar.bz2#9708c3ac26c20b4c4549cbe8fef937eb
+https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda#47d31b792659ce70f470b5c82fdfb7a4
+https://conda.anaconda.org/conda-forge/linux-64/s2n-1.3.41-h3358134_0.conda#6e3b75864fd97aef652c0d61bc2804be
https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.12-h27826a3_0.tar.bz2#5b8c42eb62e9fc961af70bdd6a26e168
+https://conda.anaconda.org/conda-forge/linux-64/ucx-1.14.0-ha0ee010_0.conda#7f34aae830e22c4212c14bd456c1796c
https://conda.anaconda.org/conda-forge/linux-64/xorg-libsm-1.2.3-hd9c2040_1000.tar.bz2#9e856f78d5c80d5a78f61e72d1d473a3
https://conda.anaconda.org/conda-forge/linux-64/zeromq-4.3.4-h9c3ff4c_1.tar.bz2#21743a8d2ea0c8cfbbf8fe489b0347df
https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.13-h166bdaf_4.tar.bz2#4b11e365c0275b808be78b30f904e295
https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.2-h3eb15da_6.conda#6b63daed8feeca47be78f323e793d555
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-io-0.10.5-hfb6a706_0.tar.bz2#47d6b88b0c42a8c9877f3993b49f052d
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-io-0.13.19-h5b20300_3.conda#2f8cdd45bb9983aa337a6357b12951c5
https://conda.anaconda.org/conda-forge/linux-64/blosc-1.21.3-hafa529b_0.conda#bcf0664a2dbbbb86cbd4c1e6ff10ddd6
https://conda.anaconda.org/conda-forge/linux-64/boost-cpp-1.78.0-h75c5d50_1.tar.bz2#accc1f1ca33809bbf9ad067a0a69e236
https://conda.anaconda.org/conda-forge/linux-64/brotli-bin-1.0.9-h166bdaf_8.tar.bz2#e5613f2bc717e9945840ff474419b8e4
https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-hca18f0e_1.conda#e1232042de76d24539a436d37597eb06
-https://conda.anaconda.org/conda-forge/linux-64/grpc-cpp-1.47.1-hbad87ad_6.tar.bz2#6d0f1ddd701aebf007274ee5ea9a3018
https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.15-h9772cbc_5.tar.bz2#ee08782aff2ff9b3291c967fa6bc7336
-https://conda.anaconda.org/conda-forge/linux-64/krb5-1.19.3-h3790be6_0.tar.bz2#7d862b05445123144bec92cb1acc8ef8
+https://conda.anaconda.org/conda-forge/linux-64/krb5-1.20.1-h81ceb04_0.conda#89a41adce7106749573d883b2f657d78
https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-16_linux64_openblas.tar.bz2#20bae26d0a1db73f758fc3754cab4719
https://conda.anaconda.org/conda-forge/linux-64/libglib-2.74.1-h606061b_1.tar.bz2#ed5349aa96776e00b34eccecf4a948fe
+https://conda.anaconda.org/conda-forge/linux-64/libgrpc-1.52.1-hcf146ea_1.conda#999b2527de4ab2a3472d51a5aab719c4
https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-16_linux64_openblas.tar.bz2#955d993f41f9354bf753d29864ea20ad
-https://conda.anaconda.org/conda-forge/linux-64/libthrift-0.16.0-h491838f_2.tar.bz2#9134d477d02ad9264c6ee359fa36702c
-https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.4.0-h82bc61c_5.conda#e712a63a21f9db647982971dc121cdcf
-https://conda.anaconda.org/conda-forge/linux-64/nss-3.88-he45b914_0.conda#d7a81dfb99ad8fbb88872fb7ec646e6c
-https://conda.anaconda.org/conda-forge/linux-64/orc-1.7.6-h6c59b99_0.tar.bz2#7978db6ca7b2932ccf9d3c36093f8281
-https://conda.anaconda.org/conda-forge/linux-64/python-3.10.8-h257c98d_0_cpython.conda#fa742265350d7f6d664bc13436caf4ad
+https://conda.anaconda.org/conda-forge/linux-64/libthrift-0.18.1-h5e4af38_0.conda#a2fab690ff5efa0d31cf5e27cd433faa
+https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.0-h6adf6a1_2.conda#2e648a34072eb39d7c4fc2a9981c5f0c
+https://conda.anaconda.org/conda-forge/linux-64/nss-3.89-he45b914_0.conda#2745719a58eeaab6657256a3f142f099
+https://conda.anaconda.org/conda-forge/linux-64/orc-1.8.3-hfdbbad2_0.conda#8aafd0a5ba97bf0cc451550b147a4e0a
+https://conda.anaconda.org/conda-forge/linux-64/python-3.10.10-he550d4f_0_cpython.conda#de25afc7041c103c7f510c746bb63435
https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.40.0-h4ff8645_0.tar.bz2#bb11803129cbbb53ed56f9506ff74145
https://conda.anaconda.org/conda-forge/linux-64/unixodbc-2.3.10-h583eb01_0.tar.bz2#906893193434d971b6f92839086f430d
-https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.7.2-h7f98852_0.tar.bz2#12a61e640b8894504326aadafccbb790
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.4-h0b41bf4_0.conda#ea8fbfeb976ac49cbeb594e985393514
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/linux-64/atk-1.0-2.38.0-hd4edc92_1.tar.bz2#6c72ec3e660a51736913ef6ea68c454b
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.2.7-h3541f99_13.tar.bz2#39768ba0fe69c241d54703a7f5e3119f
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.2.20-h00877a2_4.conda#cd282ae47b410df93a192b16399100d0
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-http-0.7.6-hf342b9f_0.conda#ddec786d29917630faee14b54aac584d
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
https://conda.anaconda.org/conda-forge/linux-64/backports.zoneinfo-0.2.1-py310hff52083_7.tar.bz2#02d7c823f5e6fd4bbe5562c612465aed
-https://conda.anaconda.org/conda-forge/linux-64/bitarray-2.7.2-py310h1fa729e_0.conda#acdcda77a0268d6c7c80acb671d7ec26
+https://conda.anaconda.org/conda-forge/linux-64/bitarray-2.7.3-py310h1fa729e_0.conda#03193e8062c1a0b4e21552064f8aa049
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-h166bdaf_8.tar.bz2#2ff08978892a3e8b954397c461f18418
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
https://conda.anaconda.org/conda-forge/linux-64/clickhouse-cityhash-1.0.2.3-py310hd8f1fbe_4.tar.bz2#40518690075b4630382e9ca0b47128a1
@@ -140,31 +146,32 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.6.6-py310heca2aa9_0.conda#1235d03bc69ce4633b802a91ba58b3dd
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
-https://conda.anaconda.org/conda-forge/noarch/flit-core-3.8.0-pyhd8ed1ab_0.tar.bz2#6d5e56de2e65da7aa35fd10131226efa
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.14.2-h14ed4e7_0.conda#0f69b688f52ff6da70bccb7ff7001d1d
-https://conda.anaconda.org/conda-forge/linux-64/freetds-1.3.16-h41fea10_0.conda#912ba9630b3d6287760536bf041e78b0
+https://conda.anaconda.org/conda-forge/linux-64/freetds-1.1.15-h1770fba_1.tar.bz2#9ebc291d4a9f33099a59a47f9af72a17
https://conda.anaconda.org/conda-forge/linux-64/frozenlist-1.3.3-py310h5764c6d_0.tar.bz2#25e1626333f9a0646579a162e7b174ee
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
-https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.8-hff1cb4f_1.tar.bz2#a61c6312192e7c9de71548a6706a21e6
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.10-h05c8ddd_0.conda#1a109126a43003d65b39c1cad656bc9b
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/linux-64/greenlet-2.0.2-py310heca2aa9_0.conda#2a6e2e6deb0ddf5344ac74395444e3df
+https://conda.anaconda.org/conda-forge/linux-64/grpcio-1.52.1-py310heca2aa9_1.conda#ae3c71c3af66ea2856fd33e7daa926f5
https://conda.anaconda.org/conda-forge/linux-64/gts-0.7.6-h64030ff_2.tar.bz2#112eb9b5b93f0c02e59aea4fd1967363
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-1.1.2-pyhd8ed1ab_0.conda#1a7584b46014b66568069cb6ef2253bf
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.4-py310hbf28c38_1.tar.bz2#ad5647e517ba68e2868ef2e6e6ff7723
-https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.14-h6ed2654_0.tar.bz2#dcc588839de1445d90995a0a2c4f3a39
-https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.86.0-h7bff187_1.tar.bz2#5e5f33d81f31598d87f9b849f73c30e3
+https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hfd0df8a_0.conda#aa8840cdf17ef0c6084d1e24abc7a28b
+https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.88.1-hdc1c0ab_1.conda#3d1189864d1c0ed2a5919cb067b5903d
https://conda.anaconda.org/conda-forge/linux-64/libkml-1.3.0-h37653c0_1015.tar.bz2#37d3747dd24d604f63d2610910576e63
-https://conda.anaconda.org/conda-forge/linux-64/libpq-15.1-hf695f80_1.conda#12a501b9ee0927abfc95083303b6c89f
-https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.4-h522a892_0.tar.bz2#802e43f480122a85ae6a34c1909f8f98
+https://conda.anaconda.org/conda-forge/linux-64/libpq-15.2-hb675445_0.conda#4654b17eccaba55b8581d6b9c77f53cc
+https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.4-h1daa5a0_1.conda#77003f63d1763c1e6569a02c1742c9f4
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/linux-64/lz4-4.3.2-py310h0cfdcf0_0.conda#29674148bef03cc0355e81cd069fa047
https://conda.anaconda.org/conda-forge/linux-64/markupsafe-2.1.2-py310h1fa729e_0.conda#a1f0db6709778b77b5903541eeac4032
@@ -172,24 +179,23 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.4-py310hbf28c38_1.tar.bz2#1fa34c9e9be72b7e4c3c9b95017463a3
+https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.5-py310hdf3cbec_0.conda#5311a49aaea44b73935c84a6d9a68e5f
https://conda.anaconda.org/conda-forge/linux-64/multidict-6.0.4-py310h1fa729e_0.conda#b33287be963a70f8fb4b143b4561ba62
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.2-py310h8deb116_0.conda#b7085457309e206174b8e234d90a7605
-https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.0-h7d73246_1.tar.bz2#a11b4df9271a8d7917686725aa04c8f2
+https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.0-hfec8fc6_2.conda#5ce6a42505c6e9e6151c54c3ec8d68ea
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
https://conda.anaconda.org/conda-forge/noarch/pprintpp-0.4.0-pyhd8ed1ab_5.conda#3c9f3f3f7e0a9f0b2fd9d0e2064729ba
-https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.16.0-pyhd8ed1ab_0.conda#8efaddc1c8b8ce262c4d1a7c6571c799
https://conda.anaconda.org/conda-forge/linux-64/psutil-5.9.4-py310h5764c6d_0.tar.bz2#c3c55664e9becc48e6a652e2b641961f
https://conda.anaconda.org/conda-forge/noarch/ptyprocess-0.7.0-pyhd3deb0d_0.tar.bz2#359eeb6536da0e687af562ed265ec263
https://conda.anaconda.org/conda-forge/noarch/pure-sasl-0.6.2-pyhd8ed1ab_0.tar.bz2#ac695eecf21ab48093bc33fd60b4102d
@@ -200,30 +206,24 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/linux-64/pycryptodomex-3.16.0-py310h5764c6d_0.conda#681bc14a8297b76ea10b05773e2ff4dd
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/linux-64/pyrsistent-0.19.3-py310h1fa729e_0.conda#f732bec05ecc2e302a868d971ae484e0
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-json-logger-2.0.6-pyhd8ed1ab_0.conda#525828457f46cf124526760c5400982d
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/linux-64/pyyaml-6.0-py310h5764c6d_5.tar.bz2#9e68d2ff6d98737c855b65f48dd3c597
-https://conda.anaconda.org/conda-forge/linux-64/pyzmq-25.0.0-py310h059b190_0.conda#125d2a047e37a0ff0676912c91a622ae
-https://conda.anaconda.org/conda-forge/linux-64/regex-2022.10.31-py310h5764c6d_0.tar.bz2#8fad03b61d0e8a70f03115677cb55e61
-https://conda.anaconda.org/conda-forge/noarch/rfc3986-validator-0.1.1-pyh9f0ad1d_0.tar.bz2#912a71cc01012ee38e6b90ddd561e36f
+https://conda.anaconda.org/conda-forge/linux-64/pyzmq-25.0.2-py310h059b190_0.conda#a0cf00cb5dd15f3d243f7bdab7d28800
+https://conda.anaconda.org/conda-forge/linux-64/regex-2023.3.23-py310h1fa729e_0.conda#684679589ab49049183640b15554be5d
https://conda.anaconda.org/conda-forge/linux-64/rtree-1.0.1-py310hbdcdc62_1.tar.bz2#49ad4035b71bbf7289ac1523f8023ebe
-https://conda.anaconda.org/conda-forge/linux-64/ruff-0.0.249-py310h11c32a7_0.conda#040a526549bd174c9abeba804a29cf83
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/send2trash-1.8.0-pyhd8ed1ab_0.tar.bz2#edab14119efe85c3bf131ad747e9005c
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/linux-64/ruff-0.0.259-py310h11c32a7_0.conda#d1ebc250f9eb06229c5be50f0a44ce34
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
-https://conda.anaconda.org/conda-forge/noarch/sniffio-1.3.0-pyhd8ed1ab_0.tar.bz2#dd6cbc539e74cb1f430efbd4575b9303
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -233,22 +233,23 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/linux-64/tornado-6.2-py310h5764c6d_1.tar.bz2#be4a201ac582c11d89ed7d15b3157cc3
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/linux-64/unicodedata2-15.0.0-py310h5764c6d_0.tar.bz2#e972c5a1f472561cf4a91962cb01f4b4
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.5.1-pyhd8ed1ab_0.conda#2a914654b9ade742049dab13e29571c6
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
-https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h7f98852_1.tar.bz2#536cc5db4d0a3ba0630541aec064b5e4
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h0b41bf4_2.conda#82b6df12252e6f32402b96dacc656fec
https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-h7f98852_1003.tar.bz2#f59c1242cc1dd93e72c2ee2b360979eb
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
-https://conda.anaconda.org/conda-forge/noarch/anyio-3.6.2-pyhd8ed1ab_0.tar.bz2#8ada050fa88f26916fc1e76e368a49fd
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.8.186-hecaee15_4.tar.bz2#e29dc8e8611b70cdfcc3139dba6e9001
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-auth-0.6.26-hf365957_1.conda#5f2aefd743f82e4177c997c314a55f22
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-mqtt-0.8.6-hc4349f7_12.conda#0ba6aa71b51d31d48195b26f343d926f
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-ha61ee94_1014.tar.bz2#d1a88f3ed5b52e1024b80d4bcd26a7a0
@@ -256,190 +257,187 @@ https://conda.anaconda.org/conda-forge/linux-64/cffi-1.15.1-py310h255011f_3.cond
https://conda.anaconda.org/conda-forge/linux-64/cfitsio-4.2.0-hd9d235c_0.conda#8c57a9adbafd87f5eff842abde599cb4
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
https://conda.anaconda.org/conda-forge/linux-64/contourpy-1.0.7-py310hdf3cbec_0.conda#7bf9d8c765b6b04882c719509652c6d6
-https://conda.anaconda.org/conda-forge/linux-64/coverage-7.1.0-py310h1fa729e_0.conda#da7c45dbe780f5e162011a3af44e5009
-https://conda.anaconda.org/conda-forge/linux-64/curl-7.86.0-h7bff187_1.tar.bz2#bc9567c50833f4b0d36b25caca7b34f8
+https://conda.anaconda.org/conda-forge/linux-64/coverage-7.2.2-py310h1fa729e_0.conda#8750e87414347c0208b1b2e035aa6af2
+https://conda.anaconda.org/conda-forge/linux-64/curl-7.88.1-hdc1c0ab_1.conda#2016c398f234cfa354ea704c6731b5d5
https://conda.anaconda.org/conda-forge/linux-64/cytoolz-0.12.0-py310h5764c6d_1.tar.bz2#fd18cd597d23b2b5ddde23bd5b7aec32
-https://conda.anaconda.org/conda-forge/linux-64/fastavro-1.7.1-py310h1fa729e_0.conda#0c808b2a78cfcb35d661e6496fa77318
-https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.38.0-py310h5764c6d_1.tar.bz2#12ebe92a8a578bc903bd844744f4d040
+https://conda.anaconda.org/conda-forge/linux-64/fastavro-1.7.3-py310h1fa729e_0.conda#9682ebe9bdcdfbe2ae248b8ed97ae2d3
+https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.2-py310h1fa729e_0.conda#3b354798e12b65fa8ebe1d189de6a507
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/linux-64/grpcio-1.47.1-py310h946def9_6.tar.bz2#0f9f69ca8543d9f114e69344054f2189
-https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.12.2-nompi_h2386368_100.tar.bz2#b014a5f912e0193783e48086b7bb3995
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.12.2-nompi_h4df4325_101.conda#162a25904af6586b234b2dd52ee99c61
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
-https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h18fbbfe_3.tar.bz2#ea9758cf553476ddf75c789fdd239dc5
-https://conda.anaconda.org/conda-forge/linux-64/libgoogle-cloud-2.1.0-h9ebe8e8_2.tar.bz2#e8ae8bddbc20f598706dc3ae15dbf95e
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h5aea950_4.conda#82ef57611ace65b59db35a9687264572
+https://conda.anaconda.org/conda-forge/linux-64/libgoogle-cloud-2.8.0-h0bc5f78_1.conda#bdf605748604b09602f3c841abdba817
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
-https://conda.anaconda.org/conda-forge/linux-64/maturin-0.14.13-py310h4426083_0.conda#98f82b06b7949bd91a0d3fb8aff848d5
+https://conda.anaconda.org/conda-forge/linux-64/maturin-0.14.16-py310h4426083_0.conda#07946162e03b9f5725862e7b389c0359
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
-https://conda.anaconda.org/conda-forge/linux-64/pillow-9.2.0-py310h454ad03_3.tar.bz2#eb354ff791f505b1d6f13f776359d88e
+https://conda.anaconda.org/conda-forge/linux-64/pillow-9.4.0-py310h023d228_1.conda#bbea829b541aa15df5c65bd40b8c1981
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/linux-64/polars-0.16.7-py310h4426083_0.conda#b4351b35651c1341ddfdeb8e62ed3f3a
-https://conda.anaconda.org/conda-forge/linux-64/postgresql-15.1-hdeef612_1.conda#f89d4c616e48fc8976edaf3b6a9dde0f
-https://conda.anaconda.org/conda-forge/linux-64/proj-9.1.0-h93bde94_0.tar.bz2#255c7204dda39747c3ba380d28b026d7
-https://conda.anaconda.org/conda-forge/linux-64/protobuf-3.20.2-py310hd8f1fbe_1.conda#5fe061917ac4008c9880829c04ea6a7e
+https://conda.anaconda.org/conda-forge/linux-64/polars-0.16.16-py310h4426083_0.conda#d92c4b3ca9d8569adbf1f0d521d3b5f5
+https://conda.anaconda.org/conda-forge/linux-64/postgresql-15.2-h3248436_0.conda#4dbd6c4bc33369751a4d728b392943ba
+https://conda.anaconda.org/conda-forge/linux-64/proj-9.1.1-h8ffa02c_2.conda#c264aea0e16bba26afa0a0940e954492
+https://conda.anaconda.org/conda-forge/linux-64/protobuf-4.21.12-py310heca2aa9_0.conda#90bb7e1b729c4b50272cf78be97ab912
https://conda.anaconda.org/conda-forge/linux-64/psycopg2-2.9.3-py310h416cc33_2.conda#c37b231d9031334c8d07a5b183749d27
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
-https://conda.anaconda.org/conda-forge/linux-64/pymssql-2.2.7-py310heca2aa9_0.conda#4d693e2a608410cdd96849685cadc62a
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/linux-64/pymssql-2.2.5-py310hd8f1fbe_2.tar.bz2#f288e5854c7d500b002e7b5aa6d1ef6c
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/linux-64/pytz-deprecation-shim-0.1.0.post0-py310hff52083_3.tar.bz2#82aa6b712a8268bc74d25b4a254b7dbc
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
-https://conda.anaconda.org/conda-forge/noarch/rfc3339-validator-0.1.4-pyhd8ed1ab_0.tar.bz2#fed45fc5ea0813240707998abe49f520
https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf410858b2cefc267316408a77c436
https://conda.anaconda.org/conda-forge/linux-64/shapely-1.8.5-py310h5b266fc_2.tar.bz2#c4a3707d6a630facb6cf7ed8e0d37326
https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-1.4.46-py310h1fa729e_0.conda#7d70e0b7322c6e9b1f69d72d46af865d
-https://conda.anaconda.org/conda-forge/noarch/terminado-0.17.1-pyh41d4057_0.conda#3788984d535770cad699efaeb6cb3037
https://conda.anaconda.org/conda-forge/linux-64/thrift-0.16.0-py310hd8f1fbe_2.tar.bz2#51baafd32af4f606f455bce5fa784c70
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/linux-64/watchdog-2.2.1-py310hff52083_0.conda#3a50904a55921d7d0d72fc6e90211d28
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/linux-64/watchdog-3.0.0-py310hff52083_0.conda#7fd99455953539786322bad15affa308
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/linux-64/xerces-c-3.2.4-h55805fa_1.tar.bz2#d127dc8efe24033b306180939e51e6af
https://conda.anaconda.org/conda-forge/linux-64/yarl-1.8.2-py310h5764c6d_0.conda#a88cda17074955bdb5e93b8e3be59e7d
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
-https://conda.anaconda.org/conda-forge/linux-64/argon2-cffi-bindings-21.2.0-py310h5764c6d_3.tar.bz2#12f70cd23e4ea88f913dba50b0f0aba0
-https://conda.anaconda.org/conda-forge/linux-64/arrow-cpp-8.0.1-py310h4f1c134_2_cpu.tar.bz2#a701f00bfad1094e55fb1a25d4746106
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-s3-0.2.7-h909e904_1.conda#7cb3fd9464ed9aaf8189837fe9d96c28
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py310h5764c6d_1005.tar.bz2#87669c3468dff637bbd0363bc0f895cf
-https://conda.anaconda.org/conda-forge/linux-64/cryptography-38.0.4-py310h597c629_0.conda#7581a8173640b98c7f916c966f67ac72
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/linux-64/cryptography-38.0.4-py310h600f1e7_0.conda#f999dcc21fe27ad97a8afcfa590daa14
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
-https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.7.1-ha76d385_4.tar.bz2#6a613710a0f19aba3a5dfe83bf1c1c0f
+https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.7.1-h7a142b4_6.conda#b7963c107ed1f6a95cadc244f95cd3cd
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
https://conda.anaconda.org/conda-forge/linux-64/google-crc32c-1.1.2-py310he8fe98e_4.tar.bz2#eacd2681883d37f27440cf5cd779bef2
https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-6.0.0-h8e241bc_0.conda#448fe40d2fed88ccf4d9ded37cbb2b38
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
-https://conda.anaconda.org/conda-forge/noarch/jupyter_server_terminals-0.4.4-pyhd8ed1ab_1.conda#7c0965e1d4a0ee1529e8eaa03a78a5b3
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/linux-64/kealib-1.5.0-ha7026e8_0.conda#c948b920f45fd81a2dde8b1ab514cc84
-https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.8.1-nompi_h261ec11_106.tar.bz2#9b25de670ce5753a33c18b1090d1d3bf
-https://conda.anaconda.org/conda-forge/linux-64/libspatialite-5.0.1-h7c8129e_22.tar.bz2#23abed7562ad969493b89ad0e5f5c521
+https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.9.1-nompi_h34a3ff0_101.conda#9ce7f5bde721be2f82da9f861c57f1b3
+https://conda.anaconda.org/conda-forge/linux-64/libspatialite-5.0.1-h221c8f1_23.conda#859297085081cfbc123dc60015864f6b
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.0-py310he60537e_0.conda#83a21bbd1c6fbeb339ba914fb5e5c02d
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
+https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.1-py310he60537e_0.conda#68b2dd34c69d08b05a9db5e3596fe3ee
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
https://conda.anaconda.org/conda-forge/linux-64/pandas-1.5.3-py310h9b08913_0.conda#467244b0dbb7da40927ac6ee0e9491de
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
-https://conda.anaconda.org/conda-forge/linux-64/poppler-22.12.0-h92391eb_0.conda#7ad6d858f5615f9b0e9e4bd60395ea75
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/linux-64/poppler-23.03.0-h091648b_0.conda#a449be485743e64ed48d340d5424774d
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
-https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.4.1-py310hfc24d34_0.conda#c126f81b5cea6b2d4a64d0744249a26f
+https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.4.1-py310h15e2413_1.conda#5be35366687def87437d210fd673100c
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.13.2-hc2ae436_0.conda#8cb0b84db929d2b32fffbd93c497e5ee
-https://conda.anaconda.org/conda-forge/linux-64/tzlocal-4.2-py310hff52083_2.tar.bz2#3bf45672f7bb89916c06cd5e19e8710d
+https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.13.2-hd532e3d_0.conda#6d97164f19dbd27575ef1899b02dc1e0
+https://conda.anaconda.org/conda-forge/linux-64/tzlocal-4.3-py310hff52083_0.conda#d363eda493802840269f06e445414692
+https://conda.anaconda.org/conda-forge/linux-64/ukkonen-1.0.1-py310hbf28c38_3.tar.bz2#703ff1ac7d1b27fb5944b8052b5d1edb
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
https://conda.anaconda.org/conda-forge/linux-64/aiohttp-3.8.4-py310h1fa729e_0.conda#ad96f1f4a5a53f6e474953539d0f73ea
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/argon2-cffi-21.3.0-pyhd8ed1ab_0.tar.bz2#a0b402db58f73aaab8ee0ca1025a362e
+https://conda.anaconda.org/conda-forge/linux-64/aws-crt-cpp-0.19.8-hf7fbfca_12.conda#c2940067a049037ec1789ccfcb853fb4
https://conda.anaconda.org/conda-forge/linux-64/black-23.1.0-py310hff52083_0.conda#079d6366d57f7aff0e674620a8b68a33
https://conda.anaconda.org/conda-forge/linux-64/clickhouse-driver-0.2.5-py310h5764c6d_0.conda#18ab2576a5c54e1d0704f9f341e72bce
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.2.0-py310hff52083_0.conda#fe002e7c5030e7baec9e0f9a6cdbe15e
-https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.6.3-pyhd8ed1ab_0.conda#d98c5196ab6ffeb0c2feca2912801353
-https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.6.1-h896b04b_1.conda#0ef3cdacbcefb93d2e94b017db6d9c8a
+https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.3.0-py310hff52083_0.conda#49428e10aae69baa6b34cb7e275f1ae9
+https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.6.2-h6c674c2_9.conda#d6023c0a9a1b0c04c78d0d33d98e6620
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
-https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.13-hd33c08f_0.conda#e3b13445b8ee9d6a3d53a714f89ccd76
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
+https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.14-hd33c08f_0.conda#a8b9e35dd7be2c945b0de4fe19a7c3a9
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/linux-64/gdal-3.6.1-py310hb0f0f5e_1.conda#83b5fe67f903e60a9c0fc47282642b24
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.10.57-h17c43bd_8.conda#a318ddbd962b0ec5639cc4fb7e9b2230
+https://conda.anaconda.org/conda-forge/linux-64/gdal-3.6.2-py310hc1b7723_9.conda#9ba152894e33875f9501e7bec0755674
https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-h90689f9_2.tar.bz2#957a0255ab58aaf394a91725d73ab422
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyh41d4057_0.conda#4703355103974293bbd8a32449b3ff28
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.54.4-h7abd40a_0.tar.bz2#921e53675ed5ea352f022b79abab076a
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
-https://conda.anaconda.org/conda-forge/linux-64/pyarrow-8.0.1-py310h9be7b57_2_cpu.tar.bz2#27c949ff91ecf4a484956d8d082740e3
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
-https://conda.anaconda.org/conda-forge/linux-64/datafusion-0.7.0-py310h4426083_0.conda#3bd49f96523180fce973240e697db2a3
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/linux-64/fiona-1.8.22-py310ha325b7b_5.conda#4dbdf48d4712e8906595291f38423eff
-https://conda.anaconda.org/conda-forge/linux-64/graphviz-7.0.5-h2e5815a_0.conda#96bf06b24d74a5bf826485e9032c9312
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh210e3f2_0.conda#f4c469f01c4aa05f77ab2f70c2fbbef2
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/linux-64/fiona-1.9.1-py310ha325b7b_0.conda#dd86e4232f30ee17fabd28b1020f75a2
+https://conda.anaconda.org/conda-forge/linux-64/graphviz-7.1.0-h2e5815a_0.conda#e7ecda996c443142a0e9c379f3b28e48
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyh41d4057_0.conda#c8f4db8b2fc42692b3b7f1e348b2ab59
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/linux-64/libarrow-11.0.0-h93537a5_13_cpu.conda#49d5c8c33c0d1db3362058d45da6af69
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/linux-64/python-duckdb-0.7.0-py310h13fce15_1.conda#ae42049f122c8ebbba8a5520d5cde8c3
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/linux-64/arrow-cpp-11.0.0-ha770c72_13_cpu.conda#26ab48029304dce678b7084206415e03
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh210e3f2_0.conda#1b463a5f4b7c83f509f6a1168a6ef554
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
-https://conda.anaconda.org/conda-forge/linux-64/snowflake-connector-python-2.8.3-py310h1948b5c_0.conda#915ed8f2b3b9313bf89c3815050980b9
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
-https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.3.0-pyhd8ed1ab_0.conda#644c60cdd1e85407fc28b9085438c7a0
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/linux-64/scipy-1.10.0-py310h8deb116_2.conda#a12933d43fc0e55c2e5e00f56196108c
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
+https://conda.anaconda.org/conda-forge/linux-64/scipy-1.10.1-py310h8deb116_0.conda#4c9604c5ec179c21f8f0a09e3c164480
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
-https://conda.anaconda.org/conda-forge/noarch/notebook-shim-0.2.2-pyhd8ed1ab_0.tar.bz2#40be846cd4e78672a40e43db9dae753c
+https://conda.anaconda.org/conda-forge/linux-64/pyarrow-11.0.0-py310h633f555_13_cpu.conda#502e78eaa1dd2577a06d210a6d5b2890
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/linux-64/scikit-learn-1.2.1-py310h209a8ca_0.conda#3ffef54f2577d392e8d8790b3815ced6
-https://conda.anaconda.org/conda-forge/linux-64/google-cloud-bigquery-core-3.4.2-py310hff52083_0.conda#eb287ab67b6321f123cda2050cc1b2c9
+https://conda.anaconda.org/conda-forge/linux-64/scikit-learn-1.2.2-py310h41b6a48_1.conda#7d06046647be68f5cbf331532d020a71
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/linux-64/datafusion-0.7.0-py310h4426083_0.conda#3bd49f96523180fce973240e697db2a3
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
-https://conda.anaconda.org/conda-forge/noarch/nbclassic-0.5.2-pyhd8ed1ab_0.conda#c5039404bd47fbdc811b5e9282c51afe
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/linux-64/python-duckdb-0.7.1-py310h13fce15_0.conda#c110a1f253bd834d40f91e4c5d752a6b
+https://conda.anaconda.org/conda-forge/linux-64/snowflake-connector-python-3.0.2-py310hf85a2ed_0.conda#dfd2056d2d29b93c66588f2640287b39
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.2-pyha770c72_1.tar.bz2#7bf26ca095481f206e6f9dd7681085fe
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-3.6.1-pyha770c72_0.tar.bz2#03cd073d4dc0623b857bf9e175d0f736
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-7.7.1-pyhd8ed1ab_0.tar.bz2#96ba78bf526df670bf9562d6100eb627
-https://conda.anaconda.org/conda-forge/linux-64/google-cloud-bigquery-3.4.2-py310hff52083_0.conda#c2ca1e382774df71c4ac8df78b3ab080
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
diff --git a/linux-64-3.11.lock b/linux-64-3.11.lock
index f225062..295cbe2 100644
--- a/linux-64-3.11.lock
+++ b/linux-64-3.11.lock
@@ -0,0 +1,440 @@
+# Generated by conda-lock.
+# platform: linux-64
+# input_hash: ba4c66ab1a9a5f6544513cad565377fb4eeee96bf34a32ca37671225f20ff5b5
+@EXPLICIT
+https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
+https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.12.7-ha878542_0.conda#ff9f73d45c4a07d6f424495288a26080
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-dejavu-sans-mono-2.37-hab24e00_0.tar.bz2#0c96522c6bdaed4b1566d11387caaf45
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-3.000-h77eed37_0.tar.bz2#34893075a5c9e55cdafac56607368fc6
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77eed37_0.tar.bz2#4d59c254e01d9cde7957100457e2d5fb
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
+https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-h41732ed_0.conda#7aca3059a1729aa76c597603f10b0dd3
+https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-12.2.0-h337968e_19.tar.bz2#164b4b1acaedc47ee7e658ae6b308ca3
+https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-12.2.0-h46fd767_19.tar.bz2#1030b1f38c129f2634eae026f704fe60
+https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
+https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.11-3_cp311.conda#c2e2630ddb68cf52eec74dc7dfab20b5
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
+https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
+https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-12.2.0-h69a702a_19.tar.bz2#cd7a806282c16e1f2d39a7e80d3a3e0d
+https://conda.anaconda.org/conda-forge/linux-64/libgomp-12.2.0-h65d4601_19.tar.bz2#cedcee7c064c01c403f962c9e8d3c373
+https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2#73aaf86a425cc6e73fcf236a5a46396d
+https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
+https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-12.2.0-h65d4601_19.tar.bz2#e4c94f80aef025c17ab0828cd85ef535
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.8.14-h0b41bf4_0.conda#2512d4aa4007fdf7b705713d73bf6967
+https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2#a1fd65c7ccbf10880423d82bca54eb54
+https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.18.1-h7f98852_0.tar.bz2#f26ef8098fab1f719c91eb760d63381a
+https://conda.anaconda.org/conda-forge/linux-64/expat-2.5.0-h27087fc_0.tar.bz2#c4fbad8d4bddeb3c085f18cbf97fbfad
+https://conda.anaconda.org/conda-forge/linux-64/freexl-1.0.6-h166bdaf_1.tar.bz2#897e772a157faf3330d72dd291486f62
+https://conda.anaconda.org/conda-forge/linux-64/fribidi-1.0.10-h36c2ea0_0.tar.bz2#ac7bc6a654f8f41b352b38f4051135f8
+https://conda.anaconda.org/conda-forge/linux-64/geos-3.11.1-h27087fc_0.tar.bz2#917b9a50001fffdd89b321b5dba31e55
+https://conda.anaconda.org/conda-forge/linux-64/gettext-0.21.1-h27087fc_0.tar.bz2#14947d8770185e5153fdd04d4673ed37
+https://conda.anaconda.org/conda-forge/linux-64/gflags-2.2.2-he1b5a44_1004.tar.bz2#cddaf2c63ea4a5901cf09524c490ecdc
+https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h0b41bf4_3.conda#96f3b11872ef6fad973eac856cd2624f
+https://conda.anaconda.org/conda-forge/linux-64/gmp-6.2.1-h58526e2_0.tar.bz2#b94cf2db16066b242ebd26db2facbd56
+https://conda.anaconda.org/conda-forge/linux-64/graphite2-1.3.13-h58526e2_1001.tar.bz2#8c54672728e8ec6aa6db90cf2806d220
+https://conda.anaconda.org/conda-forge/linux-64/icu-70.1-h27087fc_0.tar.bz2#87473a15119779e021c314249d4b4aed
+https://conda.anaconda.org/conda-forge/linux-64/jpeg-9e-h0b41bf4_3.conda#c7a069243e1fbe9a556ed2ec030e6407
+https://conda.anaconda.org/conda-forge/linux-64/json-c-0.16-hc379101_0.tar.bz2#0e2bca6857cb73acec30387fef7c3142
+https://conda.anaconda.org/conda-forge/linux-64/keyutils-1.6.1-h166bdaf_0.tar.bz2#30186d27e2c9fa62b45fb1476b7200e3
+https://conda.anaconda.org/conda-forge/linux-64/lerc-4.0.0-h27087fc_0.tar.bz2#76bbff344f0134279f225174e9064c8f
+https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230125.0-cxx17_hcb278e6_1.conda#a1c65f83198fd8d0328c0a6482c6f31b
+https://conda.anaconda.org/conda-forge/linux-64/libaec-1.0.6-hcb278e6_1.conda#0f683578378cddb223e7fd24f785ab2a
+https://conda.anaconda.org/conda-forge/linux-64/libbrotlicommon-1.0.9-h166bdaf_8.tar.bz2#9194c9bf9428035a05352d031462eae4
+https://conda.anaconda.org/conda-forge/linux-64/libcrc32c-1.1.2-h9c3ff4c_0.tar.bz2#c965a5aa0d5c1c37ffc62dff36e28400
+https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.17-h0b41bf4_0.conda#5cc781fd91968b11a8a7fdbee0982676
+https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-h516909a_1.tar.bz2#6f8720dff19e17ce5d48cfe7f3d2f0a3
+https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2#d645c6d2ac96843a2bfaccd2d62b3ac3
+https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2#b62b52da46c39ee2bc3c162ac7f1804d
+https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.0-h7f98852_0.tar.bz2#39b1328babf85c7c3a61636d9cd50206
+https://conda.anaconda.org/conda-forge/linux-64/libnuma-2.0.16-h0b41bf4_1.conda#28bfe2cb11357ccc5be21101a6b7ce86
+https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.21-pthreads_h78a6416_3.tar.bz2#8c5963a49b6035c40646a763293fbb35
+https://conda.anaconda.org/conda-forge/linux-64/libsodium-1.0.18-h36c2ea0_1.tar.bz2#c3788462a6fbddafdb413a9f9053e58d
+https://conda.anaconda.org/conda-forge/linux-64/libspatialindex-1.9.3-h9c3ff4c_4.tar.bz2#d87fbe9c0ff589e802ff13872980bfd9
+https://conda.anaconda.org/conda-forge/linux-64/libtool-2.4.7-h27087fc_0.conda#f204c8ba400ec475452737094fb81d52
+https://conda.anaconda.org/conda-forge/linux-64/libutf8proc-2.8.0-h166bdaf_0.tar.bz2#ede4266dc02e875fe1ea77b25dd43747
+https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.32.1-h7f98852_1000.tar.bz2#772d69f030955d9646d3d0eaf21d859d
+https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.2.4-h166bdaf_0.tar.bz2#ac2ccf7323d21f2994e4d1f5da664f37
+https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h166bdaf_4.tar.bz2#f3f9de449d32ca9b9c66a22863c96f41
+https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.9.4-hcb278e6_0.conda#318b08df404f9c9be5712aaa5a6f0bb0
+https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.3-h27087fc_1.tar.bz2#4acfc691e64342b9dae57cf2adc63238
+https://conda.anaconda.org/conda-forge/linux-64/nspr-4.35-h27087fc_0.conda#da0ec11a6454ae19bff5b02ed881a2b1
+https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-h0b41bf4_0.conda#2d833be81a21128e317325a01326d36f
+https://conda.anaconda.org/conda-forge/linux-64/pixman-0.40.0-h36c2ea0_0.tar.bz2#660e72c82f2e75a6b3fe6a6e75c79f19
+https://conda.anaconda.org/conda-forge/linux-64/pthread-stubs-0.4-h36c2ea0_1001.tar.bz2#22dad4df6e8630e8dff2428f6f6a7036
+https://conda.anaconda.org/conda-forge/linux-64/re2-2023.02.02-hcb278e6_0.conda#ecfc7890f1bd597ba55fbda1396f46fe
+https://conda.anaconda.org/conda-forge/linux-64/snappy-1.1.10-h9fff704_0.conda#e6d228cd0bb74a51dd18f5bfce0b4115
+https://conda.anaconda.org/conda-forge/linux-64/tzcode-2023b-h0b41bf4_0.conda#54e266a59d6da0d119461e830a41f1db
+https://conda.anaconda.org/conda-forge/linux-64/xorg-kbproto-1.0.7-h7f98852_1002.tar.bz2#4b230e8381279d76131116660f5a241a
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libice-1.0.10-h7f98852_0.tar.bz2#d6b0b50b49eccfe0be0373be628be0f3
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.9-h7f98852_0.tar.bz2#bf6f803a544f26ebbdc3bfff272eb179
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libxdmcp-1.1.3-h7f98852_0.tar.bz2#be93aabceefa2fac576e971aef407908
+https://conda.anaconda.org/conda-forge/linux-64/xorg-renderproto-0.11.1-h7f98852_1002.tar.bz2#06feff3d2634e3097ce2fe681474b534
+https://conda.anaconda.org/conda-forge/linux-64/xorg-xextproto-7.3.0-h0b41bf4_1003.conda#bce9f945da8ad2ae9b1d7165a64d0f87
+https://conda.anaconda.org/conda-forge/linux-64/xorg-xproto-7.0.31-h7f98852_1007.tar.bz2#b4a4381d54784606820704f7b5f05a15
+https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2#2161070d867d1b1204ea749c8eec4ef0
+https://conda.anaconda.org/conda-forge/linux-64/yaml-0.2.5-h7f98852_2.tar.bz2#4cb3ad778ec2d5a7acbdf254eb1c42ae
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-cal-0.5.21-h48707d8_2.conda#de2efba4b6f1635d5682728460808487
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-compression-0.2.16-h03acc5a_5.conda#6bc5d85dbafdd7acbcc243793ae8fa05
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-sdkutils-0.1.8-h03acc5a_0.conda#347cdfafa34723feda1beed53ac7d092
+https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.14-h03acc5a_5.conda#621ec569388ccd005e974a8cb66ab869
+https://conda.anaconda.org/conda-forge/linux-64/glog-0.6.0-h6f12383_0.tar.bz2#b31f3565cb84435407594e548a2fb7b2
+https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-16_linux64_openblas.tar.bz2#d9b7a8639171f6c6fa0a983edabcfe2b
+https://conda.anaconda.org/conda-forge/linux-64/libbrotlidec-1.0.9-h166bdaf_8.tar.bz2#4ae4d7795d33e02bd20f6b23d91caf82
+https://conda.anaconda.org/conda-forge/linux-64/libbrotlienc-1.0.9-h166bdaf_8.tar.bz2#04bac51ba35ea023dc48af73c1c88c25
+https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20191231-he28a2e2_2.tar.bz2#4d331e44109e3f0e19b4cb8f9b82f3e1
+https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-h28343ad_4.tar.bz2#4a049fc560e00e43151dc51368915fdd
+https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.52.0-h61bc06f_0.conda#613955a50485812985c059e7b269f42e
+https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.39-h753d276_0.conda#e1c890aebdebbfbf87e2c917187b4416
+https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-3.21.12-h3eb15da_0.conda#4b36c68184c6c85d88c6e595a32a1ede
+https://conda.anaconda.org/conda-forge/linux-64/librttopo-1.1.0-ha49c73b_12.tar.bz2#d2047c6de84b07a1db9cbe1683939956
+https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.40.0-h753d276_0.tar.bz2#2e5f9a37d487e1019fd4d8113adb2f9f
+https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.10.0-hf14f497_3.tar.bz2#d85acad4b47dff4e3def14a769a97906
+https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1004.tar.bz2#b3653fdc58d03face9724f602218a904
+https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-hca2bb57_4.conda#bb808b654bdc3c783deaf107a2ffb503
+https://conda.anaconda.org/conda-forge/linux-64/libzip-1.9.2-hc929e4a_1.tar.bz2#5b122b50e738c4be5c3f2899f010d7cf
+https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.1.1-h32600fe_0.conda#68dcea6605bcebb17215d2b4efb3e1cf
+https://conda.anaconda.org/conda-forge/linux-64/pcre2-10.40-hc3806b6_0.tar.bz2#69e2c796349cd9b273890bee0febfe1b
+https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda#47d31b792659ce70f470b5c82fdfb7a4
+https://conda.anaconda.org/conda-forge/linux-64/s2n-1.3.41-h3358134_0.conda#6e3b75864fd97aef652c0d61bc2804be
+https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.12-h27826a3_0.tar.bz2#5b8c42eb62e9fc961af70bdd6a26e168
+https://conda.anaconda.org/conda-forge/linux-64/ucx-1.14.0-ha0ee010_0.conda#7f34aae830e22c4212c14bd456c1796c
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libsm-1.2.3-hd9c2040_1000.tar.bz2#9e856f78d5c80d5a78f61e72d1d473a3
+https://conda.anaconda.org/conda-forge/linux-64/zeromq-4.3.4-h9c3ff4c_1.tar.bz2#21743a8d2ea0c8cfbbf8fe489b0347df
+https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.13-h166bdaf_4.tar.bz2#4b11e365c0275b808be78b30f904e295
+https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.2-h3eb15da_6.conda#6b63daed8feeca47be78f323e793d555
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-io-0.13.19-h5b20300_3.conda#2f8cdd45bb9983aa337a6357b12951c5
+https://conda.anaconda.org/conda-forge/linux-64/blosc-1.21.3-hafa529b_0.conda#bcf0664a2dbbbb86cbd4c1e6ff10ddd6
+https://conda.anaconda.org/conda-forge/linux-64/boost-cpp-1.78.0-h75c5d50_1.tar.bz2#accc1f1ca33809bbf9ad067a0a69e236
+https://conda.anaconda.org/conda-forge/linux-64/brotli-bin-1.0.9-h166bdaf_8.tar.bz2#e5613f2bc717e9945840ff474419b8e4
+https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-hca18f0e_1.conda#e1232042de76d24539a436d37597eb06
+https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.15-h9772cbc_5.tar.bz2#ee08782aff2ff9b3291c967fa6bc7336
+https://conda.anaconda.org/conda-forge/linux-64/krb5-1.20.1-h81ceb04_0.conda#89a41adce7106749573d883b2f657d78
+https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-16_linux64_openblas.tar.bz2#20bae26d0a1db73f758fc3754cab4719
+https://conda.anaconda.org/conda-forge/linux-64/libglib-2.74.1-h606061b_1.tar.bz2#ed5349aa96776e00b34eccecf4a948fe
+https://conda.anaconda.org/conda-forge/linux-64/libgrpc-1.52.1-hcf146ea_1.conda#999b2527de4ab2a3472d51a5aab719c4
+https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-16_linux64_openblas.tar.bz2#955d993f41f9354bf753d29864ea20ad
+https://conda.anaconda.org/conda-forge/linux-64/libthrift-0.18.1-h5e4af38_0.conda#a2fab690ff5efa0d31cf5e27cd433faa
+https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.0-h6adf6a1_2.conda#2e648a34072eb39d7c4fc2a9981c5f0c
+https://conda.anaconda.org/conda-forge/linux-64/nss-3.89-he45b914_0.conda#2745719a58eeaab6657256a3f142f099
+https://conda.anaconda.org/conda-forge/linux-64/orc-1.8.3-hfdbbad2_0.conda#8aafd0a5ba97bf0cc451550b147a4e0a
+https://conda.anaconda.org/conda-forge/linux-64/python-3.11.0-he550d4f_1_cpython.conda#8d14fc2aa12db370a443753c8230be1e
+https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.40.0-h4ff8645_0.tar.bz2#bb11803129cbbb53ed56f9506ff74145
+https://conda.anaconda.org/conda-forge/linux-64/unixodbc-2.3.10-h583eb01_0.tar.bz2#906893193434d971b6f92839086f430d
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.4-h0b41bf4_0.conda#ea8fbfeb976ac49cbeb594e985393514
+https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
+https://conda.anaconda.org/conda-forge/linux-64/atk-1.0-2.38.0-hd4edc92_1.tar.bz2#6c72ec3e660a51736913ef6ea68c454b
+https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
+https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.2.20-h00877a2_4.conda#cd282ae47b410df93a192b16399100d0
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-http-0.7.6-hf342b9f_0.conda#ddec786d29917630faee14b54aac584d
+https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
+https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
+https://conda.anaconda.org/conda-forge/linux-64/backports.zoneinfo-0.2.1-py311h38be061_7.tar.bz2#ec62b3c5b953cb610f5e2b09cd776caf
+https://conda.anaconda.org/conda-forge/linux-64/bitarray-2.7.3-py311h2582759_0.conda#e6deddf513a8ecfa4357c94f0cca0fb3
+https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
+https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-h166bdaf_8.tar.bz2#2ff08978892a3e8b954397c461f18418
+https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
+https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
+https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
+https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
+https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
+https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.2.1-pyhd8ed1ab_0.conda#b325bfc4cff7d7f8a868f1f7ecc4ed16
+https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_0.tar.bz2#3faab06a954c2a04039983f2c4a50d99
+https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2#a50559fad0affdbb33729a68669ca1cb
+https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.6.6-py311hcafe171_0.conda#bd1a16fa506659546f686deb96eb60c6
+https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
+https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
+https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
+https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
+https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
+https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.14.2-h14ed4e7_0.conda#0f69b688f52ff6da70bccb7ff7001d1d
+https://conda.anaconda.org/conda-forge/linux-64/freetds-1.1.15-h1770fba_1.tar.bz2#9ebc291d4a9f33099a59a47f9af72a17
+https://conda.anaconda.org/conda-forge/linux-64/frozenlist-1.3.3-py311hd4cff14_0.tar.bz2#b81ebef162551d6cf909263695fd6d6b
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.10-h05c8ddd_0.conda#1a109126a43003d65b39c1cad656bc9b
+https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
+https://conda.anaconda.org/conda-forge/linux-64/greenlet-2.0.2-py311hcafe171_0.conda#ed14793904097c2d91698cb59dbd2b70
+https://conda.anaconda.org/conda-forge/linux-64/grpcio-1.52.1-py311hcafe171_1.conda#235b598d924b0a87cdc86227b5d4a2ab
+https://conda.anaconda.org/conda-forge/linux-64/gts-0.7.6-h64030ff_2.tar.bz2#112eb9b5b93f0c02e59aea4fd1967363
+https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
+https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
+https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
+https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.4-py311h4dd048b_1.tar.bz2#46d451f575392c01dc193069bd89766d
+https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hfd0df8a_0.conda#aa8840cdf17ef0c6084d1e24abc7a28b
+https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.88.1-hdc1c0ab_1.conda#3d1189864d1c0ed2a5919cb067b5903d
+https://conda.anaconda.org/conda-forge/linux-64/libkml-1.3.0-h37653c0_1015.tar.bz2#37d3747dd24d604f63d2610910576e63
+https://conda.anaconda.org/conda-forge/linux-64/libpq-15.2-hb675445_0.conda#4654b17eccaba55b8581d6b9c77f53cc
+https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.4-h1daa5a0_1.conda#77003f63d1763c1e6569a02c1742c9f4
+https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
+https://conda.anaconda.org/conda-forge/linux-64/lz4-4.3.2-py311h9f220a4_0.conda#b8aad2507303e04037e8d02d8ac54217
+https://conda.anaconda.org/conda-forge/linux-64/markupsafe-2.1.2-py311h2582759_0.conda#adb20bd57069614552adac60a020c36d
+https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f8dab71fdc13b1bf29a01248b156d268
+https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
+https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
+https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.5-py311ha3edf6b_0.conda#7415f24f8c44e44152623d93c5015000
+https://conda.anaconda.org/conda-forge/linux-64/multidict-6.0.4-py311h2582759_0.conda#8f581c14b50f2df47a2c6bd8d230a579
+https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
+https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
+https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
+https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
+https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.2-py311h8e6699e_0.conda#90db8cc0dfa20853329bfc6642f887aa
+https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.0-hfec8fc6_2.conda#5ce6a42505c6e9e6151c54c3ec8d68ea
+https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
+https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
+https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
+https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
+https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
+https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
+https://conda.anaconda.org/conda-forge/noarch/pprintpp-0.4.0-pyhd8ed1ab_5.conda#3c9f3f3f7e0a9f0b2fd9d0e2064729ba
+https://conda.anaconda.org/conda-forge/linux-64/psutil-5.9.4-py311hd4cff14_0.tar.bz2#6fbda857a56adb4140bed339fbe0b801
+https://conda.anaconda.org/conda-forge/noarch/ptyprocess-0.7.0-pyhd3deb0d_0.tar.bz2#359eeb6536da0e687af562ed265ec263
+https://conda.anaconda.org/conda-forge/noarch/pure-sasl-0.6.2-pyhd8ed1ab_0.tar.bz2#ac695eecf21ab48093bc33fd60b4102d
+https://conda.anaconda.org/conda-forge/noarch/pure_eval-0.2.2-pyhd8ed1ab_0.tar.bz2#6784285c7e55cb7212efabc79e4c2883
+https://conda.anaconda.org/conda-forge/noarch/py-cpuinfo-9.0.0-pyhd8ed1ab_0.tar.bz2#6f6d42b894118f8378fce11887ccdaff
+https://conda.anaconda.org/conda-forge/noarch/py4j-0.10.9.5-pyhd8ed1ab_0.tar.bz2#aa4b90e96537b3178e500ecb0d7913ce
+https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f8f72ac77911db942eda24fb9
+https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
+https://conda.anaconda.org/conda-forge/linux-64/pycryptodomex-3.16.0-py311hd4cff14_0.conda#e0803d5b8e9c506c7b76ad496dc44148
+https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
+https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
+https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
+https://conda.anaconda.org/conda-forge/linux-64/pyrsistent-0.19.3-py311h2582759_0.conda#e53876b66dcc4ba8a0afa63cd8502ac3
+https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
+https://conda.anaconda.org/conda-forge/linux-64/pyyaml-6.0-py311hd4cff14_5.tar.bz2#da8769492e423103c59f469f4f17f8d9
+https://conda.anaconda.org/conda-forge/linux-64/pyzmq-25.0.2-py311hd6ccaeb_0.conda#8917d0819ab7180b5204a60fe12f7c3a
+https://conda.anaconda.org/conda-forge/linux-64/regex-2023.3.23-py311h2582759_0.conda#139c07fd7955fe864351190f3bd1d48b
+https://conda.anaconda.org/conda-forge/linux-64/rtree-1.0.1-py311h3bb2b0f_1.tar.bz2#1b020e2257c97aea220dd46f3f57db4b
+https://conda.anaconda.org/conda-forge/linux-64/ruff-0.0.259-py311ha4fe6a1_0.conda#f777879dc22257f5388c3dc2afc14122
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
+https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
+https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
+https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
+https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
+https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
+https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
+https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
+https://conda.anaconda.org/conda-forge/noarch/toml-0.10.2-pyhd8ed1ab_0.tar.bz2#f832c45a477c78bebd107098db465095
+https://conda.anaconda.org/conda-forge/noarch/tomli-2.0.1-pyhd8ed1ab_0.tar.bz2#5844808ffab9ebdb694585b50ba02a96
+https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#92facfec94bc02d6ccf42e7173831a36
+https://conda.anaconda.org/conda-forge/linux-64/tornado-6.2-py311hd4cff14_1.tar.bz2#4d86cd6dbdc1185f4e72d974f1f1f852
+https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
+https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
+https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h0b41bf4_2.conda#82b6df12252e6f32402b96dacc656fec
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-h7f98852_1003.tar.bz2#f59c1242cc1dd93e72c2ee2b360979eb
+https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
+https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
+https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-auth-0.6.26-hf365957_1.conda#5f2aefd743f82e4177c997c314a55f22
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-mqtt-0.8.6-hc4349f7_12.conda#0ba6aa71b51d31d48195b26f343d926f
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
+https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
+https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
+https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
+https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-ha61ee94_1014.tar.bz2#d1a88f3ed5b52e1024b80d4bcd26a7a0
+https://conda.anaconda.org/conda-forge/linux-64/cffi-1.15.1-py311h409f033_3.conda#9025d0786dbbe4bc91fd8e85502decce
+https://conda.anaconda.org/conda-forge/linux-64/cfitsio-4.2.0-hd9d235c_0.conda#8c57a9adbafd87f5eff842abde599cb4
+https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
+https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/linux-64/contourpy-1.0.7-py311ha3edf6b_0.conda#e7548e7f58965a2fe97a95950a5fedc6
+https://conda.anaconda.org/conda-forge/linux-64/coverage-7.2.2-py311h2582759_0.conda#41f2bca794aa1b4e70c1a23f8ec2dfa5
+https://conda.anaconda.org/conda-forge/linux-64/curl-7.88.1-hdc1c0ab_1.conda#2016c398f234cfa354ea704c6731b5d5
+https://conda.anaconda.org/conda-forge/linux-64/cytoolz-0.12.0-py311hd4cff14_1.tar.bz2#21523141b35484b1edafba962c6ea883
+https://conda.anaconda.org/conda-forge/linux-64/fastavro-1.7.3-py311h2582759_0.conda#7adc34c55807055978517230f0585f0e
+https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.2-py311h2582759_0.conda#f227528f25c3d45717f71774222a2200
+https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
+https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.12.2-nompi_h4df4325_101.conda#162a25904af6586b234b2dd52ee99c61
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
+https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
+https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
+https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
+https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
+https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h5aea950_4.conda#82ef57611ace65b59db35a9687264572
+https://conda.anaconda.org/conda-forge/linux-64/libgoogle-cloud-2.8.0-h0bc5f78_1.conda#bdf605748604b09602f3c841abdba817
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
+https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
+https://conda.anaconda.org/conda-forge/linux-64/maturin-0.14.16-py311hfe55011_0.conda#3eb292b516ce8f72c9a21fa50f4440a9
+https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
+https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
+https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
+https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
+https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
+https://conda.anaconda.org/conda-forge/linux-64/pillow-9.4.0-py311h50def17_1.conda#8b5d1da23907114bd7aa3d562150ff36
+https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
+https://conda.anaconda.org/conda-forge/linux-64/polars-0.16.16-py311hfe55011_0.conda#e3570e974c324877bedecf02dc5257aa
+https://conda.anaconda.org/conda-forge/linux-64/postgresql-15.2-h3248436_0.conda#4dbd6c4bc33369751a4d728b392943ba
+https://conda.anaconda.org/conda-forge/linux-64/proj-9.1.1-h8ffa02c_2.conda#c264aea0e16bba26afa0a0940e954492
+https://conda.anaconda.org/conda-forge/linux-64/protobuf-4.21.12-py311hcafe171_0.conda#e50c8a6b26b30cc435a04391d654f572
+https://conda.anaconda.org/conda-forge/linux-64/psycopg2-2.9.3-py311h968e94b_2.conda#fdbb71c126dfaa4149f026c31f536ca8
+https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
+https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
+https://conda.anaconda.org/conda-forge/linux-64/pymssql-2.2.5-py311ha362b79_2.tar.bz2#c953f09ff112a2363ebc1434fc2859f1
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
+https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
+https://conda.anaconda.org/conda-forge/linux-64/pytz-deprecation-shim-0.1.0.post0-py311h38be061_3.tar.bz2#8783590d2a26e07f0386342563c861a4
+https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
+https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
+https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf410858b2cefc267316408a77c436
+https://conda.anaconda.org/conda-forge/linux-64/shapely-1.8.5-py311h2b60523_2.tar.bz2#069246afc942fd3530060b8f349afa9b
+https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-1.4.46-py311h2582759_0.conda#3030087ba2101543b8b82e2832a70063
+https://conda.anaconda.org/conda-forge/linux-64/thrift-0.16.0-py311ha362b79_2.tar.bz2#d30537612b1a2b805c6735aaf97f9e07
+https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/linux-64/watchdog-3.0.0-py311h38be061_0.conda#a3e24b38169e66795f7af4779ea337b3
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
+https://conda.anaconda.org/conda-forge/linux-64/xerces-c-3.2.4-h55805fa_1.tar.bz2#d127dc8efe24033b306180939e51e6af
+https://conda.anaconda.org/conda-forge/linux-64/yarl-1.8.2-py311hd4cff14_0.conda#42c1455c6ccdb660f81e868675dae664
+https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
+https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-s3-0.2.7-h909e904_1.conda#7cb3fd9464ed9aaf8189837fe9d96c28
+https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
+https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
+https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py311hd4cff14_1005.tar.bz2#9bdac7084ecfc08338bae1b976535724
+https://conda.anaconda.org/conda-forge/linux-64/cryptography-38.0.4-py311h42a1071_0.conda#34c95722eb879d7a9ee0546671084b2d
+https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
+https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
+https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.7.1-h7a142b4_6.conda#b7963c107ed1f6a95cadc244f95cd3cd
+https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
+https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
+https://conda.anaconda.org/conda-forge/linux-64/google-crc32c-1.1.2-py311h98db957_4.tar.bz2#30fc7e9e67651173963320d38fb3cb12
+https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
+https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
+https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-6.0.0-h8e241bc_0.conda#448fe40d2fed88ccf4d9ded37cbb2b38
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
+https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
+https://conda.anaconda.org/conda-forge/linux-64/kealib-1.5.0-ha7026e8_0.conda#c948b920f45fd81a2dde8b1ab514cc84
+https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.9.1-nompi_h34a3ff0_101.conda#9ce7f5bde721be2f82da9f861c57f1b3
+https://conda.anaconda.org/conda-forge/linux-64/libspatialite-5.0.1-h221c8f1_23.conda#859297085081cfbc123dc60015864f6b
+https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
+https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.1-py311h8597a09_0.conda#70c3b734ffe82c16b6d121aaa11929a8
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
+https://conda.anaconda.org/conda-forge/linux-64/pandas-1.5.3-py311h2872171_0.conda#a129a2aa7f5c2f45808399d60c3080f2
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/linux-64/poppler-23.03.0-h091648b_0.conda#a449be485743e64ed48d340d5424774d
+https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
+https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.4.1-py311h945b3ca_1.conda#0c2122f649780a766ec6b2b4fd83887f
+https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
+https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
+https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
+https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
+https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
+https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
+https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
+https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
+https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
+https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.13.2-hd532e3d_0.conda#6d97164f19dbd27575ef1899b02dc1e0
+https://conda.anaconda.org/conda-forge/linux-64/tzlocal-4.3-py311h38be061_0.conda#bbf76fe49723742045e1d2fcd1a0a4e5
+https://conda.anaconda.org/conda-forge/linux-64/ukkonen-1.0.1-py311h4dd048b_3.tar.bz2#dbfea4376856bf7bd2121e719cf816e5
+https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
+https://conda.anaconda.org/conda-forge/linux-64/aiohttp-3.8.4-py311h2582759_0.conda#0760bb979717fc0db601e34ede5fa4bc
+https://conda.anaconda.org/conda-forge/linux-64/aws-crt-cpp-0.19.8-hf7fbfca_12.conda#c2940067a049037ec1789ccfcb853fb4
+https://conda.anaconda.org/conda-forge/linux-64/black-23.1.0-py311h38be061_0.conda#c737160bd5ce6abee26abc6a9e8da79c
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
+https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
+https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
+https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
+https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.3.0-py311h38be061_0.conda#1dd43a18a75d59206019e2a2a28555e5
+https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.6.2-h6c674c2_9.conda#d6023c0a9a1b0c04c78d0d33d98e6620
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
+https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
+https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.14-hd33c08f_0.conda#a8b9e35dd7be2c945b0de4fe19a7c3a9
+https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
+https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
+https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.10.57-h17c43bd_8.conda#a318ddbd962b0ec5639cc4fb7e9b2230
+https://conda.anaconda.org/conda-forge/linux-64/gdal-3.6.2-py311hadb6153_9.conda#0b35e6680807865ea017bec5c41422de
+https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-h90689f9_2.tar.bz2#957a0255ab58aaf394a91725d73ab422
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
+https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.54.4-h7abd40a_0.tar.bz2#921e53675ed5ea352f022b79abab076a
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/linux-64/fiona-1.9.1-py311h3f14cef_0.conda#193fd1cb5a7737422c8fa50c087f0e7a
+https://conda.anaconda.org/conda-forge/linux-64/graphviz-7.1.0-h2e5815a_0.conda#e7ecda996c443142a0e9c379f3b28e48
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyh41d4057_0.conda#c8f4db8b2fc42692b3b7f1e348b2ab59
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/linux-64/libarrow-11.0.0-h93537a5_13_cpu.conda#49d5c8c33c0d1db3362058d45da6af69
+https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
+https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
+https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
+https://conda.anaconda.org/conda-forge/linux-64/arrow-cpp-11.0.0-ha770c72_13_cpu.conda#26ab48029304dce678b7084206415e03
+https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh210e3f2_0.conda#1b463a5f4b7c83f509f6a1168a6ef554
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
+https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
+https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
+https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
+https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
+https://conda.anaconda.org/conda-forge/linux-64/scipy-1.10.1-py311h8e6699e_0.conda#a9dba1242a54275e4914a2540f4eb233
+https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
+https://conda.anaconda.org/conda-forge/linux-64/pyarrow-11.0.0-py311hbdf6286_13_cpu.conda#f221289ac50a72d575bd91d964418f81
+https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
+https://conda.anaconda.org/conda-forge/linux-64/scikit-learn-1.2.2-py311h103fc68_1.conda#1a69529b0bcf0e3a03e6585903659df7
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/linux-64/datafusion-0.7.0-py311hfe55011_0.conda#0085ebe708a84bcf58c203cc6c74ea73
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
+https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/linux-64/python-duckdb-0.7.1-py311h3f2ac15_0.conda#e6ef6bb8795678905d8d6deeb0f9ac89
+https://conda.anaconda.org/conda-forge/linux-64/snowflake-connector-python-3.0.2-py311h4eb5c51_0.conda#69ed6757ee1e24e3727c5e3203666fca
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
diff --git a/linux-64-3.8.lock b/linux-64-3.8.lock
index eada2a7..59b9e16 100644
--- a/linux-64-3.8.lock
+++ b/linux-64-3.8.lock
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
-# input_hash: 6aef5fddb7afbe59b633fecd654e13b9a3735cefbc6f41a6aa915bd6358945ce
+# input_hash: c3bc56fa25393daa2334f7ad97656a25ac9826b71a69e367ee0a66dcde14e6f2
@EXPLICIT
https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.12.7-ha878542_0.conda#ff9f73d45c4a07d6f424495288a26080
@@ -13,14 +13,14 @@ https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-12.2.0-h337968e_19.
https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-12.2.0-h46fd767_19.tar.bz2#1030b1f38c129f2634eae026f704fe60
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.8-3_cp38.conda#2f3f7af062b42d664117662612022204
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-12.2.0-h69a702a_19.tar.bz2#cd7a806282c16e1f2d39a7e80d3a3e0d
https://conda.anaconda.org/conda-forge/linux-64/libgomp-12.2.0-h65d4601_19.tar.bz2#cedcee7c064c01c403f962c9e8d3c373
https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2#73aaf86a425cc6e73fcf236a5a46396d
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-12.2.0-h65d4601_19.tar.bz2#e4c94f80aef025c17ab0828cd85ef535
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.6.2-h7f98852_0.tar.bz2#ce69a062b3080485b760378841240634
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.8.14-h0b41bf4_0.conda#2512d4aa4007fdf7b705713d73bf6967
https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2#a1fd65c7ccbf10880423d82bca54eb54
https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.18.1-h7f98852_0.tar.bz2#f26ef8098fab1f719c91eb760d63381a
https://conda.anaconda.org/conda-forge/linux-64/expat-2.5.0-h27087fc_0.tar.bz2#c4fbad8d4bddeb3c085f18cbf97fbfad
@@ -29,7 +29,7 @@ https://conda.anaconda.org/conda-forge/linux-64/fribidi-1.0.10-h36c2ea0_0.tar.bz
https://conda.anaconda.org/conda-forge/linux-64/geos-3.11.1-h27087fc_0.tar.bz2#917b9a50001fffdd89b321b5dba31e55
https://conda.anaconda.org/conda-forge/linux-64/gettext-0.21.1-h27087fc_0.tar.bz2#14947d8770185e5153fdd04d4673ed37
https://conda.anaconda.org/conda-forge/linux-64/gflags-2.2.2-he1b5a44_1004.tar.bz2#cddaf2c63ea4a5901cf09524c490ecdc
-https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h36c2ea0_2.tar.bz2#626e68ae9cc5912d6adb79d318cf962d
+https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h0b41bf4_3.conda#96f3b11872ef6fad973eac856cd2624f
https://conda.anaconda.org/conda-forge/linux-64/gmp-6.2.1-h58526e2_0.tar.bz2#b94cf2db16066b242ebd26db2facbd56
https://conda.anaconda.org/conda-forge/linux-64/graphite2-1.3.13-h58526e2_1001.tar.bz2#8c54672728e8ec6aa6db90cf2806d220
https://conda.anaconda.org/conda-forge/linux-64/icu-70.1-h27087fc_0.tar.bz2#87473a15119779e021c314249d4b4aed
@@ -37,14 +37,16 @@ https://conda.anaconda.org/conda-forge/linux-64/jpeg-9e-h0b41bf4_3.conda#c7a0692
https://conda.anaconda.org/conda-forge/linux-64/json-c-0.16-hc379101_0.tar.bz2#0e2bca6857cb73acec30387fef7c3142
https://conda.anaconda.org/conda-forge/linux-64/keyutils-1.6.1-h166bdaf_0.tar.bz2#30186d27e2c9fa62b45fb1476b7200e3
https://conda.anaconda.org/conda-forge/linux-64/lerc-4.0.0-h27087fc_0.tar.bz2#76bbff344f0134279f225174e9064c8f
-https://conda.anaconda.org/conda-forge/linux-64/libabseil-20220623.0-cxx17_h05df665_6.conda#39f6394ae835f0b16f01cbbd3bb1e8e2
+https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230125.0-cxx17_hcb278e6_1.conda#a1c65f83198fd8d0328c0a6482c6f31b
+https://conda.anaconda.org/conda-forge/linux-64/libaec-1.0.6-hcb278e6_1.conda#0f683578378cddb223e7fd24f785ab2a
https://conda.anaconda.org/conda-forge/linux-64/libbrotlicommon-1.0.9-h166bdaf_8.tar.bz2#9194c9bf9428035a05352d031462eae4
https://conda.anaconda.org/conda-forge/linux-64/libcrc32c-1.1.2-h9c3ff4c_0.tar.bz2#c965a5aa0d5c1c37ffc62dff36e28400
-https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.14-h166bdaf_0.tar.bz2#fc84a0446e4e4fb882e78d786cfb9734
+https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.17-h0b41bf4_0.conda#5cc781fd91968b11a8a7fdbee0982676
https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-h516909a_1.tar.bz2#6f8720dff19e17ce5d48cfe7f3d2f0a3
https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2#d645c6d2ac96843a2bfaccd2d62b3ac3
https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2#b62b52da46c39ee2bc3c162ac7f1804d
https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.0-h7f98852_0.tar.bz2#39b1328babf85c7c3a61636d9cd50206
+https://conda.anaconda.org/conda-forge/linux-64/libnuma-2.0.16-h0b41bf4_1.conda#28bfe2cb11357ccc5be21101a6b7ce86
https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.21-pthreads_h78a6416_3.tar.bz2#8c5963a49b6035c40646a763293fbb35
https://conda.anaconda.org/conda-forge/linux-64/libsodium-1.0.18-h36c2ea0_1.tar.bz2#c3788462a6fbddafdb413a9f9053e58d
https://conda.anaconda.org/conda-forge/linux-64/libspatialindex-1.9.3-h9c3ff4c_4.tar.bz2#d87fbe9c0ff589e802ff13872980bfd9
@@ -56,80 +58,84 @@ https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h166bdaf_4.tar.bz
https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.9.4-hcb278e6_0.conda#318b08df404f9c9be5712aaa5a6f0bb0
https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.3-h27087fc_1.tar.bz2#4acfc691e64342b9dae57cf2adc63238
https://conda.anaconda.org/conda-forge/linux-64/nspr-4.35-h27087fc_0.conda#da0ec11a6454ae19bff5b02ed881a2b1
-https://conda.anaconda.org/conda-forge/linux-64/openssl-1.1.1t-h0b41bf4_0.conda#a35dc66c4cee8c4399507d14cf1501b1
+https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-h0b41bf4_0.conda#2d833be81a21128e317325a01326d36f
https://conda.anaconda.org/conda-forge/linux-64/pixman-0.40.0-h36c2ea0_0.tar.bz2#660e72c82f2e75a6b3fe6a6e75c79f19
https://conda.anaconda.org/conda-forge/linux-64/pthread-stubs-0.4-h36c2ea0_1001.tar.bz2#22dad4df6e8630e8dff2428f6f6a7036
-https://conda.anaconda.org/conda-forge/linux-64/re2-2022.06.01-h27087fc_1.conda#68070cd09c67755f37e0db13f00a008b
-https://conda.anaconda.org/conda-forge/linux-64/snappy-1.1.9-hbd366e4_2.tar.bz2#48018e187dacc6002d3ede9c824238ac
-https://conda.anaconda.org/conda-forge/linux-64/tzcode-2022g-h166bdaf_0.conda#229620ecbc0bf2f9f04b888fd3478f79
+https://conda.anaconda.org/conda-forge/linux-64/re2-2023.02.02-hcb278e6_0.conda#ecfc7890f1bd597ba55fbda1396f46fe
+https://conda.anaconda.org/conda-forge/linux-64/snappy-1.1.10-h9fff704_0.conda#e6d228cd0bb74a51dd18f5bfce0b4115
+https://conda.anaconda.org/conda-forge/linux-64/tzcode-2023b-h0b41bf4_0.conda#54e266a59d6da0d119461e830a41f1db
https://conda.anaconda.org/conda-forge/linux-64/xorg-kbproto-1.0.7-h7f98852_1002.tar.bz2#4b230e8381279d76131116660f5a241a
https://conda.anaconda.org/conda-forge/linux-64/xorg-libice-1.0.10-h7f98852_0.tar.bz2#d6b0b50b49eccfe0be0373be628be0f3
https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.9-h7f98852_0.tar.bz2#bf6f803a544f26ebbdc3bfff272eb179
https://conda.anaconda.org/conda-forge/linux-64/xorg-libxdmcp-1.1.3-h7f98852_0.tar.bz2#be93aabceefa2fac576e971aef407908
https://conda.anaconda.org/conda-forge/linux-64/xorg-renderproto-0.11.1-h7f98852_1002.tar.bz2#06feff3d2634e3097ce2fe681474b534
-https://conda.anaconda.org/conda-forge/linux-64/xorg-xextproto-7.3.0-h7f98852_1002.tar.bz2#1e15f6ad85a7d743a2ac68dae6c82b98
+https://conda.anaconda.org/conda-forge/linux-64/xorg-xextproto-7.3.0-h0b41bf4_1003.conda#bce9f945da8ad2ae9b1d7165a64d0f87
https://conda.anaconda.org/conda-forge/linux-64/xorg-xproto-7.0.31-h7f98852_1007.tar.bz2#b4a4381d54784606820704f7b5f05a15
https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2#2161070d867d1b1204ea749c8eec4ef0
https://conda.anaconda.org/conda-forge/linux-64/yaml-0.2.5-h7f98852_2.tar.bz2#4cb3ad778ec2d5a7acbdf254eb1c42ae
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-cal-0.5.11-h95a6274_0.tar.bz2#d4e7b241fb22dd3d7be1171f813d5da3
-https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.11-ha31a3da_7.tar.bz2#2fdb96aaab883abc0766ff76c0a34483
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-cal-0.5.21-h48707d8_2.conda#de2efba4b6f1635d5682728460808487
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-compression-0.2.16-h03acc5a_5.conda#6bc5d85dbafdd7acbcc243793ae8fa05
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-sdkutils-0.1.8-h03acc5a_0.conda#347cdfafa34723feda1beed53ac7d092
+https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.14-h03acc5a_5.conda#621ec569388ccd005e974a8cb66ab869
https://conda.anaconda.org/conda-forge/linux-64/glog-0.6.0-h6f12383_0.tar.bz2#b31f3565cb84435407594e548a2fb7b2
https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-16_linux64_openblas.tar.bz2#d9b7a8639171f6c6fa0a983edabcfe2b
https://conda.anaconda.org/conda-forge/linux-64/libbrotlidec-1.0.9-h166bdaf_8.tar.bz2#4ae4d7795d33e02bd20f6b23d91caf82
https://conda.anaconda.org/conda-forge/linux-64/libbrotlienc-1.0.9-h166bdaf_8.tar.bz2#04bac51ba35ea023dc48af73c1c88c25
https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20191231-he28a2e2_2.tar.bz2#4d331e44109e3f0e19b4cb8f9b82f3e1
-https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-h9b69904_4.tar.bz2#390026683aef81db27ff1b8570ca1336
-https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.51.0-hdcd2b5c_0.conda#c42b460bae0365fb9777b1ff9d09a554
+https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-h28343ad_4.tar.bz2#4a049fc560e00e43151dc51368915fdd
+https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.52.0-h61bc06f_0.conda#613955a50485812985c059e7b269f42e
https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.39-h753d276_0.conda#e1c890aebdebbfbf87e2c917187b4416
-https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-3.20.2-h6239696_0.tar.bz2#dd9c398d02aa82219a4ea5fa69739ae7
+https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-3.21.12-h3eb15da_0.conda#4b36c68184c6c85d88c6e595a32a1ede
https://conda.anaconda.org/conda-forge/linux-64/librttopo-1.1.0-ha49c73b_12.tar.bz2#d2047c6de84b07a1db9cbe1683939956
https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.40.0-h753d276_0.tar.bz2#2e5f9a37d487e1019fd4d8113adb2f9f
-https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.10.0-haa6b8db_3.tar.bz2#89acee135f0809a18a1f4537390aa2dd
+https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.10.0-hf14f497_3.tar.bz2#d85acad4b47dff4e3def14a769a97906
https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1004.tar.bz2#b3653fdc58d03face9724f602218a904
-https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-h7463322_0.tar.bz2#3b933ea47ef8f330c4c068af25fcd6a8
-https://conda.anaconda.org/conda-forge/linux-64/libzip-1.9.2-hc869a4a_1.tar.bz2#7a268cf1386d271e576e35ae82149ef2
-https://conda.anaconda.org/conda-forge/linux-64/pandoc-2.19.2-h32600fe_1.tar.bz2#35a82883468c85ac8bf41f083c1933cf
+https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-hca2bb57_4.conda#bb808b654bdc3c783deaf107a2ffb503
+https://conda.anaconda.org/conda-forge/linux-64/libzip-1.9.2-hc929e4a_1.tar.bz2#5b122b50e738c4be5c3f2899f010d7cf
+https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.1.1-h32600fe_0.conda#68dcea6605bcebb17215d2b4efb3e1cf
https://conda.anaconda.org/conda-forge/linux-64/pcre2-10.40-hc3806b6_0.tar.bz2#69e2c796349cd9b273890bee0febfe1b
-https://conda.anaconda.org/conda-forge/linux-64/readline-8.1.2-h0f457ee_0.tar.bz2#db2ebbe2943aae81ed051a6a9af8e0fa
-https://conda.anaconda.org/conda-forge/linux-64/s2n-1.0.10-h9b69904_0.tar.bz2#9708c3ac26c20b4c4549cbe8fef937eb
+https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda#47d31b792659ce70f470b5c82fdfb7a4
+https://conda.anaconda.org/conda-forge/linux-64/s2n-1.3.41-h3358134_0.conda#6e3b75864fd97aef652c0d61bc2804be
https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.12-h27826a3_0.tar.bz2#5b8c42eb62e9fc961af70bdd6a26e168
+https://conda.anaconda.org/conda-forge/linux-64/ucx-1.14.0-ha0ee010_0.conda#7f34aae830e22c4212c14bd456c1796c
https://conda.anaconda.org/conda-forge/linux-64/xorg-libsm-1.2.3-hd9c2040_1000.tar.bz2#9e856f78d5c80d5a78f61e72d1d473a3
https://conda.anaconda.org/conda-forge/linux-64/zeromq-4.3.4-h9c3ff4c_1.tar.bz2#21743a8d2ea0c8cfbbf8fe489b0347df
https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.13-h166bdaf_4.tar.bz2#4b11e365c0275b808be78b30f904e295
https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.2-h3eb15da_6.conda#6b63daed8feeca47be78f323e793d555
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-io-0.10.5-hfb6a706_0.tar.bz2#47d6b88b0c42a8c9877f3993b49f052d
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-io-0.13.19-h5b20300_3.conda#2f8cdd45bb9983aa337a6357b12951c5
https://conda.anaconda.org/conda-forge/linux-64/blosc-1.21.3-hafa529b_0.conda#bcf0664a2dbbbb86cbd4c1e6ff10ddd6
https://conda.anaconda.org/conda-forge/linux-64/boost-cpp-1.78.0-h75c5d50_1.tar.bz2#accc1f1ca33809bbf9ad067a0a69e236
https://conda.anaconda.org/conda-forge/linux-64/brotli-bin-1.0.9-h166bdaf_8.tar.bz2#e5613f2bc717e9945840ff474419b8e4
https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-hca18f0e_1.conda#e1232042de76d24539a436d37597eb06
-https://conda.anaconda.org/conda-forge/linux-64/grpc-cpp-1.47.1-hbad87ad_6.tar.bz2#6d0f1ddd701aebf007274ee5ea9a3018
https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.15-h9772cbc_5.tar.bz2#ee08782aff2ff9b3291c967fa6bc7336
-https://conda.anaconda.org/conda-forge/linux-64/krb5-1.19.3-h3790be6_0.tar.bz2#7d862b05445123144bec92cb1acc8ef8
+https://conda.anaconda.org/conda-forge/linux-64/krb5-1.20.1-h81ceb04_0.conda#89a41adce7106749573d883b2f657d78
https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-16_linux64_openblas.tar.bz2#20bae26d0a1db73f758fc3754cab4719
https://conda.anaconda.org/conda-forge/linux-64/libglib-2.74.1-h606061b_1.tar.bz2#ed5349aa96776e00b34eccecf4a948fe
+https://conda.anaconda.org/conda-forge/linux-64/libgrpc-1.52.1-hcf146ea_1.conda#999b2527de4ab2a3472d51a5aab719c4
https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-16_linux64_openblas.tar.bz2#955d993f41f9354bf753d29864ea20ad
-https://conda.anaconda.org/conda-forge/linux-64/libthrift-0.16.0-h491838f_2.tar.bz2#9134d477d02ad9264c6ee359fa36702c
-https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.4.0-h82bc61c_5.conda#e712a63a21f9db647982971dc121cdcf
-https://conda.anaconda.org/conda-forge/linux-64/nss-3.88-he45b914_0.conda#d7a81dfb99ad8fbb88872fb7ec646e6c
-https://conda.anaconda.org/conda-forge/linux-64/orc-1.7.6-h6c59b99_0.tar.bz2#7978db6ca7b2932ccf9d3c36093f8281
-https://conda.anaconda.org/conda-forge/linux-64/python-3.8.15-h257c98d_0_cpython.conda#485151f9b0c1cfb2375b6c4995ac52ba
+https://conda.anaconda.org/conda-forge/linux-64/libthrift-0.18.1-h5e4af38_0.conda#a2fab690ff5efa0d31cf5e27cd433faa
+https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.0-h6adf6a1_2.conda#2e648a34072eb39d7c4fc2a9981c5f0c
+https://conda.anaconda.org/conda-forge/linux-64/nss-3.89-he45b914_0.conda#2745719a58eeaab6657256a3f142f099
+https://conda.anaconda.org/conda-forge/linux-64/orc-1.8.3-hfdbbad2_0.conda#8aafd0a5ba97bf0cc451550b147a4e0a
+https://conda.anaconda.org/conda-forge/linux-64/python-3.8.16-he550d4f_1_cpython.conda#9de84cccfbc5f8350a3667bb6ef6fc30
https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.40.0-h4ff8645_0.tar.bz2#bb11803129cbbb53ed56f9506ff74145
https://conda.anaconda.org/conda-forge/linux-64/unixodbc-2.3.10-h583eb01_0.tar.bz2#906893193434d971b6f92839086f430d
-https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.7.2-h7f98852_0.tar.bz2#12a61e640b8894504326aadafccbb790
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.4-h0b41bf4_0.conda#ea8fbfeb976ac49cbeb594e985393514
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/linux-64/atk-1.0-2.38.0-hd4edc92_1.tar.bz2#6c72ec3e660a51736913ef6ea68c454b
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.2.7-h3541f99_13.tar.bz2#39768ba0fe69c241d54703a7f5e3119f
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.2.20-h00877a2_4.conda#cd282ae47b410df93a192b16399100d0
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-http-0.7.6-hf342b9f_0.conda#ddec786d29917630faee14b54aac584d
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
-https://conda.anaconda.org/conda-forge/linux-64/bitarray-2.7.2-py38h1de0b5d_0.conda#e1fb81e8fd28a040f878740fb6e2ea2b
+https://conda.anaconda.org/conda-forge/linux-64/bitarray-2.7.3-py38h1de0b5d_0.conda#0a7c44f6b1c850f41c631bdc3c086cdd
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-h166bdaf_8.tar.bz2#2ff08978892a3e8b954397c461f18418
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
https://conda.anaconda.org/conda-forge/linux-64/clickhouse-cityhash-1.0.2.3-py38hfa26641_4.tar.bz2#bb3017877771e658fba9231521dc8273
@@ -139,31 +145,32 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.6.6-py38h8dc9893_0.conda#155f4cc0da35e5801e30783065768e9a
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
-https://conda.anaconda.org/conda-forge/noarch/flit-core-3.8.0-pyhd8ed1ab_0.tar.bz2#6d5e56de2e65da7aa35fd10131226efa
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.14.2-h14ed4e7_0.conda#0f69b688f52ff6da70bccb7ff7001d1d
-https://conda.anaconda.org/conda-forge/linux-64/freetds-1.3.16-h41fea10_0.conda#912ba9630b3d6287760536bf041e78b0
+https://conda.anaconda.org/conda-forge/linux-64/freetds-1.1.15-h1770fba_1.tar.bz2#9ebc291d4a9f33099a59a47f9af72a17
https://conda.anaconda.org/conda-forge/linux-64/frozenlist-1.3.3-py38h0a891b7_0.tar.bz2#b68f1b24442f2c93d0a4651341c88345
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
-https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.8-hff1cb4f_1.tar.bz2#a61c6312192e7c9de71548a6706a21e6
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.10-h05c8ddd_0.conda#1a109126a43003d65b39c1cad656bc9b
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/linux-64/greenlet-2.0.2-py38h8dc9893_0.conda#f20dc3894796d8a3a2ebd3e2854a5dee
+https://conda.anaconda.org/conda-forge/linux-64/grpcio-1.52.1-py38h8dc9893_1.conda#a0be4b8de15ef01db2eab431379edd1a
https://conda.anaconda.org/conda-forge/linux-64/gts-0.7.6-h64030ff_2.tar.bz2#112eb9b5b93f0c02e59aea4fd1967363
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-1.1.2-pyhd8ed1ab_0.conda#1a7584b46014b66568069cb6ef2253bf
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.4-py38h43d8883_1.tar.bz2#41ca56d5cac7bfc7eb4fcdbee878eb84
-https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.14-h6ed2654_0.tar.bz2#dcc588839de1445d90995a0a2c4f3a39
-https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.86.0-h7bff187_1.tar.bz2#5e5f33d81f31598d87f9b849f73c30e3
+https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hfd0df8a_0.conda#aa8840cdf17ef0c6084d1e24abc7a28b
+https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.88.1-hdc1c0ab_1.conda#3d1189864d1c0ed2a5919cb067b5903d
https://conda.anaconda.org/conda-forge/linux-64/libkml-1.3.0-h37653c0_1015.tar.bz2#37d3747dd24d604f63d2610910576e63
-https://conda.anaconda.org/conda-forge/linux-64/libpq-15.1-hf695f80_1.conda#12a501b9ee0927abfc95083303b6c89f
-https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.4-h522a892_0.tar.bz2#802e43f480122a85ae6a34c1909f8f98
+https://conda.anaconda.org/conda-forge/linux-64/libpq-15.2-hb675445_0.conda#4654b17eccaba55b8581d6b9c77f53cc
+https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.4-h1daa5a0_1.conda#77003f63d1763c1e6569a02c1742c9f4
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/linux-64/lz4-4.3.2-py38hd012fdc_0.conda#96568ab147a75c61657d079dc1a9b427
https://conda.anaconda.org/conda-forge/linux-64/markupsafe-2.1.2-py38h1de0b5d_0.conda#6d97b5d6f06933ab653f1862ddf6e33e
@@ -171,24 +178,23 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.4-py38h43d8883_1.tar.bz2#c7791d28af035651ed6ecac71096c76d
+https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.5-py38hfbd4bf9_0.conda#5401b83c1007f408d0c74e23fa9b5eff
https://conda.anaconda.org/conda-forge/linux-64/multidict-6.0.4-py38h1de0b5d_0.conda#3b6e650480e6b628b2922dd3acd75fd6
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.2-py38h10c12cc_0.conda#05592c85b9f6931dc2df1e80c0d56294
-https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.0-h7d73246_1.tar.bz2#a11b4df9271a8d7917686725aa04c8f2
+https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.0-hfec8fc6_2.conda#5ce6a42505c6e9e6151c54c3ec8d68ea
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
https://conda.anaconda.org/conda-forge/noarch/pprintpp-0.4.0-pyhd8ed1ab_5.conda#3c9f3f3f7e0a9f0b2fd9d0e2064729ba
-https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.16.0-pyhd8ed1ab_0.conda#8efaddc1c8b8ce262c4d1a7c6571c799
https://conda.anaconda.org/conda-forge/linux-64/psutil-5.9.4-py38h0a891b7_0.tar.bz2#fe2ef279417faa1af0adf178de2032f7
https://conda.anaconda.org/conda-forge/noarch/ptyprocess-0.7.0-pyhd3deb0d_0.tar.bz2#359eeb6536da0e687af562ed265ec263
https://conda.anaconda.org/conda-forge/noarch/pure-sasl-0.6.2-pyhd8ed1ab_0.tar.bz2#ac695eecf21ab48093bc33fd60b4102d
@@ -199,30 +205,24 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/linux-64/pycryptodomex-3.16.0-py38h0a891b7_0.conda#4e4e73fd062174c4f78c7a13b852f783
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/linux-64/pyrsistent-0.19.3-py38h1de0b5d_0.conda#a33157288d499397a2a56da4d724948d
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-json-logger-2.0.6-pyhd8ed1ab_0.conda#525828457f46cf124526760c5400982d
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/linux-64/pyyaml-6.0-py38h0a891b7_5.tar.bz2#0856c59f9ddb710c640dc0428d66b1b7
-https://conda.anaconda.org/conda-forge/linux-64/pyzmq-25.0.0-py38he24dcef_0.conda#b7527850daeb11074c2d316fdb9e573e
-https://conda.anaconda.org/conda-forge/linux-64/regex-2022.10.31-py38h0a891b7_0.tar.bz2#307f1db6d6b682f961385e2201cec729
-https://conda.anaconda.org/conda-forge/noarch/rfc3986-validator-0.1.1-pyh9f0ad1d_0.tar.bz2#912a71cc01012ee38e6b90ddd561e36f
+https://conda.anaconda.org/conda-forge/linux-64/pyzmq-25.0.2-py38he24dcef_0.conda#2809c142d8afb750687432f64da8a0a9
+https://conda.anaconda.org/conda-forge/linux-64/regex-2023.3.23-py38h1de0b5d_0.conda#a02e83e3d2a7fc72112d63354f3a6b9e
https://conda.anaconda.org/conda-forge/linux-64/rtree-1.0.1-py38h02d302b_1.tar.bz2#b85cc606fa58810cd623e6853aa58322
-https://conda.anaconda.org/conda-forge/linux-64/ruff-0.0.249-py38h3fb8c2e_0.conda#4688382caf3634fed64b34ead5375965
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/send2trash-1.8.0-pyhd8ed1ab_0.tar.bz2#edab14119efe85c3bf131ad747e9005c
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/linux-64/ruff-0.0.259-py38h3fb8c2e_0.conda#1c52f6929a733b237ed967813dec0577
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
-https://conda.anaconda.org/conda-forge/noarch/sniffio-1.3.0-pyhd8ed1ab_0.tar.bz2#dd6cbc539e74cb1f430efbd4575b9303
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -232,23 +232,24 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/linux-64/tornado-6.2-py38h0a891b7_1.tar.bz2#358beb228a53b5e1031862de3525d1d3
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/linux-64/unicodedata2-15.0.0-py38h0a891b7_0.tar.bz2#44421904760e9f5ae2035193e04360f0
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.5.1-pyhd8ed1ab_0.conda#2a914654b9ade742049dab13e29571c6
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
-https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h7f98852_1.tar.bz2#536cc5db4d0a3ba0630541aec064b5e4
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h0b41bf4_2.conda#82b6df12252e6f32402b96dacc656fec
https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-h7f98852_1003.tar.bz2#f59c1242cc1dd93e72c2ee2b360979eb
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
-https://conda.anaconda.org/conda-forge/noarch/anyio-3.6.2-pyhd8ed1ab_0.tar.bz2#8ada050fa88f26916fc1e76e368a49fd
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.8.186-hecaee15_4.tar.bz2#e29dc8e8611b70cdfcc3139dba6e9001
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-auth-0.6.26-hf365957_1.conda#5f2aefd743f82e4177c997c314a55f22
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-mqtt-0.8.6-hc4349f7_12.conda#0ba6aa71b51d31d48195b26f343d926f
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
https://conda.anaconda.org/conda-forge/linux-64/backports.zoneinfo-0.2.1-py38h0a891b7_7.tar.bz2#003b3a64d3cfff545dd0c12732c5270f
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-ha61ee94_1014.tar.bz2#d1a88f3ed5b52e1024b80d4bcd26a7a0
@@ -256,191 +257,188 @@ https://conda.anaconda.org/conda-forge/linux-64/cffi-1.15.1-py38h4a40e3a_3.conda
https://conda.anaconda.org/conda-forge/linux-64/cfitsio-4.2.0-hd9d235c_0.conda#8c57a9adbafd87f5eff842abde599cb4
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
https://conda.anaconda.org/conda-forge/linux-64/contourpy-1.0.7-py38hfbd4bf9_0.conda#638537863b298151635c05c762a997ab
-https://conda.anaconda.org/conda-forge/linux-64/coverage-7.1.0-py38h1de0b5d_0.conda#b3bb4543dd1be00a686c5545293432cc
-https://conda.anaconda.org/conda-forge/linux-64/curl-7.86.0-h7bff187_1.tar.bz2#bc9567c50833f4b0d36b25caca7b34f8
+https://conda.anaconda.org/conda-forge/linux-64/coverage-7.2.2-py38h1de0b5d_0.conda#fca73ffc742e51b98eaf7c9114b6c60d
+https://conda.anaconda.org/conda-forge/linux-64/curl-7.88.1-hdc1c0ab_1.conda#2016c398f234cfa354ea704c6731b5d5
https://conda.anaconda.org/conda-forge/linux-64/cytoolz-0.12.0-py38h0a891b7_1.tar.bz2#183f6160ab3498b882e903b06be7d430
-https://conda.anaconda.org/conda-forge/linux-64/fastavro-1.7.1-py38h1de0b5d_0.conda#1bb12697a36ddcaf5603ed8ef8f374d4
-https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.38.0-py38h0a891b7_1.tar.bz2#62c89ddefed9c5835e228a32b357a28d
+https://conda.anaconda.org/conda-forge/linux-64/fastavro-1.7.3-py38h1de0b5d_0.conda#a159a0ff7a53d0c2087179749a13ba9b
+https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.2-py38h1de0b5d_0.conda#affec6061f9a2d056db74561477a62b5
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/linux-64/grpcio-1.47.1-py38h5b6373e_6.tar.bz2#d49c41d0b1e691d7c8be386f0e83dee4
-https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.12.2-nompi_h2386368_100.tar.bz2#b014a5f912e0193783e48086b7bb3995
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.12.2-nompi_h4df4325_101.conda#162a25904af6586b234b2dd52ee99c61
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
-https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h18fbbfe_3.tar.bz2#ea9758cf553476ddf75c789fdd239dc5
-https://conda.anaconda.org/conda-forge/linux-64/libgoogle-cloud-2.1.0-h9ebe8e8_2.tar.bz2#e8ae8bddbc20f598706dc3ae15dbf95e
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h5aea950_4.conda#82ef57611ace65b59db35a9687264572
+https://conda.anaconda.org/conda-forge/linux-64/libgoogle-cloud-2.8.0-h0bc5f78_1.conda#bdf605748604b09602f3c841abdba817
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
-https://conda.anaconda.org/conda-forge/linux-64/maturin-0.14.13-py38h9fda977_0.conda#07548beda349117ae97a174bc27741d0
+https://conda.anaconda.org/conda-forge/linux-64/maturin-0.14.16-py38h9fda977_0.conda#44296071d5866bab1da7c880414bc602
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
-https://conda.anaconda.org/conda-forge/linux-64/pillow-9.2.0-py38h9eb91d8_3.tar.bz2#61dc7b3140b7b79b1985b53d52726d74
+https://conda.anaconda.org/conda-forge/linux-64/pillow-9.4.0-py38hde6dc18_1.conda#3de5619d3f556f966189e5251a266125
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/linux-64/postgresql-15.1-hdeef612_1.conda#f89d4c616e48fc8976edaf3b6a9dde0f
-https://conda.anaconda.org/conda-forge/linux-64/proj-9.1.0-h93bde94_0.tar.bz2#255c7204dda39747c3ba380d28b026d7
-https://conda.anaconda.org/conda-forge/linux-64/protobuf-3.20.2-py38hfa26641_1.conda#c8173cbe54565255c8e9965763bce393
+https://conda.anaconda.org/conda-forge/linux-64/postgresql-15.2-h3248436_0.conda#4dbd6c4bc33369751a4d728b392943ba
+https://conda.anaconda.org/conda-forge/linux-64/proj-9.1.1-h8ffa02c_2.conda#c264aea0e16bba26afa0a0940e954492
+https://conda.anaconda.org/conda-forge/linux-64/protobuf-4.21.12-py38h8dc9893_0.conda#237767c44dee8908f533454f9f3cdaae
https://conda.anaconda.org/conda-forge/linux-64/psycopg2-2.9.3-py38h0ca591d_2.conda#d0b1c5e0fa3db14fd5c390cd1282c20e
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
-https://conda.anaconda.org/conda-forge/linux-64/pymssql-2.2.7-py38h8dc9893_0.conda#24503b47e01adda0860e1e9efa6341c2
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/linux-64/pymssql-2.2.5-py38hfa26641_2.tar.bz2#dff8c64010a97809c1e347e6861f6db7
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
-https://conda.anaconda.org/conda-forge/noarch/rfc3339-validator-0.1.4-pyhd8ed1ab_0.tar.bz2#fed45fc5ea0813240707998abe49f520
https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf410858b2cefc267316408a77c436
https://conda.anaconda.org/conda-forge/linux-64/shapely-1.8.5-py38hafd38ec_2.tar.bz2#8df75c6a8c1deac4e99583ec624ff327
https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-1.4.46-py38h1de0b5d_0.conda#c4a14465b79d2e799f24c67d718410e3
-https://conda.anaconda.org/conda-forge/noarch/terminado-0.17.1-pyh41d4057_0.conda#3788984d535770cad699efaeb6cb3037
https://conda.anaconda.org/conda-forge/linux-64/thrift-0.16.0-py38hfa26641_2.tar.bz2#0b8284fee57cd0c59828174238047263
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/linux-64/watchdog-2.2.1-py38h578d9bd_0.conda#409c1af0d9b411bf50c848428d36d5bf
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/linux-64/watchdog-3.0.0-py38h578d9bd_0.conda#41680fdab13981c012669868b4db1c1f
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/linux-64/xerces-c-3.2.4-h55805fa_1.tar.bz2#d127dc8efe24033b306180939e51e6af
https://conda.anaconda.org/conda-forge/linux-64/yarl-1.8.2-py38h0a891b7_0.conda#221202cfdefa7ab301209c9f8e35a00d
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
-https://conda.anaconda.org/conda-forge/linux-64/argon2-cffi-bindings-21.2.0-py38h0a891b7_3.tar.bz2#efcaa056d265a3138d2038a4b6b68791
-https://conda.anaconda.org/conda-forge/linux-64/arrow-cpp-9.0.0-py38he270906_2_cpu.tar.bz2#5d57f15a58fd3c6e7923320960c3f131
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-s3-0.2.7-h909e904_1.conda#7cb3fd9464ed9aaf8189837fe9d96c28
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py38h0a891b7_1005.tar.bz2#e99e08812dfff30fdd17b3f8838e2759
-https://conda.anaconda.org/conda-forge/linux-64/cryptography-38.0.4-py38h2b5fc30_0.conda#6929a22f82fc8b7b0432b07be73796e2
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/linux-64/cryptography-38.0.4-py38h80a4ca7_0.conda#d3c4698fd7475640f4d9eff8d792deac
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
-https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.7.1-ha76d385_4.tar.bz2#6a613710a0f19aba3a5dfe83bf1c1c0f
+https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.7.1-h7a142b4_6.conda#b7963c107ed1f6a95cadc244f95cd3cd
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
https://conda.anaconda.org/conda-forge/linux-64/google-crc32c-1.1.2-py38h57c428a_4.tar.bz2#17d0194449074c5bb7f227b234f577d3
https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-6.0.0-h8e241bc_0.conda#448fe40d2fed88ccf4d9ded37cbb2b38
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
https://conda.anaconda.org/conda-forge/noarch/importlib-resources-5.12.0-pyhd8ed1ab_0.conda#3544c818f0720c89eb16ae6940ab440b
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
-https://conda.anaconda.org/conda-forge/noarch/jupyter_server_terminals-0.4.4-pyhd8ed1ab_1.conda#7c0965e1d4a0ee1529e8eaa03a78a5b3
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/linux-64/kealib-1.5.0-ha7026e8_0.conda#c948b920f45fd81a2dde8b1ab514cc84
-https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.8.1-nompi_h261ec11_106.tar.bz2#9b25de670ce5753a33c18b1090d1d3bf
-https://conda.anaconda.org/conda-forge/linux-64/libspatialite-5.0.1-h7c8129e_22.tar.bz2#23abed7562ad969493b89ad0e5f5c521
+https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.9.1-nompi_h34a3ff0_101.conda#9ce7f5bde721be2f82da9f861c57f1b3
+https://conda.anaconda.org/conda-forge/linux-64/libspatialite-5.0.1-h221c8f1_23.conda#859297085081cfbc123dc60015864f6b
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
https://conda.anaconda.org/conda-forge/linux-64/pandas-1.5.3-py38hdc8b05c_0.conda#5073966d63a54434d2a2fc41d325b072
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
-https://conda.anaconda.org/conda-forge/linux-64/polars-0.16.7-py38h9fda977_0.conda#e9398ee90ac1fb8fe80130db7b98885d
-https://conda.anaconda.org/conda-forge/linux-64/poppler-22.12.0-h92391eb_0.conda#7ad6d858f5615f9b0e9e4bd60395ea75
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/linux-64/polars-0.16.16-py38h9fda977_0.conda#9b3be213431657ea28efe779fda637c0
+https://conda.anaconda.org/conda-forge/linux-64/poppler-23.03.0-h091648b_0.conda#a449be485743e64ed48d340d5424774d
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
-https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.4.1-py38hf928c62_0.conda#bb6d6874f1dcafdd2dce7dfd54d2b96c
+https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.4.1-py38h58d5fe2_1.conda#5286eaec7e93586e4ae05e7d658cd3e2
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
https://conda.anaconda.org/conda-forge/linux-64/pytz-deprecation-shim-0.1.0.post0-py38h578d9bd_3.tar.bz2#e3b86d38943bd7d6ed6122a7e142bf5a
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.13.2-hc2ae436_0.conda#8cb0b84db929d2b32fffbd93c497e5ee
+https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.13.2-hd532e3d_0.conda#6d97164f19dbd27575ef1899b02dc1e0
+https://conda.anaconda.org/conda-forge/linux-64/ukkonen-1.0.1-py38h43d8883_3.tar.bz2#82b3797d08a43a101b645becbb938e65
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
https://conda.anaconda.org/conda-forge/linux-64/aiohttp-3.8.4-py38h1de0b5d_0.conda#97eb5f64bbb0b5847d5dbdfbf1ddadaf
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/argon2-cffi-21.3.0-pyhd8ed1ab_0.tar.bz2#a0b402db58f73aaab8ee0ca1025a362e
+https://conda.anaconda.org/conda-forge/linux-64/aws-crt-cpp-0.19.8-hf7fbfca_12.conda#c2940067a049037ec1789ccfcb853fb4
https://conda.anaconda.org/conda-forge/linux-64/black-23.1.0-py38h578d9bd_0.conda#a47f6789960a5f7455799605586b617f
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.2.0-py38h578d9bd_0.conda#7372cbf4e1dccc1a6358c43d7487c322
-https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.6.3-pyhd8ed1ab_0.conda#d98c5196ab6ffeb0c2feca2912801353
-https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.6.1-h896b04b_1.conda#0ef3cdacbcefb93d2e94b017db6d9c8a
-https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.0-py38hd6c3c57_0.conda#dd63f6486ba95c036b6bfe0b5c53d875
+https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.3.0-py38h578d9bd_0.conda#d75b783a348cf33c6d3d75480300fecd
+https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.6.2-h6c674c2_9.conda#d6023c0a9a1b0c04c78d0d33d98e6620
+https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.1-py38hd6c3c57_0.conda#3b8ba76acae09fbd4b2247c4ee4c0324
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
-https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.13-hd33c08f_0.conda#e3b13445b8ee9d6a3d53a714f89ccd76
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
+https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.14-hd33c08f_0.conda#a8b9e35dd7be2c945b0de4fe19a7c3a9
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/linux-64/tzlocal-4.2-py38h578d9bd_2.tar.bz2#c03287c09bf8c4ccdfc7b1a2df094f1e
+https://conda.anaconda.org/conda-forge/linux-64/tzlocal-4.3-py38h578d9bd_0.conda#a87c25e71408ea93e3cf38d2503e6669
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.10.57-h17c43bd_8.conda#a318ddbd962b0ec5639cc4fb7e9b2230
https://conda.anaconda.org/conda-forge/linux-64/clickhouse-driver-0.2.5-py38h0a891b7_0.conda#76149a89552ea2a138c6425abb7cdefd
-https://conda.anaconda.org/conda-forge/linux-64/gdal-3.6.1-py38h99c2c3e_1.conda#e85c717e9362ca0691096e6fc178de0e
+https://conda.anaconda.org/conda-forge/linux-64/gdal-3.6.2-py38h58634bd_9.conda#8c1d5b9547768e355a247cfc3df9fb99
https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-h90689f9_2.tar.bz2#957a0255ab58aaf394a91725d73ab422
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyh41d4057_0.conda#4703355103974293bbd8a32449b3ff28
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.54.4-h7abd40a_0.tar.bz2#921e53675ed5ea352f022b79abab076a
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
-https://conda.anaconda.org/conda-forge/linux-64/pyarrow-9.0.0-py38h097c49a_2_cpu.tar.bz2#86671f0fe2da758bd20bf4434b16599c
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
-https://conda.anaconda.org/conda-forge/linux-64/datafusion-0.7.0-py38h9fda977_0.conda#52495a8228668ed03c13ea8d7c3cce40
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/linux-64/fiona-1.8.22-py38h85a5e0f_5.conda#64b9f580d12189fa35c480719efd518a
-https://conda.anaconda.org/conda-forge/linux-64/graphviz-7.0.5-h2e5815a_0.conda#96bf06b24d74a5bf826485e9032c9312
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh210e3f2_0.conda#f4c469f01c4aa05f77ab2f70c2fbbef2
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/linux-64/fiona-1.9.1-py38h85a5e0f_0.conda#809691aba60f9d63d1d3c4e52f716d16
+https://conda.anaconda.org/conda-forge/linux-64/graphviz-7.1.0-h2e5815a_0.conda#e7ecda996c443142a0e9c379f3b28e48
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyh41d4057_0.conda#c8f4db8b2fc42692b3b7f1e348b2ab59
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/linux-64/libarrow-11.0.0-h93537a5_13_cpu.conda#49d5c8c33c0d1db3362058d45da6af69
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/linux-64/python-duckdb-0.7.0-py38h8db18de_1.conda#80334c349cb162ca40209f8044e1a129
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/linux-64/arrow-cpp-11.0.0-ha770c72_13_cpu.conda#26ab48029304dce678b7084206415e03
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh210e3f2_0.conda#1b463a5f4b7c83f509f6a1168a6ef554
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
-https://conda.anaconda.org/conda-forge/linux-64/snowflake-connector-python-2.8.3-py38hd7a726b_0.conda#d79759301cabe7f80dc736556b9df829
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
-https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.3.0-pyhd8ed1ab_0.conda#644c60cdd1e85407fc28b9085438c7a0
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/linux-64/scipy-1.10.0-py38h10c12cc_2.conda#d6a3defdc4ab4acd69c04c8ef73d9b57
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
+https://conda.anaconda.org/conda-forge/linux-64/scipy-1.10.1-py38h10c12cc_0.conda#1cbc47bb9a600ce4a49d8da797d375bf
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
-https://conda.anaconda.org/conda-forge/noarch/notebook-shim-0.2.2-pyhd8ed1ab_0.tar.bz2#40be846cd4e78672a40e43db9dae753c
+https://conda.anaconda.org/conda-forge/linux-64/pyarrow-11.0.0-py38hf05218d_13_cpu.conda#115e8efa8efec9d2925d24018299a6bc
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/linux-64/scikit-learn-1.2.1-py38h1e1a916_0.conda#77841d41b4928e10aba52fb485cb7f5c
-https://conda.anaconda.org/conda-forge/linux-64/google-cloud-bigquery-core-3.4.2-py38h578d9bd_0.conda#19ca445749c30988d969213c37219824
+https://conda.anaconda.org/conda-forge/linux-64/scikit-learn-1.2.2-py38hd4b6e60_1.conda#63220c9150e5af9d41e0c311969af04c
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/linux-64/datafusion-0.7.0-py38h9fda977_0.conda#52495a8228668ed03c13ea8d7c3cce40
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
-https://conda.anaconda.org/conda-forge/noarch/nbclassic-0.5.2-pyhd8ed1ab_0.conda#c5039404bd47fbdc811b5e9282c51afe
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/linux-64/python-duckdb-0.7.1-py38hc166876_0.conda#a545037c993c4fc552e5241c2eb2729f
+https://conda.anaconda.org/conda-forge/linux-64/snowflake-connector-python-3.0.2-py38hc166876_0.conda#707d8d3e030d04ec6eedc3ddefa7b4d4
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.2-pyha770c72_1.tar.bz2#7bf26ca095481f206e6f9dd7681085fe
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-3.6.1-pyha770c72_0.tar.bz2#03cd073d4dc0623b857bf9e175d0f736
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-7.7.1-pyhd8ed1ab_0.tar.bz2#96ba78bf526df670bf9562d6100eb627
-https://conda.anaconda.org/conda-forge/linux-64/google-cloud-bigquery-3.4.2-py38h578d9bd_0.conda#c711eaa01acb06524e25a70cdf458e6b
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
diff --git a/linux-64-3.9.lock b/linux-64-3.9.lock
index 6d09617..f9ff6bf 100644
--- a/linux-64-3.9.lock
+++ b/linux-64-3.9.lock
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
-# input_hash: dff7f7654e544dee36e375397820eaa36a102f153d8d750db4d6fbeaa1607e92
+# input_hash: 66beede71ed2acd3e40122bf6226a5dfd9ae0bfc2edcb377ba742057d10a0222
@EXPLICIT
https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.12.7-ha878542_0.conda#ff9f73d45c4a07d6f424495288a26080
@@ -13,14 +13,14 @@ https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-12.2.0-h337968e_19.
https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-12.2.0-h46fd767_19.tar.bz2#1030b1f38c129f2634eae026f704fe60
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.9-3_cp39.conda#0dd193187d54e585cac7eab942a8847e
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-12.2.0-h69a702a_19.tar.bz2#cd7a806282c16e1f2d39a7e80d3a3e0d
https://conda.anaconda.org/conda-forge/linux-64/libgomp-12.2.0-h65d4601_19.tar.bz2#cedcee7c064c01c403f962c9e8d3c373
https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2#73aaf86a425cc6e73fcf236a5a46396d
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-12.2.0-h65d4601_19.tar.bz2#e4c94f80aef025c17ab0828cd85ef535
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.6.2-h7f98852_0.tar.bz2#ce69a062b3080485b760378841240634
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.8.14-h0b41bf4_0.conda#2512d4aa4007fdf7b705713d73bf6967
https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2#a1fd65c7ccbf10880423d82bca54eb54
https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.18.1-h7f98852_0.tar.bz2#f26ef8098fab1f719c91eb760d63381a
https://conda.anaconda.org/conda-forge/linux-64/expat-2.5.0-h27087fc_0.tar.bz2#c4fbad8d4bddeb3c085f18cbf97fbfad
@@ -29,7 +29,7 @@ https://conda.anaconda.org/conda-forge/linux-64/fribidi-1.0.10-h36c2ea0_0.tar.bz
https://conda.anaconda.org/conda-forge/linux-64/geos-3.11.1-h27087fc_0.tar.bz2#917b9a50001fffdd89b321b5dba31e55
https://conda.anaconda.org/conda-forge/linux-64/gettext-0.21.1-h27087fc_0.tar.bz2#14947d8770185e5153fdd04d4673ed37
https://conda.anaconda.org/conda-forge/linux-64/gflags-2.2.2-he1b5a44_1004.tar.bz2#cddaf2c63ea4a5901cf09524c490ecdc
-https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h36c2ea0_2.tar.bz2#626e68ae9cc5912d6adb79d318cf962d
+https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h0b41bf4_3.conda#96f3b11872ef6fad973eac856cd2624f
https://conda.anaconda.org/conda-forge/linux-64/gmp-6.2.1-h58526e2_0.tar.bz2#b94cf2db16066b242ebd26db2facbd56
https://conda.anaconda.org/conda-forge/linux-64/graphite2-1.3.13-h58526e2_1001.tar.bz2#8c54672728e8ec6aa6db90cf2806d220
https://conda.anaconda.org/conda-forge/linux-64/icu-70.1-h27087fc_0.tar.bz2#87473a15119779e021c314249d4b4aed
@@ -37,14 +37,16 @@ https://conda.anaconda.org/conda-forge/linux-64/jpeg-9e-h0b41bf4_3.conda#c7a0692
https://conda.anaconda.org/conda-forge/linux-64/json-c-0.16-hc379101_0.tar.bz2#0e2bca6857cb73acec30387fef7c3142
https://conda.anaconda.org/conda-forge/linux-64/keyutils-1.6.1-h166bdaf_0.tar.bz2#30186d27e2c9fa62b45fb1476b7200e3
https://conda.anaconda.org/conda-forge/linux-64/lerc-4.0.0-h27087fc_0.tar.bz2#76bbff344f0134279f225174e9064c8f
-https://conda.anaconda.org/conda-forge/linux-64/libabseil-20220623.0-cxx17_h05df665_6.conda#39f6394ae835f0b16f01cbbd3bb1e8e2
+https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230125.0-cxx17_hcb278e6_1.conda#a1c65f83198fd8d0328c0a6482c6f31b
+https://conda.anaconda.org/conda-forge/linux-64/libaec-1.0.6-hcb278e6_1.conda#0f683578378cddb223e7fd24f785ab2a
https://conda.anaconda.org/conda-forge/linux-64/libbrotlicommon-1.0.9-h166bdaf_8.tar.bz2#9194c9bf9428035a05352d031462eae4
https://conda.anaconda.org/conda-forge/linux-64/libcrc32c-1.1.2-h9c3ff4c_0.tar.bz2#c965a5aa0d5c1c37ffc62dff36e28400
-https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.14-h166bdaf_0.tar.bz2#fc84a0446e4e4fb882e78d786cfb9734
+https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.17-h0b41bf4_0.conda#5cc781fd91968b11a8a7fdbee0982676
https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-h516909a_1.tar.bz2#6f8720dff19e17ce5d48cfe7f3d2f0a3
https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2#d645c6d2ac96843a2bfaccd2d62b3ac3
https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2#b62b52da46c39ee2bc3c162ac7f1804d
https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.0-h7f98852_0.tar.bz2#39b1328babf85c7c3a61636d9cd50206
+https://conda.anaconda.org/conda-forge/linux-64/libnuma-2.0.16-h0b41bf4_1.conda#28bfe2cb11357ccc5be21101a6b7ce86
https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.21-pthreads_h78a6416_3.tar.bz2#8c5963a49b6035c40646a763293fbb35
https://conda.anaconda.org/conda-forge/linux-64/libsodium-1.0.18-h36c2ea0_1.tar.bz2#c3788462a6fbddafdb413a9f9053e58d
https://conda.anaconda.org/conda-forge/linux-64/libspatialindex-1.9.3-h9c3ff4c_4.tar.bz2#d87fbe9c0ff589e802ff13872980bfd9
@@ -56,81 +58,85 @@ https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-h166bdaf_4.tar.bz
https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.9.4-hcb278e6_0.conda#318b08df404f9c9be5712aaa5a6f0bb0
https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.3-h27087fc_1.tar.bz2#4acfc691e64342b9dae57cf2adc63238
https://conda.anaconda.org/conda-forge/linux-64/nspr-4.35-h27087fc_0.conda#da0ec11a6454ae19bff5b02ed881a2b1
-https://conda.anaconda.org/conda-forge/linux-64/openssl-1.1.1t-h0b41bf4_0.conda#a35dc66c4cee8c4399507d14cf1501b1
+https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.0-h0b41bf4_0.conda#2d833be81a21128e317325a01326d36f
https://conda.anaconda.org/conda-forge/linux-64/pixman-0.40.0-h36c2ea0_0.tar.bz2#660e72c82f2e75a6b3fe6a6e75c79f19
https://conda.anaconda.org/conda-forge/linux-64/pthread-stubs-0.4-h36c2ea0_1001.tar.bz2#22dad4df6e8630e8dff2428f6f6a7036
-https://conda.anaconda.org/conda-forge/linux-64/re2-2022.06.01-h27087fc_1.conda#68070cd09c67755f37e0db13f00a008b
-https://conda.anaconda.org/conda-forge/linux-64/snappy-1.1.9-hbd366e4_2.tar.bz2#48018e187dacc6002d3ede9c824238ac
-https://conda.anaconda.org/conda-forge/linux-64/tzcode-2022g-h166bdaf_0.conda#229620ecbc0bf2f9f04b888fd3478f79
+https://conda.anaconda.org/conda-forge/linux-64/re2-2023.02.02-hcb278e6_0.conda#ecfc7890f1bd597ba55fbda1396f46fe
+https://conda.anaconda.org/conda-forge/linux-64/snappy-1.1.10-h9fff704_0.conda#e6d228cd0bb74a51dd18f5bfce0b4115
+https://conda.anaconda.org/conda-forge/linux-64/tzcode-2023b-h0b41bf4_0.conda#54e266a59d6da0d119461e830a41f1db
https://conda.anaconda.org/conda-forge/linux-64/xorg-kbproto-1.0.7-h7f98852_1002.tar.bz2#4b230e8381279d76131116660f5a241a
https://conda.anaconda.org/conda-forge/linux-64/xorg-libice-1.0.10-h7f98852_0.tar.bz2#d6b0b50b49eccfe0be0373be628be0f3
https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.9-h7f98852_0.tar.bz2#bf6f803a544f26ebbdc3bfff272eb179
https://conda.anaconda.org/conda-forge/linux-64/xorg-libxdmcp-1.1.3-h7f98852_0.tar.bz2#be93aabceefa2fac576e971aef407908
https://conda.anaconda.org/conda-forge/linux-64/xorg-renderproto-0.11.1-h7f98852_1002.tar.bz2#06feff3d2634e3097ce2fe681474b534
-https://conda.anaconda.org/conda-forge/linux-64/xorg-xextproto-7.3.0-h7f98852_1002.tar.bz2#1e15f6ad85a7d743a2ac68dae6c82b98
+https://conda.anaconda.org/conda-forge/linux-64/xorg-xextproto-7.3.0-h0b41bf4_1003.conda#bce9f945da8ad2ae9b1d7165a64d0f87
https://conda.anaconda.org/conda-forge/linux-64/xorg-xproto-7.0.31-h7f98852_1007.tar.bz2#b4a4381d54784606820704f7b5f05a15
https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2#2161070d867d1b1204ea749c8eec4ef0
https://conda.anaconda.org/conda-forge/linux-64/yaml-0.2.5-h7f98852_2.tar.bz2#4cb3ad778ec2d5a7acbdf254eb1c42ae
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-cal-0.5.11-h95a6274_0.tar.bz2#d4e7b241fb22dd3d7be1171f813d5da3
-https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.11-ha31a3da_7.tar.bz2#2fdb96aaab883abc0766ff76c0a34483
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-cal-0.5.21-h48707d8_2.conda#de2efba4b6f1635d5682728460808487
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-compression-0.2.16-h03acc5a_5.conda#6bc5d85dbafdd7acbcc243793ae8fa05
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-sdkutils-0.1.8-h03acc5a_0.conda#347cdfafa34723feda1beed53ac7d092
+https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.14-h03acc5a_5.conda#621ec569388ccd005e974a8cb66ab869
https://conda.anaconda.org/conda-forge/linux-64/glog-0.6.0-h6f12383_0.tar.bz2#b31f3565cb84435407594e548a2fb7b2
https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-16_linux64_openblas.tar.bz2#d9b7a8639171f6c6fa0a983edabcfe2b
https://conda.anaconda.org/conda-forge/linux-64/libbrotlidec-1.0.9-h166bdaf_8.tar.bz2#4ae4d7795d33e02bd20f6b23d91caf82
https://conda.anaconda.org/conda-forge/linux-64/libbrotlienc-1.0.9-h166bdaf_8.tar.bz2#04bac51ba35ea023dc48af73c1c88c25
https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20191231-he28a2e2_2.tar.bz2#4d331e44109e3f0e19b4cb8f9b82f3e1
-https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-h9b69904_4.tar.bz2#390026683aef81db27ff1b8570ca1336
-https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.51.0-hdcd2b5c_0.conda#c42b460bae0365fb9777b1ff9d09a554
+https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.10-h28343ad_4.tar.bz2#4a049fc560e00e43151dc51368915fdd
+https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.52.0-h61bc06f_0.conda#613955a50485812985c059e7b269f42e
https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.39-h753d276_0.conda#e1c890aebdebbfbf87e2c917187b4416
-https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-3.20.2-h6239696_0.tar.bz2#dd9c398d02aa82219a4ea5fa69739ae7
+https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-3.21.12-h3eb15da_0.conda#4b36c68184c6c85d88c6e595a32a1ede
https://conda.anaconda.org/conda-forge/linux-64/librttopo-1.1.0-ha49c73b_12.tar.bz2#d2047c6de84b07a1db9cbe1683939956
https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.40.0-h753d276_0.tar.bz2#2e5f9a37d487e1019fd4d8113adb2f9f
-https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.10.0-haa6b8db_3.tar.bz2#89acee135f0809a18a1f4537390aa2dd
+https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.10.0-hf14f497_3.tar.bz2#d85acad4b47dff4e3def14a769a97906
https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1004.tar.bz2#b3653fdc58d03face9724f602218a904
-https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-h7463322_0.tar.bz2#3b933ea47ef8f330c4c068af25fcd6a8
-https://conda.anaconda.org/conda-forge/linux-64/libzip-1.9.2-hc869a4a_1.tar.bz2#7a268cf1386d271e576e35ae82149ef2
-https://conda.anaconda.org/conda-forge/linux-64/pandoc-2.19.2-h32600fe_1.tar.bz2#35a82883468c85ac8bf41f083c1933cf
+https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-hca2bb57_4.conda#bb808b654bdc3c783deaf107a2ffb503
+https://conda.anaconda.org/conda-forge/linux-64/libzip-1.9.2-hc929e4a_1.tar.bz2#5b122b50e738c4be5c3f2899f010d7cf
+https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.1.1-h32600fe_0.conda#68dcea6605bcebb17215d2b4efb3e1cf
https://conda.anaconda.org/conda-forge/linux-64/pcre2-10.40-hc3806b6_0.tar.bz2#69e2c796349cd9b273890bee0febfe1b
-https://conda.anaconda.org/conda-forge/linux-64/readline-8.1.2-h0f457ee_0.tar.bz2#db2ebbe2943aae81ed051a6a9af8e0fa
-https://conda.anaconda.org/conda-forge/linux-64/s2n-1.0.10-h9b69904_0.tar.bz2#9708c3ac26c20b4c4549cbe8fef937eb
+https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda#47d31b792659ce70f470b5c82fdfb7a4
+https://conda.anaconda.org/conda-forge/linux-64/s2n-1.3.41-h3358134_0.conda#6e3b75864fd97aef652c0d61bc2804be
https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.12-h27826a3_0.tar.bz2#5b8c42eb62e9fc961af70bdd6a26e168
+https://conda.anaconda.org/conda-forge/linux-64/ucx-1.14.0-ha0ee010_0.conda#7f34aae830e22c4212c14bd456c1796c
https://conda.anaconda.org/conda-forge/linux-64/xorg-libsm-1.2.3-hd9c2040_1000.tar.bz2#9e856f78d5c80d5a78f61e72d1d473a3
https://conda.anaconda.org/conda-forge/linux-64/zeromq-4.3.4-h9c3ff4c_1.tar.bz2#21743a8d2ea0c8cfbbf8fe489b0347df
https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.13-h166bdaf_4.tar.bz2#4b11e365c0275b808be78b30f904e295
https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.2-h3eb15da_6.conda#6b63daed8feeca47be78f323e793d555
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-io-0.10.5-hfb6a706_0.tar.bz2#47d6b88b0c42a8c9877f3993b49f052d
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-io-0.13.19-h5b20300_3.conda#2f8cdd45bb9983aa337a6357b12951c5
https://conda.anaconda.org/conda-forge/linux-64/blosc-1.21.3-hafa529b_0.conda#bcf0664a2dbbbb86cbd4c1e6ff10ddd6
https://conda.anaconda.org/conda-forge/linux-64/boost-cpp-1.78.0-h75c5d50_1.tar.bz2#accc1f1ca33809bbf9ad067a0a69e236
https://conda.anaconda.org/conda-forge/linux-64/brotli-bin-1.0.9-h166bdaf_8.tar.bz2#e5613f2bc717e9945840ff474419b8e4
https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-hca18f0e_1.conda#e1232042de76d24539a436d37597eb06
-https://conda.anaconda.org/conda-forge/linux-64/grpc-cpp-1.47.1-hbad87ad_6.tar.bz2#6d0f1ddd701aebf007274ee5ea9a3018
https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.15-h9772cbc_5.tar.bz2#ee08782aff2ff9b3291c967fa6bc7336
-https://conda.anaconda.org/conda-forge/linux-64/krb5-1.19.3-h3790be6_0.tar.bz2#7d862b05445123144bec92cb1acc8ef8
+https://conda.anaconda.org/conda-forge/linux-64/krb5-1.20.1-h81ceb04_0.conda#89a41adce7106749573d883b2f657d78
https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-16_linux64_openblas.tar.bz2#20bae26d0a1db73f758fc3754cab4719
https://conda.anaconda.org/conda-forge/linux-64/libglib-2.74.1-h606061b_1.tar.bz2#ed5349aa96776e00b34eccecf4a948fe
+https://conda.anaconda.org/conda-forge/linux-64/libgrpc-1.52.1-hcf146ea_1.conda#999b2527de4ab2a3472d51a5aab719c4
https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-16_linux64_openblas.tar.bz2#955d993f41f9354bf753d29864ea20ad
-https://conda.anaconda.org/conda-forge/linux-64/libthrift-0.16.0-h491838f_2.tar.bz2#9134d477d02ad9264c6ee359fa36702c
-https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.4.0-h82bc61c_5.conda#e712a63a21f9db647982971dc121cdcf
-https://conda.anaconda.org/conda-forge/linux-64/nss-3.88-he45b914_0.conda#d7a81dfb99ad8fbb88872fb7ec646e6c
-https://conda.anaconda.org/conda-forge/linux-64/orc-1.7.6-h6c59b99_0.tar.bz2#7978db6ca7b2932ccf9d3c36093f8281
-https://conda.anaconda.org/conda-forge/linux-64/python-3.9.15-h47a2c10_0_cpython.conda#4c15ad54369ad2fa36a0d56c6675e241
+https://conda.anaconda.org/conda-forge/linux-64/libthrift-0.18.1-h5e4af38_0.conda#a2fab690ff5efa0d31cf5e27cd433faa
+https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.0-h6adf6a1_2.conda#2e648a34072eb39d7c4fc2a9981c5f0c
+https://conda.anaconda.org/conda-forge/linux-64/nss-3.89-he45b914_0.conda#2745719a58eeaab6657256a3f142f099
+https://conda.anaconda.org/conda-forge/linux-64/orc-1.8.3-hfdbbad2_0.conda#8aafd0a5ba97bf0cc451550b147a4e0a
+https://conda.anaconda.org/conda-forge/linux-64/python-3.9.16-h2782a2a_0_cpython.conda#95c9b7c96a7fd7342e0c9d0a917b8f78
https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.40.0-h4ff8645_0.tar.bz2#bb11803129cbbb53ed56f9506ff74145
https://conda.anaconda.org/conda-forge/linux-64/unixodbc-2.3.10-h583eb01_0.tar.bz2#906893193434d971b6f92839086f430d
-https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.7.2-h7f98852_0.tar.bz2#12a61e640b8894504326aadafccbb790
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.4-h0b41bf4_0.conda#ea8fbfeb976ac49cbeb594e985393514
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/linux-64/atk-1.0-2.38.0-hd4edc92_1.tar.bz2#6c72ec3e660a51736913ef6ea68c454b
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.2.7-h3541f99_13.tar.bz2#39768ba0fe69c241d54703a7f5e3119f
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.2.20-h00877a2_4.conda#cd282ae47b410df93a192b16399100d0
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-http-0.7.6-hf342b9f_0.conda#ddec786d29917630faee14b54aac584d
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
https://conda.anaconda.org/conda-forge/linux-64/backports.zoneinfo-0.2.1-py39hf3d152e_7.tar.bz2#b1a72c73acf3527aa5c1e2eed594fa25
-https://conda.anaconda.org/conda-forge/linux-64/bitarray-2.7.2-py39h72bdee0_0.conda#31c9d1166ff5c29cc6d82ad96bec6800
+https://conda.anaconda.org/conda-forge/linux-64/bitarray-2.7.3-py39h72bdee0_0.conda#1857719e898766bdaf3b8e2d79a284cb
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-h166bdaf_8.tar.bz2#2ff08978892a3e8b954397c461f18418
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
https://conda.anaconda.org/conda-forge/linux-64/clickhouse-cityhash-1.0.2.3-py39h5a03fae_4.tar.bz2#1f3e58a560fcf033a81d8ac88a678f39
@@ -140,31 +146,32 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.6.6-py39h227be39_0.conda#bfd2d6f572201394387edcadc4a08888
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
-https://conda.anaconda.org/conda-forge/noarch/flit-core-3.8.0-pyhd8ed1ab_0.tar.bz2#6d5e56de2e65da7aa35fd10131226efa
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.14.2-h14ed4e7_0.conda#0f69b688f52ff6da70bccb7ff7001d1d
-https://conda.anaconda.org/conda-forge/linux-64/freetds-1.3.16-h41fea10_0.conda#912ba9630b3d6287760536bf041e78b0
+https://conda.anaconda.org/conda-forge/linux-64/freetds-1.1.15-h1770fba_1.tar.bz2#9ebc291d4a9f33099a59a47f9af72a17
https://conda.anaconda.org/conda-forge/linux-64/frozenlist-1.3.3-py39hb9d737c_0.tar.bz2#e5e0bc1285c83d925b42ad139adca58f
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
-https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.8-hff1cb4f_1.tar.bz2#a61c6312192e7c9de71548a6706a21e6
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.10-h05c8ddd_0.conda#1a109126a43003d65b39c1cad656bc9b
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/linux-64/greenlet-2.0.2-py39h227be39_0.conda#c286c4afbe034845b96c78125c1aff15
+https://conda.anaconda.org/conda-forge/linux-64/grpcio-1.52.1-py39h227be39_1.conda#605c929b282ee88a42f08c61131ec1fc
https://conda.anaconda.org/conda-forge/linux-64/gts-0.7.6-h64030ff_2.tar.bz2#112eb9b5b93f0c02e59aea4fd1967363
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-1.1.2-pyhd8ed1ab_0.conda#1a7584b46014b66568069cb6ef2253bf
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.4-py39hf939315_1.tar.bz2#41679a052a8ce841c74df1ebc802e411
-https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.14-h6ed2654_0.tar.bz2#dcc588839de1445d90995a0a2c4f3a39
-https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.86.0-h7bff187_1.tar.bz2#5e5f33d81f31598d87f9b849f73c30e3
+https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hfd0df8a_0.conda#aa8840cdf17ef0c6084d1e24abc7a28b
+https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.88.1-hdc1c0ab_1.conda#3d1189864d1c0ed2a5919cb067b5903d
https://conda.anaconda.org/conda-forge/linux-64/libkml-1.3.0-h37653c0_1015.tar.bz2#37d3747dd24d604f63d2610910576e63
-https://conda.anaconda.org/conda-forge/linux-64/libpq-15.1-hf695f80_1.conda#12a501b9ee0927abfc95083303b6c89f
-https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.4-h522a892_0.tar.bz2#802e43f480122a85ae6a34c1909f8f98
+https://conda.anaconda.org/conda-forge/linux-64/libpq-15.2-hb675445_0.conda#4654b17eccaba55b8581d6b9c77f53cc
+https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.4-h1daa5a0_1.conda#77003f63d1763c1e6569a02c1742c9f4
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/linux-64/lz4-4.3.2-py39h724f13c_0.conda#c2c31bf17fa6b19094709472ed6580fe
https://conda.anaconda.org/conda-forge/linux-64/markupsafe-2.1.2-py39h72bdee0_0.conda#35514f5320206df9f4661c138c02e1c1
@@ -172,24 +179,23 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.4-py39hf939315_1.tar.bz2#1476ded6cd61da1e2d921a2396207c75
+https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.5-py39h4b4f3f3_0.conda#413374bab5022a5199c5dd89aef75df5
https://conda.anaconda.org/conda-forge/linux-64/multidict-6.0.4-py39h72bdee0_0.conda#85d78bf46da38d726c8c6bec78f90fa8
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
https://conda.anaconda.org/conda-forge/linux-64/numpy-1.24.2-py39h7360e5f_0.conda#757070dc7cc33003254888808cd34f1e
-https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.0-h7d73246_1.tar.bz2#a11b4df9271a8d7917686725aa04c8f2
+https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.0-hfec8fc6_2.conda#5ce6a42505c6e9e6151c54c3ec8d68ea
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
https://conda.anaconda.org/conda-forge/noarch/pprintpp-0.4.0-pyhd8ed1ab_5.conda#3c9f3f3f7e0a9f0b2fd9d0e2064729ba
-https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.16.0-pyhd8ed1ab_0.conda#8efaddc1c8b8ce262c4d1a7c6571c799
https://conda.anaconda.org/conda-forge/linux-64/psutil-5.9.4-py39hb9d737c_0.tar.bz2#12184951da572828fb986b06ffb63eed
https://conda.anaconda.org/conda-forge/noarch/ptyprocess-0.7.0-pyhd3deb0d_0.tar.bz2#359eeb6536da0e687af562ed265ec263
https://conda.anaconda.org/conda-forge/noarch/pure-sasl-0.6.2-pyhd8ed1ab_0.tar.bz2#ac695eecf21ab48093bc33fd60b4102d
@@ -200,30 +206,24 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/linux-64/pycryptodomex-3.16.0-py39hb9d737c_0.conda#242581a5828003ae7002b9037a1de87f
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/linux-64/pyrsistent-0.19.3-py39h72bdee0_0.conda#659013ef00dcd1751bfd26d894f73857
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-json-logger-2.0.6-pyhd8ed1ab_0.conda#525828457f46cf124526760c5400982d
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/linux-64/pyyaml-6.0-py39hb9d737c_5.tar.bz2#ef9db3c38ae7275f6b14491cfe61a248
-https://conda.anaconda.org/conda-forge/linux-64/pyzmq-25.0.0-py39h0be026e_0.conda#7ed232c22ecbe2cabdebafa7d422f51d
-https://conda.anaconda.org/conda-forge/linux-64/regex-2022.10.31-py39hb9d737c_0.tar.bz2#225db0bae910b9fc6722eb23e60b1079
-https://conda.anaconda.org/conda-forge/noarch/rfc3986-validator-0.1.1-pyh9f0ad1d_0.tar.bz2#912a71cc01012ee38e6b90ddd561e36f
+https://conda.anaconda.org/conda-forge/linux-64/pyzmq-25.0.2-py39h0be026e_0.conda#6642e383076fe1c1514ebfe04d7206f2
+https://conda.anaconda.org/conda-forge/linux-64/regex-2023.3.23-py39h72bdee0_0.conda#ad6db6b8924acbc37ae6d961dfbbf19f
https://conda.anaconda.org/conda-forge/linux-64/rtree-1.0.1-py39hb102c33_1.tar.bz2#b3813b718ca1da036a48e3fe1db3edd8
-https://conda.anaconda.org/conda-forge/linux-64/ruff-0.0.249-py39h16b1714_0.conda#588cce074691836c2e8ced8b53d912af
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/send2trash-1.8.0-pyhd8ed1ab_0.tar.bz2#edab14119efe85c3bf131ad747e9005c
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/linux-64/ruff-0.0.259-py39h16b1714_0.conda#7df606cf70461b1b076a7cac1af7e570
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
-https://conda.anaconda.org/conda-forge/noarch/sniffio-1.3.0-pyhd8ed1ab_0.tar.bz2#dd6cbc539e74cb1f430efbd4575b9303
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -233,22 +233,23 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/linux-64/tornado-6.2-py39hb9d737c_1.tar.bz2#8a7d309b08cff6386fe384aa10dd3748
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/linux-64/unicodedata2-15.0.0-py39hb9d737c_0.tar.bz2#230d65004135bf312504a1bbcb0c7a08
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.5.1-pyhd8ed1ab_0.conda#2a914654b9ade742049dab13e29571c6
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
-https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h7f98852_1.tar.bz2#536cc5db4d0a3ba0630541aec064b5e4
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h0b41bf4_2.conda#82b6df12252e6f32402b96dacc656fec
https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-h7f98852_1003.tar.bz2#f59c1242cc1dd93e72c2ee2b360979eb
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
-https://conda.anaconda.org/conda-forge/noarch/anyio-3.6.2-pyhd8ed1ab_0.tar.bz2#8ada050fa88f26916fc1e76e368a49fd
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.8.186-hecaee15_4.tar.bz2#e29dc8e8611b70cdfcc3139dba6e9001
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-auth-0.6.26-hf365957_1.conda#5f2aefd743f82e4177c997c314a55f22
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-mqtt-0.8.6-hc4349f7_12.conda#0ba6aa71b51d31d48195b26f343d926f
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-ha61ee94_1014.tar.bz2#d1a88f3ed5b52e1024b80d4bcd26a7a0
@@ -256,73 +257,69 @@ https://conda.anaconda.org/conda-forge/linux-64/cffi-1.15.1-py39he91dace_3.conda
https://conda.anaconda.org/conda-forge/linux-64/cfitsio-4.2.0-hd9d235c_0.conda#8c57a9adbafd87f5eff842abde599cb4
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
https://conda.anaconda.org/conda-forge/linux-64/contourpy-1.0.7-py39h4b4f3f3_0.conda#c5387f3fb1f5b8b71e1c865fc55f4951
-https://conda.anaconda.org/conda-forge/linux-64/coverage-7.1.0-py39h72bdee0_0.conda#915b100b564875cceb85cbeab61fd678
-https://conda.anaconda.org/conda-forge/linux-64/curl-7.86.0-h7bff187_1.tar.bz2#bc9567c50833f4b0d36b25caca7b34f8
+https://conda.anaconda.org/conda-forge/linux-64/coverage-7.2.2-py39h72bdee0_0.conda#a7cd6538571364a455c613e3be652f9d
+https://conda.anaconda.org/conda-forge/linux-64/curl-7.88.1-hdc1c0ab_1.conda#2016c398f234cfa354ea704c6731b5d5
https://conda.anaconda.org/conda-forge/linux-64/cytoolz-0.12.0-py39hb9d737c_1.tar.bz2#eb31327ace8dac15c2df243d9505a132
-https://conda.anaconda.org/conda-forge/linux-64/fastavro-1.7.1-py39h72bdee0_0.conda#d0ae960e1e4ea8cdc65c8c8c64604a53
-https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.38.0-py39hb9d737c_1.tar.bz2#3f2d104f2fefdd5e8a205dd3aacbf1d7
+https://conda.anaconda.org/conda-forge/linux-64/fastavro-1.7.3-py39h72bdee0_0.conda#30d970b89ae3fd0a513bf6898e610eb5
+https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.39.2-py39h72bdee0_0.conda#f87853cd6f76c4b8014b41fa522e5bda
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/linux-64/grpcio-1.47.1-py39h43a650c_6.tar.bz2#2d75b0f641ba3e9994810c85b6b189a2
-https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.12.2-nompi_h2386368_100.tar.bz2#b014a5f912e0193783e48086b7bb3995
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.12.2-nompi_h4df4325_101.conda#162a25904af6586b234b2dd52ee99c61
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
-https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h18fbbfe_3.tar.bz2#ea9758cf553476ddf75c789fdd239dc5
-https://conda.anaconda.org/conda-forge/linux-64/libgoogle-cloud-2.1.0-h9ebe8e8_2.tar.bz2#e8ae8bddbc20f598706dc3ae15dbf95e
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h5aea950_4.conda#82ef57611ace65b59db35a9687264572
+https://conda.anaconda.org/conda-forge/linux-64/libgoogle-cloud-2.8.0-h0bc5f78_1.conda#bdf605748604b09602f3c841abdba817
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
-https://conda.anaconda.org/conda-forge/linux-64/maturin-0.14.13-py39h50f1755_0.conda#0ef8ecee8ac33c44605d46bfa2c54a71
+https://conda.anaconda.org/conda-forge/linux-64/maturin-0.14.16-py39h50f1755_0.conda#b6b37a9bf67bf066efbafd5370105c27
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
-https://conda.anaconda.org/conda-forge/linux-64/pillow-9.2.0-py39hf3a2cdf_3.tar.bz2#2bd111c38da69056e5fe25a51b832eba
+https://conda.anaconda.org/conda-forge/linux-64/pillow-9.4.0-py39h2320bf1_1.conda#d2f79132b9c8e416058a4cd84ef27b3d
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/linux-64/polars-0.16.7-py39h50f1755_0.conda#a7004dc078148808c127cd795a490ac3
-https://conda.anaconda.org/conda-forge/linux-64/postgresql-15.1-hdeef612_1.conda#f89d4c616e48fc8976edaf3b6a9dde0f
-https://conda.anaconda.org/conda-forge/linux-64/proj-9.1.0-h93bde94_0.tar.bz2#255c7204dda39747c3ba380d28b026d7
-https://conda.anaconda.org/conda-forge/linux-64/protobuf-3.20.2-py39h5a03fae_1.conda#5e9cb4dedec15b9db3acf0c7d51f4d4b
+https://conda.anaconda.org/conda-forge/linux-64/polars-0.16.16-py39h50f1755_0.conda#9d848e79f1a22b14f4b2284ba06441ec
+https://conda.anaconda.org/conda-forge/linux-64/postgresql-15.2-h3248436_0.conda#4dbd6c4bc33369751a4d728b392943ba
+https://conda.anaconda.org/conda-forge/linux-64/proj-9.1.1-h8ffa02c_2.conda#c264aea0e16bba26afa0a0940e954492
+https://conda.anaconda.org/conda-forge/linux-64/protobuf-4.21.12-py39h227be39_0.conda#984b4ee0c3241d7ce715f8a731421073
https://conda.anaconda.org/conda-forge/linux-64/psycopg2-2.9.3-py39h24a400a_2.conda#83cc563fcaf519ea93c32ed50815abfc
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
-https://conda.anaconda.org/conda-forge/linux-64/pymssql-2.2.7-py39h227be39_0.conda#22a232de8d28147f752a4a05f02d46d8
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/linux-64/pymssql-2.2.5-py39h5a03fae_2.tar.bz2#03c724a6917b692639d9295e12eecf9d
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/linux-64/pytz-deprecation-shim-0.1.0.post0-py39hf3d152e_3.tar.bz2#0a74595d069d974d789279cc1337572f
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
-https://conda.anaconda.org/conda-forge/noarch/rfc3339-validator-0.1.4-pyhd8ed1ab_0.tar.bz2#fed45fc5ea0813240707998abe49f520
https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf410858b2cefc267316408a77c436
https://conda.anaconda.org/conda-forge/linux-64/shapely-1.8.5-py39h76a96b7_2.tar.bz2#10bea68a9dd064b703743d210e679408
https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-1.4.46-py39h72bdee0_0.conda#8e7f9dca9ff278a640f0b63ae0c9633d
-https://conda.anaconda.org/conda-forge/noarch/terminado-0.17.1-pyh41d4057_0.conda#3788984d535770cad699efaeb6cb3037
https://conda.anaconda.org/conda-forge/linux-64/thrift-0.16.0-py39h5a03fae_2.tar.bz2#78d2b516c3d8c729cf57611589a27236
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/linux-64/watchdog-2.2.1-py39hf3d152e_0.conda#94947509459288b220997d8769ae96ec
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/linux-64/watchdog-3.0.0-py39hf3d152e_0.conda#f49b5c4a8ad5e6fe7697185aeb835fa1
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/linux-64/xerces-c-3.2.4-h55805fa_1.tar.bz2#d127dc8efe24033b306180939e51e6af
https://conda.anaconda.org/conda-forge/linux-64/yarl-1.8.2-py39hb9d737c_0.conda#fc75e67104cc1bdd6aa2a3b970b19f7f
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
-https://conda.anaconda.org/conda-forge/linux-64/argon2-cffi-bindings-21.2.0-py39hb9d737c_3.tar.bz2#4df2495b3be6785029856ab326b949ea
-https://conda.anaconda.org/conda-forge/linux-64/arrow-cpp-9.0.0-py39hd3ccb9b_2_cpu.tar.bz2#f2e4efbf51eea1bffc1f6dc0898e6d29
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-s3-0.2.7-h909e904_1.conda#7cb3fd9464ed9aaf8189837fe9d96c28
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/linux-64/brotlipy-0.7.0-py39hb9d737c_1005.tar.bz2#a639fdd9428d8b25f8326a3838d54045
-https://conda.anaconda.org/conda-forge/linux-64/cryptography-38.0.4-py39hd97740a_0.conda#791af88304225b61bdd0e716169d576f
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/linux-64/cryptography-38.0.4-py39h3ccb8fc_0.conda#dee37fde01f9bbc53ec421199d7b17cf
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
-https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.7.1-ha76d385_4.tar.bz2#6a613710a0f19aba3a5dfe83bf1c1c0f
+https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.7.1-h7a142b4_6.conda#b7963c107ed1f6a95cadc244f95cd3cd
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
https://conda.anaconda.org/conda-forge/linux-64/google-crc32c-1.1.2-py39h8db88ab_4.tar.bz2#5110516ff6a9fcd477c28fad1d88f4af
@@ -330,117 +327,118 @@ https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-py
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-6.0.0-h8e241bc_0.conda#448fe40d2fed88ccf4d9ded37cbb2b38
https://conda.anaconda.org/conda-forge/noarch/importlib-resources-5.12.0-pyhd8ed1ab_0.conda#3544c818f0720c89eb16ae6940ab440b
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
-https://conda.anaconda.org/conda-forge/noarch/jupyter_server_terminals-0.4.4-pyhd8ed1ab_1.conda#7c0965e1d4a0ee1529e8eaa03a78a5b3
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/linux-64/kealib-1.5.0-ha7026e8_0.conda#c948b920f45fd81a2dde8b1ab514cc84
-https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.8.1-nompi_h261ec11_106.tar.bz2#9b25de670ce5753a33c18b1090d1d3bf
-https://conda.anaconda.org/conda-forge/linux-64/libspatialite-5.0.1-h7c8129e_22.tar.bz2#23abed7562ad969493b89ad0e5f5c521
+https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.9.1-nompi_h34a3ff0_101.conda#9ce7f5bde721be2f82da9f861c57f1b3
+https://conda.anaconda.org/conda-forge/linux-64/libspatialite-5.0.1-h221c8f1_23.conda#859297085081cfbc123dc60015864f6b
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
https://conda.anaconda.org/conda-forge/linux-64/pandas-1.5.3-py39h2ad29b5_0.conda#3ea96adbbc2a66fa45178102a9cfbecc
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
-https://conda.anaconda.org/conda-forge/linux-64/poppler-22.12.0-h92391eb_0.conda#7ad6d858f5615f9b0e9e4bd60395ea75
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/linux-64/poppler-23.03.0-h091648b_0.conda#a449be485743e64ed48d340d5424774d
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
-https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.4.1-py39h12578bd_0.conda#7edbb99bec2bfab82f86abd71d24b505
+https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.4.1-py39hf14cbfd_1.conda#67766c515601b3ee1514072d6fd060bb
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.13.2-hc2ae436_0.conda#8cb0b84db929d2b32fffbd93c497e5ee
-https://conda.anaconda.org/conda-forge/linux-64/tzlocal-4.2-py39hf3d152e_2.tar.bz2#8ae86cc3776da514301b9ac2b43bfabb
+https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.13.2-hd532e3d_0.conda#6d97164f19dbd27575ef1899b02dc1e0
+https://conda.anaconda.org/conda-forge/linux-64/tzlocal-4.3-py39hf3d152e_0.conda#c844b4c33c4233387cc90d61ce17e77e
+https://conda.anaconda.org/conda-forge/linux-64/ukkonen-1.0.1-py39hf939315_3.tar.bz2#0f11bcdf9669a5ae0f39efd8c830209a
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
https://conda.anaconda.org/conda-forge/linux-64/aiohttp-3.8.4-py39h72bdee0_0.conda#0e856218fc838b36e1b340f574b7885f
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/argon2-cffi-21.3.0-pyhd8ed1ab_0.tar.bz2#a0b402db58f73aaab8ee0ca1025a362e
+https://conda.anaconda.org/conda-forge/linux-64/aws-crt-cpp-0.19.8-hf7fbfca_12.conda#c2940067a049037ec1789ccfcb853fb4
https://conda.anaconda.org/conda-forge/linux-64/black-23.1.0-py39hf3d152e_0.conda#28b0da3dc5c2d75542ea2588068b31c4
https://conda.anaconda.org/conda-forge/linux-64/clickhouse-driver-0.2.5-py39hb9d737c_0.conda#eb1f2e3b81fa773884a4a40447d60d8e
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.2.0-py39hf3d152e_0.conda#0facf80f55b4ffd4513221354f65f50d
-https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.6.3-pyhd8ed1ab_0.conda#d98c5196ab6ffeb0c2feca2912801353
-https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.6.1-h896b04b_1.conda#0ef3cdacbcefb93d2e94b017db6d9c8a
-https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.0-py39he190548_0.conda#62d6ddd9e534f4d325d12470cc4961ab
+https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.3.0-py39hf3d152e_0.conda#09aafa6fee56aab97695c6a70194f5e5
+https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.6.2-h6c674c2_9.conda#d6023c0a9a1b0c04c78d0d33d98e6620
+https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.1-py39he190548_0.conda#f2a931db797bb58bd335f4a857b4c898
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
-https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.13-hd33c08f_0.conda#e3b13445b8ee9d6a3d53a714f89ccd76
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
+https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.14-hd33c08f_0.conda#a8b9e35dd7be2c945b0de4fe19a7c3a9
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/linux-64/gdal-3.6.1-py39hee12558_1.conda#5d240db308be07fdc1156dfd56417557
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.10.57-h17c43bd_8.conda#a318ddbd962b0ec5639cc4fb7e9b2230
+https://conda.anaconda.org/conda-forge/linux-64/gdal-3.6.2-py39hc6cd174_9.conda#a769ad84090d6580c587e019f664efd7
https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-h90689f9_2.tar.bz2#957a0255ab58aaf394a91725d73ab422
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyh41d4057_0.conda#4703355103974293bbd8a32449b3ff28
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.54.4-h7abd40a_0.tar.bz2#921e53675ed5ea352f022b79abab076a
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
-https://conda.anaconda.org/conda-forge/linux-64/pyarrow-9.0.0-py39hc0775d8_2_cpu.tar.bz2#7ce89474ea7932b29491ade87bfba19a
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
-https://conda.anaconda.org/conda-forge/linux-64/datafusion-0.7.0-py39h50f1755_0.conda#8c94cc4c1ba1ec9551e1de479e9b9284
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/linux-64/fiona-1.8.22-py39hbc5ff6d_5.conda#2721b7501252fabde467f0fedc8299b9
-https://conda.anaconda.org/conda-forge/linux-64/graphviz-7.0.5-h2e5815a_0.conda#96bf06b24d74a5bf826485e9032c9312
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh210e3f2_0.conda#f4c469f01c4aa05f77ab2f70c2fbbef2
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/linux-64/fiona-1.9.1-py39hbc5ff6d_0.conda#6b42665b571986222f0f28d9bcc0e627
+https://conda.anaconda.org/conda-forge/linux-64/graphviz-7.1.0-h2e5815a_0.conda#e7ecda996c443142a0e9c379f3b28e48
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyh41d4057_0.conda#c8f4db8b2fc42692b3b7f1e348b2ab59
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/linux-64/libarrow-11.0.0-h93537a5_13_cpu.conda#49d5c8c33c0d1db3362058d45da6af69
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/linux-64/python-duckdb-0.7.0-py39h207a36c_1.conda#0425f3a79f08dc2b66b2bc673585b507
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/linux-64/arrow-cpp-11.0.0-ha770c72_13_cpu.conda#26ab48029304dce678b7084206415e03
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh210e3f2_0.conda#1b463a5f4b7c83f509f6a1168a6ef554
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
-https://conda.anaconda.org/conda-forge/linux-64/snowflake-connector-python-2.8.3-py39he2b9a33_0.conda#85779e638923cc95aa6b5e74646432c1
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
-https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.3.0-pyhd8ed1ab_0.conda#644c60cdd1e85407fc28b9085438c7a0
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/linux-64/scipy-1.10.0-py39h7360e5f_2.conda#fbee2ab3fe7729f2ff5c5699d58e40b9
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
+https://conda.anaconda.org/conda-forge/linux-64/scipy-1.10.1-py39h7360e5f_0.conda#7584d1bc5499d25eccfd24a7f656e3ee
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
-https://conda.anaconda.org/conda-forge/noarch/notebook-shim-0.2.2-pyhd8ed1ab_0.tar.bz2#40be846cd4e78672a40e43db9dae753c
+https://conda.anaconda.org/conda-forge/linux-64/pyarrow-11.0.0-py39hf0ef2fd_13_cpu.conda#3a49aa2613f24e98df870f5d7467012b
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/linux-64/scikit-learn-1.2.1-py39h86b2a18_0.conda#1f96b6aa72d033842b738c3085a38856
-https://conda.anaconda.org/conda-forge/linux-64/google-cloud-bigquery-core-3.4.2-py39hf3d152e_0.conda#eda2efe1b9e1d4aee5f960c9438d62ab
+https://conda.anaconda.org/conda-forge/linux-64/scikit-learn-1.2.2-py39hd189fd4_1.conda#4ad12d81a9672faa131d64abe2f1060f
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/linux-64/datafusion-0.7.0-py39h50f1755_0.conda#8c94cc4c1ba1ec9551e1de479e9b9284
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
-https://conda.anaconda.org/conda-forge/noarch/nbclassic-0.5.2-pyhd8ed1ab_0.conda#c5039404bd47fbdc811b5e9282c51afe
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/linux-64/python-duckdb-0.7.1-py39h0765c1d_0.conda#ddfc8d338528a2262d6fee8512a5e5ef
+https://conda.anaconda.org/conda-forge/linux-64/snowflake-connector-python-3.0.2-py39ha8c5812_0.conda#1c3f3d5b49f4e461190fdfb25a2c734a
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.2-pyha770c72_1.tar.bz2#7bf26ca095481f206e6f9dd7681085fe
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-3.6.1-pyha770c72_0.tar.bz2#03cd073d4dc0623b857bf9e175d0f736
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-7.7.1-pyhd8ed1ab_0.tar.bz2#96ba78bf526df670bf9562d6100eb627
-https://conda.anaconda.org/conda-forge/linux-64/google-cloud-bigquery-3.4.2-py39hf3d152e_0.conda#12e900e4ec63ebe39dea90162d6e46eb
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
diff --git a/osx-64-3.10.lock b/osx-64-3.10.lock
index 607786c..6576f8f 100644
--- a/osx-64-3.10.lock
+++ b/osx-64-3.10.lock
@@ -1,8 +1,8 @@
# Generated by conda-lock.
# platform: osx-64
-# input_hash: 65c9cea97e9a3be0df4af22a407c5bcf572ae48f7498aecd56e67240fd88f2cd
+# input_hash: 8ba69a5d0b9c2268334cdb59d8a3436d2dd9d5efe092df05ccb41ec9f869e3c5
@EXPLICIT
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-common-0.6.2-h0d85af4_0.tar.bz2#0f72a3415c40ead80c978fec230f49ee
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-common-0.8.14-hb7f2c08_0.conda#a2ded8f5113b04e5e7274d044f75cbbc
https://conda.anaconda.org/conda-forge/osx-64/bzip2-1.0.8-h0d85af4_4.tar.bz2#37edc4e6304ca87316e160f5ca0bd1b5
https://conda.anaconda.org/conda-forge/osx-64/c-ares-1.18.1-h0d85af4_0.tar.bz2#00b3e98a61e6430808fe7a2534681f28
https://conda.anaconda.org/conda-forge/osx-64/ca-certificates-2022.12.7-h033912b_0.conda#af2bdcd68f16ce030ca957cdeb83d88a
@@ -12,12 +12,12 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77
https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
https://conda.anaconda.org/conda-forge/osx-64/freexl-1.0.6-hb7f2c08_1.tar.bz2#4fc494f8539871247167bbe4167f3277
https://conda.anaconda.org/conda-forge/osx-64/fribidi-1.0.10-hbcb3906_0.tar.bz2#f1c6b41e0f56998ecd9a3e210faa1dc0
-https://conda.anaconda.org/conda-forge/osx-64/giflib-5.2.1-hbcb3906_2.tar.bz2#be8f747c37e4d7e346c133e641966750
+https://conda.anaconda.org/conda-forge/osx-64/giflib-5.2.1-hb7f2c08_3.conda#aca150b0186836f893ebac79019e5498
https://conda.anaconda.org/conda-forge/osx-64/jpeg-9e-hb7f2c08_3.conda#6b55131ae9445ef38746dc6b080acda9
https://conda.anaconda.org/conda-forge/osx-64/json-c-0.16-h01d06f9_0.tar.bz2#6696477dbfcb5b7ea8559865e7f9dbef
https://conda.anaconda.org/conda-forge/osx-64/libbrotlicommon-1.0.9-hb7f2c08_8.tar.bz2#37157d273eaf3bc7d6862104161d9ec9
-https://conda.anaconda.org/conda-forge/osx-64/libcxx-14.0.6-hccf4f1f_0.tar.bz2#208a6a874b073277374de48a782f6b10
-https://conda.anaconda.org/conda-forge/osx-64/libdeflate-1.14-hb7f2c08_0.tar.bz2#ce2a6075114c9b64ad8cace52492feee
+https://conda.anaconda.org/conda-forge/osx-64/libcxx-15.0.7-h71dddab_0.conda#ad1c6c1ddfd7717e3d46bf06ff2e9400
+https://conda.anaconda.org/conda-forge/osx-64/libdeflate-1.17-hac1461d_0.conda#e3894420cf8b6abbf6c4d3d9742fbb4a
https://conda.anaconda.org/conda-forge/osx-64/libev-4.33-haf1e3a3_1.tar.bz2#79dc2be110b2a3d1e97ec21f691c50ad
https://conda.anaconda.org/conda-forge/osx-64/libffi-3.4.2-h0d85af4_5.tar.bz2#ccb34fb14960ad8b125962d3d79b31a9
https://conda.anaconda.org/conda-forge/osx-64/libiconv-1.17-hac89ed1_0.tar.bz2#691d103d11180486154af49c037b7ed9
@@ -26,20 +26,21 @@ https://conda.anaconda.org/conda-forge/osx-64/libtool-2.4.7-hf0c8a7f_0.conda#1f8
https://conda.anaconda.org/conda-forge/osx-64/libutf8proc-2.8.0-hb7f2c08_0.tar.bz2#db98dc3e58cbc11583180609c429c17d
https://conda.anaconda.org/conda-forge/osx-64/libwebp-base-1.2.4-h775f41a_0.tar.bz2#28807bef802a354f9c164e7ab242c5cb
https://conda.anaconda.org/conda-forge/osx-64/libzlib-1.2.13-hfd90126_4.tar.bz2#35eb3fce8d51ed3c1fd4122bad48250b
-https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-15.0.7-h61d9ccf_0.conda#3faa9933dff6e96333b5ca5274674b63
+https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-16.0.0-h61d9ccf_0.conda#00d0daa29e5a4ce56ef9b351148a1e88
https://conda.anaconda.org/conda-forge/osx-64/ncurses-6.3-h96cf925_1.tar.bz2#76217ebfbb163ff2770a261f955a5861
-https://conda.anaconda.org/conda-forge/osx-64/pandoc-2.19.2-h694c41f_1.tar.bz2#fa70c816e73fca7b3c7653e8c7e3bfdb
https://conda.anaconda.org/conda-forge/osx-64/pixman-0.40.0-hbcb3906_0.tar.bz2#09a583a6f172715be21d93aaa1b42d71
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/osx-64/pthread-stubs-0.4-hc929b4f_1001.tar.bz2#addd19059de62181cd11ae8f4ef26084
https://conda.anaconda.org/conda-forge/osx-64/python_abi-3.10-3_cp310.conda#42da9b0138e911cd5b2f75b0278e26dc
-https://conda.anaconda.org/conda-forge/osx-64/tzcode-2022g-hb7f2c08_0.conda#f1bf42ae6c2a752b4c064140365563c2
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/osx-64/tzcode-2023b-hb7f2c08_0.conda#09f3f3b89c6d7d01de40772cc58fe5bf
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/osx-64/xorg-libxau-1.0.9-h35c211d_0.tar.bz2#c5049997b2e98edfbcdd294582f66281
https://conda.anaconda.org/conda-forge/osx-64/xorg-libxdmcp-1.1.3-h35c211d_0.tar.bz2#86ac76d6bf1cbb9621943eb3bd9ae36e
https://conda.anaconda.org/conda-forge/osx-64/xz-5.2.6-h775f41a_0.tar.bz2#a72f9d4ea13d55d745ff1ed594747f10
https://conda.anaconda.org/conda-forge/osx-64/yaml-0.2.5-h0d85af4_2.tar.bz2#d7e08fcf8259d742156188e8762b4d20
-https://conda.anaconda.org/conda-forge/osx-64/aws-checksums-0.1.11-h0010a65_7.tar.bz2#c86bc781dc7b3ba4e6130ffb14da0d6b
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-compression-0.2.16-h99c63db_5.conda#fbafb2857152f62fa5d48145be10dec8
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-sdkutils-0.1.8-h99c63db_0.conda#30706b270f0d8eaced4ef4a226aa9d0b
+https://conda.anaconda.org/conda-forge/osx-64/aws-checksums-0.1.14-h99c63db_5.conda#c3dd2e2e309f28ff492fc16ddf2f3044
https://conda.anaconda.org/conda-forge/osx-64/expat-2.5.0-hf0c8a7f_0.tar.bz2#7648a729fc8b7272596e90b0ab0a3e98
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/osx-64/geos-3.11.1-hf0c8a7f_0.tar.bz2#b8ac0c20383087c33ac8e5e330072832
@@ -49,68 +50,70 @@ https://conda.anaconda.org/conda-forge/osx-64/gmp-6.2.1-h2e338ed_0.tar.bz2#dedc9
https://conda.anaconda.org/conda-forge/osx-64/graphite2-1.3.13-h2e338ed_1001.tar.bz2#5f6e7f98caddd0fc2d345b207531814c
https://conda.anaconda.org/conda-forge/osx-64/icu-70.1-h96cf925_0.tar.bz2#376635049e9b9b0bb875efd39dcd7b3b
https://conda.anaconda.org/conda-forge/osx-64/lerc-4.0.0-hb486fe8_0.tar.bz2#f9d6a4c82889d5ecedec1d90eb673c55
-https://conda.anaconda.org/conda-forge/osx-64/libabseil-20220623.0-cxx17_h844d122_6.conda#14fcfd14fb90f40a8be87f48a3f89355
+https://conda.anaconda.org/conda-forge/osx-64/libabseil-20230125.0-cxx17_hf0c8a7f_1.conda#86f75c350dd5951f41d4056c35ba4845
+https://conda.anaconda.org/conda-forge/osx-64/libaec-1.0.6-hf0c8a7f_1.conda#7c0f82f435ab4c48d65dc9b28db2ad9e
https://conda.anaconda.org/conda-forge/osx-64/libbrotlidec-1.0.9-hb7f2c08_8.tar.bz2#7f952a036d9014b4dab96c6ea0f8c2a7
https://conda.anaconda.org/conda-forge/osx-64/libbrotlienc-1.0.9-hb7f2c08_8.tar.bz2#b36a3bfe866d9127f25f286506982166
https://conda.anaconda.org/conda-forge/osx-64/libcrc32c-1.1.2-he49afe7_0.tar.bz2#23d6d5a69918a438355d7cbc4c3d54c9
https://conda.anaconda.org/conda-forge/osx-64/libedit-3.1.20191231-h0678c8f_2.tar.bz2#6016a8a1d0e63cac3de2c352cd40208b
-https://conda.anaconda.org/conda-forge/osx-64/libgfortran5-11.3.0-h082f757_28.conda#4b0400521ae098af1c87350442d88d1c
+https://conda.anaconda.org/conda-forge/osx-64/libgfortran5-12.2.0-he409387_31.conda#5a544130e584b1f204ac896ff071d5b3
https://conda.anaconda.org/conda-forge/osx-64/libpng-1.6.39-ha978bb4_0.conda#35e4928794c5391aec14ffdf1deaaee5
-https://conda.anaconda.org/conda-forge/osx-64/libprotobuf-3.20.2-hbc0c0cd_0.tar.bz2#016fda52742981ae0a2c49f3e0ff930b
+https://conda.anaconda.org/conda-forge/osx-64/libprotobuf-3.21.12-hbc0c0cd_0.conda#7a9b17cfb3e57143e4e9118b5244b691
https://conda.anaconda.org/conda-forge/osx-64/libspatialindex-1.9.3-he49afe7_4.tar.bz2#b1c13764417c32fa87fac733caa82a64
https://conda.anaconda.org/conda-forge/osx-64/libsqlite-3.40.0-ha978bb4_0.tar.bz2#ceb13b6726534b96e3b4e3dda91e9050
https://conda.anaconda.org/conda-forge/osx-64/libxcb-1.13-h0d85af4_1004.tar.bz2#eb7860935e14aec936065cbc21a1a962
https://conda.anaconda.org/conda-forge/osx-64/lz4-c-1.9.4-hf0c8a7f_0.conda#aa04f7143228308662696ac24023f991
https://conda.anaconda.org/conda-forge/osx-64/nspr-4.35-hea0b92c_0.conda#a9e56c98d13d8b7ce72bf4357317c29b
-https://conda.anaconda.org/conda-forge/osx-64/openssl-1.1.1t-hfd90126_0.conda#788ef682cff438725828036383e748f5
+https://conda.anaconda.org/conda-forge/osx-64/openssl-3.1.0-hfd90126_0.conda#a7df3470c748a517663bf095c2ac0235
+https://conda.anaconda.org/conda-forge/osx-64/pandoc-3.1.1-h9d075a6_0.conda#5d082d93256a60f6311068849f7fca10
https://conda.anaconda.org/conda-forge/osx-64/pcre2-10.40-h1c4e4bc_0.tar.bz2#e0f80c8f3a0352a54eddfe59cd2b25b1
-https://conda.anaconda.org/conda-forge/osx-64/re2-2022.06.01-hb486fe8_1.conda#317b48dc2c5ab6ceccdd9ced4e1ef47f
-https://conda.anaconda.org/conda-forge/osx-64/readline-8.1.2-h3899abd_0.tar.bz2#89fa404901fa8fb7d4f4e07083b8d635
-https://conda.anaconda.org/conda-forge/osx-64/snappy-1.1.9-h225ccf5_2.tar.bz2#eb2c4c3544099a357db4c02eda1a0766
+https://conda.anaconda.org/conda-forge/osx-64/re2-2023.02.02-hf0c8a7f_0.conda#1c2886c84068be32f68493245672ec31
+https://conda.anaconda.org/conda-forge/osx-64/readline-8.2-h9e318b2_1.conda#f17f77f2acf4d344734bda76829ce14e
+https://conda.anaconda.org/conda-forge/osx-64/snappy-1.1.10-h225ccf5_0.conda#4320a8781f14cd959689b86e349f3b73
https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.12-h5dbffcc_0.tar.bz2#8e9480d9c47061db2ed1b4ecce519a7f
https://conda.anaconda.org/conda-forge/osx-64/zeromq-4.3.4-he49afe7_1.tar.bz2#1972d732b123ed04b60fd21e94f0b178
https://conda.anaconda.org/conda-forge/osx-64/zlib-1.2.13-hfd90126_4.tar.bz2#be90e6223c74ea253080abae19b3bdb1
https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.2-hbc0c0cd_6.conda#40a188783d3c425bdccc9ae9104acbb8
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-cal-0.5.11-hd2e2f4b_0.tar.bz2#09bd616bd04399d208dc06b909a5e1c0
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-cal-0.5.21-hf54dd2f_2.conda#b4f707705e5211e13516e8a1889c6535
https://conda.anaconda.org/conda-forge/osx-64/blosc-1.21.2-hebb52c4_0.conda#2e726e782e57ba3e70f2e85891377cd5
https://conda.anaconda.org/conda-forge/osx-64/boost-cpp-1.78.0-h8b082ac_1.tar.bz2#810ad57aa3057a76ea1c65731d58da55
https://conda.anaconda.org/conda-forge/osx-64/brotli-bin-1.0.9-hb7f2c08_8.tar.bz2#aac5ad0d8f747ef7f871508146df75d9
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
+https://conda.anaconda.org/conda-forge/osx-64/freetds-1.00.44-0.tar.bz2#db962bf27f5f6a27411806fd2cd8cc3e
https://conda.anaconda.org/conda-forge/osx-64/freetype-2.12.1-h3f81eb7_1.conda#852224ea3e8991a8342228eab274840e
https://conda.anaconda.org/conda-forge/osx-64/glog-0.6.0-h8ac2a54_0.tar.bz2#69eb97ca709a136c53fdca1f2fd33ddf
-https://conda.anaconda.org/conda-forge/osx-64/grpc-cpp-1.46.4-h6579160_7.tar.bz2#57a3f07b87107e12ca611c78c77ee1f3
https://conda.anaconda.org/conda-forge/osx-64/hdf4-4.2.15-h7aa5921_5.tar.bz2#a5e171d71c6b524409de40d81c098758
-https://conda.anaconda.org/conda-forge/osx-64/krb5-1.19.3-hb49756b_0.tar.bz2#e60363be26ab2a74326c06195d638447
-https://conda.anaconda.org/conda-forge/osx-64/libevent-2.1.10-h815e4d9_4.tar.bz2#adc6c89498c5f6fe5ba874d8259e7eeb
-https://conda.anaconda.org/conda-forge/osx-64/libgfortran-5.0.0-10_4_0_h97931a8_28.conda#aa6a12546c19f6d816bf80371e19a409
+https://conda.anaconda.org/conda-forge/osx-64/krb5-1.20.1-h049b76e_0.conda#db11fa2968ef0837288fe2d7f5b77a50
+https://conda.anaconda.org/conda-forge/osx-64/libevent-2.1.10-h7d65743_4.tar.bz2#ed607da8c2602aeddb4ae723819fcdcc
+https://conda.anaconda.org/conda-forge/osx-64/libgfortran-5.0.0-11_3_0_h97931a8_31.conda#97451338600bd9c5b535eb224ef6c471
https://conda.anaconda.org/conda-forge/osx-64/libglib-2.74.1-h4c723e1_1.tar.bz2#68a698fe240032c2ff587028ed51b155
-https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.51.0-h0dd9d14_0.conda#6c83a076112d9496b4cb5f940e40023a
+https://conda.anaconda.org/conda-forge/osx-64/libgrpc-1.52.1-h5bc3d57_1.conda#ec992eb9d33e9707cdecabc1464f0ea4
+https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.52.0-he2ab024_0.conda#12ac7d100bf260263e30a019517f42a2
https://conda.anaconda.org/conda-forge/osx-64/librttopo-1.1.0-h9461dca_12.tar.bz2#cbf6767a38ffbc9be29cf26045e81faf
-https://conda.anaconda.org/conda-forge/osx-64/libssh2-1.10.0-h7535e13_3.tar.bz2#acc1797f7b89018eeba2029c56dfdf0c
-https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.4.0-h6268bbc_5.conda#551fc78ba147767ea5905d0746e2fbb5
-https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.10.3-hb9e07b5_0.tar.bz2#13ba8bf8f44cdac2e5401dac20a36040
-https://conda.anaconda.org/conda-forge/osx-64/libzip-1.9.2-h3ad4413_1.tar.bz2#1f22d7bc7ffd031b0cf3a5a2d257a6bf
-https://conda.anaconda.org/conda-forge/osx-64/nss-3.88-h78b00b3_0.conda#95b6bfc95f9c11286fcc2b11da36a5e8
-https://conda.anaconda.org/conda-forge/osx-64/orc-1.7.6-hc067c44_0.tar.bz2#34d99d2c60cd0aa4f36c3a4ed8192d1e
-https://conda.anaconda.org/conda-forge/osx-64/python-3.10.8-h4150a38_0_cpython.conda#d1c3118c4eb7a33a06d5f5a81d40a40b
+https://conda.anaconda.org/conda-forge/osx-64/libssh2-1.10.0-h47af595_3.tar.bz2#5a28624eeb7812b585b9e2d75f846ba2
+https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.5.0-hee9004a_2.conda#35f714269a801f7c3cb522aacd3c0e69
+https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.10.3-h201ad9d_4.conda#2101dd548f0601be252e27e48fa532fa
+https://conda.anaconda.org/conda-forge/osx-64/libzip-1.9.2-h6db710c_1.tar.bz2#ce732d37e479919f3d22b1ccdeb858ac
+https://conda.anaconda.org/conda-forge/osx-64/nss-3.89-h78b00b3_0.conda#1eb1408ecae62d98a902636d46f5595c
+https://conda.anaconda.org/conda-forge/osx-64/orc-1.8.3-ha9d861c_0.conda#f1fdbf0e6c47818a8ba08b0ac4fbd6b6
+https://conda.anaconda.org/conda-forge/osx-64/python-3.10.10-he7542f4_0_cpython.conda#6275017d92bafed547c9314e0d43920d
https://conda.anaconda.org/conda-forge/osx-64/sqlite-3.40.0-h9ae0607_0.tar.bz2#b66b0b11f1b901f3c2bce9406bedfd40
-https://conda.anaconda.org/conda-forge/osx-64/unixodbc-2.3.10-h7b58acd_0.tar.bz2#846a63a046f67d5e7998c2a1608a2a30
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
https://conda.anaconda.org/conda-forge/noarch/appnope-0.1.3-pyhd8ed1ab_0.tar.bz2#54ac328d703bff191256ffa1183126d1
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/osx-64/atk-1.0-2.38.0-h1d18e73_1.tar.bz2#5a538295f97a484ee332aacc131718b5
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-io-0.10.5-h35aa462_0.tar.bz2#2647690fb7719e72da8a547c2c845708
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-io-0.13.19-had634fe_3.conda#70a2f3e2b2b20a051980e2369f48ac3f
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
https://conda.anaconda.org/conda-forge/osx-64/backports.zoneinfo-0.2.1-py310h2ec42d9_7.tar.bz2#ad82b483748074a7e1fc1c09e3d2fa93
-https://conda.anaconda.org/conda-forge/osx-64/bitarray-2.7.2-py310h90acd4f_0.conda#f87a763a6cf388b452a2b3842b9dd2f1
+https://conda.anaconda.org/conda-forge/osx-64/bitarray-2.7.3-py310h90acd4f_0.conda#5eb6096a67d65f0fbfbccad1535453f1
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/osx-64/brotli-1.0.9-hb7f2c08_8.tar.bz2#55f612fe4a9b5f6ac76348b6de94aaeb
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
https://conda.anaconda.org/conda-forge/osx-64/clickhouse-cityhash-1.0.2.3-py310h9d931ec_4.tar.bz2#0b9bc5754848058dcbeab590c1fdf519
@@ -120,31 +123,33 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/osx-64/debugpy-1.6.6-py310h7a76584_0.conda#64db217962d4957f089664b2947ace6c
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/osx-64/fontconfig-2.14.2-h5bb23bf_0.conda#86cc5867dfbee4178118392bae4a3c89
-https://conda.anaconda.org/conda-forge/osx-64/freetds-1.3.16-h99143db_0.conda#3852da6fc91b51685186c4fd40032f67
https://conda.anaconda.org/conda-forge/osx-64/frozenlist-1.3.3-py310h90acd4f_0.tar.bz2#a3236ddc60f49384eba9348391293038
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
-https://conda.anaconda.org/conda-forge/osx-64/gdk-pixbuf-2.42.8-h3648f77_1.tar.bz2#f709a0451aa786175db4c3cfa2af35cc
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/osx-64/gdk-pixbuf-2.42.10-he00a9fc_0.conda#93d4a0706c27961c200bdc49e09e1b75
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/osx-64/greenlet-2.0.2-py310h7a76584_0.conda#9f8c45f7d7d8f01dfa95e0b790fd4909
+https://conda.anaconda.org/conda-forge/osx-64/grpcio-1.52.1-py310h7a76584_1.conda#2624342586b1bc2766bd6d26a4213d36
https://conda.anaconda.org/conda-forge/osx-64/gts-0.7.6-hccb3bdf_2.tar.bz2#ad799f4bcdacc510347c2d9d19b40bc3
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.5-pyhd8ed1ab_0.conda#953a312b272f37d39fe9d09f46734622
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/osx-64/kiwisolver-1.4.4-py310ha23aa8a_1.tar.bz2#cc358fb878ac593c60cea08b28ac7423
-https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.14-h90f4b2a_0.tar.bz2#e56c432e9a78c63692fa6bd076a15713
-https://conda.anaconda.org/conda-forge/osx-64/libcurl-7.86.0-h57eb407_1.tar.bz2#edf3eb7cd24741ae15c18ac0a10e84e8
+https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.15-h29502cd_0.conda#4f448677a99bfc41d3bd538c1302f1fb
+https://conda.anaconda.org/conda-forge/osx-64/libcurl-7.88.1-h6df9250_1.conda#1973ff6a22194ece3cb15caddf26db7c
https://conda.anaconda.org/conda-forge/osx-64/libkml-1.3.0-haeb80ef_1015.tar.bz2#f1a092ddaedbde48dcf62a9455ce7e31
https://conda.anaconda.org/conda-forge/osx-64/libopenblas-0.3.21-openmp_h429af6e_3.tar.bz2#968c46aa7f4032c3f3873f3452ed4c34
-https://conda.anaconda.org/conda-forge/osx-64/libpq-15.1-h4aa9af9_1.conda#9abd7b8e31e1fef606402cf07a52e330
-https://conda.anaconda.org/conda-forge/osx-64/libthrift-0.16.0-h08c06f4_2.tar.bz2#c7a0779d1b87c4ba4897fc7f12b304ca
-https://conda.anaconda.org/conda-forge/osx-64/libwebp-1.2.4-hfa4350a_0.tar.bz2#d3b5a56369701e6a11bf300ba3394391
+https://conda.anaconda.org/conda-forge/osx-64/libpq-15.2-h3640bf0_0.conda#411d9cd4559a2f2b7ec37fb4932fe9b9
+https://conda.anaconda.org/conda-forge/osx-64/libthrift-0.18.1-h16802d8_0.conda#bfacdfd4452689c3c7bdcb1e5ac6e5e9
+https://conda.anaconda.org/conda-forge/osx-64/libwebp-1.2.4-h70a068d_1.conda#c1d73d39f4bbff1903d1f4931355b78d
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/osx-64/lz4-4.3.2-py310h8d4e1d9_0.conda#e6a39ec57eaff988587401fb5281b6f3
https://conda.anaconda.org/conda-forge/osx-64/markupsafe-2.1.2-py310h90acd4f_0.conda#a230aa9172440ace9a1b33a74f7b6fbd
@@ -152,18 +157,18 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/osx-64/msgpack-python-1.0.4-py310ha23aa8a_1.tar.bz2#164e856479d735e96fcbd547afa70251
+https://conda.anaconda.org/conda-forge/osx-64/msgpack-python-1.0.5-py310ha23aa8a_0.conda#eaca50d68ad312e2930b2f9eca8756ef
https://conda.anaconda.org/conda-forge/osx-64/multidict-6.0.4-py310h90acd4f_0.conda#0324181c4442d94c865cf9ae3b6a7fea
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
-https://conda.anaconda.org/conda-forge/osx-64/openjpeg-2.5.0-h5d0d7b0_1.tar.bz2#be533cc782981a0ec5eed28aa618470a
+https://conda.anaconda.org/conda-forge/osx-64/openjpeg-2.5.0-h13ac156_2.conda#299a29af9ac9f550ad459d655739280b
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
@@ -178,26 +183,25 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/osx-64/pycryptodomex-3.16.0-py310h90acd4f_0.conda#12ab8e86065fb0aa22f4f7992d375f6b
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
+https://conda.anaconda.org/conda-forge/osx-64/pymssql-2.2.5-py310h11ac2da_2.tar.bz2#3a8b0678739a29d6168682e47bb12579
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/osx-64/pyrsistent-0.19.3-py310h90acd4f_0.conda#2de2b931546de39d852e5d21e58876c1
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/osx-64/pyyaml-6.0-py310h90acd4f_5.tar.bz2#e0ba2009f52ccda088c63dedf0d1c5ec
-https://conda.anaconda.org/conda-forge/osx-64/pyzmq-25.0.0-py310hf615a82_0.conda#a1f758ee654b7723b53a582b6ae45739
-https://conda.anaconda.org/conda-forge/osx-64/regex-2022.10.31-py310h90acd4f_0.tar.bz2#13ea168d87aba497a4548205a1b360f4
+https://conda.anaconda.org/conda-forge/osx-64/pyzmq-25.0.2-py310hf615a82_0.conda#a33586e29c556ec8a44f1e892e9f868a
+https://conda.anaconda.org/conda-forge/osx-64/regex-2023.3.23-py310h90acd4f_0.conda#d64621e4c9f16fd308c0380ca4a6062d
https://conda.anaconda.org/conda-forge/osx-64/rtree-1.0.1-py310had9ce37_1.tar.bz2#621e20dd837cb895f3bccaa7ade9e1dd
-https://conda.anaconda.org/conda-forge/osx-64/ruff-0.0.249-py310h1e0b698_0.conda#d62d3e47b83feea477c59bc01e9f5f0c
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/osx-64/ruff-0.0.259-py310h1e0b698_0.conda#5cac50110bc79faf1f7a2dca4e57cfbd
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -207,19 +211,21 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/osx-64/tornado-6.2-py310h90acd4f_1.tar.bz2#ca9d4e6a9598a9a9ab7e6ccc4e52749b
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/osx-64/unicodedata2-15.0.0-py310h90acd4f_0.tar.bz2#b62adca3645b3bbc46940d5b1833d59b
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.5-pyhd8ed1ab_0.conda#2af53b3894fb9bdbb3679c0d31028b1b
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-event-stream-0.2.7-hb9330a7_13.tar.bz2#d7319f5973bc93e63eb1b32dbb4d03b8
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-event-stream-0.2.20-h0ae4c0f_4.conda#8b0e31f714d69f0211419150cb2be6be
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-http-0.7.6-hcdd7835_0.conda#2f2b9a52b2dcbbdcdc183f4860e96f5b
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/osx-64/cairo-1.16.0-h904041c_1014.tar.bz2#2e7b4350178ed52bb6fd2b1ecbeeed4f
@@ -227,41 +233,40 @@ https://conda.anaconda.org/conda-forge/osx-64/cffi-1.15.1-py310ha78151a_3.conda#
https://conda.anaconda.org/conda-forge/osx-64/cfitsio-4.2.0-hd56cc12_0.conda#28e03cefd79aa28ec0e313e5a9c71f5b
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
-https://conda.anaconda.org/conda-forge/osx-64/coverage-7.1.0-py310h90acd4f_0.conda#0499188bb1d22c9c5dc5d2b70c09c8ed
-https://conda.anaconda.org/conda-forge/osx-64/curl-7.86.0-h57eb407_1.tar.bz2#66971030ca300059cb6fbd27da348e10
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/osx-64/coverage-7.2.2-py310h90acd4f_0.conda#b84f4c1b4c50604192a35782f42569ae
+https://conda.anaconda.org/conda-forge/osx-64/curl-7.88.1-h6df9250_1.conda#2cf75b9fb10c82425c94e12273ac7791
https://conda.anaconda.org/conda-forge/osx-64/cytoolz-0.12.0-py310h90acd4f_1.tar.bz2#7420b99bf92064b4ad077bbc909e1ffd
-https://conda.anaconda.org/conda-forge/osx-64/fastavro-1.7.1-py310h90acd4f_0.conda#a3f79664a30a6d7529b2461b074e1ef1
-https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.38.0-py310h90acd4f_1.tar.bz2#0b05af0a10ea3a8db1847bc0e389a335
+https://conda.anaconda.org/conda-forge/osx-64/fastavro-1.7.3-py310h90acd4f_0.conda#6255a5e5301e6787602bcf84b6ae8e60
+https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.39.2-py310h90acd4f_0.conda#2643992c2bb27b3c2a92ecf56adee2ca
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/osx-64/grpcio-1.46.4-py310h082f274_7.tar.bz2#f8e841ba58c354f7e28b53657007c0ab
-https://conda.anaconda.org/conda-forge/osx-64/hdf5-1.12.2-nompi_hc782337_100.tar.bz2#62834ae35eb346b324b3b9c4fdc5e539
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/osx-64/hdf5-1.12.2-nompi_h48135f9_101.conda#2ee4811ba5f72f7f12f69b3ec2d6cd96
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
https://conda.anaconda.org/conda-forge/osx-64/libblas-3.9.0-16_osx64_openblas.tar.bz2#644d63e9379867490b67bace400b2a0f
-https://conda.anaconda.org/conda-forge/osx-64/libgd-2.3.3-h1e214de_3.tar.bz2#350af2b75c58dc16985fa97298469143
-https://conda.anaconda.org/conda-forge/osx-64/libgoogle-cloud-2.1.0-habe576c_1.tar.bz2#165d074d3ad3204232cf0bf72a24e34d
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/osx-64/libgd-2.3.3-h4685329_4.conda#656fb395549f224a3336c7cae28d7a93
+https://conda.anaconda.org/conda-forge/osx-64/libgoogle-cloud-2.8.0-h176059f_1.conda#0e1b18b92865c0130f4f8b4392e8558c
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
-https://conda.anaconda.org/conda-forge/osx-64/pillow-9.2.0-py310hffcf78b_3.tar.bz2#a7b7035e6aeace50e0023839f3f5beaa
+https://conda.anaconda.org/conda-forge/osx-64/pillow-9.4.0-py310h306a057_1.conda#1ef68ae4293c7f7df586d07e29f5dc43
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/osx-64/postgresql-15.1-h7bc2cb3_1.conda#6143380ea69db7034a24ee6a9ac5d1cb
-https://conda.anaconda.org/conda-forge/osx-64/proj-9.1.0-hcbd9701_0.tar.bz2#78ee95e87e5143d0e4a17d4aeef56411
-https://conda.anaconda.org/conda-forge/osx-64/protobuf-3.20.2-py310h7a76584_1.conda#c2cdb322dbbe0e0ae6ad8fe38ee7b790
-https://conda.anaconda.org/conda-forge/osx-64/psycopg2-2.9.3-py310h2d0af76_2.conda#c756d2e58232fa7ceb75742cad2ed5ca
+https://conda.anaconda.org/conda-forge/osx-64/postgresql-15.2-hbea33b9_0.conda#4ffe00143090158bb7f5fc2f4f1a920c
+https://conda.anaconda.org/conda-forge/osx-64/proj-9.1.1-hf909084_2.conda#96d16a3411f40f30f622f7594ddae222
+https://conda.anaconda.org/conda-forge/osx-64/protobuf-4.21.12-py310h7a76584_0.conda#589cb650d197ab61a0cd54553e063c21
+https://conda.anaconda.org/conda-forge/osx-64/psycopg2-2.9.3-py310h31f19fa_2.conda#e0fba6187efc4b7d198a62f4f039c0d7
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
-https://conda.anaconda.org/conda-forge/osx-64/pymssql-2.2.7-py310h11ac2da_0.conda#0b82888ce5287e2ecffcc77cd7e488cb
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/osx-64/pytz-deprecation-shim-0.1.0.post0-py310h2ec42d9_3.tar.bz2#4a0590c5a112e023783e94ec7c54bc02
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
@@ -270,140 +275,149 @@ https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf4
https://conda.anaconda.org/conda-forge/osx-64/sqlalchemy-1.4.46-py310h90acd4f_0.conda#718329457fb9710bd54e325b2f4d80f7
https://conda.anaconda.org/conda-forge/osx-64/thrift-0.16.0-py310h7a76584_2.tar.bz2#9e8d0c2aebc165f6cebb45ce30cf565b
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/osx-64/watchdog-2.2.1-py310h389cd99_0.conda#72acfd24d369315cc410e3f653bdb322
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/osx-64/watchdog-3.0.0-py310h389cd99_0.conda#07e85ab1bb437e36baae9485ee469b44
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/osx-64/xerces-c-3.2.4-h2007e90_1.tar.bz2#da5951ed1609c4fdd135db32c4c8ef36
https://conda.anaconda.org/conda-forge/osx-64/yarl-1.8.2-py310h90acd4f_0.conda#9e18f6b25b97c6078299f6d2ad6c1d07
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
-https://conda.anaconda.org/conda-forge/osx-64/aws-sdk-cpp-1.8.186-h7c85d8e_4.tar.bz2#83537fd65fe827f41b96851e6c92fd73
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-auth-0.6.26-hcaaecf5_1.conda#57e3968abdb1414279c83aa1145dc65d
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-mqtt-0.8.6-ha4e05e3_12.conda#ae6f4dedbbb14f41d643986af3d87d23
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/osx-64/brotlipy-0.7.0-py310h90acd4f_1005.tar.bz2#63accc45f2b9ae1dad4db9cdfaa903b4
-https://conda.anaconda.org/conda-forge/osx-64/cryptography-38.0.4-py310h23bb4e6_0.conda#21df0c16e407e4130f95e50849314159
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/osx-64/cryptography-38.0.4-py310hdd0c95c_0.conda#7f0791ebd6b9c996fbd16ed1368b7eee
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
-https://conda.anaconda.org/conda-forge/osx-64/geotiff-1.7.1-he29fd1c_4.tar.bz2#7fab5b9379958e9d3f784842c00c8e66
+https://conda.anaconda.org/conda-forge/osx-64/geotiff-1.7.1-hd690177_6.conda#13da0cc6fabf8971a3bc3ab1de1a9bb9
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
https://conda.anaconda.org/conda-forge/osx-64/google-crc32c-1.1.2-py310h6f7428f_4.tar.bz2#d3575d879b46a8452503ca08b997e782
https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
https://conda.anaconda.org/conda-forge/osx-64/harfbuzz-6.0.0-h08f8713_0.conda#3852d6ef7b77da3e81074a8e487e7df5
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/osx-64/kealib-1.5.0-h5c1f988_0.conda#4aab67daf291f97462a5a947aaad48ea
https://conda.anaconda.org/conda-forge/osx-64/libcblas-3.9.0-16_osx64_openblas.tar.bz2#28592eab0f05bcf9969789e87f754e11
https://conda.anaconda.org/conda-forge/osx-64/liblapack-3.9.0-16_osx64_openblas.tar.bz2#406ad426aade5578b90544cc2ed4a79b
-https://conda.anaconda.org/conda-forge/osx-64/libnetcdf-4.8.1-nompi_hc61b76e_106.tar.bz2#502e31e4a400216854da4e9933fb21c2
-https://conda.anaconda.org/conda-forge/osx-64/libspatialite-5.0.1-hc1c2c66_22.tar.bz2#13513d4171137de61c7f8dd7c2fa4e74
+https://conda.anaconda.org/conda-forge/osx-64/libnetcdf-4.9.1-nompi_h56690a0_101.conda#47f469ea7abef24fe25d7ea8f3c57e2a
+https://conda.anaconda.org/conda-forge/osx-64/libspatialite-5.0.1-hd6e941a_23.conda#f8b8c912eca84fdb35215e02dcd4a0f4
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
-https://conda.anaconda.org/conda-forge/osx-64/poppler-22.12.0-hf2ff1a1_0.conda#ad1c9f970971bc448424cff37c99eddd
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/osx-64/poppler-23.03.0-h6e9091c_0.conda#1764e7410be61cdaf6cf6b0b27cb87a2
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
-https://conda.anaconda.org/conda-forge/osx-64/pyproj-3.4.1-py310h8c678d5_0.conda#8f348c1e0d172fcd371df80d399b4500
+https://conda.anaconda.org/conda-forge/osx-64/pyproj-3.4.1-py310ha48f28b_1.conda#981e35440446f8fab64922e7833579df
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/osx-64/tiledb-2.13.2-h3b7b576_0.conda#d75ea515b550689adc41b26c7f9eaef6
-https://conda.anaconda.org/conda-forge/osx-64/tzlocal-4.2-py310h2ec42d9_2.tar.bz2#a680d8168cc568300e4b750bad612bef
+https://conda.anaconda.org/conda-forge/osx-64/tiledb-2.13.2-h8b9cbf0_0.conda#a10738d4788cf6b0b0d9bff2e324b942
+https://conda.anaconda.org/conda-forge/osx-64/tzlocal-4.3-py310h2ec42d9_0.conda#3f38ae3f0617bf29be8564ccb15cd9d4
+https://conda.anaconda.org/conda-forge/osx-64/ukkonen-1.0.1-py310ha23aa8a_3.tar.bz2#b3727e37919b1f4ef885d65ed97f3ca1
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
https://conda.anaconda.org/conda-forge/osx-64/aiohttp-3.8.4-py310h90acd4f_0.conda#8fb19e0e231a12977eaedfd53ab143a0
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-s3-0.2.7-hba8c00c_1.conda#7bca115eac894cd5d8f00aabe4bbb1d5
https://conda.anaconda.org/conda-forge/osx-64/black-23.1.0-py310h2ec42d9_0.conda#b7082a20291807011ffc55880ff63419
https://conda.anaconda.org/conda-forge/osx-64/clickhouse-driver-0.2.5-py310h90acd4f_0.conda#0db8c416967370d6487e7a38df27175e
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/osx-64/jupyter_core-5.2.0-py310h2ec42d9_0.conda#5dfd396b995d403a7544ca59ce981fb8
-https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.6.1-h46da3b9_1.conda#932a6d9e98859cfbc821112df6602207
+https://conda.anaconda.org/conda-forge/osx-64/jupyter_core-5.3.0-py310h2ec42d9_0.conda#f73c532855154e9f4abcd5b9ce2a1860
+https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.6.2-hd7924a8_9.conda#499973e2bcb547bde4289905cb7a9676
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/osx-64/numpy-1.24.2-py310h788a5b3_0.conda#fea956b460a39dd944742b7dfbd55983
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
-https://conda.anaconda.org/conda-forge/osx-64/pango-1.50.13-hbd9bf65_0.conda#c979037ff3fc99257ec7cb28bb0083f4
+https://conda.anaconda.org/conda-forge/osx-64/pango-1.50.14-hbd9bf65_0.conda#7de54d83e9c685b742e0a4d81b271de0
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/osx-64/arrow-cpp-8.0.1-py310h0687de5_2_cpu.tar.bz2#8e65f03d5c491e6722a84300063f6fc1
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/osx-64/aws-crt-cpp-0.19.8-h8b21dc2_12.conda#a24352ea6d682777803b088279be8082
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/osx-64/contourpy-1.0.7-py310ha23aa8a_0.conda#bc714cc57ec6422105ed991167987a9d
-https://conda.anaconda.org/conda-forge/osx-64/gdal-3.6.1-py310he22d2f2_1.conda#e50e7158b6ecd9757d6503efd20fae2f
+https://conda.anaconda.org/conda-forge/osx-64/gdal-3.6.2-py310h5abc6fc_9.conda#9a4480371682ff6d0b1ae18e210127c0
https://conda.anaconda.org/conda-forge/osx-64/gtk2-2.24.33-h7c1209e_2.tar.bz2#307614630946527e302b7dd042a5cfa2
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyhd1c38e8_0.conda#e67b634578fefbb312cd6cfd34b63d86
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/osx-64/librsvg-2.54.4-h3d48ba6_0.tar.bz2#1a106d9119086f73b5f88c650f700210
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
https://conda.anaconda.org/conda-forge/osx-64/pandas-1.5.3-py310hecf8f37_0.conda#00e667c3b1935c6c58f0717497fd5f1e
-https://conda.anaconda.org/conda-forge/osx-64/polars-0.16.7-py310hb28ce15_0.conda#e8b5de800548e4ef3a6f4297ed427e3d
+https://conda.anaconda.org/conda-forge/osx-64/polars-0.16.16-py310hb28ce15_0.conda#86db8037fbd50599dab23cd65164ffa6
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
https://conda.anaconda.org/conda-forge/osx-64/shapely-1.8.5-py310h4e43f2a_2.tar.bz2#08ce2573d824243bcfc93ac076056c49
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/osx-64/fiona-1.8.22-py310h3963e5c_5.conda#34ccda7a32fb6a71ba13228219fd43f1
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/osx-64/aws-sdk-cpp-1.10.57-h0d082ec_8.conda#238e81ff0a438402ca73c34dc8d878f5
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/osx-64/fiona-1.9.1-py310h3963e5c_0.conda#da201fdc56005b6029308abeddb13634
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
-https://conda.anaconda.org/conda-forge/osx-64/graphviz-7.0.5-hc51f7b9_0.conda#589501e7b16648c032a537b6a0870dbe
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh736e0ef_0.conda#aa43ffb10a39d9eb2538761a3f838a87
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
-https://conda.anaconda.org/conda-forge/osx-64/matplotlib-base-3.7.0-py310he725631_0.conda#aca292e9d6c8a7a20df0327337f0609d
+https://conda.anaconda.org/conda-forge/osx-64/graphviz-7.1.0-hc51f7b9_0.conda#fd7e8ad97c77e364ed28b655f8c27b19
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyhd1c38e8_0.conda#e88ca7d30e60645b2621c888029b85f1
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/osx-64/matplotlib-base-3.7.1-py310he725631_0.conda#8b1caf6e250a7c8270711c301d8bcd2e
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.4-pyhd8ed1ab_0.conda#9dea5ab3cc33084f7a3680a98859731e
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh736e0ef_0.conda#3bbe4a71a9d5d8e13c1504e3cd077b32
+https://conda.anaconda.org/conda-forge/osx-64/libarrow-11.0.0-h547aefa_13_cpu.conda#1114268ce25dd22ad08cd92209d98a3c
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
-https://conda.anaconda.org/conda-forge/osx-64/pyarrow-8.0.1-py310hf0faa4b_2_cpu.tar.bz2#7eaf358e2eb7eb5ebcf28202343621f4
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
-https://conda.anaconda.org/conda-forge/osx-64/datafusion-0.7.0-py310hb28ce15_0.conda#40b38896f888c19265b7626c9cd22830
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/osx-64/arrow-cpp-11.0.0-h694c41f_13_cpu.conda#b692e17c44e10422db31ba8668f7fbec
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/osx-64/python-duckdb-0.7.0-py310h417b97f_1.conda#400ac655b7e3a19d83e04192fbe81791
-https://conda.anaconda.org/conda-forge/osx-64/scipy-1.10.0-py310h240c617_2.conda#24f7ca2e9d0c09bd0f2a63c9b3604b9c
-https://conda.anaconda.org/conda-forge/osx-64/snowflake-connector-python-2.8.3-py310h09c8c73_0.conda#58c81085df02cbc15bfbf8a51761da67
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/osx-64/scipy-1.10.1-py310h240c617_0.conda#7782dea817887222538e8c322e1ba6e2
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/osx-64/scikit-learn-1.2.1-py310hcebe997_0.conda#bf0b2deb9b519872e481020b20883c8c
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
+https://conda.anaconda.org/conda-forge/osx-64/scikit-learn-1.2.2-py310h311060b_1.conda#dd07ee9559f056614d7f7d65b4fa1d7c
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/osx-64/pyarrow-11.0.0-py310h435aefc_13_cpu.conda#9a6326eba9ed17b5d3ded9fd25c8e689
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/osx-64/datafusion-0.7.0-py310hb28ce15_0.conda#40b38896f888c19265b7626c9cd22830
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.1.0-pyhd8ed1ab_0.tar.bz2#b0816cdad1ed5f376831b1c36a74106b
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.1.0-pyhd8ed1ab_0.tar.bz2#1d66863d0c73e517fbcfd859e89d3b4d
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/osx-64/python-duckdb-0.7.1-py310h7853987_0.conda#bbdfced3933c42b2e8f04a6ae4cea9df
+https://conda.anaconda.org/conda-forge/osx-64/snowflake-connector-python-3.0.2-py310hdcc7dc2_0.conda#0594f44ac9190f91bf7970fd12d15ce7
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
diff --git a/osx-64-3.11.lock b/osx-64-3.11.lock
index 6c51c6f..39f3036 100644
--- a/osx-64-3.11.lock
+++ b/osx-64-3.11.lock
@@ -0,0 +1,420 @@
+# Generated by conda-lock.
+# platform: osx-64
+# input_hash: a82bc7de13fa5f0f3328e1075ea6e963ae25196d80bcc4b969fc948358d21154
+@EXPLICIT
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-common-0.8.14-hb7f2c08_0.conda#a2ded8f5113b04e5e7274d044f75cbbc
+https://conda.anaconda.org/conda-forge/osx-64/bzip2-1.0.8-h0d85af4_4.tar.bz2#37edc4e6304ca87316e160f5ca0bd1b5
+https://conda.anaconda.org/conda-forge/osx-64/c-ares-1.18.1-h0d85af4_0.tar.bz2#00b3e98a61e6430808fe7a2534681f28
+https://conda.anaconda.org/conda-forge/osx-64/ca-certificates-2022.12.7-h033912b_0.conda#af2bdcd68f16ce030ca957cdeb83d88a
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-dejavu-sans-mono-2.37-hab24e00_0.tar.bz2#0c96522c6bdaed4b1566d11387caaf45
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-3.000-h77eed37_0.tar.bz2#34893075a5c9e55cdafac56607368fc6
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77eed37_0.tar.bz2#4d59c254e01d9cde7957100457e2d5fb
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
+https://conda.anaconda.org/conda-forge/osx-64/freexl-1.0.6-hb7f2c08_1.tar.bz2#4fc494f8539871247167bbe4167f3277
+https://conda.anaconda.org/conda-forge/osx-64/fribidi-1.0.10-hbcb3906_0.tar.bz2#f1c6b41e0f56998ecd9a3e210faa1dc0
+https://conda.anaconda.org/conda-forge/osx-64/giflib-5.2.1-hb7f2c08_3.conda#aca150b0186836f893ebac79019e5498
+https://conda.anaconda.org/conda-forge/osx-64/jpeg-9e-hb7f2c08_3.conda#6b55131ae9445ef38746dc6b080acda9
+https://conda.anaconda.org/conda-forge/osx-64/json-c-0.16-h01d06f9_0.tar.bz2#6696477dbfcb5b7ea8559865e7f9dbef
+https://conda.anaconda.org/conda-forge/osx-64/libbrotlicommon-1.0.9-hb7f2c08_8.tar.bz2#37157d273eaf3bc7d6862104161d9ec9
+https://conda.anaconda.org/conda-forge/osx-64/libcxx-15.0.7-h71dddab_0.conda#ad1c6c1ddfd7717e3d46bf06ff2e9400
+https://conda.anaconda.org/conda-forge/osx-64/libdeflate-1.17-hac1461d_0.conda#e3894420cf8b6abbf6c4d3d9742fbb4a
+https://conda.anaconda.org/conda-forge/osx-64/libev-4.33-haf1e3a3_1.tar.bz2#79dc2be110b2a3d1e97ec21f691c50ad
+https://conda.anaconda.org/conda-forge/osx-64/libffi-3.4.2-h0d85af4_5.tar.bz2#ccb34fb14960ad8b125962d3d79b31a9
+https://conda.anaconda.org/conda-forge/osx-64/libiconv-1.17-hac89ed1_0.tar.bz2#691d103d11180486154af49c037b7ed9
+https://conda.anaconda.org/conda-forge/osx-64/libsodium-1.0.18-hbcb3906_1.tar.bz2#24632c09ed931af617fe6d5292919cab
+https://conda.anaconda.org/conda-forge/osx-64/libtool-2.4.7-hf0c8a7f_0.conda#1f87b8f56ae1210c77f6133705ef24af
+https://conda.anaconda.org/conda-forge/osx-64/libutf8proc-2.8.0-hb7f2c08_0.tar.bz2#db98dc3e58cbc11583180609c429c17d
+https://conda.anaconda.org/conda-forge/osx-64/libwebp-base-1.2.4-h775f41a_0.tar.bz2#28807bef802a354f9c164e7ab242c5cb
+https://conda.anaconda.org/conda-forge/osx-64/libzlib-1.2.13-hfd90126_4.tar.bz2#35eb3fce8d51ed3c1fd4122bad48250b
+https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-16.0.0-h61d9ccf_0.conda#00d0daa29e5a4ce56ef9b351148a1e88
+https://conda.anaconda.org/conda-forge/osx-64/ncurses-6.3-h96cf925_1.tar.bz2#76217ebfbb163ff2770a261f955a5861
+https://conda.anaconda.org/conda-forge/osx-64/pixman-0.40.0-hbcb3906_0.tar.bz2#09a583a6f172715be21d93aaa1b42d71
+https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
+https://conda.anaconda.org/conda-forge/osx-64/pthread-stubs-0.4-hc929b4f_1001.tar.bz2#addd19059de62181cd11ae8f4ef26084
+https://conda.anaconda.org/conda-forge/osx-64/python_abi-3.11-3_cp311.conda#5e0a069a585445333868d2c6651c3b3f
+https://conda.anaconda.org/conda-forge/osx-64/tzcode-2023b-hb7f2c08_0.conda#09f3f3b89c6d7d01de40772cc58fe5bf
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
+https://conda.anaconda.org/conda-forge/osx-64/xorg-libxau-1.0.9-h35c211d_0.tar.bz2#c5049997b2e98edfbcdd294582f66281
+https://conda.anaconda.org/conda-forge/osx-64/xorg-libxdmcp-1.1.3-h35c211d_0.tar.bz2#86ac76d6bf1cbb9621943eb3bd9ae36e
+https://conda.anaconda.org/conda-forge/osx-64/xz-5.2.6-h775f41a_0.tar.bz2#a72f9d4ea13d55d745ff1ed594747f10
+https://conda.anaconda.org/conda-forge/osx-64/yaml-0.2.5-h0d85af4_2.tar.bz2#d7e08fcf8259d742156188e8762b4d20
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-compression-0.2.16-h99c63db_5.conda#fbafb2857152f62fa5d48145be10dec8
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-sdkutils-0.1.8-h99c63db_0.conda#30706b270f0d8eaced4ef4a226aa9d0b
+https://conda.anaconda.org/conda-forge/osx-64/aws-checksums-0.1.14-h99c63db_5.conda#c3dd2e2e309f28ff492fc16ddf2f3044
+https://conda.anaconda.org/conda-forge/osx-64/expat-2.5.0-hf0c8a7f_0.tar.bz2#7648a729fc8b7272596e90b0ab0a3e98
+https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
+https://conda.anaconda.org/conda-forge/osx-64/geos-3.11.1-hf0c8a7f_0.tar.bz2#b8ac0c20383087c33ac8e5e330072832
+https://conda.anaconda.org/conda-forge/osx-64/gettext-0.21.1-h8a4c099_0.tar.bz2#1e3aff29ce703d421c43f371ad676cc5
+https://conda.anaconda.org/conda-forge/osx-64/gflags-2.2.2-hb1e8313_1004.tar.bz2#3f59cc77a929537e42120faf104e0d16
+https://conda.anaconda.org/conda-forge/osx-64/gmp-6.2.1-h2e338ed_0.tar.bz2#dedc96914428dae572a39e69ee2a392f
+https://conda.anaconda.org/conda-forge/osx-64/graphite2-1.3.13-h2e338ed_1001.tar.bz2#5f6e7f98caddd0fc2d345b207531814c
+https://conda.anaconda.org/conda-forge/osx-64/icu-70.1-h96cf925_0.tar.bz2#376635049e9b9b0bb875efd39dcd7b3b
+https://conda.anaconda.org/conda-forge/osx-64/lerc-4.0.0-hb486fe8_0.tar.bz2#f9d6a4c82889d5ecedec1d90eb673c55
+https://conda.anaconda.org/conda-forge/osx-64/libabseil-20230125.0-cxx17_hf0c8a7f_1.conda#86f75c350dd5951f41d4056c35ba4845
+https://conda.anaconda.org/conda-forge/osx-64/libaec-1.0.6-hf0c8a7f_1.conda#7c0f82f435ab4c48d65dc9b28db2ad9e
+https://conda.anaconda.org/conda-forge/osx-64/libbrotlidec-1.0.9-hb7f2c08_8.tar.bz2#7f952a036d9014b4dab96c6ea0f8c2a7
+https://conda.anaconda.org/conda-forge/osx-64/libbrotlienc-1.0.9-hb7f2c08_8.tar.bz2#b36a3bfe866d9127f25f286506982166
+https://conda.anaconda.org/conda-forge/osx-64/libcrc32c-1.1.2-he49afe7_0.tar.bz2#23d6d5a69918a438355d7cbc4c3d54c9
+https://conda.anaconda.org/conda-forge/osx-64/libedit-3.1.20191231-h0678c8f_2.tar.bz2#6016a8a1d0e63cac3de2c352cd40208b
+https://conda.anaconda.org/conda-forge/osx-64/libgfortran5-12.2.0-he409387_31.conda#5a544130e584b1f204ac896ff071d5b3
+https://conda.anaconda.org/conda-forge/osx-64/libpng-1.6.39-ha978bb4_0.conda#35e4928794c5391aec14ffdf1deaaee5
+https://conda.anaconda.org/conda-forge/osx-64/libprotobuf-3.21.12-hbc0c0cd_0.conda#7a9b17cfb3e57143e4e9118b5244b691
+https://conda.anaconda.org/conda-forge/osx-64/libspatialindex-1.9.3-he49afe7_4.tar.bz2#b1c13764417c32fa87fac733caa82a64
+https://conda.anaconda.org/conda-forge/osx-64/libsqlite-3.40.0-ha978bb4_0.tar.bz2#ceb13b6726534b96e3b4e3dda91e9050
+https://conda.anaconda.org/conda-forge/osx-64/libxcb-1.13-h0d85af4_1004.tar.bz2#eb7860935e14aec936065cbc21a1a962
+https://conda.anaconda.org/conda-forge/osx-64/lz4-c-1.9.4-hf0c8a7f_0.conda#aa04f7143228308662696ac24023f991
+https://conda.anaconda.org/conda-forge/osx-64/nspr-4.35-hea0b92c_0.conda#a9e56c98d13d8b7ce72bf4357317c29b
+https://conda.anaconda.org/conda-forge/osx-64/openssl-3.1.0-hfd90126_0.conda#a7df3470c748a517663bf095c2ac0235
+https://conda.anaconda.org/conda-forge/osx-64/pandoc-3.1.1-h9d075a6_0.conda#5d082d93256a60f6311068849f7fca10
+https://conda.anaconda.org/conda-forge/osx-64/pcre2-10.40-h1c4e4bc_0.tar.bz2#e0f80c8f3a0352a54eddfe59cd2b25b1
+https://conda.anaconda.org/conda-forge/osx-64/re2-2023.02.02-hf0c8a7f_0.conda#1c2886c84068be32f68493245672ec31
+https://conda.anaconda.org/conda-forge/osx-64/readline-8.2-h9e318b2_1.conda#f17f77f2acf4d344734bda76829ce14e
+https://conda.anaconda.org/conda-forge/osx-64/snappy-1.1.10-h225ccf5_0.conda#4320a8781f14cd959689b86e349f3b73
+https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.12-h5dbffcc_0.tar.bz2#8e9480d9c47061db2ed1b4ecce519a7f
+https://conda.anaconda.org/conda-forge/osx-64/zeromq-4.3.4-he49afe7_1.tar.bz2#1972d732b123ed04b60fd21e94f0b178
+https://conda.anaconda.org/conda-forge/osx-64/zlib-1.2.13-hfd90126_4.tar.bz2#be90e6223c74ea253080abae19b3bdb1
+https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.2-hbc0c0cd_6.conda#40a188783d3c425bdccc9ae9104acbb8
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-cal-0.5.21-hf54dd2f_2.conda#b4f707705e5211e13516e8a1889c6535
+https://conda.anaconda.org/conda-forge/osx-64/blosc-1.21.2-hebb52c4_0.conda#2e726e782e57ba3e70f2e85891377cd5
+https://conda.anaconda.org/conda-forge/osx-64/boost-cpp-1.78.0-h8b082ac_1.tar.bz2#810ad57aa3057a76ea1c65731d58da55
+https://conda.anaconda.org/conda-forge/osx-64/brotli-bin-1.0.9-hb7f2c08_8.tar.bz2#aac5ad0d8f747ef7f871508146df75d9
+https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
+https://conda.anaconda.org/conda-forge/osx-64/freetds-1.00.44-0.tar.bz2#db962bf27f5f6a27411806fd2cd8cc3e
+https://conda.anaconda.org/conda-forge/osx-64/freetype-2.12.1-h3f81eb7_1.conda#852224ea3e8991a8342228eab274840e
+https://conda.anaconda.org/conda-forge/osx-64/glog-0.6.0-h8ac2a54_0.tar.bz2#69eb97ca709a136c53fdca1f2fd33ddf
+https://conda.anaconda.org/conda-forge/osx-64/hdf4-4.2.15-h7aa5921_5.tar.bz2#a5e171d71c6b524409de40d81c098758
+https://conda.anaconda.org/conda-forge/osx-64/krb5-1.20.1-h049b76e_0.conda#db11fa2968ef0837288fe2d7f5b77a50
+https://conda.anaconda.org/conda-forge/osx-64/libevent-2.1.10-h7d65743_4.tar.bz2#ed607da8c2602aeddb4ae723819fcdcc
+https://conda.anaconda.org/conda-forge/osx-64/libgfortran-5.0.0-11_3_0_h97931a8_31.conda#97451338600bd9c5b535eb224ef6c471
+https://conda.anaconda.org/conda-forge/osx-64/libglib-2.74.1-h4c723e1_1.tar.bz2#68a698fe240032c2ff587028ed51b155
+https://conda.anaconda.org/conda-forge/osx-64/libgrpc-1.52.1-h5bc3d57_1.conda#ec992eb9d33e9707cdecabc1464f0ea4
+https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.52.0-he2ab024_0.conda#12ac7d100bf260263e30a019517f42a2
+https://conda.anaconda.org/conda-forge/osx-64/librttopo-1.1.0-h9461dca_12.tar.bz2#cbf6767a38ffbc9be29cf26045e81faf
+https://conda.anaconda.org/conda-forge/osx-64/libssh2-1.10.0-h47af595_3.tar.bz2#5a28624eeb7812b585b9e2d75f846ba2
+https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.5.0-hee9004a_2.conda#35f714269a801f7c3cb522aacd3c0e69
+https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.10.3-h201ad9d_4.conda#2101dd548f0601be252e27e48fa532fa
+https://conda.anaconda.org/conda-forge/osx-64/libzip-1.9.2-h6db710c_1.tar.bz2#ce732d37e479919f3d22b1ccdeb858ac
+https://conda.anaconda.org/conda-forge/osx-64/nss-3.89-h78b00b3_0.conda#1eb1408ecae62d98a902636d46f5595c
+https://conda.anaconda.org/conda-forge/osx-64/orc-1.8.3-ha9d861c_0.conda#f1fdbf0e6c47818a8ba08b0ac4fbd6b6
+https://conda.anaconda.org/conda-forge/osx-64/python-3.11.0-he7542f4_1_cpython.conda#9ecfa530b33aefd0d22e0272336f638a
+https://conda.anaconda.org/conda-forge/osx-64/sqlite-3.40.0-h9ae0607_0.tar.bz2#b66b0b11f1b901f3c2bce9406bedfd40
+https://conda.anaconda.org/conda-forge/noarch/appnope-0.1.3-pyhd8ed1ab_0.tar.bz2#54ac328d703bff191256ffa1183126d1
+https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
+https://conda.anaconda.org/conda-forge/osx-64/atk-1.0-2.38.0-h1d18e73_1.tar.bz2#5a538295f97a484ee332aacc131718b5
+https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
+https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-io-0.13.19-had634fe_3.conda#70a2f3e2b2b20a051980e2369f48ac3f
+https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
+https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
+https://conda.anaconda.org/conda-forge/osx-64/backports.zoneinfo-0.2.1-py311h6eed73b_7.tar.bz2#90baa768cca74edbbbf8b9d5b66a4ca2
+https://conda.anaconda.org/conda-forge/osx-64/bitarray-2.7.3-py311h5547dcb_0.conda#80e72b74fb1964f9738e3a3b21e9f965
+https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
+https://conda.anaconda.org/conda-forge/osx-64/brotli-1.0.9-hb7f2c08_8.tar.bz2#55f612fe4a9b5f6ac76348b6de94aaeb
+https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
+https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
+https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
+https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
+https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
+https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.2.1-pyhd8ed1ab_0.conda#b325bfc4cff7d7f8a868f1f7ecc4ed16
+https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_0.tar.bz2#3faab06a954c2a04039983f2c4a50d99
+https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2#a50559fad0affdbb33729a68669ca1cb
+https://conda.anaconda.org/conda-forge/osx-64/debugpy-1.6.6-py311h814d153_0.conda#be2cb32dfb1d146099de5ce4de78ff76
+https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
+https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
+https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
+https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
+https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
+https://conda.anaconda.org/conda-forge/osx-64/fontconfig-2.14.2-h5bb23bf_0.conda#86cc5867dfbee4178118392bae4a3c89
+https://conda.anaconda.org/conda-forge/osx-64/frozenlist-1.3.3-py311h5547dcb_0.tar.bz2#e5a486c298f9283c7cee302b74ba69f1
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/osx-64/gdk-pixbuf-2.42.10-he00a9fc_0.conda#93d4a0706c27961c200bdc49e09e1b75
+https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
+https://conda.anaconda.org/conda-forge/osx-64/greenlet-2.0.2-py311h814d153_0.conda#2a476c5b9c378fc7e3db6f2f8461cf9d
+https://conda.anaconda.org/conda-forge/osx-64/grpcio-1.52.1-py311h814d153_1.conda#e041f10bb1c8bf448983305c4f1715d9
+https://conda.anaconda.org/conda-forge/osx-64/gts-0.7.6-hccb3bdf_2.tar.bz2#ad799f4bcdacc510347c2d9d19b40bc3
+https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
+https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
+https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
+https://conda.anaconda.org/conda-forge/osx-64/kiwisolver-1.4.4-py311hd2070f0_1.tar.bz2#5219e72a43e53e8f6af4fdf76a0f90ef
+https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.15-h29502cd_0.conda#4f448677a99bfc41d3bd538c1302f1fb
+https://conda.anaconda.org/conda-forge/osx-64/libcurl-7.88.1-h6df9250_1.conda#1973ff6a22194ece3cb15caddf26db7c
+https://conda.anaconda.org/conda-forge/osx-64/libkml-1.3.0-haeb80ef_1015.tar.bz2#f1a092ddaedbde48dcf62a9455ce7e31
+https://conda.anaconda.org/conda-forge/osx-64/libopenblas-0.3.21-openmp_h429af6e_3.tar.bz2#968c46aa7f4032c3f3873f3452ed4c34
+https://conda.anaconda.org/conda-forge/osx-64/libpq-15.2-h3640bf0_0.conda#411d9cd4559a2f2b7ec37fb4932fe9b9
+https://conda.anaconda.org/conda-forge/osx-64/libthrift-0.18.1-h16802d8_0.conda#bfacdfd4452689c3c7bdcb1e5ac6e5e9
+https://conda.anaconda.org/conda-forge/osx-64/libwebp-1.2.4-h70a068d_1.conda#c1d73d39f4bbff1903d1f4931355b78d
+https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
+https://conda.anaconda.org/conda-forge/osx-64/lz4-4.3.2-py311haa801a3_0.conda#7a4e07f1d8801ddcdc7710a9eca5b9e9
+https://conda.anaconda.org/conda-forge/osx-64/markupsafe-2.1.2-py311h5547dcb_0.conda#13091519d55d667506aaf413cffaff10
+https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f8dab71fdc13b1bf29a01248b156d268
+https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
+https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
+https://conda.anaconda.org/conda-forge/osx-64/msgpack-python-1.0.5-py311hd2070f0_0.conda#d3a60c5422b7d61b2740c7c5df508c86
+https://conda.anaconda.org/conda-forge/osx-64/multidict-6.0.4-py311h5547dcb_0.conda#f7e130153ae7f3e9ea6fcf032bf6c535
+https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
+https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
+https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
+https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
+https://conda.anaconda.org/conda-forge/osx-64/openjpeg-2.5.0-h13ac156_2.conda#299a29af9ac9f550ad459d655739280b
+https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
+https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
+https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
+https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
+https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
+https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
+https://conda.anaconda.org/conda-forge/noarch/pprintpp-0.4.0-pyhd8ed1ab_5.conda#3c9f3f3f7e0a9f0b2fd9d0e2064729ba
+https://conda.anaconda.org/conda-forge/osx-64/psutil-5.9.4-py311h5547dcb_0.tar.bz2#7240e0886bb94ea8846cb010352d3dd8
+https://conda.anaconda.org/conda-forge/noarch/ptyprocess-0.7.0-pyhd3deb0d_0.tar.bz2#359eeb6536da0e687af562ed265ec263
+https://conda.anaconda.org/conda-forge/noarch/pure-sasl-0.6.2-pyhd8ed1ab_0.tar.bz2#ac695eecf21ab48093bc33fd60b4102d
+https://conda.anaconda.org/conda-forge/noarch/pure_eval-0.2.2-pyhd8ed1ab_0.tar.bz2#6784285c7e55cb7212efabc79e4c2883
+https://conda.anaconda.org/conda-forge/noarch/py-cpuinfo-9.0.0-pyhd8ed1ab_0.tar.bz2#6f6d42b894118f8378fce11887ccdaff
+https://conda.anaconda.org/conda-forge/noarch/py4j-0.10.9.5-pyhd8ed1ab_0.tar.bz2#aa4b90e96537b3178e500ecb0d7913ce
+https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f8f72ac77911db942eda24fb9
+https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
+https://conda.anaconda.org/conda-forge/osx-64/pycryptodomex-3.16.0-py311h5547dcb_0.conda#d6ec72bbb08dcf067dbd5562d50f63b4
+https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
+https://conda.anaconda.org/conda-forge/osx-64/pymssql-2.2.5-py311hd08c637_2.tar.bz2#00f4e61c194ce0b45ff278bc68ced167
+https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
+https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
+https://conda.anaconda.org/conda-forge/osx-64/pyrsistent-0.19.3-py311h5547dcb_0.conda#f114c0dab9f9c894b260297371124634
+https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
+https://conda.anaconda.org/conda-forge/osx-64/pyyaml-6.0-py311h5547dcb_5.tar.bz2#8d1e456914ce961119b07f396187a564
+https://conda.anaconda.org/conda-forge/osx-64/pyzmq-25.0.2-py311habfacb3_0.conda#d5af515eb5cf0cbfd8a783e4e663ddf9
+https://conda.anaconda.org/conda-forge/osx-64/regex-2023.3.23-py311h5547dcb_0.conda#fa77f8f2d9c79a7da8784f384da647e9
+https://conda.anaconda.org/conda-forge/osx-64/rtree-1.0.1-py311hbc1f44b_1.tar.bz2#976a24c2adba8bb6b8ac6f7341cd411f
+https://conda.anaconda.org/conda-forge/osx-64/ruff-0.0.259-py311h1cdbfd8_0.conda#ea46e3e30c3d9ad1172253463c7600c2
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
+https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
+https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
+https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
+https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
+https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
+https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
+https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
+https://conda.anaconda.org/conda-forge/noarch/toml-0.10.2-pyhd8ed1ab_0.tar.bz2#f832c45a477c78bebd107098db465095
+https://conda.anaconda.org/conda-forge/noarch/tomli-2.0.1-pyhd8ed1ab_0.tar.bz2#5844808ffab9ebdb694585b50ba02a96
+https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#92facfec94bc02d6ccf42e7173831a36
+https://conda.anaconda.org/conda-forge/osx-64/tornado-6.2-py311h5547dcb_1.tar.bz2#bc9918caedfa2de9e582104bf605d57d
+https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
+https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
+https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
+https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
+https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
+https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-event-stream-0.2.20-h0ae4c0f_4.conda#8b0e31f714d69f0211419150cb2be6be
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-http-0.7.6-hcdd7835_0.conda#2f2b9a52b2dcbbdcdc183f4860e96f5b
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
+https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
+https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
+https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
+https://conda.anaconda.org/conda-forge/osx-64/cairo-1.16.0-h904041c_1014.tar.bz2#2e7b4350178ed52bb6fd2b1ecbeeed4f
+https://conda.anaconda.org/conda-forge/osx-64/cffi-1.15.1-py311ha86e640_3.conda#5967be4da33261eada7cc79593f71088
+https://conda.anaconda.org/conda-forge/osx-64/cfitsio-4.2.0-hd56cc12_0.conda#28e03cefd79aa28ec0e313e5a9c71f5b
+https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
+https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/osx-64/coverage-7.2.2-py311h5547dcb_0.conda#912eec0baf21527e058cff24f2bc6794
+https://conda.anaconda.org/conda-forge/osx-64/curl-7.88.1-h6df9250_1.conda#2cf75b9fb10c82425c94e12273ac7791
+https://conda.anaconda.org/conda-forge/osx-64/cytoolz-0.12.0-py311h5547dcb_1.tar.bz2#e35eb14ca3ccf29618bdfabb0a012987
+https://conda.anaconda.org/conda-forge/osx-64/fastavro-1.7.3-py311h5547dcb_0.conda#402cae43e0757061d05016f0b0a273a4
+https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.39.2-py311h5547dcb_0.conda#b108bcc7df5a90356ca9934261d84536
+https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
+https://conda.anaconda.org/conda-forge/osx-64/hdf5-1.12.2-nompi_h48135f9_101.conda#2ee4811ba5f72f7f12f69b3ec2d6cd96
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
+https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
+https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
+https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
+https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
+https://conda.anaconda.org/conda-forge/osx-64/libblas-3.9.0-16_osx64_openblas.tar.bz2#644d63e9379867490b67bace400b2a0f
+https://conda.anaconda.org/conda-forge/osx-64/libgd-2.3.3-h4685329_4.conda#656fb395549f224a3336c7cae28d7a93
+https://conda.anaconda.org/conda-forge/osx-64/libgoogle-cloud-2.8.0-h176059f_1.conda#0e1b18b92865c0130f4f8b4392e8558c
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
+https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
+https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
+https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
+https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
+https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
+https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
+https://conda.anaconda.org/conda-forge/osx-64/pillow-9.4.0-py311h5bae705_1.conda#c87c306c4ce9042f52c956d9517026da
+https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
+https://conda.anaconda.org/conda-forge/osx-64/postgresql-15.2-hbea33b9_0.conda#4ffe00143090158bb7f5fc2f4f1a920c
+https://conda.anaconda.org/conda-forge/osx-64/proj-9.1.1-hf909084_2.conda#96d16a3411f40f30f622f7594ddae222
+https://conda.anaconda.org/conda-forge/osx-64/protobuf-4.21.12-py311h814d153_0.conda#33cd90a68de87b897dfaa8544ecfc13b
+https://conda.anaconda.org/conda-forge/osx-64/psycopg2-2.9.3-py311h557c174_2.conda#ded4ac1bebbd9468950daa2c9e376fc7
+https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
+https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
+https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
+https://conda.anaconda.org/conda-forge/osx-64/pytz-deprecation-shim-0.1.0.post0-py311h6eed73b_3.tar.bz2#f43e20ef498ecba3f52833e7a2614170
+https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
+https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
+https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf410858b2cefc267316408a77c436
+https://conda.anaconda.org/conda-forge/osx-64/sqlalchemy-1.4.46-py311h5547dcb_0.conda#032553a3ed76ef61210c7afc43f6f738
+https://conda.anaconda.org/conda-forge/osx-64/thrift-0.16.0-py311h814d153_2.tar.bz2#195442153f96b52fe4694d1d68fd4c1b
+https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/osx-64/watchdog-3.0.0-py311h6fddac2_0.conda#e7f600fb722f84d31d8df250f6ed11fc
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
+https://conda.anaconda.org/conda-forge/osx-64/xerces-c-3.2.4-h2007e90_1.tar.bz2#da5951ed1609c4fdd135db32c4c8ef36
+https://conda.anaconda.org/conda-forge/osx-64/yarl-1.8.2-py311h5547dcb_0.conda#fe0d6ac801fdeb5d9a4689d65a996a3c
+https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
+https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-auth-0.6.26-hcaaecf5_1.conda#57e3968abdb1414279c83aa1145dc65d
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-mqtt-0.8.6-ha4e05e3_12.conda#ae6f4dedbbb14f41d643986af3d87d23
+https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
+https://conda.anaconda.org/conda-forge/osx-64/brotlipy-0.7.0-py311h5547dcb_1005.tar.bz2#5f97ac938a90d06eebea42c321abe0d7
+https://conda.anaconda.org/conda-forge/osx-64/cryptography-38.0.4-py311h61927ef_0.conda#d7415ad7ae6c27050886ab2b583f09ca
+https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
+https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
+https://conda.anaconda.org/conda-forge/osx-64/geotiff-1.7.1-hd690177_6.conda#13da0cc6fabf8971a3bc3ab1de1a9bb9
+https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
+https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
+https://conda.anaconda.org/conda-forge/osx-64/google-crc32c-1.1.2-py311h0669569_4.tar.bz2#bb5f5a212cb6dd44784f785ef56bf5ee
+https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
+https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
+https://conda.anaconda.org/conda-forge/osx-64/harfbuzz-6.0.0-h08f8713_0.conda#3852d6ef7b77da3e81074a8e487e7df5
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
+https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
+https://conda.anaconda.org/conda-forge/osx-64/kealib-1.5.0-h5c1f988_0.conda#4aab67daf291f97462a5a947aaad48ea
+https://conda.anaconda.org/conda-forge/osx-64/libcblas-3.9.0-16_osx64_openblas.tar.bz2#28592eab0f05bcf9969789e87f754e11
+https://conda.anaconda.org/conda-forge/osx-64/liblapack-3.9.0-16_osx64_openblas.tar.bz2#406ad426aade5578b90544cc2ed4a79b
+https://conda.anaconda.org/conda-forge/osx-64/libnetcdf-4.9.1-nompi_h56690a0_101.conda#47f469ea7abef24fe25d7ea8f3c57e2a
+https://conda.anaconda.org/conda-forge/osx-64/libspatialite-5.0.1-hd6e941a_23.conda#f8b8c912eca84fdb35215e02dcd4a0f4
+https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/osx-64/poppler-23.03.0-h6e9091c_0.conda#1764e7410be61cdaf6cf6b0b27cb87a2
+https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
+https://conda.anaconda.org/conda-forge/osx-64/pyproj-3.4.1-py311hdc3c720_1.conda#58e53bb3c7c27551788196ec8c84cbf0
+https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
+https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
+https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
+https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
+https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
+https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
+https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
+https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
+https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
+https://conda.anaconda.org/conda-forge/osx-64/tiledb-2.13.2-h8b9cbf0_0.conda#a10738d4788cf6b0b0d9bff2e324b942
+https://conda.anaconda.org/conda-forge/osx-64/tzlocal-4.3-py311h6eed73b_0.conda#ab20bdb631e633fedb2d9f16bd6d2c65
+https://conda.anaconda.org/conda-forge/osx-64/ukkonen-1.0.1-py311hd2070f0_3.tar.bz2#cc38bdf32e077ea689d6ca9aa94b8a76
+https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
+https://conda.anaconda.org/conda-forge/osx-64/aiohttp-3.8.4-py311h5547dcb_0.conda#ac94862d7c14b69403339fa43494d181
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-s3-0.2.7-hba8c00c_1.conda#7bca115eac894cd5d8f00aabe4bbb1d5
+https://conda.anaconda.org/conda-forge/osx-64/black-23.1.0-py311h6eed73b_0.conda#b0e4e082b92decd17295b95dd680e37b
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
+https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
+https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
+https://conda.anaconda.org/conda-forge/osx-64/jupyter_core-5.3.0-py311h6eed73b_0.conda#e0e5cfb36ece6eae9c355eed1e90ff9d
+https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.6.2-hd7924a8_9.conda#499973e2bcb547bde4289905cb7a9676
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
+https://conda.anaconda.org/conda-forge/osx-64/numpy-1.24.2-py311ha9d2c9f_0.conda#bcd25d27b63e7d57defd8ebdf67dc361
+https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
+https://conda.anaconda.org/conda-forge/osx-64/pango-1.50.14-hbd9bf65_0.conda#7de54d83e9c685b742e0a4d81b271de0
+https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
+https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
+https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/osx-64/aws-crt-cpp-0.19.8-h8b21dc2_12.conda#a24352ea6d682777803b088279be8082
+https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
+https://conda.anaconda.org/conda-forge/osx-64/contourpy-1.0.7-py311hd2070f0_0.conda#d78f75103409d2c7a8774c873821ae9a
+https://conda.anaconda.org/conda-forge/osx-64/gdal-3.6.2-py311h619941e_9.conda#68779ebd57ccd14c4c6385cd9c3bc080
+https://conda.anaconda.org/conda-forge/osx-64/gtk2-2.24.33-h7c1209e_2.tar.bz2#307614630946527e302b7dd042a5cfa2
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
+https://conda.anaconda.org/conda-forge/osx-64/librsvg-2.54.4-h3d48ba6_0.tar.bz2#1a106d9119086f73b5f88c650f700210
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
+https://conda.anaconda.org/conda-forge/osx-64/pandas-1.5.3-py311hd84f3f5_0.conda#ec94f0de8411bbc63098cb01324b6683
+https://conda.anaconda.org/conda-forge/osx-64/polars-0.16.16-py311h890d03e_0.conda#d9ee19c25180c7bf1380c3cb6c8c3adc
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
+https://conda.anaconda.org/conda-forge/osx-64/shapely-1.8.5-py311h781b04c_2.tar.bz2#be807d8e0b5cf5ceb33404261be5ccb1
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/osx-64/aws-sdk-cpp-1.10.57-h0d082ec_8.conda#238e81ff0a438402ca73c34dc8d878f5
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/osx-64/fiona-1.9.1-py311h9687163_0.conda#46fe4d074f8bfc33fe2ee05a9bc37ee3
+https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
+https://conda.anaconda.org/conda-forge/osx-64/graphviz-7.1.0-hc51f7b9_0.conda#fd7e8ad97c77e364ed28b655f8c27b19
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyhd1c38e8_0.conda#e88ca7d30e60645b2621c888029b85f1
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/osx-64/matplotlib-base-3.7.1-py311h2bf763f_0.conda#d67ac9c9b834ae77ff7b2c59f702803c
+https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
+https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
+https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
+https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh736e0ef_0.conda#3bbe4a71a9d5d8e13c1504e3cd077b32
+https://conda.anaconda.org/conda-forge/osx-64/libarrow-11.0.0-h547aefa_13_cpu.conda#1114268ce25dd22ad08cd92209d98a3c
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
+https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
+https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
+https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/osx-64/arrow-cpp-11.0.0-h694c41f_13_cpu.conda#b692e17c44e10422db31ba8668f7fbec
+https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
+https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
+https://conda.anaconda.org/conda-forge/osx-64/scipy-1.10.1-py311h939689b_0.conda#c0ba4b8d033cd4b2af087ef96e98db04
+https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
+https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
+https://conda.anaconda.org/conda-forge/osx-64/scikit-learn-1.2.2-py311hda7f639_1.conda#e2dd2bd2dcf23b11d5af2d6df01904a6
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
+https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/osx-64/pyarrow-11.0.0-py311hb17b21d_13_cpu.conda#ef03857acc13558195fc1361408308a9
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/osx-64/datafusion-0.7.0-py311h890d03e_0.conda#5f4b802597c502ef041b638522690c98
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/osx-64/python-duckdb-0.7.1-py311h42f7b3e_0.conda#1d78d34d7022f06e39b618bf48198492
+https://conda.anaconda.org/conda-forge/osx-64/snowflake-connector-python-3.0.2-py311h183a9f9_0.conda#926fed952864d4c6d2686d4f9c699581
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
diff --git a/osx-64-3.8.lock b/osx-64-3.8.lock
index 1c6a04f..5c59e00 100644
--- a/osx-64-3.8.lock
+++ b/osx-64-3.8.lock
@@ -1,8 +1,8 @@
# Generated by conda-lock.
# platform: osx-64
-# input_hash: 80a6da9ea72f6d1f3447e974dc2826c2d0fed591bb1ee460d9777dda03542604
+# input_hash: 20417bbc335c39cb87536b7f471e643be7f1cd2e965542aff5ec4367db71ff55
@EXPLICIT
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-common-0.6.2-h0d85af4_0.tar.bz2#0f72a3415c40ead80c978fec230f49ee
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-common-0.8.14-hb7f2c08_0.conda#a2ded8f5113b04e5e7274d044f75cbbc
https://conda.anaconda.org/conda-forge/osx-64/bzip2-1.0.8-h0d85af4_4.tar.bz2#37edc4e6304ca87316e160f5ca0bd1b5
https://conda.anaconda.org/conda-forge/osx-64/c-ares-1.18.1-h0d85af4_0.tar.bz2#00b3e98a61e6430808fe7a2534681f28
https://conda.anaconda.org/conda-forge/osx-64/ca-certificates-2022.12.7-h033912b_0.conda#af2bdcd68f16ce030ca957cdeb83d88a
@@ -12,12 +12,12 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77
https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
https://conda.anaconda.org/conda-forge/osx-64/freexl-1.0.6-hb7f2c08_1.tar.bz2#4fc494f8539871247167bbe4167f3277
https://conda.anaconda.org/conda-forge/osx-64/fribidi-1.0.10-hbcb3906_0.tar.bz2#f1c6b41e0f56998ecd9a3e210faa1dc0
-https://conda.anaconda.org/conda-forge/osx-64/giflib-5.2.1-hbcb3906_2.tar.bz2#be8f747c37e4d7e346c133e641966750
+https://conda.anaconda.org/conda-forge/osx-64/giflib-5.2.1-hb7f2c08_3.conda#aca150b0186836f893ebac79019e5498
https://conda.anaconda.org/conda-forge/osx-64/jpeg-9e-hb7f2c08_3.conda#6b55131ae9445ef38746dc6b080acda9
https://conda.anaconda.org/conda-forge/osx-64/json-c-0.16-h01d06f9_0.tar.bz2#6696477dbfcb5b7ea8559865e7f9dbef
https://conda.anaconda.org/conda-forge/osx-64/libbrotlicommon-1.0.9-hb7f2c08_8.tar.bz2#37157d273eaf3bc7d6862104161d9ec9
-https://conda.anaconda.org/conda-forge/osx-64/libcxx-14.0.6-hccf4f1f_0.tar.bz2#208a6a874b073277374de48a782f6b10
-https://conda.anaconda.org/conda-forge/osx-64/libdeflate-1.14-hb7f2c08_0.tar.bz2#ce2a6075114c9b64ad8cace52492feee
+https://conda.anaconda.org/conda-forge/osx-64/libcxx-15.0.7-h71dddab_0.conda#ad1c6c1ddfd7717e3d46bf06ff2e9400
+https://conda.anaconda.org/conda-forge/osx-64/libdeflate-1.17-hac1461d_0.conda#e3894420cf8b6abbf6c4d3d9742fbb4a
https://conda.anaconda.org/conda-forge/osx-64/libev-4.33-haf1e3a3_1.tar.bz2#79dc2be110b2a3d1e97ec21f691c50ad
https://conda.anaconda.org/conda-forge/osx-64/libffi-3.4.2-h0d85af4_5.tar.bz2#ccb34fb14960ad8b125962d3d79b31a9
https://conda.anaconda.org/conda-forge/osx-64/libiconv-1.17-hac89ed1_0.tar.bz2#691d103d11180486154af49c037b7ed9
@@ -26,20 +26,21 @@ https://conda.anaconda.org/conda-forge/osx-64/libtool-2.4.7-hf0c8a7f_0.conda#1f8
https://conda.anaconda.org/conda-forge/osx-64/libutf8proc-2.8.0-hb7f2c08_0.tar.bz2#db98dc3e58cbc11583180609c429c17d
https://conda.anaconda.org/conda-forge/osx-64/libwebp-base-1.2.4-h775f41a_0.tar.bz2#28807bef802a354f9c164e7ab242c5cb
https://conda.anaconda.org/conda-forge/osx-64/libzlib-1.2.13-hfd90126_4.tar.bz2#35eb3fce8d51ed3c1fd4122bad48250b
-https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-15.0.7-h61d9ccf_0.conda#3faa9933dff6e96333b5ca5274674b63
+https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-16.0.0-h61d9ccf_0.conda#00d0daa29e5a4ce56ef9b351148a1e88
https://conda.anaconda.org/conda-forge/osx-64/ncurses-6.3-h96cf925_1.tar.bz2#76217ebfbb163ff2770a261f955a5861
-https://conda.anaconda.org/conda-forge/osx-64/pandoc-2.19.2-h694c41f_1.tar.bz2#fa70c816e73fca7b3c7653e8c7e3bfdb
https://conda.anaconda.org/conda-forge/osx-64/pixman-0.40.0-hbcb3906_0.tar.bz2#09a583a6f172715be21d93aaa1b42d71
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/osx-64/pthread-stubs-0.4-hc929b4f_1001.tar.bz2#addd19059de62181cd11ae8f4ef26084
https://conda.anaconda.org/conda-forge/osx-64/python_abi-3.8-3_cp38.conda#ff192f59f7fe23555612030493a079f8
-https://conda.anaconda.org/conda-forge/osx-64/tzcode-2022g-hb7f2c08_0.conda#f1bf42ae6c2a752b4c064140365563c2
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/osx-64/tzcode-2023b-hb7f2c08_0.conda#09f3f3b89c6d7d01de40772cc58fe5bf
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/osx-64/xorg-libxau-1.0.9-h35c211d_0.tar.bz2#c5049997b2e98edfbcdd294582f66281
https://conda.anaconda.org/conda-forge/osx-64/xorg-libxdmcp-1.1.3-h35c211d_0.tar.bz2#86ac76d6bf1cbb9621943eb3bd9ae36e
https://conda.anaconda.org/conda-forge/osx-64/xz-5.2.6-h775f41a_0.tar.bz2#a72f9d4ea13d55d745ff1ed594747f10
https://conda.anaconda.org/conda-forge/osx-64/yaml-0.2.5-h0d85af4_2.tar.bz2#d7e08fcf8259d742156188e8762b4d20
-https://conda.anaconda.org/conda-forge/osx-64/aws-checksums-0.1.11-h0010a65_7.tar.bz2#c86bc781dc7b3ba4e6130ffb14da0d6b
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-compression-0.2.16-h99c63db_5.conda#fbafb2857152f62fa5d48145be10dec8
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-sdkutils-0.1.8-h99c63db_0.conda#30706b270f0d8eaced4ef4a226aa9d0b
+https://conda.anaconda.org/conda-forge/osx-64/aws-checksums-0.1.14-h99c63db_5.conda#c3dd2e2e309f28ff492fc16ddf2f3044
https://conda.anaconda.org/conda-forge/osx-64/expat-2.5.0-hf0c8a7f_0.tar.bz2#7648a729fc8b7272596e90b0ab0a3e98
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/osx-64/geos-3.11.1-hf0c8a7f_0.tar.bz2#b8ac0c20383087c33ac8e5e330072832
@@ -49,67 +50,69 @@ https://conda.anaconda.org/conda-forge/osx-64/gmp-6.2.1-h2e338ed_0.tar.bz2#dedc9
https://conda.anaconda.org/conda-forge/osx-64/graphite2-1.3.13-h2e338ed_1001.tar.bz2#5f6e7f98caddd0fc2d345b207531814c
https://conda.anaconda.org/conda-forge/osx-64/icu-70.1-h96cf925_0.tar.bz2#376635049e9b9b0bb875efd39dcd7b3b
https://conda.anaconda.org/conda-forge/osx-64/lerc-4.0.0-hb486fe8_0.tar.bz2#f9d6a4c82889d5ecedec1d90eb673c55
-https://conda.anaconda.org/conda-forge/osx-64/libabseil-20220623.0-cxx17_h844d122_6.conda#14fcfd14fb90f40a8be87f48a3f89355
+https://conda.anaconda.org/conda-forge/osx-64/libabseil-20230125.0-cxx17_hf0c8a7f_1.conda#86f75c350dd5951f41d4056c35ba4845
+https://conda.anaconda.org/conda-forge/osx-64/libaec-1.0.6-hf0c8a7f_1.conda#7c0f82f435ab4c48d65dc9b28db2ad9e
https://conda.anaconda.org/conda-forge/osx-64/libbrotlidec-1.0.9-hb7f2c08_8.tar.bz2#7f952a036d9014b4dab96c6ea0f8c2a7
https://conda.anaconda.org/conda-forge/osx-64/libbrotlienc-1.0.9-hb7f2c08_8.tar.bz2#b36a3bfe866d9127f25f286506982166
https://conda.anaconda.org/conda-forge/osx-64/libcrc32c-1.1.2-he49afe7_0.tar.bz2#23d6d5a69918a438355d7cbc4c3d54c9
https://conda.anaconda.org/conda-forge/osx-64/libedit-3.1.20191231-h0678c8f_2.tar.bz2#6016a8a1d0e63cac3de2c352cd40208b
-https://conda.anaconda.org/conda-forge/osx-64/libgfortran5-11.3.0-h082f757_28.conda#4b0400521ae098af1c87350442d88d1c
+https://conda.anaconda.org/conda-forge/osx-64/libgfortran5-12.2.0-he409387_31.conda#5a544130e584b1f204ac896ff071d5b3
https://conda.anaconda.org/conda-forge/osx-64/libpng-1.6.39-ha978bb4_0.conda#35e4928794c5391aec14ffdf1deaaee5
-https://conda.anaconda.org/conda-forge/osx-64/libprotobuf-3.20.2-hbc0c0cd_0.tar.bz2#016fda52742981ae0a2c49f3e0ff930b
+https://conda.anaconda.org/conda-forge/osx-64/libprotobuf-3.21.12-hbc0c0cd_0.conda#7a9b17cfb3e57143e4e9118b5244b691
https://conda.anaconda.org/conda-forge/osx-64/libspatialindex-1.9.3-he49afe7_4.tar.bz2#b1c13764417c32fa87fac733caa82a64
https://conda.anaconda.org/conda-forge/osx-64/libsqlite-3.40.0-ha978bb4_0.tar.bz2#ceb13b6726534b96e3b4e3dda91e9050
https://conda.anaconda.org/conda-forge/osx-64/libxcb-1.13-h0d85af4_1004.tar.bz2#eb7860935e14aec936065cbc21a1a962
https://conda.anaconda.org/conda-forge/osx-64/lz4-c-1.9.4-hf0c8a7f_0.conda#aa04f7143228308662696ac24023f991
https://conda.anaconda.org/conda-forge/osx-64/nspr-4.35-hea0b92c_0.conda#a9e56c98d13d8b7ce72bf4357317c29b
-https://conda.anaconda.org/conda-forge/osx-64/openssl-1.1.1t-hfd90126_0.conda#788ef682cff438725828036383e748f5
+https://conda.anaconda.org/conda-forge/osx-64/openssl-3.1.0-hfd90126_0.conda#a7df3470c748a517663bf095c2ac0235
+https://conda.anaconda.org/conda-forge/osx-64/pandoc-3.1.1-h9d075a6_0.conda#5d082d93256a60f6311068849f7fca10
https://conda.anaconda.org/conda-forge/osx-64/pcre2-10.40-h1c4e4bc_0.tar.bz2#e0f80c8f3a0352a54eddfe59cd2b25b1
-https://conda.anaconda.org/conda-forge/osx-64/re2-2022.06.01-hb486fe8_1.conda#317b48dc2c5ab6ceccdd9ced4e1ef47f
-https://conda.anaconda.org/conda-forge/osx-64/readline-8.1.2-h3899abd_0.tar.bz2#89fa404901fa8fb7d4f4e07083b8d635
-https://conda.anaconda.org/conda-forge/osx-64/snappy-1.1.9-h225ccf5_2.tar.bz2#eb2c4c3544099a357db4c02eda1a0766
+https://conda.anaconda.org/conda-forge/osx-64/re2-2023.02.02-hf0c8a7f_0.conda#1c2886c84068be32f68493245672ec31
+https://conda.anaconda.org/conda-forge/osx-64/readline-8.2-h9e318b2_1.conda#f17f77f2acf4d344734bda76829ce14e
+https://conda.anaconda.org/conda-forge/osx-64/snappy-1.1.10-h225ccf5_0.conda#4320a8781f14cd959689b86e349f3b73
https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.12-h5dbffcc_0.tar.bz2#8e9480d9c47061db2ed1b4ecce519a7f
https://conda.anaconda.org/conda-forge/osx-64/zeromq-4.3.4-he49afe7_1.tar.bz2#1972d732b123ed04b60fd21e94f0b178
https://conda.anaconda.org/conda-forge/osx-64/zlib-1.2.13-hfd90126_4.tar.bz2#be90e6223c74ea253080abae19b3bdb1
https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.2-hbc0c0cd_6.conda#40a188783d3c425bdccc9ae9104acbb8
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-cal-0.5.11-hd2e2f4b_0.tar.bz2#09bd616bd04399d208dc06b909a5e1c0
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-cal-0.5.21-hf54dd2f_2.conda#b4f707705e5211e13516e8a1889c6535
https://conda.anaconda.org/conda-forge/osx-64/blosc-1.21.2-hebb52c4_0.conda#2e726e782e57ba3e70f2e85891377cd5
https://conda.anaconda.org/conda-forge/osx-64/boost-cpp-1.78.0-h8b082ac_1.tar.bz2#810ad57aa3057a76ea1c65731d58da55
https://conda.anaconda.org/conda-forge/osx-64/brotli-bin-1.0.9-hb7f2c08_8.tar.bz2#aac5ad0d8f747ef7f871508146df75d9
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
+https://conda.anaconda.org/conda-forge/osx-64/freetds-1.00.44-0.tar.bz2#db962bf27f5f6a27411806fd2cd8cc3e
https://conda.anaconda.org/conda-forge/osx-64/freetype-2.12.1-h3f81eb7_1.conda#852224ea3e8991a8342228eab274840e
https://conda.anaconda.org/conda-forge/osx-64/glog-0.6.0-h8ac2a54_0.tar.bz2#69eb97ca709a136c53fdca1f2fd33ddf
-https://conda.anaconda.org/conda-forge/osx-64/grpc-cpp-1.47.1-h6579160_6.tar.bz2#e93e05da2eb1cd2a246863b5f5c26698
https://conda.anaconda.org/conda-forge/osx-64/hdf4-4.2.15-h7aa5921_5.tar.bz2#a5e171d71c6b524409de40d81c098758
-https://conda.anaconda.org/conda-forge/osx-64/krb5-1.19.3-hb49756b_0.tar.bz2#e60363be26ab2a74326c06195d638447
-https://conda.anaconda.org/conda-forge/osx-64/libevent-2.1.10-h815e4d9_4.tar.bz2#adc6c89498c5f6fe5ba874d8259e7eeb
-https://conda.anaconda.org/conda-forge/osx-64/libgfortran-5.0.0-10_4_0_h97931a8_28.conda#aa6a12546c19f6d816bf80371e19a409
+https://conda.anaconda.org/conda-forge/osx-64/krb5-1.20.1-h049b76e_0.conda#db11fa2968ef0837288fe2d7f5b77a50
+https://conda.anaconda.org/conda-forge/osx-64/libevent-2.1.10-h7d65743_4.tar.bz2#ed607da8c2602aeddb4ae723819fcdcc
+https://conda.anaconda.org/conda-forge/osx-64/libgfortran-5.0.0-11_3_0_h97931a8_31.conda#97451338600bd9c5b535eb224ef6c471
https://conda.anaconda.org/conda-forge/osx-64/libglib-2.74.1-h4c723e1_1.tar.bz2#68a698fe240032c2ff587028ed51b155
-https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.51.0-h0dd9d14_0.conda#6c83a076112d9496b4cb5f940e40023a
+https://conda.anaconda.org/conda-forge/osx-64/libgrpc-1.52.1-h5bc3d57_1.conda#ec992eb9d33e9707cdecabc1464f0ea4
+https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.52.0-he2ab024_0.conda#12ac7d100bf260263e30a019517f42a2
https://conda.anaconda.org/conda-forge/osx-64/librttopo-1.1.0-h9461dca_12.tar.bz2#cbf6767a38ffbc9be29cf26045e81faf
-https://conda.anaconda.org/conda-forge/osx-64/libssh2-1.10.0-h7535e13_3.tar.bz2#acc1797f7b89018eeba2029c56dfdf0c
-https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.4.0-h6268bbc_5.conda#551fc78ba147767ea5905d0746e2fbb5
-https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.10.3-hb9e07b5_0.tar.bz2#13ba8bf8f44cdac2e5401dac20a36040
-https://conda.anaconda.org/conda-forge/osx-64/libzip-1.9.2-h3ad4413_1.tar.bz2#1f22d7bc7ffd031b0cf3a5a2d257a6bf
-https://conda.anaconda.org/conda-forge/osx-64/nss-3.88-h78b00b3_0.conda#95b6bfc95f9c11286fcc2b11da36a5e8
-https://conda.anaconda.org/conda-forge/osx-64/orc-1.7.6-hc067c44_0.tar.bz2#34d99d2c60cd0aa4f36c3a4ed8192d1e
-https://conda.anaconda.org/conda-forge/osx-64/python-3.8.15-hc915b28_0_cpython.conda#241419033ffabb092e9a4fb8bc3e0d78
+https://conda.anaconda.org/conda-forge/osx-64/libssh2-1.10.0-h47af595_3.tar.bz2#5a28624eeb7812b585b9e2d75f846ba2
+https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.5.0-hee9004a_2.conda#35f714269a801f7c3cb522aacd3c0e69
+https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.10.3-h201ad9d_4.conda#2101dd548f0601be252e27e48fa532fa
+https://conda.anaconda.org/conda-forge/osx-64/libzip-1.9.2-h6db710c_1.tar.bz2#ce732d37e479919f3d22b1ccdeb858ac
+https://conda.anaconda.org/conda-forge/osx-64/nss-3.89-h78b00b3_0.conda#1eb1408ecae62d98a902636d46f5595c
+https://conda.anaconda.org/conda-forge/osx-64/orc-1.8.3-ha9d861c_0.conda#f1fdbf0e6c47818a8ba08b0ac4fbd6b6
+https://conda.anaconda.org/conda-forge/osx-64/python-3.8.16-hf9b03c3_1_cpython.conda#96d23d997c18a90efde924d9ca6dd5b3
https://conda.anaconda.org/conda-forge/osx-64/sqlite-3.40.0-h9ae0607_0.tar.bz2#b66b0b11f1b901f3c2bce9406bedfd40
-https://conda.anaconda.org/conda-forge/osx-64/unixodbc-2.3.10-h7b58acd_0.tar.bz2#846a63a046f67d5e7998c2a1608a2a30
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
https://conda.anaconda.org/conda-forge/noarch/appnope-0.1.3-pyhd8ed1ab_0.tar.bz2#54ac328d703bff191256ffa1183126d1
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/osx-64/atk-1.0-2.38.0-h1d18e73_1.tar.bz2#5a538295f97a484ee332aacc131718b5
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-io-0.10.5-h35aa462_0.tar.bz2#2647690fb7719e72da8a547c2c845708
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-io-0.13.19-had634fe_3.conda#70a2f3e2b2b20a051980e2369f48ac3f
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
-https://conda.anaconda.org/conda-forge/osx-64/bitarray-2.7.2-py38hef030d1_0.conda#119a000a34e0cbecc8b42cd7220a359c
+https://conda.anaconda.org/conda-forge/osx-64/bitarray-2.7.3-py38hef030d1_0.conda#8bae502de61a9ec4711b557a91a05f90
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/osx-64/brotli-1.0.9-hb7f2c08_8.tar.bz2#55f612fe4a9b5f6ac76348b6de94aaeb
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
https://conda.anaconda.org/conda-forge/osx-64/clickhouse-cityhash-1.0.2.3-py38h038c8f4_4.tar.bz2#4ebabc90bebc9fe69f484cf0e5267c37
@@ -119,33 +122,33 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/osx-64/debugpy-1.6.6-py38h4cd09af_0.conda#f0f480030a08edbb74962f69177d6a87
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
-https://conda.anaconda.org/conda-forge/noarch/flit-core-3.8.0-pyhd8ed1ab_0.tar.bz2#6d5e56de2e65da7aa35fd10131226efa
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/osx-64/fontconfig-2.14.2-h5bb23bf_0.conda#86cc5867dfbee4178118392bae4a3c89
-https://conda.anaconda.org/conda-forge/osx-64/freetds-1.3.16-h99143db_0.conda#3852da6fc91b51685186c4fd40032f67
https://conda.anaconda.org/conda-forge/osx-64/frozenlist-1.3.3-py38hef030d1_0.tar.bz2#81e1a8060aad336b770abd3d1e0e6dd1
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
-https://conda.anaconda.org/conda-forge/osx-64/gdk-pixbuf-2.42.8-h3648f77_1.tar.bz2#f709a0451aa786175db4c3cfa2af35cc
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/osx-64/gdk-pixbuf-2.42.10-he00a9fc_0.conda#93d4a0706c27961c200bdc49e09e1b75
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/osx-64/greenlet-2.0.2-py38h4cd09af_0.conda#9d7c68d4298fef9f149fbf707d403ae3
+https://conda.anaconda.org/conda-forge/osx-64/grpcio-1.52.1-py38h4cd09af_1.conda#239954659bfb1f08fbabdf25be2b6519
https://conda.anaconda.org/conda-forge/osx-64/gts-0.7.6-hccb3bdf_2.tar.bz2#ad799f4bcdacc510347c2d9d19b40bc3
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-1.1.2-pyhd8ed1ab_0.conda#1a7584b46014b66568069cb6ef2253bf
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/osx-64/kiwisolver-1.4.4-py38h98b9b1b_1.tar.bz2#c11eff21a36bc5809b8e23a05ee71df8
-https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.14-h90f4b2a_0.tar.bz2#e56c432e9a78c63692fa6bd076a15713
-https://conda.anaconda.org/conda-forge/osx-64/libcurl-7.86.0-h57eb407_1.tar.bz2#edf3eb7cd24741ae15c18ac0a10e84e8
+https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.15-h29502cd_0.conda#4f448677a99bfc41d3bd538c1302f1fb
+https://conda.anaconda.org/conda-forge/osx-64/libcurl-7.88.1-h6df9250_1.conda#1973ff6a22194ece3cb15caddf26db7c
https://conda.anaconda.org/conda-forge/osx-64/libkml-1.3.0-haeb80ef_1015.tar.bz2#f1a092ddaedbde48dcf62a9455ce7e31
https://conda.anaconda.org/conda-forge/osx-64/libopenblas-0.3.21-openmp_h429af6e_3.tar.bz2#968c46aa7f4032c3f3873f3452ed4c34
-https://conda.anaconda.org/conda-forge/osx-64/libpq-15.1-h4aa9af9_1.conda#9abd7b8e31e1fef606402cf07a52e330
-https://conda.anaconda.org/conda-forge/osx-64/libthrift-0.16.0-h08c06f4_2.tar.bz2#c7a0779d1b87c4ba4897fc7f12b304ca
-https://conda.anaconda.org/conda-forge/osx-64/libwebp-1.2.4-hfa4350a_0.tar.bz2#d3b5a56369701e6a11bf300ba3394391
+https://conda.anaconda.org/conda-forge/osx-64/libpq-15.2-h3640bf0_0.conda#411d9cd4559a2f2b7ec37fb4932fe9b9
+https://conda.anaconda.org/conda-forge/osx-64/libthrift-0.18.1-h16802d8_0.conda#bfacdfd4452689c3c7bdcb1e5ac6e5e9
+https://conda.anaconda.org/conda-forge/osx-64/libwebp-1.2.4-h70a068d_1.conda#c1d73d39f4bbff1903d1f4931355b78d
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/osx-64/lz4-4.3.2-py38h10aaa5c_0.conda#15b006a41a02183c7e4b5f8aaf1bce0d
https://conda.anaconda.org/conda-forge/osx-64/markupsafe-2.1.2-py38hef030d1_0.conda#011ae40b08362bc2b0b549f4fc0bd79f
@@ -153,23 +156,22 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/osx-64/msgpack-python-1.0.4-py38h98b9b1b_1.tar.bz2#0c2b95548ea54be43f13eddcddc4084c
+https://conda.anaconda.org/conda-forge/osx-64/msgpack-python-1.0.5-py38h98b9b1b_0.conda#c8dc8bd685921ea63ba672f4ae018f06
https://conda.anaconda.org/conda-forge/osx-64/multidict-6.0.4-py38hef030d1_0.conda#92010b36d58baa10bb7de120caa6b237
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
-https://conda.anaconda.org/conda-forge/osx-64/openjpeg-2.5.0-h5d0d7b0_1.tar.bz2#be533cc782981a0ec5eed28aa618470a
+https://conda.anaconda.org/conda-forge/osx-64/openjpeg-2.5.0-h13ac156_2.conda#299a29af9ac9f550ad459d655739280b
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
https://conda.anaconda.org/conda-forge/noarch/pprintpp-0.4.0-pyhd8ed1ab_5.conda#3c9f3f3f7e0a9f0b2fd9d0e2064729ba
-https://conda.anaconda.org/conda-forge/noarch/prometheus_client-0.16.0-pyhd8ed1ab_0.conda#8efaddc1c8b8ce262c4d1a7c6571c799
https://conda.anaconda.org/conda-forge/osx-64/psutil-5.9.4-py38hef030d1_0.tar.bz2#bb5ed5c32371ef153177237099353ce3
https://conda.anaconda.org/conda-forge/noarch/ptyprocess-0.7.0-pyhd3deb0d_0.tar.bz2#359eeb6536da0e687af562ed265ec263
https://conda.anaconda.org/conda-forge/noarch/pure-sasl-0.6.2-pyhd8ed1ab_0.tar.bz2#ac695eecf21ab48093bc33fd60b4102d
@@ -180,30 +182,25 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/osx-64/pycryptodomex-3.16.0-py38hef030d1_0.conda#35a128acbcef64eb91efe411be14659b
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
+https://conda.anaconda.org/conda-forge/osx-64/pymssql-2.2.5-py38hd73ea38_2.tar.bz2#d6482eff9fe2e252d09cdf68795e0090
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/osx-64/pyrsistent-0.19.3-py38hef030d1_0.conda#01ca11f08679d88fc881a19902a0a008
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-json-logger-2.0.6-pyhd8ed1ab_0.conda#525828457f46cf124526760c5400982d
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/osx-64/pyyaml-6.0-py38hef030d1_5.tar.bz2#e27d698dc29c6d5b49f1385bcd1d50f9
-https://conda.anaconda.org/conda-forge/osx-64/pyzmq-25.0.0-py38h0b711fd_0.conda#76161bfe63aa12d9af08168ca6ae7ba4
-https://conda.anaconda.org/conda-forge/osx-64/regex-2022.10.31-py38hef030d1_0.tar.bz2#395db1eb93344328c32996ac0049bbb6
-https://conda.anaconda.org/conda-forge/noarch/rfc3986-validator-0.1.1-pyh9f0ad1d_0.tar.bz2#912a71cc01012ee38e6b90ddd561e36f
+https://conda.anaconda.org/conda-forge/osx-64/pyzmq-25.0.2-py38h0b711fd_0.conda#6aafe8de24c304eabdacbabfe290d9c7
+https://conda.anaconda.org/conda-forge/osx-64/regex-2023.3.23-py38hef030d1_0.conda#6c1e3ba38fef8033045a99a1585ad510
https://conda.anaconda.org/conda-forge/osx-64/rtree-1.0.1-py38hc59ffc2_1.tar.bz2#240fe117b19f85df95d01bc159f4a9a7
-https://conda.anaconda.org/conda-forge/osx-64/ruff-0.0.249-py38he05994f_0.conda#fa703f6f13a0d6266ba95b77a1c886e7
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/send2trash-1.8.0-pyhd8ed1ab_0.tar.bz2#edab14119efe85c3bf131ad747e9005c
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/osx-64/ruff-0.0.259-py38he05994f_0.conda#79d151626870a22d8f422dacb7a30fd2
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
-https://conda.anaconda.org/conda-forge/noarch/sniffio-1.3.0-pyhd8ed1ab_0.tar.bz2#dd6cbc539e74cb1f430efbd4575b9303
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -213,21 +210,22 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/osx-64/tornado-6.2-py38hef030d1_1.tar.bz2#e0019ca44cd5e33c94ab2f1d77325739
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/osx-64/unicodedata2-15.0.0-py38hef030d1_0.tar.bz2#51020c740c53f14657f6307b9eb23f85
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.5.1-pyhd8ed1ab_0.conda#2a914654b9ade742049dab13e29571c6
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
-https://conda.anaconda.org/conda-forge/noarch/anyio-3.6.2-pyhd8ed1ab_0.tar.bz2#8ada050fa88f26916fc1e76e368a49fd
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-event-stream-0.2.7-hb9330a7_13.tar.bz2#d7319f5973bc93e63eb1b32dbb4d03b8
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-event-stream-0.2.20-h0ae4c0f_4.conda#8b0e31f714d69f0211419150cb2be6be
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-http-0.7.6-hcdd7835_0.conda#2f2b9a52b2dcbbdcdc183f4860e96f5b
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
https://conda.anaconda.org/conda-forge/osx-64/backports.zoneinfo-0.2.1-py38hef030d1_7.tar.bz2#a7f9af548356f23c10d5baa4abeef972
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/osx-64/cairo-1.16.0-h904041c_1014.tar.bz2#2e7b4350178ed52bb6fd2b1ecbeeed4f
@@ -235,194 +233,192 @@ https://conda.anaconda.org/conda-forge/osx-64/cffi-1.15.1-py38hb368cf1_3.conda#a
https://conda.anaconda.org/conda-forge/osx-64/cfitsio-4.2.0-hd56cc12_0.conda#28e03cefd79aa28ec0e313e5a9c71f5b
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
-https://conda.anaconda.org/conda-forge/osx-64/coverage-7.1.0-py38hef030d1_0.conda#fd48b6e78d3094a2454443e08909d34f
-https://conda.anaconda.org/conda-forge/osx-64/curl-7.86.0-h57eb407_1.tar.bz2#66971030ca300059cb6fbd27da348e10
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/osx-64/coverage-7.2.2-py38hef030d1_0.conda#24e21baa563718c49fff4ff96fabb32d
+https://conda.anaconda.org/conda-forge/osx-64/curl-7.88.1-h6df9250_1.conda#2cf75b9fb10c82425c94e12273ac7791
https://conda.anaconda.org/conda-forge/osx-64/cytoolz-0.12.0-py38hef030d1_1.tar.bz2#4432b7d11dc542646fcae6162fa319af
-https://conda.anaconda.org/conda-forge/osx-64/fastavro-1.7.1-py38hef030d1_0.conda#ab91d7d5d452ca794eca5a9b1e3ca51f
-https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.38.0-py38hef030d1_1.tar.bz2#2a3f30545977dc93e1059fcc651eecfc
+https://conda.anaconda.org/conda-forge/osx-64/fastavro-1.7.3-py38hef030d1_0.conda#392e3036399087cb1b6218819061eead
+https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.39.2-py38hef030d1_0.conda#15ee81f0df98a16632877ccffe0fe9bc
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/osx-64/grpcio-1.47.1-py38hb2f8fee_6.tar.bz2#2f0f42a6e82dadbbb46388a7c3bb9222
-https://conda.anaconda.org/conda-forge/osx-64/hdf5-1.12.2-nompi_hc782337_100.tar.bz2#62834ae35eb346b324b3b9c4fdc5e539
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/osx-64/hdf5-1.12.2-nompi_h48135f9_101.conda#2ee4811ba5f72f7f12f69b3ec2d6cd96
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
https://conda.anaconda.org/conda-forge/osx-64/libblas-3.9.0-16_osx64_openblas.tar.bz2#644d63e9379867490b67bace400b2a0f
-https://conda.anaconda.org/conda-forge/osx-64/libgd-2.3.3-h1e214de_3.tar.bz2#350af2b75c58dc16985fa97298469143
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/osx-64/libgd-2.3.3-h4685329_4.conda#656fb395549f224a3336c7cae28d7a93
+https://conda.anaconda.org/conda-forge/osx-64/libgoogle-cloud-2.8.0-h176059f_1.conda#0e1b18b92865c0130f4f8b4392e8558c
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
-https://conda.anaconda.org/conda-forge/osx-64/pillow-9.2.0-py38h85595ef_3.tar.bz2#cdeb59b01040db5a392caa5416a59084
+https://conda.anaconda.org/conda-forge/osx-64/pillow-9.4.0-py38hf04c7c8_1.conda#da99348cdc2f1f486de05d7bd29b531e
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/osx-64/postgresql-15.1-h7bc2cb3_1.conda#6143380ea69db7034a24ee6a9ac5d1cb
-https://conda.anaconda.org/conda-forge/osx-64/proj-9.1.0-hcbd9701_0.tar.bz2#78ee95e87e5143d0e4a17d4aeef56411
-https://conda.anaconda.org/conda-forge/osx-64/protobuf-3.20.2-py38h4cd09af_1.conda#7f16090caecd7d89a259e59d0d75d1ca
-https://conda.anaconda.org/conda-forge/osx-64/psycopg2-2.9.3-py38h436fe72_2.conda#eb9fcb34ad8bd6db1f0725a7466e5cb2
+https://conda.anaconda.org/conda-forge/osx-64/postgresql-15.2-hbea33b9_0.conda#4ffe00143090158bb7f5fc2f4f1a920c
+https://conda.anaconda.org/conda-forge/osx-64/proj-9.1.1-hf909084_2.conda#96d16a3411f40f30f622f7594ddae222
+https://conda.anaconda.org/conda-forge/osx-64/protobuf-4.21.12-py38h4cd09af_0.conda#8e7fb85084824f63ed3af02f52a22b2d
+https://conda.anaconda.org/conda-forge/osx-64/psycopg2-2.9.3-py38he502179_2.conda#3b42bcbbda3904057dc1fc85108d3d3f
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
-https://conda.anaconda.org/conda-forge/osx-64/pymssql-2.2.7-py38hd73ea38_0.conda#f4e2c118c16bb96d92bfb9e70a641836
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
-https://conda.anaconda.org/conda-forge/noarch/rfc3339-validator-0.1.4-pyhd8ed1ab_0.tar.bz2#fed45fc5ea0813240707998abe49f520
https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf410858b2cefc267316408a77c436
https://conda.anaconda.org/conda-forge/osx-64/sqlalchemy-1.4.46-py38hef030d1_0.conda#ed4ef7f77441144feb0aac3b78453e67
-https://conda.anaconda.org/conda-forge/noarch/terminado-0.17.1-pyhd1c38e8_0.conda#046120b71d8896cb7faef78bfdbfee1e
https://conda.anaconda.org/conda-forge/osx-64/thrift-0.16.0-py38h4cd09af_2.tar.bz2#9d196922c7da8d2c7b785801c2dbeac7
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/osx-64/watchdog-2.2.1-py38h3ddec92_0.conda#81c26bea852d1ea421a9d0213b6d9aca
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/osx-64/watchdog-3.0.0-py38h3ddec92_0.conda#49a6c90765859fe469e37fcaf0716c11
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/osx-64/xerces-c-3.2.4-h2007e90_1.tar.bz2#da5951ed1609c4fdd135db32c4c8ef36
https://conda.anaconda.org/conda-forge/osx-64/yarl-1.8.2-py38hef030d1_0.conda#1261d3c75b122999f45a77c6f49bc907
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
-https://conda.anaconda.org/conda-forge/osx-64/argon2-cffi-bindings-21.2.0-py38hef030d1_3.tar.bz2#fc1bc20add8eff07c367973bba25e8eb
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
-https://conda.anaconda.org/conda-forge/osx-64/aws-sdk-cpp-1.8.186-h7c85d8e_4.tar.bz2#83537fd65fe827f41b96851e6c92fd73
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-auth-0.6.26-hcaaecf5_1.conda#57e3968abdb1414279c83aa1145dc65d
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-mqtt-0.8.6-ha4e05e3_12.conda#ae6f4dedbbb14f41d643986af3d87d23
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/osx-64/brotlipy-0.7.0-py38hef030d1_1005.tar.bz2#2fa6826f6f94c847bf26709f2162a09c
-https://conda.anaconda.org/conda-forge/osx-64/cryptography-38.0.4-py38ha6c3189_0.conda#110b7479e1d06b3a4999132367596dd9
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/osx-64/cryptography-38.0.4-py38h4257468_0.conda#3903793c2999400c47e190b920416188
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
-https://conda.anaconda.org/conda-forge/osx-64/geotiff-1.7.1-he29fd1c_4.tar.bz2#7fab5b9379958e9d3f784842c00c8e66
+https://conda.anaconda.org/conda-forge/osx-64/geotiff-1.7.1-hd690177_6.conda#13da0cc6fabf8971a3bc3ab1de1a9bb9
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
https://conda.anaconda.org/conda-forge/osx-64/google-crc32c-1.1.2-py38h664dbe5_4.tar.bz2#d693f30f1be71a3d5aa442ba45af099b
https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
https://conda.anaconda.org/conda-forge/osx-64/harfbuzz-6.0.0-h08f8713_0.conda#3852d6ef7b77da3e81074a8e487e7df5
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
https://conda.anaconda.org/conda-forge/noarch/importlib-resources-5.12.0-pyhd8ed1ab_0.conda#3544c818f0720c89eb16ae6940ab440b
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
-https://conda.anaconda.org/conda-forge/noarch/jupyter_server_terminals-0.4.4-pyhd8ed1ab_1.conda#7c0965e1d4a0ee1529e8eaa03a78a5b3
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/osx-64/kealib-1.5.0-h5c1f988_0.conda#4aab67daf291f97462a5a947aaad48ea
https://conda.anaconda.org/conda-forge/osx-64/libcblas-3.9.0-16_osx64_openblas.tar.bz2#28592eab0f05bcf9969789e87f754e11
https://conda.anaconda.org/conda-forge/osx-64/liblapack-3.9.0-16_osx64_openblas.tar.bz2#406ad426aade5578b90544cc2ed4a79b
-https://conda.anaconda.org/conda-forge/osx-64/libnetcdf-4.8.1-nompi_hc61b76e_106.tar.bz2#502e31e4a400216854da4e9933fb21c2
-https://conda.anaconda.org/conda-forge/osx-64/libspatialite-5.0.1-hc1c2c66_22.tar.bz2#13513d4171137de61c7f8dd7c2fa4e74
+https://conda.anaconda.org/conda-forge/osx-64/libnetcdf-4.9.1-nompi_h56690a0_101.conda#47f469ea7abef24fe25d7ea8f3c57e2a
+https://conda.anaconda.org/conda-forge/osx-64/libspatialite-5.0.1-hd6e941a_23.conda#f8b8c912eca84fdb35215e02dcd4a0f4
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
-https://conda.anaconda.org/conda-forge/osx-64/poppler-22.12.0-hf2ff1a1_0.conda#ad1c9f970971bc448424cff37c99eddd
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/osx-64/poppler-23.03.0-h6e9091c_0.conda#1764e7410be61cdaf6cf6b0b27cb87a2
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
-https://conda.anaconda.org/conda-forge/osx-64/pyproj-3.4.1-py38hb2f5155_0.conda#b75f106e6a8dc8da646a4c3ab4e1830e
+https://conda.anaconda.org/conda-forge/osx-64/pyproj-3.4.1-py38hd2e8ff6_1.conda#4907c91f6a5222390079241e51ae852b
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
https://conda.anaconda.org/conda-forge/osx-64/pytz-deprecation-shim-0.1.0.post0-py38h50d1736_3.tar.bz2#0a4f8f964bc2d4df93a39fd7b7f73d88
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/osx-64/tiledb-2.13.2-h3b7b576_0.conda#d75ea515b550689adc41b26c7f9eaef6
+https://conda.anaconda.org/conda-forge/osx-64/tiledb-2.13.2-h8b9cbf0_0.conda#a10738d4788cf6b0b0d9bff2e324b942
+https://conda.anaconda.org/conda-forge/osx-64/ukkonen-1.0.1-py38h98b9b1b_3.tar.bz2#e97bba5bb846f9c009e8c54a79776c80
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
https://conda.anaconda.org/conda-forge/osx-64/aiohttp-3.8.4-py38hef030d1_0.conda#a3d9464d7e0657fed5fc0895cf545af7
-https://conda.anaconda.org/conda-forge/noarch/argon2-cffi-21.3.0-pyhd8ed1ab_0.tar.bz2#a0b402db58f73aaab8ee0ca1025a362e
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-s3-0.2.7-hba8c00c_1.conda#7bca115eac894cd5d8f00aabe4bbb1d5
https://conda.anaconda.org/conda-forge/osx-64/black-23.1.0-py38h50d1736_0.conda#3e9d0583b974c1bb97abad0d2eb9450a
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/osx-64/jupyter_core-5.2.0-py38h50d1736_0.conda#c2a86675f1f4a113b61b99093b3acffe
-https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.6.3-pyhd8ed1ab_0.conda#d98c5196ab6ffeb0c2feca2912801353
-https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.6.1-h46da3b9_1.conda#932a6d9e98859cfbc821112df6602207
+https://conda.anaconda.org/conda-forge/osx-64/jupyter_core-5.3.0-py38h50d1736_0.conda#c342b82641ef032fa8b256eb4f0a5649
+https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.6.2-hd7924a8_9.conda#499973e2bcb547bde4289905cb7a9676
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/osx-64/numpy-1.24.2-py38h5a2dcdf_0.conda#b436529f3e10fdad56e64b5be8371e93
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
-https://conda.anaconda.org/conda-forge/osx-64/pango-1.50.13-hbd9bf65_0.conda#c979037ff3fc99257ec7cb28bb0083f4
+https://conda.anaconda.org/conda-forge/osx-64/pango-1.50.14-hbd9bf65_0.conda#7de54d83e9c685b742e0a4d81b271de0
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/osx-64/tzlocal-4.2-py38h50d1736_2.tar.bz2#8f886c601c21d050d5027b162a28382d
-https://conda.anaconda.org/conda-forge/osx-64/arrow-cpp-6.0.2-py38h24693e7_1_cpu.tar.bz2#bbf14768baa1d3abaf7cb1970843106d
+https://conda.anaconda.org/conda-forge/osx-64/tzlocal-4.3-py38h50d1736_0.conda#06afedbd53ebba918efa9c8800e767f8
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/osx-64/aws-crt-cpp-0.19.8-h8b21dc2_12.conda#a24352ea6d682777803b088279be8082
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/osx-64/clickhouse-driver-0.2.5-py38hef030d1_0.conda#90187bfe4b77fe3c3579c2f0caac6139
https://conda.anaconda.org/conda-forge/osx-64/contourpy-1.0.7-py38h98b9b1b_0.conda#c3d26ebf025c7b9c9ff2fbcaee1f7646
-https://conda.anaconda.org/conda-forge/osx-64/gdal-3.6.1-py38hd9e68d0_1.conda#b22e8b638e43e2f4028b3a7579fd0bbe
+https://conda.anaconda.org/conda-forge/osx-64/gdal-3.6.2-py38h86a93f0_9.conda#24358f89629804abfb240240eed0fc8c
https://conda.anaconda.org/conda-forge/osx-64/gtk2-2.24.33-h7c1209e_2.tar.bz2#307614630946527e302b7dd042a5cfa2
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyhd1c38e8_0.conda#e67b634578fefbb312cd6cfd34b63d86
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/osx-64/librsvg-2.54.4-h3d48ba6_0.tar.bz2#1a106d9119086f73b5f88c650f700210
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
https://conda.anaconda.org/conda-forge/osx-64/pandas-1.5.3-py38hec72209_0.conda#0669044f9100615e0b2d1047f8d50253
-https://conda.anaconda.org/conda-forge/osx-64/polars-0.16.7-py38he94b92c_0.conda#27e2700d2562038154f15d53c0952b9d
+https://conda.anaconda.org/conda-forge/osx-64/polars-0.16.16-py38he94b92c_0.conda#c43a603b4856c1c698fb3dc9be66c605
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
https://conda.anaconda.org/conda-forge/osx-64/shapely-1.8.5-py38h4d28eb3_2.tar.bz2#96a3d88bbc497efe2bd9d4022ff3cdcf
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/osx-64/fiona-1.8.22-py38h4a1972a_5.conda#4bada73f02588d0408e2cb2098f2bb20
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/osx-64/aws-sdk-cpp-1.10.57-h0d082ec_8.conda#238e81ff0a438402ca73c34dc8d878f5
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/osx-64/fiona-1.9.1-py38h4a1972a_0.conda#7fc320c44d827ae16767c3196b5d0dec
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
-https://conda.anaconda.org/conda-forge/osx-64/graphviz-7.0.5-hc51f7b9_0.conda#589501e7b16648c032a537b6a0870dbe
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh736e0ef_0.conda#aa43ffb10a39d9eb2538761a3f838a87
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
-https://conda.anaconda.org/conda-forge/osx-64/matplotlib-base-3.7.0-py38hcb346ec_0.conda#452ca7853f51d31a5b4425af9ef730a4
+https://conda.anaconda.org/conda-forge/osx-64/graphviz-7.1.0-hc51f7b9_0.conda#fd7e8ad97c77e364ed28b655f8c27b19
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyhd1c38e8_0.conda#e88ca7d30e60645b2621c888029b85f1
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/osx-64/matplotlib-base-3.7.1-py38hcb346ec_0.conda#1f1eea98c232c8ef720175e12b00d0c4
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh736e0ef_0.conda#3bbe4a71a9d5d8e13c1504e3cd077b32
+https://conda.anaconda.org/conda-forge/osx-64/libarrow-11.0.0-h547aefa_13_cpu.conda#1114268ce25dd22ad08cd92209d98a3c
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
-https://conda.anaconda.org/conda-forge/osx-64/pyarrow-6.0.2-py38h26ec201_1_cpu.tar.bz2#121795687e4f341822766b9f4da7d9f7
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
-https://conda.anaconda.org/conda-forge/osx-64/datafusion-0.7.0-py38he94b92c_0.conda#43ac185805b00b6f3adf778e2331ef96
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/osx-64/arrow-cpp-11.0.0-h694c41f_13_cpu.conda#b692e17c44e10422db31ba8668f7fbec
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
-https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.3.0-pyhd8ed1ab_0.conda#644c60cdd1e85407fc28b9085438c7a0
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/osx-64/python-duckdb-0.7.0-py38h20c7665_1.conda#5e4b3c374d65079906a49c19c4aa247f
-https://conda.anaconda.org/conda-forge/osx-64/scipy-1.10.0-py38hfb8b963_2.conda#dc84768b5df414c0bab8fe921726c4fc
-https://conda.anaconda.org/conda-forge/osx-64/snowflake-connector-python-2.8.3-py38h11ea1d4_0.conda#c88fd2baadb1ccdb991bfbc6be6c4689
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/osx-64/scipy-1.10.1-py38hfb8b963_0.conda#8633db487016b9345074650764e8239f
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
-https://conda.anaconda.org/conda-forge/noarch/notebook-shim-0.2.2-pyhd8ed1ab_0.tar.bz2#40be846cd4e78672a40e43db9dae753c
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/osx-64/scikit-learn-1.2.1-py38h573ff9c_0.conda#9679e52a9d9d8f76243b4e8c5a61bbc3
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
-https://conda.anaconda.org/conda-forge/osx-64/google-cloud-bigquery-core-3.4.2-py38h50d1736_0.conda#8970e98ed1512b535d310893973e11f4
+https://conda.anaconda.org/conda-forge/osx-64/scikit-learn-1.2.2-py38h1081964_1.conda#28ceb0f2443f059ab8415eb54bde8b95
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
-https://conda.anaconda.org/conda-forge/noarch/nbclassic-0.5.2-pyhd8ed1ab_0.conda#c5039404bd47fbdc811b5e9282c51afe
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/osx-64/pyarrow-11.0.0-py38h5866706_13_cpu.conda#321bd73e2bbb38ada52b5f183401e5fc
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/osx-64/datafusion-0.7.0-py38he94b92c_0.conda#43ac185805b00b6f3adf778e2331ef96
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.2-pyha770c72_1.tar.bz2#7bf26ca095481f206e6f9dd7681085fe
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-3.6.1-pyha770c72_0.tar.bz2#03cd073d4dc0623b857bf9e175d0f736
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-7.7.1-pyhd8ed1ab_0.tar.bz2#96ba78bf526df670bf9562d6100eb627
-https://conda.anaconda.org/conda-forge/osx-64/google-cloud-bigquery-3.4.2-py38h50d1736_0.conda#9727c030d01c4002efd25009fcf7f939
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/osx-64/python-duckdb-0.7.1-py38h00b9632_0.conda#6358dcc6af1184b25448ebc4fb82e9f6
+https://conda.anaconda.org/conda-forge/osx-64/snowflake-connector-python-3.0.2-py38h0c08250_0.conda#a978748e38cd66a8595206d936322c4f
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
diff --git a/osx-64-3.9.lock b/osx-64-3.9.lock
index c8b802e..30df4e9 100644
--- a/osx-64-3.9.lock
+++ b/osx-64-3.9.lock
@@ -1,8 +1,8 @@
# Generated by conda-lock.
# platform: osx-64
-# input_hash: 31a076201be11c99f4dcbd74b9760d887aed1fedc019fe84f66431cb2fb38e97
+# input_hash: 719d1c8e29476f43ea22a3c4900a5c0291fae20d116f00f4f3b68e91d126a5fb
@EXPLICIT
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-common-0.6.2-h0d85af4_0.tar.bz2#0f72a3415c40ead80c978fec230f49ee
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-common-0.8.14-hb7f2c08_0.conda#a2ded8f5113b04e5e7274d044f75cbbc
https://conda.anaconda.org/conda-forge/osx-64/bzip2-1.0.8-h0d85af4_4.tar.bz2#37edc4e6304ca87316e160f5ca0bd1b5
https://conda.anaconda.org/conda-forge/osx-64/c-ares-1.18.1-h0d85af4_0.tar.bz2#00b3e98a61e6430808fe7a2534681f28
https://conda.anaconda.org/conda-forge/osx-64/ca-certificates-2022.12.7-h033912b_0.conda#af2bdcd68f16ce030ca957cdeb83d88a
@@ -12,12 +12,12 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77
https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
https://conda.anaconda.org/conda-forge/osx-64/freexl-1.0.6-hb7f2c08_1.tar.bz2#4fc494f8539871247167bbe4167f3277
https://conda.anaconda.org/conda-forge/osx-64/fribidi-1.0.10-hbcb3906_0.tar.bz2#f1c6b41e0f56998ecd9a3e210faa1dc0
-https://conda.anaconda.org/conda-forge/osx-64/giflib-5.2.1-hbcb3906_2.tar.bz2#be8f747c37e4d7e346c133e641966750
+https://conda.anaconda.org/conda-forge/osx-64/giflib-5.2.1-hb7f2c08_3.conda#aca150b0186836f893ebac79019e5498
https://conda.anaconda.org/conda-forge/osx-64/jpeg-9e-hb7f2c08_3.conda#6b55131ae9445ef38746dc6b080acda9
https://conda.anaconda.org/conda-forge/osx-64/json-c-0.16-h01d06f9_0.tar.bz2#6696477dbfcb5b7ea8559865e7f9dbef
https://conda.anaconda.org/conda-forge/osx-64/libbrotlicommon-1.0.9-hb7f2c08_8.tar.bz2#37157d273eaf3bc7d6862104161d9ec9
-https://conda.anaconda.org/conda-forge/osx-64/libcxx-14.0.6-hccf4f1f_0.tar.bz2#208a6a874b073277374de48a782f6b10
-https://conda.anaconda.org/conda-forge/osx-64/libdeflate-1.14-hb7f2c08_0.tar.bz2#ce2a6075114c9b64ad8cace52492feee
+https://conda.anaconda.org/conda-forge/osx-64/libcxx-15.0.7-h71dddab_0.conda#ad1c6c1ddfd7717e3d46bf06ff2e9400
+https://conda.anaconda.org/conda-forge/osx-64/libdeflate-1.17-hac1461d_0.conda#e3894420cf8b6abbf6c4d3d9742fbb4a
https://conda.anaconda.org/conda-forge/osx-64/libev-4.33-haf1e3a3_1.tar.bz2#79dc2be110b2a3d1e97ec21f691c50ad
https://conda.anaconda.org/conda-forge/osx-64/libffi-3.4.2-h0d85af4_5.tar.bz2#ccb34fb14960ad8b125962d3d79b31a9
https://conda.anaconda.org/conda-forge/osx-64/libiconv-1.17-hac89ed1_0.tar.bz2#691d103d11180486154af49c037b7ed9
@@ -26,20 +26,21 @@ https://conda.anaconda.org/conda-forge/osx-64/libtool-2.4.7-hf0c8a7f_0.conda#1f8
https://conda.anaconda.org/conda-forge/osx-64/libutf8proc-2.8.0-hb7f2c08_0.tar.bz2#db98dc3e58cbc11583180609c429c17d
https://conda.anaconda.org/conda-forge/osx-64/libwebp-base-1.2.4-h775f41a_0.tar.bz2#28807bef802a354f9c164e7ab242c5cb
https://conda.anaconda.org/conda-forge/osx-64/libzlib-1.2.13-hfd90126_4.tar.bz2#35eb3fce8d51ed3c1fd4122bad48250b
-https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-15.0.7-h61d9ccf_0.conda#3faa9933dff6e96333b5ca5274674b63
+https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-16.0.0-h61d9ccf_0.conda#00d0daa29e5a4ce56ef9b351148a1e88
https://conda.anaconda.org/conda-forge/osx-64/ncurses-6.3-h96cf925_1.tar.bz2#76217ebfbb163ff2770a261f955a5861
-https://conda.anaconda.org/conda-forge/osx-64/pandoc-2.19.2-h694c41f_1.tar.bz2#fa70c816e73fca7b3c7653e8c7e3bfdb
https://conda.anaconda.org/conda-forge/osx-64/pixman-0.40.0-hbcb3906_0.tar.bz2#09a583a6f172715be21d93aaa1b42d71
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/osx-64/pthread-stubs-0.4-hc929b4f_1001.tar.bz2#addd19059de62181cd11ae8f4ef26084
https://conda.anaconda.org/conda-forge/osx-64/python_abi-3.9-3_cp39.conda#021e2768e8eaf24ee8e25aec64d305a1
-https://conda.anaconda.org/conda-forge/osx-64/tzcode-2022g-hb7f2c08_0.conda#f1bf42ae6c2a752b4c064140365563c2
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/osx-64/tzcode-2023b-hb7f2c08_0.conda#09f3f3b89c6d7d01de40772cc58fe5bf
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/osx-64/xorg-libxau-1.0.9-h35c211d_0.tar.bz2#c5049997b2e98edfbcdd294582f66281
https://conda.anaconda.org/conda-forge/osx-64/xorg-libxdmcp-1.1.3-h35c211d_0.tar.bz2#86ac76d6bf1cbb9621943eb3bd9ae36e
https://conda.anaconda.org/conda-forge/osx-64/xz-5.2.6-h775f41a_0.tar.bz2#a72f9d4ea13d55d745ff1ed594747f10
https://conda.anaconda.org/conda-forge/osx-64/yaml-0.2.5-h0d85af4_2.tar.bz2#d7e08fcf8259d742156188e8762b4d20
-https://conda.anaconda.org/conda-forge/osx-64/aws-checksums-0.1.11-h0010a65_7.tar.bz2#c86bc781dc7b3ba4e6130ffb14da0d6b
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-compression-0.2.16-h99c63db_5.conda#fbafb2857152f62fa5d48145be10dec8
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-sdkutils-0.1.8-h99c63db_0.conda#30706b270f0d8eaced4ef4a226aa9d0b
+https://conda.anaconda.org/conda-forge/osx-64/aws-checksums-0.1.14-h99c63db_5.conda#c3dd2e2e309f28ff492fc16ddf2f3044
https://conda.anaconda.org/conda-forge/osx-64/expat-2.5.0-hf0c8a7f_0.tar.bz2#7648a729fc8b7272596e90b0ab0a3e98
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/osx-64/geos-3.11.1-hf0c8a7f_0.tar.bz2#b8ac0c20383087c33ac8e5e330072832
@@ -49,68 +50,70 @@ https://conda.anaconda.org/conda-forge/osx-64/gmp-6.2.1-h2e338ed_0.tar.bz2#dedc9
https://conda.anaconda.org/conda-forge/osx-64/graphite2-1.3.13-h2e338ed_1001.tar.bz2#5f6e7f98caddd0fc2d345b207531814c
https://conda.anaconda.org/conda-forge/osx-64/icu-70.1-h96cf925_0.tar.bz2#376635049e9b9b0bb875efd39dcd7b3b
https://conda.anaconda.org/conda-forge/osx-64/lerc-4.0.0-hb486fe8_0.tar.bz2#f9d6a4c82889d5ecedec1d90eb673c55
-https://conda.anaconda.org/conda-forge/osx-64/libabseil-20220623.0-cxx17_h844d122_6.conda#14fcfd14fb90f40a8be87f48a3f89355
+https://conda.anaconda.org/conda-forge/osx-64/libabseil-20230125.0-cxx17_hf0c8a7f_1.conda#86f75c350dd5951f41d4056c35ba4845
+https://conda.anaconda.org/conda-forge/osx-64/libaec-1.0.6-hf0c8a7f_1.conda#7c0f82f435ab4c48d65dc9b28db2ad9e
https://conda.anaconda.org/conda-forge/osx-64/libbrotlidec-1.0.9-hb7f2c08_8.tar.bz2#7f952a036d9014b4dab96c6ea0f8c2a7
https://conda.anaconda.org/conda-forge/osx-64/libbrotlienc-1.0.9-hb7f2c08_8.tar.bz2#b36a3bfe866d9127f25f286506982166
https://conda.anaconda.org/conda-forge/osx-64/libcrc32c-1.1.2-he49afe7_0.tar.bz2#23d6d5a69918a438355d7cbc4c3d54c9
https://conda.anaconda.org/conda-forge/osx-64/libedit-3.1.20191231-h0678c8f_2.tar.bz2#6016a8a1d0e63cac3de2c352cd40208b
-https://conda.anaconda.org/conda-forge/osx-64/libgfortran5-11.3.0-h082f757_28.conda#4b0400521ae098af1c87350442d88d1c
+https://conda.anaconda.org/conda-forge/osx-64/libgfortran5-12.2.0-he409387_31.conda#5a544130e584b1f204ac896ff071d5b3
https://conda.anaconda.org/conda-forge/osx-64/libpng-1.6.39-ha978bb4_0.conda#35e4928794c5391aec14ffdf1deaaee5
-https://conda.anaconda.org/conda-forge/osx-64/libprotobuf-3.20.2-hbc0c0cd_0.tar.bz2#016fda52742981ae0a2c49f3e0ff930b
+https://conda.anaconda.org/conda-forge/osx-64/libprotobuf-3.21.12-hbc0c0cd_0.conda#7a9b17cfb3e57143e4e9118b5244b691
https://conda.anaconda.org/conda-forge/osx-64/libspatialindex-1.9.3-he49afe7_4.tar.bz2#b1c13764417c32fa87fac733caa82a64
https://conda.anaconda.org/conda-forge/osx-64/libsqlite-3.40.0-ha978bb4_0.tar.bz2#ceb13b6726534b96e3b4e3dda91e9050
https://conda.anaconda.org/conda-forge/osx-64/libxcb-1.13-h0d85af4_1004.tar.bz2#eb7860935e14aec936065cbc21a1a962
https://conda.anaconda.org/conda-forge/osx-64/lz4-c-1.9.4-hf0c8a7f_0.conda#aa04f7143228308662696ac24023f991
https://conda.anaconda.org/conda-forge/osx-64/nspr-4.35-hea0b92c_0.conda#a9e56c98d13d8b7ce72bf4357317c29b
-https://conda.anaconda.org/conda-forge/osx-64/openssl-1.1.1t-hfd90126_0.conda#788ef682cff438725828036383e748f5
+https://conda.anaconda.org/conda-forge/osx-64/openssl-3.1.0-hfd90126_0.conda#a7df3470c748a517663bf095c2ac0235
+https://conda.anaconda.org/conda-forge/osx-64/pandoc-3.1.1-h9d075a6_0.conda#5d082d93256a60f6311068849f7fca10
https://conda.anaconda.org/conda-forge/osx-64/pcre2-10.40-h1c4e4bc_0.tar.bz2#e0f80c8f3a0352a54eddfe59cd2b25b1
-https://conda.anaconda.org/conda-forge/osx-64/re2-2022.06.01-hb486fe8_1.conda#317b48dc2c5ab6ceccdd9ced4e1ef47f
-https://conda.anaconda.org/conda-forge/osx-64/readline-8.1.2-h3899abd_0.tar.bz2#89fa404901fa8fb7d4f4e07083b8d635
-https://conda.anaconda.org/conda-forge/osx-64/snappy-1.1.9-h225ccf5_2.tar.bz2#eb2c4c3544099a357db4c02eda1a0766
+https://conda.anaconda.org/conda-forge/osx-64/re2-2023.02.02-hf0c8a7f_0.conda#1c2886c84068be32f68493245672ec31
+https://conda.anaconda.org/conda-forge/osx-64/readline-8.2-h9e318b2_1.conda#f17f77f2acf4d344734bda76829ce14e
+https://conda.anaconda.org/conda-forge/osx-64/snappy-1.1.10-h225ccf5_0.conda#4320a8781f14cd959689b86e349f3b73
https://conda.anaconda.org/conda-forge/osx-64/tk-8.6.12-h5dbffcc_0.tar.bz2#8e9480d9c47061db2ed1b4ecce519a7f
https://conda.anaconda.org/conda-forge/osx-64/zeromq-4.3.4-he49afe7_1.tar.bz2#1972d732b123ed04b60fd21e94f0b178
https://conda.anaconda.org/conda-forge/osx-64/zlib-1.2.13-hfd90126_4.tar.bz2#be90e6223c74ea253080abae19b3bdb1
https://conda.anaconda.org/conda-forge/osx-64/zstd-1.5.2-hbc0c0cd_6.conda#40a188783d3c425bdccc9ae9104acbb8
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-cal-0.5.11-hd2e2f4b_0.tar.bz2#09bd616bd04399d208dc06b909a5e1c0
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-cal-0.5.21-hf54dd2f_2.conda#b4f707705e5211e13516e8a1889c6535
https://conda.anaconda.org/conda-forge/osx-64/blosc-1.21.2-hebb52c4_0.conda#2e726e782e57ba3e70f2e85891377cd5
https://conda.anaconda.org/conda-forge/osx-64/boost-cpp-1.78.0-h8b082ac_1.tar.bz2#810ad57aa3057a76ea1c65731d58da55
https://conda.anaconda.org/conda-forge/osx-64/brotli-bin-1.0.9-hb7f2c08_8.tar.bz2#aac5ad0d8f747ef7f871508146df75d9
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
+https://conda.anaconda.org/conda-forge/osx-64/freetds-1.00.44-0.tar.bz2#db962bf27f5f6a27411806fd2cd8cc3e
https://conda.anaconda.org/conda-forge/osx-64/freetype-2.12.1-h3f81eb7_1.conda#852224ea3e8991a8342228eab274840e
https://conda.anaconda.org/conda-forge/osx-64/glog-0.6.0-h8ac2a54_0.tar.bz2#69eb97ca709a136c53fdca1f2fd33ddf
-https://conda.anaconda.org/conda-forge/osx-64/grpc-cpp-1.46.4-h6579160_7.tar.bz2#57a3f07b87107e12ca611c78c77ee1f3
https://conda.anaconda.org/conda-forge/osx-64/hdf4-4.2.15-h7aa5921_5.tar.bz2#a5e171d71c6b524409de40d81c098758
-https://conda.anaconda.org/conda-forge/osx-64/krb5-1.19.3-hb49756b_0.tar.bz2#e60363be26ab2a74326c06195d638447
-https://conda.anaconda.org/conda-forge/osx-64/libevent-2.1.10-h815e4d9_4.tar.bz2#adc6c89498c5f6fe5ba874d8259e7eeb
-https://conda.anaconda.org/conda-forge/osx-64/libgfortran-5.0.0-10_4_0_h97931a8_28.conda#aa6a12546c19f6d816bf80371e19a409
+https://conda.anaconda.org/conda-forge/osx-64/krb5-1.20.1-h049b76e_0.conda#db11fa2968ef0837288fe2d7f5b77a50
+https://conda.anaconda.org/conda-forge/osx-64/libevent-2.1.10-h7d65743_4.tar.bz2#ed607da8c2602aeddb4ae723819fcdcc
+https://conda.anaconda.org/conda-forge/osx-64/libgfortran-5.0.0-11_3_0_h97931a8_31.conda#97451338600bd9c5b535eb224ef6c471
https://conda.anaconda.org/conda-forge/osx-64/libglib-2.74.1-h4c723e1_1.tar.bz2#68a698fe240032c2ff587028ed51b155
-https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.51.0-h0dd9d14_0.conda#6c83a076112d9496b4cb5f940e40023a
+https://conda.anaconda.org/conda-forge/osx-64/libgrpc-1.52.1-h5bc3d57_1.conda#ec992eb9d33e9707cdecabc1464f0ea4
+https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.52.0-he2ab024_0.conda#12ac7d100bf260263e30a019517f42a2
https://conda.anaconda.org/conda-forge/osx-64/librttopo-1.1.0-h9461dca_12.tar.bz2#cbf6767a38ffbc9be29cf26045e81faf
-https://conda.anaconda.org/conda-forge/osx-64/libssh2-1.10.0-h7535e13_3.tar.bz2#acc1797f7b89018eeba2029c56dfdf0c
-https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.4.0-h6268bbc_5.conda#551fc78ba147767ea5905d0746e2fbb5
-https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.10.3-hb9e07b5_0.tar.bz2#13ba8bf8f44cdac2e5401dac20a36040
-https://conda.anaconda.org/conda-forge/osx-64/libzip-1.9.2-h3ad4413_1.tar.bz2#1f22d7bc7ffd031b0cf3a5a2d257a6bf
-https://conda.anaconda.org/conda-forge/osx-64/nss-3.88-h78b00b3_0.conda#95b6bfc95f9c11286fcc2b11da36a5e8
-https://conda.anaconda.org/conda-forge/osx-64/orc-1.7.6-hc067c44_0.tar.bz2#34d99d2c60cd0aa4f36c3a4ed8192d1e
-https://conda.anaconda.org/conda-forge/osx-64/python-3.9.15-h531fd05_0_cpython.conda#c1c2ff367f52b7624a226df4621ba7b5
+https://conda.anaconda.org/conda-forge/osx-64/libssh2-1.10.0-h47af595_3.tar.bz2#5a28624eeb7812b585b9e2d75f846ba2
+https://conda.anaconda.org/conda-forge/osx-64/libtiff-4.5.0-hee9004a_2.conda#35f714269a801f7c3cb522aacd3c0e69
+https://conda.anaconda.org/conda-forge/osx-64/libxml2-2.10.3-h201ad9d_4.conda#2101dd548f0601be252e27e48fa532fa
+https://conda.anaconda.org/conda-forge/osx-64/libzip-1.9.2-h6db710c_1.tar.bz2#ce732d37e479919f3d22b1ccdeb858ac
+https://conda.anaconda.org/conda-forge/osx-64/nss-3.89-h78b00b3_0.conda#1eb1408ecae62d98a902636d46f5595c
+https://conda.anaconda.org/conda-forge/osx-64/orc-1.8.3-ha9d861c_0.conda#f1fdbf0e6c47818a8ba08b0ac4fbd6b6
+https://conda.anaconda.org/conda-forge/osx-64/python-3.9.16-h709bd14_0_cpython.conda#37f637999bb01d0474492ed14660c34b
https://conda.anaconda.org/conda-forge/osx-64/sqlite-3.40.0-h9ae0607_0.tar.bz2#b66b0b11f1b901f3c2bce9406bedfd40
-https://conda.anaconda.org/conda-forge/osx-64/unixodbc-2.3.10-h7b58acd_0.tar.bz2#846a63a046f67d5e7998c2a1608a2a30
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
https://conda.anaconda.org/conda-forge/noarch/appnope-0.1.3-pyhd8ed1ab_0.tar.bz2#54ac328d703bff191256ffa1183126d1
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/osx-64/atk-1.0-2.38.0-h1d18e73_1.tar.bz2#5a538295f97a484ee332aacc131718b5
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-io-0.10.5-h35aa462_0.tar.bz2#2647690fb7719e72da8a547c2c845708
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-io-0.13.19-had634fe_3.conda#70a2f3e2b2b20a051980e2369f48ac3f
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
https://conda.anaconda.org/conda-forge/osx-64/backports.zoneinfo-0.2.1-py39h6e9494a_7.tar.bz2#5727630b9e2234fbe5ba637c763a80c7
-https://conda.anaconda.org/conda-forge/osx-64/bitarray-2.7.2-py39ha30fb19_0.conda#63bb0cb252c192086434425f10ecbfb4
+https://conda.anaconda.org/conda-forge/osx-64/bitarray-2.7.3-py39ha30fb19_0.conda#550fbf64e85b53bccb34e061a8f82597
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/osx-64/brotli-1.0.9-hb7f2c08_8.tar.bz2#55f612fe4a9b5f6ac76348b6de94aaeb
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
https://conda.anaconda.org/conda-forge/osx-64/clickhouse-cityhash-1.0.2.3-py39hfd1d529_4.tar.bz2#d215d98038b95999cfa3e8cba86fbeeb
@@ -120,31 +123,33 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/osx-64/debugpy-1.6.6-py39h7a8716b_0.conda#95384ab2f1f488626e88c57b5c390655
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/osx-64/fontconfig-2.14.2-h5bb23bf_0.conda#86cc5867dfbee4178118392bae4a3c89
-https://conda.anaconda.org/conda-forge/osx-64/freetds-1.3.16-h99143db_0.conda#3852da6fc91b51685186c4fd40032f67
https://conda.anaconda.org/conda-forge/osx-64/frozenlist-1.3.3-py39ha30fb19_0.tar.bz2#66467edba60603caf75d585e0fb1c70c
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
-https://conda.anaconda.org/conda-forge/osx-64/gdk-pixbuf-2.42.8-h3648f77_1.tar.bz2#f709a0451aa786175db4c3cfa2af35cc
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/osx-64/gdk-pixbuf-2.42.10-he00a9fc_0.conda#93d4a0706c27961c200bdc49e09e1b75
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/osx-64/greenlet-2.0.2-py39h7a8716b_0.conda#fcba624b29d6b8857aac6d58c8617c9b
+https://conda.anaconda.org/conda-forge/osx-64/grpcio-1.52.1-py39h7a8716b_1.conda#65dd147b6ab8c462bf97b8f341534a6b
https://conda.anaconda.org/conda-forge/osx-64/gts-0.7.6-hccb3bdf_2.tar.bz2#ad799f4bcdacc510347c2d9d19b40bc3
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.5-pyhd8ed1ab_0.conda#953a312b272f37d39fe9d09f46734622
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/osx-64/kiwisolver-1.4.4-py39h92daf61_1.tar.bz2#7720e059630e25ab17ab12677e59c615
-https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.14-h90f4b2a_0.tar.bz2#e56c432e9a78c63692fa6bd076a15713
-https://conda.anaconda.org/conda-forge/osx-64/libcurl-7.86.0-h57eb407_1.tar.bz2#edf3eb7cd24741ae15c18ac0a10e84e8
+https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.15-h29502cd_0.conda#4f448677a99bfc41d3bd538c1302f1fb
+https://conda.anaconda.org/conda-forge/osx-64/libcurl-7.88.1-h6df9250_1.conda#1973ff6a22194ece3cb15caddf26db7c
https://conda.anaconda.org/conda-forge/osx-64/libkml-1.3.0-haeb80ef_1015.tar.bz2#f1a092ddaedbde48dcf62a9455ce7e31
https://conda.anaconda.org/conda-forge/osx-64/libopenblas-0.3.21-openmp_h429af6e_3.tar.bz2#968c46aa7f4032c3f3873f3452ed4c34
-https://conda.anaconda.org/conda-forge/osx-64/libpq-15.1-h4aa9af9_1.conda#9abd7b8e31e1fef606402cf07a52e330
-https://conda.anaconda.org/conda-forge/osx-64/libthrift-0.16.0-h08c06f4_2.tar.bz2#c7a0779d1b87c4ba4897fc7f12b304ca
-https://conda.anaconda.org/conda-forge/osx-64/libwebp-1.2.4-hfa4350a_0.tar.bz2#d3b5a56369701e6a11bf300ba3394391
+https://conda.anaconda.org/conda-forge/osx-64/libpq-15.2-h3640bf0_0.conda#411d9cd4559a2f2b7ec37fb4932fe9b9
+https://conda.anaconda.org/conda-forge/osx-64/libthrift-0.18.1-h16802d8_0.conda#bfacdfd4452689c3c7bdcb1e5ac6e5e9
+https://conda.anaconda.org/conda-forge/osx-64/libwebp-1.2.4-h70a068d_1.conda#c1d73d39f4bbff1903d1f4931355b78d
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/osx-64/lz4-4.3.2-py39hd0af75a_0.conda#c42a59cd02262ce80f221786f23ebdfb
https://conda.anaconda.org/conda-forge/osx-64/markupsafe-2.1.2-py39ha30fb19_0.conda#3b7b34916156e45ec52df74efc3db6e4
@@ -152,18 +157,18 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/osx-64/msgpack-python-1.0.4-py39h92daf61_1.tar.bz2#1514cec1741a05af5d55d0e792e9dee6
+https://conda.anaconda.org/conda-forge/osx-64/msgpack-python-1.0.5-py39h92daf61_0.conda#a2a730c9085efb9b5890b8786ddc9fe7
https://conda.anaconda.org/conda-forge/osx-64/multidict-6.0.4-py39ha30fb19_0.conda#a09340f1d9e5b4936018332d7ac69dec
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
-https://conda.anaconda.org/conda-forge/osx-64/openjpeg-2.5.0-h5d0d7b0_1.tar.bz2#be533cc782981a0ec5eed28aa618470a
+https://conda.anaconda.org/conda-forge/osx-64/openjpeg-2.5.0-h13ac156_2.conda#299a29af9ac9f550ad459d655739280b
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
@@ -178,26 +183,25 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/osx-64/pycryptodomex-3.16.0-py39ha30fb19_0.conda#e42fecad1e661def904791079b5e0597
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
+https://conda.anaconda.org/conda-forge/osx-64/pymssql-2.2.5-py39h44ddb2b_2.tar.bz2#43a256711b3b905c206141e9db94f60b
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/osx-64/pyrsistent-0.19.3-py39ha30fb19_0.conda#e4e22a74d0944ff8aa81167aa9ddf9c6
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/osx-64/pyyaml-6.0-py39ha30fb19_5.tar.bz2#45794cac8eadcc11b3f26dda1705bf62
-https://conda.anaconda.org/conda-forge/osx-64/pyzmq-25.0.0-py39hed8f129_0.conda#5d405bf0fb8a07ad1da8c059566fd800
-https://conda.anaconda.org/conda-forge/osx-64/regex-2022.10.31-py39ha30fb19_0.tar.bz2#610d64fb38efc7f81877c5b4e10ea369
+https://conda.anaconda.org/conda-forge/osx-64/pyzmq-25.0.2-py39hed8f129_0.conda#06091849497dcff49edba34526b391fa
+https://conda.anaconda.org/conda-forge/osx-64/regex-2023.3.23-py39ha30fb19_0.conda#d0f043898a8bfe793fb2d154f8cf61ec
https://conda.anaconda.org/conda-forge/osx-64/rtree-1.0.1-py39h7d0d40a_1.tar.bz2#1043072d13c423eef9a25555652a2cdc
-https://conda.anaconda.org/conda-forge/osx-64/ruff-0.0.249-py39hedce109_0.conda#97e19bfe3382d44116afa7ba036328f9
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/osx-64/ruff-0.0.259-py39hedce109_0.conda#007521fc011c15ae00d8f2dc4b9a633b
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -207,19 +211,21 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/osx-64/tornado-6.2-py39ha30fb19_1.tar.bz2#07917d8456ca9aa09acf950019bf53b2
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/osx-64/unicodedata2-15.0.0-py39ha30fb19_0.tar.bz2#17876b4aebf783fb7bba980a79516892
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.5-pyhd8ed1ab_0.conda#2af53b3894fb9bdbb3679c0d31028b1b
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/osx-64/aws-c-event-stream-0.2.7-hb9330a7_13.tar.bz2#d7319f5973bc93e63eb1b32dbb4d03b8
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-event-stream-0.2.20-h0ae4c0f_4.conda#8b0e31f714d69f0211419150cb2be6be
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-http-0.7.6-hcdd7835_0.conda#2f2b9a52b2dcbbdcdc183f4860e96f5b
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/osx-64/cairo-1.16.0-h904041c_1014.tar.bz2#2e7b4350178ed52bb6fd2b1ecbeeed4f
@@ -227,41 +233,40 @@ https://conda.anaconda.org/conda-forge/osx-64/cffi-1.15.1-py39h131948b_3.conda#3
https://conda.anaconda.org/conda-forge/osx-64/cfitsio-4.2.0-hd56cc12_0.conda#28e03cefd79aa28ec0e313e5a9c71f5b
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
-https://conda.anaconda.org/conda-forge/osx-64/coverage-7.1.0-py39ha30fb19_0.conda#be24d2d5a14dd95d77376ca68df86e94
-https://conda.anaconda.org/conda-forge/osx-64/curl-7.86.0-h57eb407_1.tar.bz2#66971030ca300059cb6fbd27da348e10
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/osx-64/coverage-7.2.2-py39ha30fb19_0.conda#3ec6b8ebf61d4f19fd91a32990df7429
+https://conda.anaconda.org/conda-forge/osx-64/curl-7.88.1-h6df9250_1.conda#2cf75b9fb10c82425c94e12273ac7791
https://conda.anaconda.org/conda-forge/osx-64/cytoolz-0.12.0-py39ha30fb19_1.tar.bz2#1d779faefd44897457b06aeacb685170
-https://conda.anaconda.org/conda-forge/osx-64/fastavro-1.7.1-py39ha30fb19_0.conda#18f1adc00de733b4fc4ec5de0bcccf78
-https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.38.0-py39ha30fb19_1.tar.bz2#d4ef9879362c40c8c346a0b6cd79f2e0
+https://conda.anaconda.org/conda-forge/osx-64/fastavro-1.7.3-py39ha30fb19_0.conda#a0f72987b4dc48bc543f87aeb700960f
+https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.39.2-py39ha30fb19_0.conda#73ca1f92cdf2671e99e50c7c382a321c
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/osx-64/grpcio-1.46.4-py39h54b4606_7.tar.bz2#38727d64cd7987133b38556a1c0c2094
-https://conda.anaconda.org/conda-forge/osx-64/hdf5-1.12.2-nompi_hc782337_100.tar.bz2#62834ae35eb346b324b3b9c4fdc5e539
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/osx-64/hdf5-1.12.2-nompi_h48135f9_101.conda#2ee4811ba5f72f7f12f69b3ec2d6cd96
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
https://conda.anaconda.org/conda-forge/osx-64/libblas-3.9.0-16_osx64_openblas.tar.bz2#644d63e9379867490b67bace400b2a0f
-https://conda.anaconda.org/conda-forge/osx-64/libgd-2.3.3-h1e214de_3.tar.bz2#350af2b75c58dc16985fa97298469143
-https://conda.anaconda.org/conda-forge/osx-64/libgoogle-cloud-2.1.0-habe576c_1.tar.bz2#165d074d3ad3204232cf0bf72a24e34d
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/osx-64/libgd-2.3.3-h4685329_4.conda#656fb395549f224a3336c7cae28d7a93
+https://conda.anaconda.org/conda-forge/osx-64/libgoogle-cloud-2.8.0-h176059f_1.conda#0e1b18b92865c0130f4f8b4392e8558c
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
-https://conda.anaconda.org/conda-forge/osx-64/pillow-9.2.0-py39h35d4919_3.tar.bz2#6ed8a5881729d8f7ee7cde78c13241a4
+https://conda.anaconda.org/conda-forge/osx-64/pillow-9.4.0-py39h7f5cd59_1.conda#d2f1bdaa85fd34020259533efeeb40bb
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/osx-64/postgresql-15.1-h7bc2cb3_1.conda#6143380ea69db7034a24ee6a9ac5d1cb
-https://conda.anaconda.org/conda-forge/osx-64/proj-9.1.0-hcbd9701_0.tar.bz2#78ee95e87e5143d0e4a17d4aeef56411
-https://conda.anaconda.org/conda-forge/osx-64/protobuf-3.20.2-py39h7a8716b_1.conda#71d4f72df5b6ef9e9b830359596a4a20
-https://conda.anaconda.org/conda-forge/osx-64/psycopg2-2.9.3-py39hde36b5c_2.conda#8429c996f96645a7a9ab976fd3f29a00
+https://conda.anaconda.org/conda-forge/osx-64/postgresql-15.2-hbea33b9_0.conda#4ffe00143090158bb7f5fc2f4f1a920c
+https://conda.anaconda.org/conda-forge/osx-64/proj-9.1.1-hf909084_2.conda#96d16a3411f40f30f622f7594ddae222
+https://conda.anaconda.org/conda-forge/osx-64/protobuf-4.21.12-py39h7a8716b_0.conda#f4fae049b4e5bec90ccda2f0660c0a8a
+https://conda.anaconda.org/conda-forge/osx-64/psycopg2-2.9.3-py39h66c63e9_2.conda#21ef7afd6ed691f18e32096abd08b296
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
-https://conda.anaconda.org/conda-forge/osx-64/pymssql-2.2.7-py39h44ddb2b_0.conda#8cd1147ac2ccd2f59874ad991e3504e4
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/osx-64/pytz-deprecation-shim-0.1.0.post0-py39h6e9494a_3.tar.bz2#6531eb0bc2befca7c0c03aca323adef1
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
@@ -270,23 +275,23 @@ https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf4
https://conda.anaconda.org/conda-forge/osx-64/sqlalchemy-1.4.46-py39ha30fb19_0.conda#de90eaef0bf42b4d8ef0a04d7dbdd3b2
https://conda.anaconda.org/conda-forge/osx-64/thrift-0.16.0-py39h7a8716b_2.tar.bz2#fa937b64729f19b2154ec05a3d57eda2
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/osx-64/watchdog-2.2.1-py39h82e4197_0.conda#9cbe7cb00c42d3c41a8f07f265eccc73
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/osx-64/watchdog-3.0.0-py39h82e4197_0.conda#5bccba856bc16b46f2a6c329b672f54d
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/osx-64/xerces-c-3.2.4-h2007e90_1.tar.bz2#da5951ed1609c4fdd135db32c4c8ef36
https://conda.anaconda.org/conda-forge/osx-64/yarl-1.8.2-py39ha30fb19_0.conda#1232f9071fd428c096bc084c3d678355
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
-https://conda.anaconda.org/conda-forge/osx-64/aws-sdk-cpp-1.8.186-h7c85d8e_4.tar.bz2#83537fd65fe827f41b96851e6c92fd73
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-auth-0.6.26-hcaaecf5_1.conda#57e3968abdb1414279c83aa1145dc65d
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-mqtt-0.8.6-ha4e05e3_12.conda#ae6f4dedbbb14f41d643986af3d87d23
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/osx-64/brotlipy-0.7.0-py39ha30fb19_1005.tar.bz2#201d86c1f0b0132954fc72251b09df8a
-https://conda.anaconda.org/conda-forge/osx-64/cryptography-38.0.3-py39h7eb6a14_0.tar.bz2#e5527580187212d8b026be1d2f87e41c
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/osx-64/cryptography-38.0.4-py39hbeae22c_0.conda#d71d3f70f5a0675624f322c7a8956b33
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
-https://conda.anaconda.org/conda-forge/osx-64/geotiff-1.7.1-he29fd1c_4.tar.bz2#7fab5b9379958e9d3f784842c00c8e66
+https://conda.anaconda.org/conda-forge/osx-64/geotiff-1.7.1-hd690177_6.conda#13da0cc6fabf8971a3bc3ab1de1a9bb9
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
https://conda.anaconda.org/conda-forge/osx-64/google-crc32c-1.1.2-py39h3ffb5a0_4.tar.bz2#1f5254d6180252f84adf424c41b417c3
@@ -294,118 +299,126 @@ https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-py
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
https://conda.anaconda.org/conda-forge/osx-64/harfbuzz-6.0.0-h08f8713_0.conda#3852d6ef7b77da3e81074a8e487e7df5
https://conda.anaconda.org/conda-forge/noarch/importlib-resources-5.12.0-pyhd8ed1ab_0.conda#3544c818f0720c89eb16ae6940ab440b
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/osx-64/kealib-1.5.0-h5c1f988_0.conda#4aab67daf291f97462a5a947aaad48ea
https://conda.anaconda.org/conda-forge/osx-64/libcblas-3.9.0-16_osx64_openblas.tar.bz2#28592eab0f05bcf9969789e87f754e11
-https://conda.anaconda.org/conda-forge/osx-64/libdap4-3.20.6-h3e144a0_2.tar.bz2#55e0706347eb18f3616808366236bcaa
https://conda.anaconda.org/conda-forge/osx-64/liblapack-3.9.0-16_osx64_openblas.tar.bz2#406ad426aade5578b90544cc2ed4a79b
-https://conda.anaconda.org/conda-forge/osx-64/libnetcdf-4.8.1-nompi_hc61b76e_106.tar.bz2#502e31e4a400216854da4e9933fb21c2
-https://conda.anaconda.org/conda-forge/osx-64/libspatialite-5.0.1-hc1c2c66_22.tar.bz2#13513d4171137de61c7f8dd7c2fa4e74
+https://conda.anaconda.org/conda-forge/osx-64/libnetcdf-4.9.1-nompi_h56690a0_101.conda#47f469ea7abef24fe25d7ea8f3c57e2a
+https://conda.anaconda.org/conda-forge/osx-64/libspatialite-5.0.1-hd6e941a_23.conda#f8b8c912eca84fdb35215e02dcd4a0f4
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
-https://conda.anaconda.org/conda-forge/osx-64/poppler-22.12.0-hf2ff1a1_0.conda#ad1c9f970971bc448424cff37c99eddd
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/osx-64/poppler-23.03.0-h6e9091c_0.conda#1764e7410be61cdaf6cf6b0b27cb87a2
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
-https://conda.anaconda.org/conda-forge/osx-64/pyproj-3.4.1-py39h2798b3d_0.conda#c8a128b239c0226171e9038142ad3671
+https://conda.anaconda.org/conda-forge/osx-64/pyproj-3.4.1-py39hdff730e_1.conda#09f9d7c1f293755fe51768289151b5c1
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/osx-64/tiledb-2.13.2-h3b7b576_0.conda#d75ea515b550689adc41b26c7f9eaef6
-https://conda.anaconda.org/conda-forge/osx-64/tzlocal-4.2-py39h6e9494a_2.tar.bz2#da9cb4e7e50c21035b5a37f2b031dc98
+https://conda.anaconda.org/conda-forge/osx-64/tiledb-2.13.2-h8b9cbf0_0.conda#a10738d4788cf6b0b0d9bff2e324b942
+https://conda.anaconda.org/conda-forge/osx-64/tzlocal-4.3-py39h6e9494a_0.conda#1b2b6a1f492f32d9285a6c215f9a459a
+https://conda.anaconda.org/conda-forge/osx-64/ukkonen-1.0.1-py39h92daf61_3.tar.bz2#24edd5c579fdf20b0721c01cc0865000
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
https://conda.anaconda.org/conda-forge/osx-64/aiohttp-3.8.4-py39ha30fb19_0.conda#6665116c51b02e111d0036a024921770
+https://conda.anaconda.org/conda-forge/osx-64/aws-c-s3-0.2.7-hba8c00c_1.conda#7bca115eac894cd5d8f00aabe4bbb1d5
https://conda.anaconda.org/conda-forge/osx-64/black-23.1.0-py39h6e9494a_0.conda#f56bf958460c69a3245db97bd2916789
https://conda.anaconda.org/conda-forge/osx-64/clickhouse-driver-0.2.5-py39ha30fb19_0.conda#27bf1d1bb564bf91f2757a737417ff52
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/osx-64/jupyter_core-5.2.0-py39h6e9494a_0.conda#e2b1c02918fc9ee8e95338156968a280
-https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.5.3-hf9b1f87_10.conda#c45e8fa2ad115a56e92806147b3c9197
+https://conda.anaconda.org/conda-forge/osx-64/jupyter_core-5.3.0-py39h6e9494a_0.conda#7bd4b2ca8941e634c76d6780ec531e23
+https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.6.2-hd7924a8_9.conda#499973e2bcb547bde4289905cb7a9676
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/osx-64/numpy-1.24.2-py39h6ee2318_0.conda#9b49051072af22354aee82b524f808ff
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
-https://conda.anaconda.org/conda-forge/osx-64/pango-1.50.13-hbd9bf65_0.conda#c979037ff3fc99257ec7cb28bb0083f4
+https://conda.anaconda.org/conda-forge/osx-64/pango-1.50.14-hbd9bf65_0.conda#7de54d83e9c685b742e0a4d81b271de0
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/osx-64/arrow-cpp-8.0.1-py39hf9ad3a7_2_cpu.tar.bz2#bb369572f53307994fab34342668db94
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/osx-64/aws-crt-cpp-0.19.8-h8b21dc2_12.conda#a24352ea6d682777803b088279be8082
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/osx-64/contourpy-1.0.7-py39h92daf61_0.conda#3b50cfd6ea07613741693ba535fcefda
-https://conda.anaconda.org/conda-forge/osx-64/gdal-3.5.3-py39h6aafa27_10.conda#af2e3494e5301aef6b51e829d1aebdb8
+https://conda.anaconda.org/conda-forge/osx-64/gdal-3.6.2-py39h6783340_9.conda#f85450bd4cc688da89b71334b5e8c4c1
https://conda.anaconda.org/conda-forge/osx-64/gtk2-2.24.33-h7c1209e_2.tar.bz2#307614630946527e302b7dd042a5cfa2
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyhd1c38e8_0.conda#e67b634578fefbb312cd6cfd34b63d86
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/osx-64/librsvg-2.54.4-h3d48ba6_0.tar.bz2#1a106d9119086f73b5f88c650f700210
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
https://conda.anaconda.org/conda-forge/osx-64/pandas-1.5.3-py39hecff1ad_0.conda#e7d2a20902a36eea13dea9b0021fbfb4
-https://conda.anaconda.org/conda-forge/osx-64/polars-0.16.7-py39hd4bc93a_0.conda#1385f97396a19708645fd43205fb9271
+https://conda.anaconda.org/conda-forge/osx-64/polars-0.16.16-py39hd4bc93a_0.conda#dddd3a0a26c6ced358dc50f319fad745
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
https://conda.anaconda.org/conda-forge/osx-64/shapely-1.8.5-py39hed42127_2.tar.bz2#acf9bef3e32fe07ae7d175235c21dd07
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/osx-64/fiona-1.8.22-py39h6fa385f_2.tar.bz2#00448d0d4945c3cbba85199b03652650
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/osx-64/aws-sdk-cpp-1.10.57-h0d082ec_8.conda#238e81ff0a438402ca73c34dc8d878f5
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/osx-64/fiona-1.9.1-py39hb507cee_0.conda#3fad71ffec1b1d62500408374088d969
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
-https://conda.anaconda.org/conda-forge/osx-64/graphviz-7.0.5-hc51f7b9_0.conda#589501e7b16648c032a537b6a0870dbe
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh736e0ef_0.conda#aa43ffb10a39d9eb2538761a3f838a87
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
-https://conda.anaconda.org/conda-forge/osx-64/matplotlib-base-3.7.0-py39hb2f573b_0.conda#a5fbadbf40c620ebbc0be69c5d963887
+https://conda.anaconda.org/conda-forge/osx-64/graphviz-7.1.0-hc51f7b9_0.conda#fd7e8ad97c77e364ed28b655f8c27b19
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyhd1c38e8_0.conda#e88ca7d30e60645b2621c888029b85f1
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/osx-64/matplotlib-base-3.7.1-py39hb2f573b_0.conda#e6b1b5ed86e30d21bf00a050c1a47af5
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.4-pyhd8ed1ab_0.conda#9dea5ab3cc33084f7a3680a98859731e
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh736e0ef_0.conda#3bbe4a71a9d5d8e13c1504e3cd077b32
+https://conda.anaconda.org/conda-forge/osx-64/libarrow-11.0.0-h547aefa_13_cpu.conda#1114268ce25dd22ad08cd92209d98a3c
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
-https://conda.anaconda.org/conda-forge/osx-64/pyarrow-8.0.1-py39h138c175_2_cpu.tar.bz2#1e29066e05b04c17f309973d5951a705
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
-https://conda.anaconda.org/conda-forge/osx-64/datafusion-0.7.0-py39hd4bc93a_0.conda#19ce86522c35dc54bec3e2a2941a0450
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/osx-64/arrow-cpp-11.0.0-h694c41f_13_cpu.conda#b692e17c44e10422db31ba8668f7fbec
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/osx-64/python-duckdb-0.7.0-py39hdbd8b11_1.conda#f338911ec90adf138fa21535c2657247
-https://conda.anaconda.org/conda-forge/osx-64/scipy-1.10.0-py39h8a15683_2.conda#fb37c05f4b9712410daa406ada94d631
-https://conda.anaconda.org/conda-forge/osx-64/snowflake-connector-python-2.8.3-py39he7ef162_0.conda#604aca8835375c6f50520bf011a24768
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/osx-64/scipy-1.10.1-py39h8a15683_0.conda#eead5e4fe30ef982abb432b559bbb326
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/osx-64/scikit-learn-1.2.1-py39hdbdcc14_0.conda#a3cbe0de59a4c004b140d624b2f09ba8
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
+https://conda.anaconda.org/conda-forge/osx-64/scikit-learn-1.2.2-py39h151e6e4_1.conda#b833d33a98561847b6c3b6d808911efc
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/osx-64/pyarrow-11.0.0-py39h56e7202_13_cpu.conda#a01af3fff5b796388de611a42d9623ef
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/osx-64/datafusion-0.7.0-py39hd4bc93a_0.conda#19ce86522c35dc54bec3e2a2941a0450
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.1.0-pyhd8ed1ab_0.tar.bz2#b0816cdad1ed5f376831b1c36a74106b
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.1.0-pyhd8ed1ab_0.tar.bz2#1d66863d0c73e517fbcfd859e89d3b4d
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/osx-64/python-duckdb-0.7.1-py39h734fbdf_0.conda#c6f6b9f8d98e06dc693e548d348e741b
+https://conda.anaconda.org/conda-forge/osx-64/snowflake-connector-python-3.0.2-py39h2cdf326_0.conda#c751fefc4a66c86f4f2577fa6e784ae9
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
diff --git a/osx-arm64-3.10.lock b/osx-arm64-3.10.lock
index 50aefa4..a3577ed 100644
--- a/osx-arm64-3.10.lock
+++ b/osx-arm64-3.10.lock
@@ -1,8 +1,8 @@
# Generated by conda-lock.
# platform: osx-arm64
-# input_hash: 19e79d099b9c718c891c131d28b4f691d9674a56081b424e72e18ccabca0ace1
+# input_hash: 4e221897e04e4fdc5dfb911e1204be30d2759254fe9e96fe34a8630fccede8fc
@EXPLICIT
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-common-0.6.2-h3422bc3_0.tar.bz2#e6c0dfc1c6e34241720983abb66ec35e
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-common-0.8.14-h1a8c8d9_0.conda#029e3775088eae34a2b978e7efea7caa
https://conda.anaconda.org/conda-forge/osx-arm64/bzip2-1.0.8-h3422bc3_4.tar.bz2#fc76ace7b94fb1f694988ab1b14dd248
https://conda.anaconda.org/conda-forge/osx-arm64/c-ares-1.18.1-h3422bc3_0.tar.bz2#5dd04dad345af4f1e8f3f0d5afc03b67
https://conda.anaconda.org/conda-forge/osx-arm64/ca-certificates-2022.12.7-h4653dfc_0.conda#7dc111916edc905957b7417a247583b6
@@ -12,34 +12,36 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77
https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
https://conda.anaconda.org/conda-forge/osx-arm64/freexl-1.0.6-h1a8c8d9_1.tar.bz2#f9e99c94afe28d7558a5dd106fef0936
https://conda.anaconda.org/conda-forge/osx-arm64/fribidi-1.0.10-h27ca646_0.tar.bz2#c64443234ff91d70cb9c7dc926c58834
-https://conda.anaconda.org/conda-forge/osx-arm64/giflib-5.2.1-h27ca646_2.tar.bz2#fcfaa10e989b15ef30f93b6329c35add
+https://conda.anaconda.org/conda-forge/osx-arm64/giflib-5.2.1-h1a8c8d9_3.conda#f39a05d3dbb0e5024b7deabb2c0993f1
https://conda.anaconda.org/conda-forge/osx-arm64/jpeg-9e-h1a8c8d9_3.conda#ef1cce2ab799e0c2f32c3344125ff218
https://conda.anaconda.org/conda-forge/osx-arm64/json-c-0.16-hc449e50_0.tar.bz2#0091e6c603f58202c026d3e63fc93f39
https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlicommon-1.0.9-h1a8c8d9_8.tar.bz2#84eb0c3c995a865079080d092e4a3c06
-https://conda.anaconda.org/conda-forge/osx-arm64/libcxx-14.0.6-h2692d47_0.tar.bz2#716c4b72ff3808ade65748fd9b49cc44
-https://conda.anaconda.org/conda-forge/osx-arm64/libdeflate-1.14-h1a8c8d9_0.tar.bz2#cb64374f9f7ad86b6194e294c56e06a5
+https://conda.anaconda.org/conda-forge/osx-arm64/libcxx-15.0.7-h75e25f2_0.conda#16d9581f4cdc3406a059a607dd2ed816
+https://conda.anaconda.org/conda-forge/osx-arm64/libdeflate-1.17-h1a8c8d9_0.conda#cae34d3f6ab02e0abf92ec3caaf0bd39
https://conda.anaconda.org/conda-forge/osx-arm64/libev-4.33-h642e427_1.tar.bz2#566dbf70fe79eacdb3c3d3d195a27f55
https://conda.anaconda.org/conda-forge/osx-arm64/libffi-3.4.2-h3422bc3_5.tar.bz2#086914b672be056eb70fd4285b6783b6
https://conda.anaconda.org/conda-forge/osx-arm64/libiconv-1.17-he4db4b2_0.tar.bz2#686f9c755574aa221f29fbcf36a67265
https://conda.anaconda.org/conda-forge/osx-arm64/libsodium-1.0.18-h27ca646_1.tar.bz2#90859688dbca4735b74c02af14c4c793
https://conda.anaconda.org/conda-forge/osx-arm64/libtool-2.4.7-hb7217d7_0.conda#fe8efc3385f58f0055e8100b07225055
https://conda.anaconda.org/conda-forge/osx-arm64/libutf8proc-2.8.0-h1a8c8d9_0.tar.bz2#f8c9c41a122ab3abdf8943b13f4957ee
-https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-base-1.2.4-h57fd34a_0.tar.bz2#23f90b9f28c585445c52184a3388d01d
+https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-base-1.2.4-h1a8c8d9_0.conda#480b5b992632e7d17778abf01bad473b
https://conda.anaconda.org/conda-forge/osx-arm64/libzlib-1.2.13-h03a7124_4.tar.bz2#780852dc54c4c07e64b276a97f89c162
-https://conda.anaconda.org/conda-forge/osx-arm64/llvm-openmp-15.0.7-h7cfbb63_0.conda#358164e15a9320f11b84a53fb8d8e446
+https://conda.anaconda.org/conda-forge/osx-arm64/llvm-openmp-16.0.0-h7cfbb63_0.conda#791063135f975b2fd7329d30728cb903
https://conda.anaconda.org/conda-forge/osx-arm64/ncurses-6.3-h07bb92c_1.tar.bz2#db86e5a978380a13f5559f97afdfe99d
-https://conda.anaconda.org/conda-forge/osx-arm64/pandoc-2.19.2-hce30654_1.tar.bz2#0503c9d6f2633bee5976d84f91c8050d
+https://conda.anaconda.org/conda-forge/osx-arm64/pandoc-2.19.2-hce30654_2.conda#e79494b8d990189fe4701f498f99cd8b
https://conda.anaconda.org/conda-forge/osx-arm64/pixman-0.40.0-h27ca646_0.tar.bz2#0cedfe37c9aee28f5e926a870965466a
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/osx-arm64/pthread-stubs-0.4-h27ca646_1001.tar.bz2#d3f26c6494d4105d4ecb85203d687102
https://conda.anaconda.org/conda-forge/osx-arm64/python_abi-3.10-3_cp310.conda#3f2b2974db21a33a2f45b0c9abbb7516
-https://conda.anaconda.org/conda-forge/osx-arm64/tzcode-2022g-h1a8c8d9_0.conda#bae4ee8009209ecc0fbdb0c1581adff1
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/osx-arm64/tzcode-2023b-h1a8c8d9_0.conda#502a17fc9bd613bc65c0fd59677a4228
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/osx-arm64/xorg-libxau-1.0.9-h27ca646_0.tar.bz2#e2fa1f5a28cf0ce02516baf910be132e
https://conda.anaconda.org/conda-forge/osx-arm64/xorg-libxdmcp-1.1.3-h27ca646_0.tar.bz2#6738b13f7fadc18725965abdd4129c36
https://conda.anaconda.org/conda-forge/osx-arm64/xz-5.2.6-h57fd34a_0.tar.bz2#39c6b54e94014701dd157f4f576ed211
https://conda.anaconda.org/conda-forge/osx-arm64/yaml-0.2.5-h3422bc3_2.tar.bz2#4bb3f014845110883a3c5ee811fd84b4
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-checksums-0.1.11-h487e1a8_7.tar.bz2#edf91bd9464b05ca9d29be2a730b9468
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-compression-0.2.16-h59b28b2_5.conda#999039f6d7b6b14e30ed08c50ea50369
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-sdkutils-0.1.8-h59b28b2_0.conda#47f10d872256c2e7079387eaf16da6e9
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-checksums-0.1.14-h59b28b2_5.conda#a47c0a55e816e14663239492983b8eef
https://conda.anaconda.org/conda-forge/osx-arm64/expat-2.5.0-hb7217d7_0.tar.bz2#88defcdff52e5c8b7238239bc53c02d2
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/osx-arm64/geos-3.11.1-hb7217d7_0.tar.bz2#945d93c362ba338531455e0f0cf54ae2
@@ -49,68 +51,69 @@ https://conda.anaconda.org/conda-forge/osx-arm64/gmp-6.2.1-h9f76cd9_0.tar.bz2#f8
https://conda.anaconda.org/conda-forge/osx-arm64/graphite2-1.3.13-h9f76cd9_1001.tar.bz2#288b591645cb9cb9c0af7309ac1114f5
https://conda.anaconda.org/conda-forge/osx-arm64/icu-70.1-h6b3803e_0.tar.bz2#5fbe318a6be2e8d0f9b0b0c730a62748
https://conda.anaconda.org/conda-forge/osx-arm64/lerc-4.0.0-h9a09cb3_0.tar.bz2#de462d5aacda3b30721b512c5da4e742
-https://conda.anaconda.org/conda-forge/osx-arm64/libabseil-20220623.0-cxx17_h28b99d4_6.conda#0d3775e19ec3fe5257dd84cdd333cfcc
+https://conda.anaconda.org/conda-forge/osx-arm64/libabseil-20230125.0-cxx17_hb7217d7_1.conda#22a5254be25ace5abcd06468f58f08bc
+https://conda.anaconda.org/conda-forge/osx-arm64/libaec-1.0.6-hb7217d7_1.conda#4f04770bf6f12d22fb6c1d91a04e0c8c
https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlidec-1.0.9-h1a8c8d9_8.tar.bz2#640ea7b788cdd0420409bd8479f023f9
https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlienc-1.0.9-h1a8c8d9_8.tar.bz2#572907b78be867937c258421bc0807a8
https://conda.anaconda.org/conda-forge/osx-arm64/libcrc32c-1.1.2-hbdafb3b_0.tar.bz2#32bd82a6a625ea6ce090a81c3d34edeb
https://conda.anaconda.org/conda-forge/osx-arm64/libedit-3.1.20191231-hc8eb9b7_2.tar.bz2#30e4362988a2623e9eb34337b83e01f9
-https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran5-11.3.0-hdaf2cc0_28.conda#21e620d9f8e17c55dc47dfc687de5185
+https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran5-12.2.0-h0eea778_31.conda#244a7665228221cc951d5126b8bc1465
https://conda.anaconda.org/conda-forge/osx-arm64/libpng-1.6.39-h76d750c_0.conda#0078e6327c13cfdeae6ff7601e360383
-https://conda.anaconda.org/conda-forge/osx-arm64/libprotobuf-3.20.2-hb5ab8b9_0.tar.bz2#a6f25546f30d4cd56bc37b0b56ab954c
+https://conda.anaconda.org/conda-forge/osx-arm64/libprotobuf-3.21.12-hb5ab8b9_0.conda#7adb342474af442e3842c422f07fbf68
https://conda.anaconda.org/conda-forge/osx-arm64/libspatialindex-1.9.3-hbdafb3b_4.tar.bz2#311816a2511df4bceeeebe7c06af63e7
https://conda.anaconda.org/conda-forge/osx-arm64/libsqlite-3.40.0-h76d750c_0.tar.bz2#d090fcec993f4ef0a90e6df7f231a273
https://conda.anaconda.org/conda-forge/osx-arm64/libxcb-1.13-h9b22ae9_1004.tar.bz2#6b3457a192f8091cb413962f65740ac4
https://conda.anaconda.org/conda-forge/osx-arm64/lz4-c-1.9.4-hb7217d7_0.conda#45505bec548634f7d05e02fb25262cb9
https://conda.anaconda.org/conda-forge/osx-arm64/nspr-4.35-hb7217d7_0.conda#f81b5ec944dbbcff3dd08375eb036efa
-https://conda.anaconda.org/conda-forge/osx-arm64/openssl-1.1.1t-h03a7124_0.conda#eb1a3168d0381724415629dd31854d42
+https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.1.0-h03a7124_0.conda#a67e5c82b81441e972733d95e2d8832b
https://conda.anaconda.org/conda-forge/osx-arm64/pcre2-10.40-hb34f9b4_0.tar.bz2#721b7288270bafc83586b0f01c2a67f2
-https://conda.anaconda.org/conda-forge/osx-arm64/re2-2022.06.01-h9a09cb3_1.conda#e95b6f8c99f9d0edfb1356c4c7ea8f43
-https://conda.anaconda.org/conda-forge/osx-arm64/readline-8.1.2-h46ed386_0.tar.bz2#dc790f296d94409efb3f22af84ee968d
-https://conda.anaconda.org/conda-forge/osx-arm64/snappy-1.1.9-h17c5cce_2.tar.bz2#a0735d35df2c7146f49705c286502cef
+https://conda.anaconda.org/conda-forge/osx-arm64/re2-2023.02.02-hb7217d7_0.conda#407639ad13c9dc4d2510c5e2a99c2ada
+https://conda.anaconda.org/conda-forge/osx-arm64/readline-8.2-h92ec313_1.conda#8cbb776a2f641b943d413b3e19df71f4
+https://conda.anaconda.org/conda-forge/osx-arm64/snappy-1.1.10-h17c5cce_0.conda#ac82a611d1a67a598096ebaa857198e3
https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.12-he1e0b03_0.tar.bz2#2cb3d18eac154109107f093860bd545f
https://conda.anaconda.org/conda-forge/osx-arm64/zeromq-4.3.4-hbdafb3b_1.tar.bz2#49132c08da6545dc68351ff8b659ac8e
https://conda.anaconda.org/conda-forge/osx-arm64/zlib-1.2.13-h03a7124_4.tar.bz2#34161cff4e29cc45e536abf2f13fd6b4
https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.2-hf913c23_6.conda#8f346953ef63bf5fb482488a659adcf3
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-cal-0.5.11-h4530763_0.tar.bz2#ce11646fafb17267c81d929ca42cdb5c
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-cal-0.5.21-h134b2d6_2.conda#d7024e289c587a6a6d93dd99977bb0f4
https://conda.anaconda.org/conda-forge/osx-arm64/blosc-1.21.3-h1d6ff8b_0.conda#827988373085c97417e51c30e40967c3
https://conda.anaconda.org/conda-forge/osx-arm64/boost-cpp-1.78.0-h1cb353e_1.tar.bz2#f2a34b853f0aeee4db721a1f70da6905
https://conda.anaconda.org/conda-forge/osx-arm64/brotli-bin-1.0.9-h1a8c8d9_8.tar.bz2#f212620a4f3606ff8f800b8b1077415a
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
https://conda.anaconda.org/conda-forge/osx-arm64/freetype-2.12.1-hd633e50_1.conda#33ea6326e26d1da25eb8dfa768195b82
https://conda.anaconda.org/conda-forge/osx-arm64/glog-0.6.0-h6da1cb0_0.tar.bz2#5a570729c7709399cf8511aeeda6f989
-https://conda.anaconda.org/conda-forge/osx-arm64/grpc-cpp-1.46.4-haeec53e_7.tar.bz2#a03c4a2cbdd278f0307dafe856799519
https://conda.anaconda.org/conda-forge/osx-arm64/hdf4-4.2.15-h1a38d6a_5.tar.bz2#33632080213c000ced85118a4265256d
-https://conda.anaconda.org/conda-forge/osx-arm64/krb5-1.19.3-hf9b2bbe_0.tar.bz2#e6987ad4d068dfe9037280e239b3d5a9
-https://conda.anaconda.org/conda-forge/osx-arm64/libevent-2.1.10-hbae9a57_4.tar.bz2#a1f2aca3c5999a24527d6f8a3a8e9320
-https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran-5.0.0-11_3_0_hd922786_28.conda#d91a6e1915d3f47dc65180859b75203f
+https://conda.anaconda.org/conda-forge/osx-arm64/krb5-1.20.1-h69eda48_0.conda#a85db53e45b1173f270fc998dd40ec03
+https://conda.anaconda.org/conda-forge/osx-arm64/libevent-2.1.10-h7673551_4.tar.bz2#762bda55783500f923a559e21c1cd096
+https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran-5.0.0-12_2_0_hd922786_31.conda#dfc3dff1ce831c8e821f19d5d218825a
https://conda.anaconda.org/conda-forge/osx-arm64/libglib-2.74.1-h4646484_1.tar.bz2#4321cf67e46674567f419e95bae18522
-https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.51.0-hd184df1_0.conda#bbc8d6defa81887dc055d9e074d751fa
+https://conda.anaconda.org/conda-forge/osx-arm64/libgrpc-1.52.1-he98ff75_1.conda#45f3e9e7299d2a01a4d90d28c3528727
+https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.52.0-hae82a92_0.conda#1d319e95a0216f801293626a00337712
https://conda.anaconda.org/conda-forge/osx-arm64/librttopo-1.1.0-h844f84d_12.tar.bz2#abf6c60dfde69d6e632780c7b44fff6e
-https://conda.anaconda.org/conda-forge/osx-arm64/libssh2-1.10.0-hb80f160_3.tar.bz2#60f87fd8eb881a4c8094824dd112140c
-https://conda.anaconda.org/conda-forge/osx-arm64/libtiff-4.4.0-heb92581_5.conda#fb564626ea319252c2b3a5edc2f7640f
-https://conda.anaconda.org/conda-forge/osx-arm64/libxml2-2.10.3-h87b0503_0.tar.bz2#35980b9d069648c553d9322bc89ecfbf
-https://conda.anaconda.org/conda-forge/osx-arm64/libzip-1.9.2-h96606af_1.tar.bz2#66e39d7149b191cdf17804bd587d5d04
-https://conda.anaconda.org/conda-forge/osx-arm64/nss-3.88-h789eff7_0.conda#fbb3a48e2d960b2af828b1e265246acc
-https://conda.anaconda.org/conda-forge/osx-arm64/orc-1.7.6-hb9d09c9_0.tar.bz2#1bb57ec3792df86dfcde3cc1d0bbe53f
-https://conda.anaconda.org/conda-forge/osx-arm64/python-3.10.8-hf452327_0_cpython.conda#5837d6faba1839493b612107865ef63e
+https://conda.anaconda.org/conda-forge/osx-arm64/libssh2-1.10.0-h7a5bd25_3.tar.bz2#1ffa4340e73809db5a7516cb1a7425a7
+https://conda.anaconda.org/conda-forge/osx-arm64/libtiff-4.5.0-h5dffbdd_2.conda#8e08eae60de32c940096ee9b4da35685
+https://conda.anaconda.org/conda-forge/osx-arm64/libxml2-2.10.3-h67585b2_4.conda#3b3f67d1c9d66e873ca91c87640a1d1b
+https://conda.anaconda.org/conda-forge/osx-arm64/libzip-1.9.2-h76ab92c_1.tar.bz2#eee3b4ab0b5b71fbda7900785f3a46fa
+https://conda.anaconda.org/conda-forge/osx-arm64/nss-3.89-h789eff7_0.conda#dbb6be9468b513522e0b03d30cc7f1fd
+https://conda.anaconda.org/conda-forge/osx-arm64/orc-1.8.3-hef0d403_0.conda#5fe39445f76fa6f2a02b8033f2e5872b
+https://conda.anaconda.org/conda-forge/osx-arm64/python-3.10.10-h3ba56d0_0_cpython.conda#5d0b6cef6d5b04df14a02d25c5295bcf
https://conda.anaconda.org/conda-forge/osx-arm64/sqlite-3.40.0-h2229b38_0.tar.bz2#e0176ac0a33639feca897a66ed1fe177
https://conda.anaconda.org/conda-forge/osx-arm64/unixodbc-2.3.10-hb39ff51_0.tar.bz2#a5a930a1c270a9c9d571179463e571c0
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
https://conda.anaconda.org/conda-forge/noarch/appnope-0.1.3-pyhd8ed1ab_0.tar.bz2#54ac328d703bff191256ffa1183126d1
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/osx-arm64/atk-1.0-2.38.0-hcb7b3dd_1.tar.bz2#3c98bfeed7717a9cf5af18c295f49f3a
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-io-0.10.5-hea86ef8_0.tar.bz2#03d1eeb5706292ae6570456b98f38dcb
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-io-0.13.19-ha2443f3_3.conda#e1d454418cb21d2a4fdf456afa81f37a
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
https://conda.anaconda.org/conda-forge/osx-arm64/backports.zoneinfo-0.2.1-py310hbe9552e_7.tar.bz2#694b65130cbd7f3139f60e8cfb958d60
-https://conda.anaconda.org/conda-forge/osx-arm64/bitarray-2.7.2-py310h8e9501a_0.conda#79a226856de8a0ccb6859503a99b118d
+https://conda.anaconda.org/conda-forge/osx-arm64/bitarray-2.7.3-py310h8e9501a_0.conda#d2f64b6eb0b1519741e3e46b9d194334
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/osx-arm64/brotli-1.0.9-h1a8c8d9_8.tar.bz2#e2a5e381ddd6529eb62e7710270b2ec5
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.2.1-pyhd8ed1ab_0.conda#b325bfc4cff7d7f8a868f1f7ecc4ed16
@@ -119,31 +122,34 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/osx-arm64/debugpy-1.6.6-py310h0f1eb42_0.conda#aeaef47087680b7ef5308cb3cd20e132
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/osx-arm64/fontconfig-2.14.2-h82840c6_0.conda#f77d47ddb6d3cc5b39b9bdf65635afbb
-https://conda.anaconda.org/conda-forge/osx-arm64/freetds-1.3.16-h10014b9_0.conda#ec7c9ba65cec93f9f81df151448d2ccc
+https://conda.anaconda.org/conda-forge/osx-arm64/freetds-1.1.15-h27bbca2_1.tar.bz2#0a00830573641771b858bdc392707e0a
https://conda.anaconda.org/conda-forge/osx-arm64/frozenlist-1.3.3-py310h8e9501a_0.tar.bz2#6ba62caccbd2e41946c02c95c4225ac2
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
-https://conda.anaconda.org/conda-forge/osx-arm64/gdk-pixbuf-2.42.8-h4f389bb_1.tar.bz2#062a406a54b8feb09213e0de74c17abf
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/osx-arm64/gdk-pixbuf-2.42.10-h9bcf4fe_0.conda#9e8a24e2ffa9bb8200cef965af01af06
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/osx-arm64/greenlet-2.0.2-py310h0f1eb42_0.conda#a1b5c69f95dffe157c950920e21f0343
+https://conda.anaconda.org/conda-forge/osx-arm64/grpcio-1.52.1-py310h0f1eb42_1.conda#707889a79cf559ae7cad22dd05b134d7
https://conda.anaconda.org/conda-forge/osx-arm64/gts-0.7.6-h4b6d4d6_2.tar.bz2#285247d54dbf40121f79a6e025c04df4
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.5-pyhd8ed1ab_0.conda#953a312b272f37d39fe9d09f46734622
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/osx-arm64/kiwisolver-1.4.4-py310h2887b22_1.tar.bz2#f7a4902c3cf4340db915669f69364490
-https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.14-h8193b64_0.tar.bz2#9bc9a1c491795c92568481b6ab59d9c5
-https://conda.anaconda.org/conda-forge/osx-arm64/libcurl-7.86.0-hd538317_1.tar.bz2#64af094274984c756c18dbbe59327a45
+https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.15-h481adae_0.conda#806395a21421da524d72aa4e0b69d54c
+https://conda.anaconda.org/conda-forge/osx-arm64/libcurl-7.88.1-h9049daf_1.conda#148e2e109774943f699768703502a918
https://conda.anaconda.org/conda-forge/osx-arm64/libkml-1.3.0-h41464e4_1015.tar.bz2#6404f2ec1ee91e48175d9e5ee1dbca5f
https://conda.anaconda.org/conda-forge/osx-arm64/libopenblas-0.3.21-openmp_hc731615_3.tar.bz2#2a980a5d8cc34ce70d339b983f9920de
-https://conda.anaconda.org/conda-forge/osx-arm64/libpq-15.1-hb650857_1.conda#0ffee7d6b76a2b69c0bf8ed8ba97bf82
-https://conda.anaconda.org/conda-forge/osx-arm64/libthrift-0.16.0-h1a74c4f_2.tar.bz2#8949545ae9641f7483a88abc3635b07a
-https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-1.2.4-h328b37c_0.tar.bz2#194c8df68e6966f8e012cd326e42c31d
+https://conda.anaconda.org/conda-forge/osx-arm64/libpq-15.2-h1a28acd_0.conda#36fd96c2586fb726f9aa4dccea769efa
+https://conda.anaconda.org/conda-forge/osx-arm64/libthrift-0.18.1-h6635e49_0.conda#c6f3d11f5df3a9cce701b4e7853cf907
+https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-1.2.4-h999c80f_1.conda#8e0866db2c7808ad9058848c47e6d6ff
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/osx-arm64/lz4-4.3.2-py310ha6df754_0.conda#555bc733936aa9a97afacc00d7627f73
https://conda.anaconda.org/conda-forge/osx-arm64/markupsafe-2.1.2-py310h8e9501a_0.conda#d33964911c203ffbcb67056800830250
@@ -151,18 +157,18 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/osx-arm64/msgpack-python-1.0.4-py310h2887b22_1.tar.bz2#cf6a39f19acf98d3b94f527627a2bd73
+https://conda.anaconda.org/conda-forge/osx-arm64/msgpack-python-1.0.5-py310h2887b22_0.conda#edbf567852c73875ecb8b053366cbab8
https://conda.anaconda.org/conda-forge/osx-arm64/multidict-6.0.4-py310h8e9501a_0.conda#0a2be8df4e1ed7556bef44a3cc05d5d0
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
-https://conda.anaconda.org/conda-forge/osx-arm64/openjpeg-2.5.0-h5d4e404_1.tar.bz2#4d65dff04bceb645c98a514c52df217f
+https://conda.anaconda.org/conda-forge/osx-arm64/openjpeg-2.5.0-hbc2ba62_2.conda#c3e184f0810a4614863569488b1ac709
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
@@ -177,26 +183,24 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/osx-arm64/pycryptodomex-3.16.0-py310h8e9501a_0.conda#a0446891b8f5dd666a544b54f3fe1f6d
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/osx-arm64/pyrsistent-0.19.3-py310h8e9501a_0.conda#40a016ab2fe37c6e54915fc197d3fad4
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/osx-arm64/pyyaml-6.0-py310h8e9501a_5.tar.bz2#51d03e61fad9a0703bece80e471e95d3
-https://conda.anaconda.org/conda-forge/osx-arm64/pyzmq-25.0.0-py310hc407298_0.conda#6100a3f0dde7f7511a4ad858f70fe8b2
-https://conda.anaconda.org/conda-forge/osx-arm64/regex-2022.10.31-py310h8e9501a_0.tar.bz2#84148e2e17915c6a071984bf3c408014
+https://conda.anaconda.org/conda-forge/osx-arm64/pyzmq-25.0.2-py310hc407298_0.conda#c9921a2ac0c961ceeff02040f669f23d
+https://conda.anaconda.org/conda-forge/osx-arm64/regex-2023.3.23-py310h8e9501a_0.conda#8fba862f38e2d946135c85b26367fdf5
https://conda.anaconda.org/conda-forge/osx-arm64/rtree-1.0.1-py310ha3239f5_1.tar.bz2#0a88ec0c3b40a311c1021c258acfd94c
-https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.0.249-py310h7d3ac2c_0.conda#412ace61a18ad785a07e2d50f6501d24
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.0.259-py310h7d3ac2c_0.conda#a618b7dfe1ac1df1ec381fcfc6ad1e73
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -206,19 +210,21 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/osx-arm64/tornado-6.2-py310h8e9501a_1.tar.bz2#cce0b9a9acfbc2bb19422528fdb7a6a1
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/osx-arm64/unicodedata2-15.0.0-py310h8e9501a_0.tar.bz2#e6af5439226301127e3a5b49e0b1fad1
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.5-pyhd8ed1ab_0.conda#2af53b3894fb9bdbb3679c0d31028b1b
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-event-stream-0.2.7-h9972306_13.tar.bz2#1aa327d20aec700b23809ce8c1da34cd
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-event-stream-0.2.20-ha370d96_4.conda#06f67e990e792f186eaef7d90042bf49
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-http-0.7.6-hca61f3c_0.conda#a31434a64509cd494d92442ed1ad4371
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/osx-arm64/cairo-1.16.0-h73a0509_1014.tar.bz2#be2ea75899a7b1f1dd59a862fac655ee
@@ -226,41 +232,41 @@ https://conda.anaconda.org/conda-forge/osx-arm64/cffi-1.15.1-py310h2399d43_3.con
https://conda.anaconda.org/conda-forge/osx-arm64/cfitsio-4.2.0-h2f961c4_0.conda#10112a8b1b7b479c7d4e87c9ade892eb
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
-https://conda.anaconda.org/conda-forge/osx-arm64/coverage-7.1.0-py310h8e9501a_0.conda#331682a6f9bb6cad2ece61345c59eb51
-https://conda.anaconda.org/conda-forge/osx-arm64/curl-7.86.0-hd538317_1.tar.bz2#068fc793cf5223be665bcd6d35a2f28f
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/osx-arm64/coverage-7.2.2-py310h8e9501a_0.conda#af9cde8e5dba6ae0c082c40cdfbbdf43
+https://conda.anaconda.org/conda-forge/osx-arm64/curl-7.88.1-h9049daf_1.conda#8df5e92aeb9de416919a64f116698761
https://conda.anaconda.org/conda-forge/osx-arm64/cytoolz-0.12.0-py310h8e9501a_1.tar.bz2#c536582cdda73cf71f5319d762ea8023
-https://conda.anaconda.org/conda-forge/osx-arm64/fastavro-1.7.1-py310h8e9501a_0.conda#e17cc6ba0f38d8e5f872e39bc075a506
-https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.38.0-py310h8e9501a_1.tar.bz2#4652860a14e94115acecfd7cb9a70967
+https://conda.anaconda.org/conda-forge/osx-arm64/fastavro-1.7.3-py310h8e9501a_0.conda#e06d93ab02962146c687bbbd1000a3d3
+https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.39.2-py310h8e9501a_0.conda#14e05200addffea5d15f70812b2506da
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/osx-arm64/grpcio-1.46.4-py310h7ba2fed_7.tar.bz2#6ef4b63809a60b4f3271f51a32189792
-https://conda.anaconda.org/conda-forge/osx-arm64/hdf5-1.12.2-nompi_h8968d4b_100.tar.bz2#6013e6a360be49d947d42b82f6a5a682
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/osx-arm64/hdf5-1.12.2-nompi_ha7af310_101.conda#050df57fed623d4b6aa817e9c8bdbfaa
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
https://conda.anaconda.org/conda-forge/osx-arm64/libblas-3.9.0-16_osxarm64_openblas.tar.bz2#53d6d5097f0d62e24db8c1979a21102e
-https://conda.anaconda.org/conda-forge/osx-arm64/libgd-2.3.3-hede1055_3.tar.bz2#8bbd974c213208687dc289d50feb5c65
-https://conda.anaconda.org/conda-forge/osx-arm64/libgoogle-cloud-2.1.0-hec15cb4_1.tar.bz2#ab0eccace6b28dbf2515897b7105fa68
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/osx-arm64/libgd-2.3.3-h90fb8ed_4.conda#03c52c3cdcf9f4cf70e07135254b799f
+https://conda.anaconda.org/conda-forge/osx-arm64/libgoogle-cloud-2.8.0-h7206bc8_1.conda#4101b82f92955893124421a303673986
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
-https://conda.anaconda.org/conda-forge/osx-arm64/pillow-9.2.0-py310h9337a76_3.tar.bz2#b8b24480162c364c87d01e44331d7246
+https://conda.anaconda.org/conda-forge/osx-arm64/pillow-9.4.0-py310h5a7539a_1.conda#b3c94458ef1002c937b89979c79eb486
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-15.1-hf80b784_1.conda#69956ca98448a03365575522744fc9f2
-https://conda.anaconda.org/conda-forge/osx-arm64/proj-9.1.0-h3bdf472_0.tar.bz2#84796e1049fba379566c5b1cc3ac9e2b
-https://conda.anaconda.org/conda-forge/osx-arm64/protobuf-3.20.2-py310h0f1eb42_1.conda#18ed7aca24af7172fbc8d00d4b7c513e
-https://conda.anaconda.org/conda-forge/osx-arm64/psycopg2-2.9.3-py310hfc29c8b_2.conda#29e4d29ec78805d0e5b4679813b4412e
+https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-15.2-h45c140d_0.conda#9f35737220640a8de16d09b59914498f
+https://conda.anaconda.org/conda-forge/osx-arm64/proj-9.1.1-h13f728c_2.conda#6924682abbbe34aa837c64ca0016ec8e
+https://conda.anaconda.org/conda-forge/osx-arm64/protobuf-4.21.12-py310h0f1eb42_0.conda#3763b614e1858dd64732e00fe1204551
+https://conda.anaconda.org/conda-forge/osx-arm64/psycopg2-2.9.3-py310h75cfdd3_2.conda#eb464498ca34f191e5edba08b3c87ba6
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
-https://conda.anaconda.org/conda-forge/osx-arm64/pymssql-2.2.7-py310h0f1eb42_0.conda#1178f45a3988ba4cc5515c42fb59a55c
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/osx-arm64/pymssql-2.2.5-py310h0f1eb42_2.tar.bz2#d9039a6ae17038153e6cf5c7401accea
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/osx-arm64/pytz-deprecation-shim-0.1.0.post0-py310hbe9552e_3.tar.bz2#630f11e736b92d1a369db33cef39226c
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
@@ -269,139 +275,147 @@ https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf4
https://conda.anaconda.org/conda-forge/osx-arm64/sqlalchemy-1.4.46-py310h8e9501a_0.conda#3b1ca98bb083dad45a9b79ac1ea9a70e
https://conda.anaconda.org/conda-forge/osx-arm64/thrift-0.16.0-py310h0f1eb42_2.tar.bz2#2f872dbeeb168b6233c0064ba7aeb951
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/osx-arm64/watchdog-2.2.1-py310h8e9501a_0.conda#41b42ab0bc8a4158825b8d6c08255d1b
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/osx-arm64/watchdog-3.0.0-py310h8e9501a_0.conda#ab84756af950bbc0758967d37f1577ae
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/osx-arm64/xerces-c-3.2.4-h627aa08_1.tar.bz2#e690c8c477c96c9f8ad9f7c63f1f94d2
https://conda.anaconda.org/conda-forge/osx-arm64/yarl-1.8.2-py310h8e9501a_0.conda#69a97466e2aa86c9517931f5c814917d
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-sdk-cpp-1.8.186-h392f50b_4.tar.bz2#d27eeebe0e48c6c4cbd21a09f575f496
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-auth-0.6.26-h9ec8a34_1.conda#9b6e888da325885e2afc3be552fc6191
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-mqtt-0.8.6-hcd3fa0e_12.conda#3ebeacc4c1ec79ba87cd5a0bab192910
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/osx-arm64/brotlipy-0.7.0-py310h8e9501a_1005.tar.bz2#0dfdc1c2e2fa6d9a1cee4798a9e9454d
-https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-38.0.4-py310h4fe9c50_0.conda#0bb0bca23520f3a578e973ee28eaa4cb
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-38.0.4-py310hfc83b78_0.conda#601658ded3da8cf4eb58d2316bdd1fbb
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
-https://conda.anaconda.org/conda-forge/osx-arm64/geotiff-1.7.1-h90559a4_4.tar.bz2#01946796ab730299feff7026b1f0d222
+https://conda.anaconda.org/conda-forge/osx-arm64/geotiff-1.7.1-hdcdc974_6.conda#6cb68e5148f9c41564eb840c89b8f7bc
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
https://conda.anaconda.org/conda-forge/osx-arm64/google-crc32c-1.1.2-py310he58995c_4.tar.bz2#b2b495faecbf73e9a059d7c5cba40459
https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
https://conda.anaconda.org/conda-forge/osx-arm64/harfbuzz-6.0.0-hddbc195_0.conda#bc6503f2956775e3d6e481d7588b7998
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/osx-arm64/kealib-1.5.0-hfd766a6_0.conda#3041514025aa54cad642e24061b6b6f6
https://conda.anaconda.org/conda-forge/osx-arm64/libcblas-3.9.0-16_osxarm64_openblas.tar.bz2#c7cfc18378f00d3faf7f8a9a2553be3c
-https://conda.anaconda.org/conda-forge/osx-arm64/libdap4-3.20.6-h8510809_2.tar.bz2#b61547e8f0c4fb57318482666c07d6ca
https://conda.anaconda.org/conda-forge/osx-arm64/liblapack-3.9.0-16_osxarm64_openblas.tar.bz2#52d270c579bfca986d6cdd81eb5ed6e7
-https://conda.anaconda.org/conda-forge/osx-arm64/libnetcdf-4.8.1-nompi_h2510be2_106.tar.bz2#c5d2afa0f2bc4eca5be78c438a41de2e
-https://conda.anaconda.org/conda-forge/osx-arm64/libspatialite-5.0.1-h558e587_22.tar.bz2#e766cf477817d5fcce530d40c9d97a96
+https://conda.anaconda.org/conda-forge/osx-arm64/libnetcdf-4.9.1-nompi_h232cb48_101.conda#87dd4b0e9fe52d1b43bf0d5e7be28fc3
+https://conda.anaconda.org/conda-forge/osx-arm64/libspatialite-5.0.1-h14115fc_23.conda#2f80ac3b18bf574bb497f9f52966cd4e
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
-https://conda.anaconda.org/conda-forge/osx-arm64/poppler-22.12.0-hae7f5f0_0.conda#8bc158f737f4119d494e288ee0880cd2
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/osx-arm64/poppler-23.03.0-h9564b9f_0.conda#a04f2bd0e84b74d694ae65ab9ec09c0b
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
-https://conda.anaconda.org/conda-forge/osx-arm64/pyproj-3.4.1-py310hce8d790_0.conda#731174475ccf2a4000b31397f7fadca4
+https://conda.anaconda.org/conda-forge/osx-arm64/pyproj-3.4.1-py310h9862ddf_1.conda#adb0fcdbd0c2306507e5e9100fc1e322
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/osx-arm64/tiledb-2.13.2-hc7ac4c9_0.conda#71844097f1f47854bb55d8928482cf25
-https://conda.anaconda.org/conda-forge/osx-arm64/tzlocal-4.2-py310hbe9552e_2.tar.bz2#7c2e7f5299a129dc5cae8792d28ff8a4
+https://conda.anaconda.org/conda-forge/osx-arm64/tiledb-2.13.2-h9bd36d0_0.conda#d3a88ffe0cbfbd8d3532bb8ef46f0626
+https://conda.anaconda.org/conda-forge/osx-arm64/tzlocal-4.3-py310hbe9552e_0.conda#905b2bdcb43c317eca3e827a8a55c44a
+https://conda.anaconda.org/conda-forge/osx-arm64/ukkonen-1.0.1-py310h2887b22_3.tar.bz2#c0afa739bd266e8c4c63e717fc5c4621
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
https://conda.anaconda.org/conda-forge/osx-arm64/aiohttp-3.8.4-py310h8e9501a_0.conda#b301ff0c427b1b7b6204c21507e6dc1e
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-s3-0.2.7-hc514de9_1.conda#d585d309fcced2a4e7b94a439f204d42
https://conda.anaconda.org/conda-forge/osx-arm64/black-23.1.0-py310hbe9552e_0.conda#4add2984be82a936564fb3af1f3d3127
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/osx-arm64/jupyter_core-5.2.0-py310hbe9552e_0.conda#862c8cd375a138aae560611aad412d44
-https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.5.3-h28a98fa_10.conda#92ee56461fa1874bcc69ea168dfbe94e
+https://conda.anaconda.org/conda-forge/osx-arm64/jupyter_core-5.3.0-py310hbe9552e_0.conda#44f14896d03e37e8faf8458a4527f3f7
+https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.6.2-h8d4b95d_9.conda#2f2e0c9c1ec238e79fd94c5f0ba35827
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/osx-arm64/numpy-1.24.2-py310h3d2048e_0.conda#447823b87d9c737f81f0a984ebec121b
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
-https://conda.anaconda.org/conda-forge/osx-arm64/pango-1.50.13-h6c112b8_0.conda#3ffd7fede31a774ad8f3dc9114897daa
+https://conda.anaconda.org/conda-forge/osx-arm64/pango-1.50.14-h6c112b8_0.conda#1e6300d15e38bad0d52871251190b5e8
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/osx-arm64/arrow-cpp-8.0.1-py310h5547a8d_2_cpu.tar.bz2#31b685c9381aaf19f3c25302846ce526
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-crt-cpp-0.19.8-h6be2766_12.conda#cdfee90317474a42d31eb3ea3752e60c
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/osx-arm64/contourpy-1.0.7-py310h2887b22_0.conda#19b6c3c875c18a775d0a7e2b248cd7eb
-https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.5.3-py310hc67b115_10.conda#232e3f53833fd2cd8cb518626f167bf8
+https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.6.2-py310h0b34360_9.conda#f0d620f2dff2878d69392d212410121e
https://conda.anaconda.org/conda-forge/osx-arm64/gtk2-2.24.33-h57013de_2.tar.bz2#144fb77338d90012ebe80d3dd13fc725
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyhd1c38e8_0.conda#e67b634578fefbb312cd6cfd34b63d86
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/osx-arm64/librsvg-2.54.4-ha2634a2_0.tar.bz2#a9fe78f1beab7f0a90581518a0e11311
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
https://conda.anaconda.org/conda-forge/osx-arm64/pandas-1.5.3-py310h2b830bf_0.conda#54585997632610e7024e5d8d722a3092
-https://conda.anaconda.org/conda-forge/osx-arm64/polars-0.16.7-py310h1dc5ec9_0.conda#b66b16575a16bceda2a78d115999355f
+https://conda.anaconda.org/conda-forge/osx-arm64/polars-0.16.16-py310h1dc5ec9_0.conda#2a2516b99795be18453b759cd6f2e822
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
https://conda.anaconda.org/conda-forge/osx-arm64/shapely-1.8.5-py310h9356385_2.tar.bz2#32e7200d03ddd713014a0946699b8131
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/osx-arm64/fiona-1.8.22-py310hcdcf461_2.tar.bz2#3d54d8cb32e1dbd51574b5b2a5b26713
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-sdk-cpp-1.10.57-h3daea3c_8.conda#c35e6a52b070dfabe03e4fb63b5da47d
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/osx-arm64/fiona-1.9.1-py310h2e51ddd_0.conda#f60b386f47d7de7fe36b33349b41f113
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
-https://conda.anaconda.org/conda-forge/osx-arm64/graphviz-7.0.5-h4f8fbd6_0.conda#88ead4365a188ffd036644a0b7931b0e
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh736e0ef_0.conda#aa43ffb10a39d9eb2538761a3f838a87
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
-https://conda.anaconda.org/conda-forge/osx-arm64/matplotlib-base-3.7.0-py310h78c5c2f_0.conda#74677ce62dec0d767160ef428b5c3f10
+https://conda.anaconda.org/conda-forge/osx-arm64/graphviz-7.1.0-h4f8fbd6_0.conda#6840266ed0788c5c4c8429bf42c4b36d
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyhd1c38e8_0.conda#e88ca7d30e60645b2621c888029b85f1
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/osx-arm64/matplotlib-base-3.7.1-py310h78c5c2f_0.conda#a1a982fea610d516ef985522117ba6dd
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.4-pyhd8ed1ab_0.conda#9dea5ab3cc33084f7a3680a98859731e
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh736e0ef_0.conda#3bbe4a71a9d5d8e13c1504e3cd077b32
+https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-11.0.0-hdcd110a_13_cpu.conda#b8915aea8d4857228a292d672f01460a
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
-https://conda.anaconda.org/conda-forge/osx-arm64/pyarrow-8.0.1-py310had0e577_2_cpu.tar.bz2#8435a4e24c4a50a6d92310f104da16d8
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/osx-arm64/arrow-cpp-11.0.0-hce30654_13_cpu.conda#ecd5efe74f31a2c6c244f81038ec9e35
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/osx-arm64/python-duckdb-0.7.0-py310he117f0e_1.conda#eea490ee7e422f90cec08feeed8bdb86
-https://conda.anaconda.org/conda-forge/osx-arm64/scipy-1.10.0-py310ha0d8a01_2.conda#4ae4ed66754b74ea1d6e8bf0f0407804
-https://conda.anaconda.org/conda-forge/osx-arm64/snowflake-connector-python-2.8.3-py310he1fb286_0.conda#1ef9ff5906aee0a70b44ee34e118b17c
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/osx-arm64/scipy-1.10.1-py310ha0d8a01_0.conda#f78d5db3a32fd6afebccb58581a25372
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/osx-arm64/scikit-learn-1.2.1-py310ha00a7cd_0.conda#59f63d61582f3e97090f02c28d9e4337
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
+https://conda.anaconda.org/conda-forge/osx-arm64/scikit-learn-1.2.2-py310h98c5782_1.conda#63a591179c38411c6b6755d3a2c6efc0
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/osx-arm64/pyarrow-11.0.0-py310h89f3c6b_13_cpu.conda#90775cee52808a200398c83213211e3c
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.1.0-pyhd8ed1ab_0.tar.bz2#b0816cdad1ed5f376831b1c36a74106b
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.1.0-pyhd8ed1ab_0.tar.bz2#1d66863d0c73e517fbcfd859e89d3b4d
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/osx-arm64/python-duckdb-0.7.1-py310h2798aea_0.conda#082f4afda2bdb3139b57037eb067123c
+https://conda.anaconda.org/conda-forge/osx-arm64/snowflake-connector-python-3.0.2-py310h2798aea_0.conda#c856883b25810c03a4aa72d4b6cc9081
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
diff --git a/osx-arm64-3.11.lock b/osx-arm64-3.11.lock
index 18b1f64..d2eb54e 100644
--- a/osx-arm64-3.11.lock
+++ b/osx-arm64-3.11.lock
@@ -0,0 +1,420 @@
+# Generated by conda-lock.
+# platform: osx-arm64
+# input_hash: 92094f22bb69015b1e08326e8305b6d1eadd90995421eacf90ea1e9d961092b5
+@EXPLICIT
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-common-0.8.14-h1a8c8d9_0.conda#029e3775088eae34a2b978e7efea7caa
+https://conda.anaconda.org/conda-forge/osx-arm64/bzip2-1.0.8-h3422bc3_4.tar.bz2#fc76ace7b94fb1f694988ab1b14dd248
+https://conda.anaconda.org/conda-forge/osx-arm64/c-ares-1.18.1-h3422bc3_0.tar.bz2#5dd04dad345af4f1e8f3f0d5afc03b67
+https://conda.anaconda.org/conda-forge/osx-arm64/ca-certificates-2022.12.7-h4653dfc_0.conda#7dc111916edc905957b7417a247583b6
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-dejavu-sans-mono-2.37-hab24e00_0.tar.bz2#0c96522c6bdaed4b1566d11387caaf45
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-3.000-h77eed37_0.tar.bz2#34893075a5c9e55cdafac56607368fc6
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77eed37_0.tar.bz2#4d59c254e01d9cde7957100457e2d5fb
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
+https://conda.anaconda.org/conda-forge/osx-arm64/freexl-1.0.6-h1a8c8d9_1.tar.bz2#f9e99c94afe28d7558a5dd106fef0936
+https://conda.anaconda.org/conda-forge/osx-arm64/fribidi-1.0.10-h27ca646_0.tar.bz2#c64443234ff91d70cb9c7dc926c58834
+https://conda.anaconda.org/conda-forge/osx-arm64/giflib-5.2.1-h1a8c8d9_3.conda#f39a05d3dbb0e5024b7deabb2c0993f1
+https://conda.anaconda.org/conda-forge/osx-arm64/jpeg-9e-h1a8c8d9_3.conda#ef1cce2ab799e0c2f32c3344125ff218
+https://conda.anaconda.org/conda-forge/osx-arm64/json-c-0.16-hc449e50_0.tar.bz2#0091e6c603f58202c026d3e63fc93f39
+https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlicommon-1.0.9-h1a8c8d9_8.tar.bz2#84eb0c3c995a865079080d092e4a3c06
+https://conda.anaconda.org/conda-forge/osx-arm64/libcxx-15.0.7-h75e25f2_0.conda#16d9581f4cdc3406a059a607dd2ed816
+https://conda.anaconda.org/conda-forge/osx-arm64/libdeflate-1.17-h1a8c8d9_0.conda#cae34d3f6ab02e0abf92ec3caaf0bd39
+https://conda.anaconda.org/conda-forge/osx-arm64/libev-4.33-h642e427_1.tar.bz2#566dbf70fe79eacdb3c3d3d195a27f55
+https://conda.anaconda.org/conda-forge/osx-arm64/libffi-3.4.2-h3422bc3_5.tar.bz2#086914b672be056eb70fd4285b6783b6
+https://conda.anaconda.org/conda-forge/osx-arm64/libiconv-1.17-he4db4b2_0.tar.bz2#686f9c755574aa221f29fbcf36a67265
+https://conda.anaconda.org/conda-forge/osx-arm64/libsodium-1.0.18-h27ca646_1.tar.bz2#90859688dbca4735b74c02af14c4c793
+https://conda.anaconda.org/conda-forge/osx-arm64/libtool-2.4.7-hb7217d7_0.conda#fe8efc3385f58f0055e8100b07225055
+https://conda.anaconda.org/conda-forge/osx-arm64/libutf8proc-2.8.0-h1a8c8d9_0.tar.bz2#f8c9c41a122ab3abdf8943b13f4957ee
+https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-base-1.2.4-h1a8c8d9_0.conda#480b5b992632e7d17778abf01bad473b
+https://conda.anaconda.org/conda-forge/osx-arm64/libzlib-1.2.13-h03a7124_4.tar.bz2#780852dc54c4c07e64b276a97f89c162
+https://conda.anaconda.org/conda-forge/osx-arm64/llvm-openmp-16.0.0-h7cfbb63_0.conda#791063135f975b2fd7329d30728cb903
+https://conda.anaconda.org/conda-forge/osx-arm64/ncurses-6.3-h07bb92c_1.tar.bz2#db86e5a978380a13f5559f97afdfe99d
+https://conda.anaconda.org/conda-forge/osx-arm64/pandoc-2.19.2-hce30654_2.conda#e79494b8d990189fe4701f498f99cd8b
+https://conda.anaconda.org/conda-forge/osx-arm64/pixman-0.40.0-h27ca646_0.tar.bz2#0cedfe37c9aee28f5e926a870965466a
+https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
+https://conda.anaconda.org/conda-forge/osx-arm64/pthread-stubs-0.4-h27ca646_1001.tar.bz2#d3f26c6494d4105d4ecb85203d687102
+https://conda.anaconda.org/conda-forge/osx-arm64/python_abi-3.11-3_cp311.conda#e1586496f8acd1c9293019ab14dbde9d
+https://conda.anaconda.org/conda-forge/osx-arm64/tzcode-2023b-h1a8c8d9_0.conda#502a17fc9bd613bc65c0fd59677a4228
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
+https://conda.anaconda.org/conda-forge/osx-arm64/xorg-libxau-1.0.9-h27ca646_0.tar.bz2#e2fa1f5a28cf0ce02516baf910be132e
+https://conda.anaconda.org/conda-forge/osx-arm64/xorg-libxdmcp-1.1.3-h27ca646_0.tar.bz2#6738b13f7fadc18725965abdd4129c36
+https://conda.anaconda.org/conda-forge/osx-arm64/xz-5.2.6-h57fd34a_0.tar.bz2#39c6b54e94014701dd157f4f576ed211
+https://conda.anaconda.org/conda-forge/osx-arm64/yaml-0.2.5-h3422bc3_2.tar.bz2#4bb3f014845110883a3c5ee811fd84b4
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-compression-0.2.16-h59b28b2_5.conda#999039f6d7b6b14e30ed08c50ea50369
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-sdkutils-0.1.8-h59b28b2_0.conda#47f10d872256c2e7079387eaf16da6e9
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-checksums-0.1.14-h59b28b2_5.conda#a47c0a55e816e14663239492983b8eef
+https://conda.anaconda.org/conda-forge/osx-arm64/expat-2.5.0-hb7217d7_0.tar.bz2#88defcdff52e5c8b7238239bc53c02d2
+https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
+https://conda.anaconda.org/conda-forge/osx-arm64/geos-3.11.1-hb7217d7_0.tar.bz2#945d93c362ba338531455e0f0cf54ae2
+https://conda.anaconda.org/conda-forge/osx-arm64/gettext-0.21.1-h0186832_0.tar.bz2#63d2ff6fddfa74e5458488fd311bf635
+https://conda.anaconda.org/conda-forge/osx-arm64/gflags-2.2.2-hc88da5d_1004.tar.bz2#aab9ddfad863e9ef81229a1f8852211b
+https://conda.anaconda.org/conda-forge/osx-arm64/gmp-6.2.1-h9f76cd9_0.tar.bz2#f8140773b6ca51bf32feec9b4290a8c5
+https://conda.anaconda.org/conda-forge/osx-arm64/graphite2-1.3.13-h9f76cd9_1001.tar.bz2#288b591645cb9cb9c0af7309ac1114f5
+https://conda.anaconda.org/conda-forge/osx-arm64/icu-70.1-h6b3803e_0.tar.bz2#5fbe318a6be2e8d0f9b0b0c730a62748
+https://conda.anaconda.org/conda-forge/osx-arm64/lerc-4.0.0-h9a09cb3_0.tar.bz2#de462d5aacda3b30721b512c5da4e742
+https://conda.anaconda.org/conda-forge/osx-arm64/libabseil-20230125.0-cxx17_hb7217d7_1.conda#22a5254be25ace5abcd06468f58f08bc
+https://conda.anaconda.org/conda-forge/osx-arm64/libaec-1.0.6-hb7217d7_1.conda#4f04770bf6f12d22fb6c1d91a04e0c8c
+https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlidec-1.0.9-h1a8c8d9_8.tar.bz2#640ea7b788cdd0420409bd8479f023f9
+https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlienc-1.0.9-h1a8c8d9_8.tar.bz2#572907b78be867937c258421bc0807a8
+https://conda.anaconda.org/conda-forge/osx-arm64/libcrc32c-1.1.2-hbdafb3b_0.tar.bz2#32bd82a6a625ea6ce090a81c3d34edeb
+https://conda.anaconda.org/conda-forge/osx-arm64/libedit-3.1.20191231-hc8eb9b7_2.tar.bz2#30e4362988a2623e9eb34337b83e01f9
+https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran5-12.2.0-h0eea778_31.conda#244a7665228221cc951d5126b8bc1465
+https://conda.anaconda.org/conda-forge/osx-arm64/libpng-1.6.39-h76d750c_0.conda#0078e6327c13cfdeae6ff7601e360383
+https://conda.anaconda.org/conda-forge/osx-arm64/libprotobuf-3.21.12-hb5ab8b9_0.conda#7adb342474af442e3842c422f07fbf68
+https://conda.anaconda.org/conda-forge/osx-arm64/libspatialindex-1.9.3-hbdafb3b_4.tar.bz2#311816a2511df4bceeeebe7c06af63e7
+https://conda.anaconda.org/conda-forge/osx-arm64/libsqlite-3.40.0-h76d750c_0.tar.bz2#d090fcec993f4ef0a90e6df7f231a273
+https://conda.anaconda.org/conda-forge/osx-arm64/libxcb-1.13-h9b22ae9_1004.tar.bz2#6b3457a192f8091cb413962f65740ac4
+https://conda.anaconda.org/conda-forge/osx-arm64/lz4-c-1.9.4-hb7217d7_0.conda#45505bec548634f7d05e02fb25262cb9
+https://conda.anaconda.org/conda-forge/osx-arm64/nspr-4.35-hb7217d7_0.conda#f81b5ec944dbbcff3dd08375eb036efa
+https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.1.0-h03a7124_0.conda#a67e5c82b81441e972733d95e2d8832b
+https://conda.anaconda.org/conda-forge/osx-arm64/pcre2-10.40-hb34f9b4_0.tar.bz2#721b7288270bafc83586b0f01c2a67f2
+https://conda.anaconda.org/conda-forge/osx-arm64/re2-2023.02.02-hb7217d7_0.conda#407639ad13c9dc4d2510c5e2a99c2ada
+https://conda.anaconda.org/conda-forge/osx-arm64/readline-8.2-h92ec313_1.conda#8cbb776a2f641b943d413b3e19df71f4
+https://conda.anaconda.org/conda-forge/osx-arm64/snappy-1.1.10-h17c5cce_0.conda#ac82a611d1a67a598096ebaa857198e3
+https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.12-he1e0b03_0.tar.bz2#2cb3d18eac154109107f093860bd545f
+https://conda.anaconda.org/conda-forge/osx-arm64/zeromq-4.3.4-hbdafb3b_1.tar.bz2#49132c08da6545dc68351ff8b659ac8e
+https://conda.anaconda.org/conda-forge/osx-arm64/zlib-1.2.13-h03a7124_4.tar.bz2#34161cff4e29cc45e536abf2f13fd6b4
+https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.2-hf913c23_6.conda#8f346953ef63bf5fb482488a659adcf3
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-cal-0.5.21-h134b2d6_2.conda#d7024e289c587a6a6d93dd99977bb0f4
+https://conda.anaconda.org/conda-forge/osx-arm64/blosc-1.21.3-h1d6ff8b_0.conda#827988373085c97417e51c30e40967c3
+https://conda.anaconda.org/conda-forge/osx-arm64/boost-cpp-1.78.0-h1cb353e_1.tar.bz2#f2a34b853f0aeee4db721a1f70da6905
+https://conda.anaconda.org/conda-forge/osx-arm64/brotli-bin-1.0.9-h1a8c8d9_8.tar.bz2#f212620a4f3606ff8f800b8b1077415a
+https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
+https://conda.anaconda.org/conda-forge/osx-arm64/freetype-2.12.1-hd633e50_1.conda#33ea6326e26d1da25eb8dfa768195b82
+https://conda.anaconda.org/conda-forge/osx-arm64/glog-0.6.0-h6da1cb0_0.tar.bz2#5a570729c7709399cf8511aeeda6f989
+https://conda.anaconda.org/conda-forge/osx-arm64/hdf4-4.2.15-h1a38d6a_5.tar.bz2#33632080213c000ced85118a4265256d
+https://conda.anaconda.org/conda-forge/osx-arm64/krb5-1.20.1-h69eda48_0.conda#a85db53e45b1173f270fc998dd40ec03
+https://conda.anaconda.org/conda-forge/osx-arm64/libevent-2.1.10-h7673551_4.tar.bz2#762bda55783500f923a559e21c1cd096
+https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran-5.0.0-12_2_0_hd922786_31.conda#dfc3dff1ce831c8e821f19d5d218825a
+https://conda.anaconda.org/conda-forge/osx-arm64/libglib-2.74.1-h4646484_1.tar.bz2#4321cf67e46674567f419e95bae18522
+https://conda.anaconda.org/conda-forge/osx-arm64/libgrpc-1.52.1-he98ff75_1.conda#45f3e9e7299d2a01a4d90d28c3528727
+https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.52.0-hae82a92_0.conda#1d319e95a0216f801293626a00337712
+https://conda.anaconda.org/conda-forge/osx-arm64/librttopo-1.1.0-h844f84d_12.tar.bz2#abf6c60dfde69d6e632780c7b44fff6e
+https://conda.anaconda.org/conda-forge/osx-arm64/libssh2-1.10.0-h7a5bd25_3.tar.bz2#1ffa4340e73809db5a7516cb1a7425a7
+https://conda.anaconda.org/conda-forge/osx-arm64/libtiff-4.5.0-h5dffbdd_2.conda#8e08eae60de32c940096ee9b4da35685
+https://conda.anaconda.org/conda-forge/osx-arm64/libxml2-2.10.3-h67585b2_4.conda#3b3f67d1c9d66e873ca91c87640a1d1b
+https://conda.anaconda.org/conda-forge/osx-arm64/libzip-1.9.2-h76ab92c_1.tar.bz2#eee3b4ab0b5b71fbda7900785f3a46fa
+https://conda.anaconda.org/conda-forge/osx-arm64/nss-3.89-h789eff7_0.conda#dbb6be9468b513522e0b03d30cc7f1fd
+https://conda.anaconda.org/conda-forge/osx-arm64/orc-1.8.3-hef0d403_0.conda#5fe39445f76fa6f2a02b8033f2e5872b
+https://conda.anaconda.org/conda-forge/osx-arm64/python-3.11.0-h3ba56d0_1_cpython.conda#2aa7ca3702d9afd323ca34a9d98879d1
+https://conda.anaconda.org/conda-forge/osx-arm64/sqlite-3.40.0-h2229b38_0.tar.bz2#e0176ac0a33639feca897a66ed1fe177
+https://conda.anaconda.org/conda-forge/osx-arm64/unixodbc-2.3.10-hb39ff51_0.tar.bz2#a5a930a1c270a9c9d571179463e571c0
+https://conda.anaconda.org/conda-forge/noarch/appnope-0.1.3-pyhd8ed1ab_0.tar.bz2#54ac328d703bff191256ffa1183126d1
+https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
+https://conda.anaconda.org/conda-forge/osx-arm64/atk-1.0-2.38.0-hcb7b3dd_1.tar.bz2#3c98bfeed7717a9cf5af18c295f49f3a
+https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
+https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-io-0.13.19-ha2443f3_3.conda#e1d454418cb21d2a4fdf456afa81f37a
+https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
+https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
+https://conda.anaconda.org/conda-forge/osx-arm64/backports.zoneinfo-0.2.1-py311h267d04e_7.tar.bz2#a933024b218c4f2ad2f49a1ccf40006d
+https://conda.anaconda.org/conda-forge/osx-arm64/bitarray-2.7.3-py311he2be06e_0.conda#f5daa09dcd8d24a2fb8f98e1e14fee52
+https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
+https://conda.anaconda.org/conda-forge/osx-arm64/brotli-1.0.9-h1a8c8d9_8.tar.bz2#e2a5e381ddd6529eb62e7710270b2ec5
+https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
+https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
+https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
+https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
+https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
+https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.2.1-pyhd8ed1ab_0.conda#b325bfc4cff7d7f8a868f1f7ecc4ed16
+https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_0.tar.bz2#3faab06a954c2a04039983f2c4a50d99
+https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2#a50559fad0affdbb33729a68669ca1cb
+https://conda.anaconda.org/conda-forge/osx-arm64/debugpy-1.6.6-py311ha397e9f_0.conda#19abf9d457a8ffe0874bb96c63dea3c8
+https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
+https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
+https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
+https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
+https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
+https://conda.anaconda.org/conda-forge/osx-arm64/fontconfig-2.14.2-h82840c6_0.conda#f77d47ddb6d3cc5b39b9bdf65635afbb
+https://conda.anaconda.org/conda-forge/osx-arm64/freetds-1.1.15-h27bbca2_1.tar.bz2#0a00830573641771b858bdc392707e0a
+https://conda.anaconda.org/conda-forge/osx-arm64/frozenlist-1.3.3-py311he2be06e_0.tar.bz2#44fe1e496177c6c896857ded897790b6
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/osx-arm64/gdk-pixbuf-2.42.10-h9bcf4fe_0.conda#9e8a24e2ffa9bb8200cef965af01af06
+https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
+https://conda.anaconda.org/conda-forge/osx-arm64/greenlet-2.0.2-py311ha397e9f_0.conda#ef6dee9c5f0250f1040f3dacdc7cd7e5
+https://conda.anaconda.org/conda-forge/osx-arm64/grpcio-1.52.1-py311ha397e9f_1.conda#a2ee969560ebaf76f20221c9a71682bf
+https://conda.anaconda.org/conda-forge/osx-arm64/gts-0.7.6-h4b6d4d6_2.tar.bz2#285247d54dbf40121f79a6e025c04df4
+https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
+https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
+https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
+https://conda.anaconda.org/conda-forge/osx-arm64/kiwisolver-1.4.4-py311hd6ee22a_1.tar.bz2#aea430ca7df231e9d17dba5dc7ba52b5
+https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.15-h481adae_0.conda#806395a21421da524d72aa4e0b69d54c
+https://conda.anaconda.org/conda-forge/osx-arm64/libcurl-7.88.1-h9049daf_1.conda#148e2e109774943f699768703502a918
+https://conda.anaconda.org/conda-forge/osx-arm64/libkml-1.3.0-h41464e4_1015.tar.bz2#6404f2ec1ee91e48175d9e5ee1dbca5f
+https://conda.anaconda.org/conda-forge/osx-arm64/libopenblas-0.3.21-openmp_hc731615_3.tar.bz2#2a980a5d8cc34ce70d339b983f9920de
+https://conda.anaconda.org/conda-forge/osx-arm64/libpq-15.2-h1a28acd_0.conda#36fd96c2586fb726f9aa4dccea769efa
+https://conda.anaconda.org/conda-forge/osx-arm64/libthrift-0.18.1-h6635e49_0.conda#c6f3d11f5df3a9cce701b4e7853cf907
+https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-1.2.4-h999c80f_1.conda#8e0866db2c7808ad9058848c47e6d6ff
+https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
+https://conda.anaconda.org/conda-forge/osx-arm64/lz4-4.3.2-py311h854b99e_0.conda#ecf7a4e74275b9cd5cea4cd0dc4904df
+https://conda.anaconda.org/conda-forge/osx-arm64/markupsafe-2.1.2-py311he2be06e_0.conda#06f340fef431792a48e772fc76c5c030
+https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f8dab71fdc13b1bf29a01248b156d268
+https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
+https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
+https://conda.anaconda.org/conda-forge/osx-arm64/msgpack-python-1.0.5-py311hd6ee22a_0.conda#216b2bab4db761d91b3341fbc10631fb
+https://conda.anaconda.org/conda-forge/osx-arm64/multidict-6.0.4-py311he2be06e_0.conda#09fe7f8c8e75d64b0440783605e02e44
+https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
+https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
+https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
+https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
+https://conda.anaconda.org/conda-forge/osx-arm64/openjpeg-2.5.0-hbc2ba62_2.conda#c3e184f0810a4614863569488b1ac709
+https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
+https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
+https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
+https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
+https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
+https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
+https://conda.anaconda.org/conda-forge/noarch/pprintpp-0.4.0-pyhd8ed1ab_5.conda#3c9f3f3f7e0a9f0b2fd9d0e2064729ba
+https://conda.anaconda.org/conda-forge/osx-arm64/psutil-5.9.4-py311he2be06e_0.tar.bz2#4eb07242cfa7aed4d041a40166753520
+https://conda.anaconda.org/conda-forge/noarch/ptyprocess-0.7.0-pyhd3deb0d_0.tar.bz2#359eeb6536da0e687af562ed265ec263
+https://conda.anaconda.org/conda-forge/noarch/pure-sasl-0.6.2-pyhd8ed1ab_0.tar.bz2#ac695eecf21ab48093bc33fd60b4102d
+https://conda.anaconda.org/conda-forge/noarch/pure_eval-0.2.2-pyhd8ed1ab_0.tar.bz2#6784285c7e55cb7212efabc79e4c2883
+https://conda.anaconda.org/conda-forge/noarch/py-cpuinfo-9.0.0-pyhd8ed1ab_0.tar.bz2#6f6d42b894118f8378fce11887ccdaff
+https://conda.anaconda.org/conda-forge/noarch/py4j-0.10.9.5-pyhd8ed1ab_0.tar.bz2#aa4b90e96537b3178e500ecb0d7913ce
+https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f8f72ac77911db942eda24fb9
+https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
+https://conda.anaconda.org/conda-forge/osx-arm64/pycryptodomex-3.16.0-py311he2be06e_0.conda#9921f0d483e87b502683c46b8447a963
+https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
+https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
+https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
+https://conda.anaconda.org/conda-forge/osx-arm64/pyrsistent-0.19.3-py311he2be06e_0.conda#2fea901bc50cdd9760eee19376c31abc
+https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
+https://conda.anaconda.org/conda-forge/osx-arm64/pyyaml-6.0-py311he2be06e_5.tar.bz2#bd3b5db42251cb399567fa21cea3faf6
+https://conda.anaconda.org/conda-forge/osx-arm64/pyzmq-25.0.2-py311h0f351f6_0.conda#d3c8dc1d171341fb05dae91b43e9cff3
+https://conda.anaconda.org/conda-forge/osx-arm64/regex-2023.3.23-py311he2be06e_0.conda#408c75f13ee2eef58fe6ddaa6e91f107
+https://conda.anaconda.org/conda-forge/osx-arm64/rtree-1.0.1-py311hd698ff7_1.tar.bz2#6cce73b07d8aabc4496a4d09ea9527b9
+https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.0.259-py311h88de81f_0.conda#af45b8dd42927c29669da4e94bdf010c
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
+https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
+https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
+https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
+https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
+https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
+https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
+https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
+https://conda.anaconda.org/conda-forge/noarch/toml-0.10.2-pyhd8ed1ab_0.tar.bz2#f832c45a477c78bebd107098db465095
+https://conda.anaconda.org/conda-forge/noarch/tomli-2.0.1-pyhd8ed1ab_0.tar.bz2#5844808ffab9ebdb694585b50ba02a96
+https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#92facfec94bc02d6ccf42e7173831a36
+https://conda.anaconda.org/conda-forge/osx-arm64/tornado-6.2-py311he2be06e_1.tar.bz2#14e26dcaa163d69b3339c760a25f7ef6
+https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
+https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
+https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
+https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
+https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
+https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-event-stream-0.2.20-ha370d96_4.conda#06f67e990e792f186eaef7d90042bf49
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-http-0.7.6-hca61f3c_0.conda#a31434a64509cd494d92442ed1ad4371
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
+https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
+https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
+https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
+https://conda.anaconda.org/conda-forge/osx-arm64/cairo-1.16.0-h73a0509_1014.tar.bz2#be2ea75899a7b1f1dd59a862fac655ee
+https://conda.anaconda.org/conda-forge/osx-arm64/cffi-1.15.1-py311hae827db_3.conda#bb7a416f8871a6cf6ddec76450d6cf7b
+https://conda.anaconda.org/conda-forge/osx-arm64/cfitsio-4.2.0-h2f961c4_0.conda#10112a8b1b7b479c7d4e87c9ade892eb
+https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
+https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/osx-arm64/coverage-7.2.2-py311he2be06e_0.conda#71bc7acd622fce097616cc3f06b9b9cc
+https://conda.anaconda.org/conda-forge/osx-arm64/curl-7.88.1-h9049daf_1.conda#8df5e92aeb9de416919a64f116698761
+https://conda.anaconda.org/conda-forge/osx-arm64/cytoolz-0.12.0-py311he2be06e_1.tar.bz2#808d9e0ab82e179f53183d54c93b3011
+https://conda.anaconda.org/conda-forge/osx-arm64/fastavro-1.7.3-py311he2be06e_0.conda#f7db2adf6fca70baaa8711d0638dcf40
+https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.39.2-py311he2be06e_0.conda#906af71ba93efa0f307ad06c412a48a3
+https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
+https://conda.anaconda.org/conda-forge/osx-arm64/hdf5-1.12.2-nompi_ha7af310_101.conda#050df57fed623d4b6aa817e9c8bdbfaa
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
+https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
+https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
+https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
+https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
+https://conda.anaconda.org/conda-forge/osx-arm64/libblas-3.9.0-16_osxarm64_openblas.tar.bz2#53d6d5097f0d62e24db8c1979a21102e
+https://conda.anaconda.org/conda-forge/osx-arm64/libgd-2.3.3-h90fb8ed_4.conda#03c52c3cdcf9f4cf70e07135254b799f
+https://conda.anaconda.org/conda-forge/osx-arm64/libgoogle-cloud-2.8.0-h7206bc8_1.conda#4101b82f92955893124421a303673986
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
+https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
+https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
+https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
+https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
+https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
+https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
+https://conda.anaconda.org/conda-forge/osx-arm64/pillow-9.4.0-py311h627eb56_1.conda#5b9c6ff480a2689258e1621dfdb653e4
+https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
+https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-15.2-h45c140d_0.conda#9f35737220640a8de16d09b59914498f
+https://conda.anaconda.org/conda-forge/osx-arm64/proj-9.1.1-h13f728c_2.conda#6924682abbbe34aa837c64ca0016ec8e
+https://conda.anaconda.org/conda-forge/osx-arm64/protobuf-4.21.12-py311ha397e9f_0.conda#6156bed45f8f3a9eb921a9b4a1aa0088
+https://conda.anaconda.org/conda-forge/osx-arm64/psycopg2-2.9.3-py311hcffe8fe_2.conda#f3470a37760b0edc0cb57e6a69ab71a0
+https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
+https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
+https://conda.anaconda.org/conda-forge/osx-arm64/pymssql-2.2.5-py311ha397e9f_2.tar.bz2#cec6919556b9bebcf61f57e580bd5591
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
+https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
+https://conda.anaconda.org/conda-forge/osx-arm64/pytz-deprecation-shim-0.1.0.post0-py311h267d04e_3.tar.bz2#a005d8eb67e7a21518e1a7270dad0440
+https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
+https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
+https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf410858b2cefc267316408a77c436
+https://conda.anaconda.org/conda-forge/osx-arm64/sqlalchemy-1.4.46-py311he2be06e_0.conda#b942b271a6773ccd8e3c5422747c6cd6
+https://conda.anaconda.org/conda-forge/osx-arm64/thrift-0.16.0-py311ha397e9f_2.tar.bz2#30232ec9c3f3bfba691f2a7b599e0151
+https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/osx-arm64/watchdog-3.0.0-py311he2be06e_0.conda#60c2e70552300f9cc702b414600d2a31
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
+https://conda.anaconda.org/conda-forge/osx-arm64/xerces-c-3.2.4-h627aa08_1.tar.bz2#e690c8c477c96c9f8ad9f7c63f1f94d2
+https://conda.anaconda.org/conda-forge/osx-arm64/yarl-1.8.2-py311he2be06e_0.conda#a911f21e960e5926726a3ea8f7d108fc
+https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
+https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-auth-0.6.26-h9ec8a34_1.conda#9b6e888da325885e2afc3be552fc6191
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-mqtt-0.8.6-hcd3fa0e_12.conda#3ebeacc4c1ec79ba87cd5a0bab192910
+https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
+https://conda.anaconda.org/conda-forge/osx-arm64/brotlipy-0.7.0-py311he2be06e_1005.tar.bz2#31942140cc59c7985448a29fc159f850
+https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-38.0.4-py311h507f6e9_0.conda#19121d9b9f729f27e58982bd89f3cd49
+https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
+https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
+https://conda.anaconda.org/conda-forge/osx-arm64/geotiff-1.7.1-hdcdc974_6.conda#6cb68e5148f9c41564eb840c89b8f7bc
+https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
+https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
+https://conda.anaconda.org/conda-forge/osx-arm64/google-crc32c-1.1.2-py311h317d298_4.tar.bz2#56e6b78c0926cfa3983991eea09ad47d
+https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
+https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
+https://conda.anaconda.org/conda-forge/osx-arm64/harfbuzz-6.0.0-hddbc195_0.conda#bc6503f2956775e3d6e481d7588b7998
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
+https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
+https://conda.anaconda.org/conda-forge/osx-arm64/kealib-1.5.0-hfd766a6_0.conda#3041514025aa54cad642e24061b6b6f6
+https://conda.anaconda.org/conda-forge/osx-arm64/libcblas-3.9.0-16_osxarm64_openblas.tar.bz2#c7cfc18378f00d3faf7f8a9a2553be3c
+https://conda.anaconda.org/conda-forge/osx-arm64/liblapack-3.9.0-16_osxarm64_openblas.tar.bz2#52d270c579bfca986d6cdd81eb5ed6e7
+https://conda.anaconda.org/conda-forge/osx-arm64/libnetcdf-4.9.1-nompi_h232cb48_101.conda#87dd4b0e9fe52d1b43bf0d5e7be28fc3
+https://conda.anaconda.org/conda-forge/osx-arm64/libspatialite-5.0.1-h14115fc_23.conda#2f80ac3b18bf574bb497f9f52966cd4e
+https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/osx-arm64/poppler-23.03.0-h9564b9f_0.conda#a04f2bd0e84b74d694ae65ab9ec09c0b
+https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
+https://conda.anaconda.org/conda-forge/osx-arm64/pyproj-3.4.1-py311hef8691e_1.conda#dcc693dbc2bc8d6506cdbe7c53a28cd4
+https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
+https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
+https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
+https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
+https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
+https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
+https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
+https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
+https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
+https://conda.anaconda.org/conda-forge/osx-arm64/tiledb-2.13.2-h9bd36d0_0.conda#d3a88ffe0cbfbd8d3532bb8ef46f0626
+https://conda.anaconda.org/conda-forge/osx-arm64/tzlocal-4.3-py311h267d04e_0.conda#5ed782836122546917e1b62612153c8e
+https://conda.anaconda.org/conda-forge/osx-arm64/ukkonen-1.0.1-py311hd6ee22a_3.tar.bz2#1ec575f5b11dab96ae76895d39d26730
+https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
+https://conda.anaconda.org/conda-forge/osx-arm64/aiohttp-3.8.4-py311he2be06e_0.conda#99d48994d81550a72d187da851b01a9f
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-s3-0.2.7-hc514de9_1.conda#d585d309fcced2a4e7b94a439f204d42
+https://conda.anaconda.org/conda-forge/osx-arm64/black-23.1.0-py311h267d04e_0.conda#cc8ec3ecadd65bcbfd6ffc7a4d7829f4
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
+https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
+https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
+https://conda.anaconda.org/conda-forge/osx-arm64/jupyter_core-5.3.0-py311h267d04e_0.conda#f194127e283c95eb0c40bbe6a7e0311a
+https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.6.2-h8d4b95d_9.conda#2f2e0c9c1ec238e79fd94c5f0ba35827
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
+https://conda.anaconda.org/conda-forge/osx-arm64/numpy-1.24.2-py311h60f8152_0.conda#d974ec074ab60c2429e85a08063a3318
+https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
+https://conda.anaconda.org/conda-forge/osx-arm64/pango-1.50.14-h6c112b8_0.conda#1e6300d15e38bad0d52871251190b5e8
+https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
+https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
+https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-crt-cpp-0.19.8-h6be2766_12.conda#cdfee90317474a42d31eb3ea3752e60c
+https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
+https://conda.anaconda.org/conda-forge/osx-arm64/contourpy-1.0.7-py311hd6ee22a_0.conda#db6e99f9f62455712d051b671a8363fb
+https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.6.2-py311h43bd5d3_9.conda#3d2825a86acceff3b6156f2afb0b3154
+https://conda.anaconda.org/conda-forge/osx-arm64/gtk2-2.24.33-h57013de_2.tar.bz2#144fb77338d90012ebe80d3dd13fc725
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
+https://conda.anaconda.org/conda-forge/osx-arm64/librsvg-2.54.4-ha2634a2_0.tar.bz2#a9fe78f1beab7f0a90581518a0e11311
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
+https://conda.anaconda.org/conda-forge/osx-arm64/pandas-1.5.3-py311h4eec4a9_0.conda#a25d99c409cc56e34de4161e649e7349
+https://conda.anaconda.org/conda-forge/osx-arm64/polars-0.16.16-py311heb423af_0.conda#0af89e786f91b3d32a66e42b3ac11732
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
+https://conda.anaconda.org/conda-forge/osx-arm64/shapely-1.8.5-py311h24f10cc_2.tar.bz2#27c3f3ce6d00d9f1bf55b0e5f73bce3e
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-sdk-cpp-1.10.57-h3daea3c_8.conda#c35e6a52b070dfabe03e4fb63b5da47d
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/osx-arm64/fiona-1.9.1-py311habcf648_0.conda#4897759aaccc5d4f5c0f6738d28ca755
+https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
+https://conda.anaconda.org/conda-forge/osx-arm64/graphviz-7.1.0-h4f8fbd6_0.conda#6840266ed0788c5c4c8429bf42c4b36d
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyhd1c38e8_0.conda#e88ca7d30e60645b2621c888029b85f1
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/osx-arm64/matplotlib-base-3.7.1-py311h99a5f44_0.conda#5e1ec271eb52ff1f76b55b23aae88a4f
+https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
+https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
+https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
+https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh736e0ef_0.conda#3bbe4a71a9d5d8e13c1504e3cd077b32
+https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-11.0.0-hdcd110a_13_cpu.conda#b8915aea8d4857228a292d672f01460a
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
+https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
+https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
+https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/osx-arm64/arrow-cpp-11.0.0-hce30654_13_cpu.conda#ecd5efe74f31a2c6c244f81038ec9e35
+https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
+https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
+https://conda.anaconda.org/conda-forge/osx-arm64/scipy-1.10.1-py311h0bcca16_0.conda#f02b5eaf3f552f145e1c3c5507abb495
+https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
+https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
+https://conda.anaconda.org/conda-forge/osx-arm64/scikit-learn-1.2.2-py311hba1c5b0_1.conda#b33251d2c51f104c938bd5d09d201a67
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
+https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/osx-arm64/pyarrow-11.0.0-py311h1e679ab_13_cpu.conda#27c39d0e9e7beaaaf61188ef03c0867e
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/osx-arm64/python-duckdb-0.7.1-py311hec61dd1_0.conda#6ea639be519e6e5b562f522a5eb03898
+https://conda.anaconda.org/conda-forge/osx-arm64/snowflake-connector-python-3.0.2-py311hec61dd1_0.conda#0d565c91ab8622c9aefc5abd1080cd89
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
diff --git a/osx-arm64-3.8.lock b/osx-arm64-3.8.lock
index fc8b092..a86eda5 100644
--- a/osx-arm64-3.8.lock
+++ b/osx-arm64-3.8.lock
@@ -1,8 +1,8 @@
# Generated by conda-lock.
# platform: osx-arm64
-# input_hash: 4fe72a3a89fd5a3abd40ecb5bf379f7e27ccea510aa8ba7984f3509f4dc51e4f
+# input_hash: 96e86287e68146a201a14c62a5b7da8d3d91e0c6f6438fb12793523beb1650af
@EXPLICIT
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-common-0.6.2-h3422bc3_0.tar.bz2#e6c0dfc1c6e34241720983abb66ec35e
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-common-0.8.14-h1a8c8d9_0.conda#029e3775088eae34a2b978e7efea7caa
https://conda.anaconda.org/conda-forge/osx-arm64/bzip2-1.0.8-h3422bc3_4.tar.bz2#fc76ace7b94fb1f694988ab1b14dd248
https://conda.anaconda.org/conda-forge/osx-arm64/c-ares-1.18.1-h3422bc3_0.tar.bz2#5dd04dad345af4f1e8f3f0d5afc03b67
https://conda.anaconda.org/conda-forge/osx-arm64/ca-certificates-2022.12.7-h4653dfc_0.conda#7dc111916edc905957b7417a247583b6
@@ -12,34 +12,36 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77
https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
https://conda.anaconda.org/conda-forge/osx-arm64/freexl-1.0.6-h1a8c8d9_1.tar.bz2#f9e99c94afe28d7558a5dd106fef0936
https://conda.anaconda.org/conda-forge/osx-arm64/fribidi-1.0.10-h27ca646_0.tar.bz2#c64443234ff91d70cb9c7dc926c58834
-https://conda.anaconda.org/conda-forge/osx-arm64/giflib-5.2.1-h27ca646_2.tar.bz2#fcfaa10e989b15ef30f93b6329c35add
+https://conda.anaconda.org/conda-forge/osx-arm64/giflib-5.2.1-h1a8c8d9_3.conda#f39a05d3dbb0e5024b7deabb2c0993f1
https://conda.anaconda.org/conda-forge/osx-arm64/jpeg-9e-h1a8c8d9_3.conda#ef1cce2ab799e0c2f32c3344125ff218
https://conda.anaconda.org/conda-forge/osx-arm64/json-c-0.16-hc449e50_0.tar.bz2#0091e6c603f58202c026d3e63fc93f39
https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlicommon-1.0.9-h1a8c8d9_8.tar.bz2#84eb0c3c995a865079080d092e4a3c06
-https://conda.anaconda.org/conda-forge/osx-arm64/libcxx-14.0.6-h2692d47_0.tar.bz2#716c4b72ff3808ade65748fd9b49cc44
-https://conda.anaconda.org/conda-forge/osx-arm64/libdeflate-1.14-h1a8c8d9_0.tar.bz2#cb64374f9f7ad86b6194e294c56e06a5
+https://conda.anaconda.org/conda-forge/osx-arm64/libcxx-15.0.7-h75e25f2_0.conda#16d9581f4cdc3406a059a607dd2ed816
+https://conda.anaconda.org/conda-forge/osx-arm64/libdeflate-1.17-h1a8c8d9_0.conda#cae34d3f6ab02e0abf92ec3caaf0bd39
https://conda.anaconda.org/conda-forge/osx-arm64/libev-4.33-h642e427_1.tar.bz2#566dbf70fe79eacdb3c3d3d195a27f55
https://conda.anaconda.org/conda-forge/osx-arm64/libffi-3.4.2-h3422bc3_5.tar.bz2#086914b672be056eb70fd4285b6783b6
https://conda.anaconda.org/conda-forge/osx-arm64/libiconv-1.17-he4db4b2_0.tar.bz2#686f9c755574aa221f29fbcf36a67265
https://conda.anaconda.org/conda-forge/osx-arm64/libsodium-1.0.18-h27ca646_1.tar.bz2#90859688dbca4735b74c02af14c4c793
https://conda.anaconda.org/conda-forge/osx-arm64/libtool-2.4.7-hb7217d7_0.conda#fe8efc3385f58f0055e8100b07225055
https://conda.anaconda.org/conda-forge/osx-arm64/libutf8proc-2.8.0-h1a8c8d9_0.tar.bz2#f8c9c41a122ab3abdf8943b13f4957ee
-https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-base-1.2.4-h57fd34a_0.tar.bz2#23f90b9f28c585445c52184a3388d01d
+https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-base-1.2.4-h1a8c8d9_0.conda#480b5b992632e7d17778abf01bad473b
https://conda.anaconda.org/conda-forge/osx-arm64/libzlib-1.2.13-h03a7124_4.tar.bz2#780852dc54c4c07e64b276a97f89c162
-https://conda.anaconda.org/conda-forge/osx-arm64/llvm-openmp-15.0.7-h7cfbb63_0.conda#358164e15a9320f11b84a53fb8d8e446
+https://conda.anaconda.org/conda-forge/osx-arm64/llvm-openmp-16.0.0-h7cfbb63_0.conda#791063135f975b2fd7329d30728cb903
https://conda.anaconda.org/conda-forge/osx-arm64/ncurses-6.3-h07bb92c_1.tar.bz2#db86e5a978380a13f5559f97afdfe99d
-https://conda.anaconda.org/conda-forge/osx-arm64/pandoc-2.19.2-hce30654_1.tar.bz2#0503c9d6f2633bee5976d84f91c8050d
+https://conda.anaconda.org/conda-forge/osx-arm64/pandoc-2.19.2-hce30654_2.conda#e79494b8d990189fe4701f498f99cd8b
https://conda.anaconda.org/conda-forge/osx-arm64/pixman-0.40.0-h27ca646_0.tar.bz2#0cedfe37c9aee28f5e926a870965466a
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/osx-arm64/pthread-stubs-0.4-h27ca646_1001.tar.bz2#d3f26c6494d4105d4ecb85203d687102
https://conda.anaconda.org/conda-forge/osx-arm64/python_abi-3.8-3_cp38.conda#079f8d6f829d2c61ee14de8e006668c1
-https://conda.anaconda.org/conda-forge/osx-arm64/tzcode-2022g-h1a8c8d9_0.conda#bae4ee8009209ecc0fbdb0c1581adff1
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/osx-arm64/tzcode-2023b-h1a8c8d9_0.conda#502a17fc9bd613bc65c0fd59677a4228
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/osx-arm64/xorg-libxau-1.0.9-h27ca646_0.tar.bz2#e2fa1f5a28cf0ce02516baf910be132e
https://conda.anaconda.org/conda-forge/osx-arm64/xorg-libxdmcp-1.1.3-h27ca646_0.tar.bz2#6738b13f7fadc18725965abdd4129c36
https://conda.anaconda.org/conda-forge/osx-arm64/xz-5.2.6-h57fd34a_0.tar.bz2#39c6b54e94014701dd157f4f576ed211
https://conda.anaconda.org/conda-forge/osx-arm64/yaml-0.2.5-h3422bc3_2.tar.bz2#4bb3f014845110883a3c5ee811fd84b4
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-checksums-0.1.11-h487e1a8_7.tar.bz2#edf91bd9464b05ca9d29be2a730b9468
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-compression-0.2.16-h59b28b2_5.conda#999039f6d7b6b14e30ed08c50ea50369
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-sdkutils-0.1.8-h59b28b2_0.conda#47f10d872256c2e7079387eaf16da6e9
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-checksums-0.1.14-h59b28b2_5.conda#a47c0a55e816e14663239492983b8eef
https://conda.anaconda.org/conda-forge/osx-arm64/expat-2.5.0-hb7217d7_0.tar.bz2#88defcdff52e5c8b7238239bc53c02d2
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/osx-arm64/geos-3.11.1-hb7217d7_0.tar.bz2#945d93c362ba338531455e0f0cf54ae2
@@ -49,67 +51,68 @@ https://conda.anaconda.org/conda-forge/osx-arm64/gmp-6.2.1-h9f76cd9_0.tar.bz2#f8
https://conda.anaconda.org/conda-forge/osx-arm64/graphite2-1.3.13-h9f76cd9_1001.tar.bz2#288b591645cb9cb9c0af7309ac1114f5
https://conda.anaconda.org/conda-forge/osx-arm64/icu-70.1-h6b3803e_0.tar.bz2#5fbe318a6be2e8d0f9b0b0c730a62748
https://conda.anaconda.org/conda-forge/osx-arm64/lerc-4.0.0-h9a09cb3_0.tar.bz2#de462d5aacda3b30721b512c5da4e742
-https://conda.anaconda.org/conda-forge/osx-arm64/libabseil-20220623.0-cxx17_h28b99d4_6.conda#0d3775e19ec3fe5257dd84cdd333cfcc
+https://conda.anaconda.org/conda-forge/osx-arm64/libabseil-20230125.0-cxx17_hb7217d7_1.conda#22a5254be25ace5abcd06468f58f08bc
+https://conda.anaconda.org/conda-forge/osx-arm64/libaec-1.0.6-hb7217d7_1.conda#4f04770bf6f12d22fb6c1d91a04e0c8c
https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlidec-1.0.9-h1a8c8d9_8.tar.bz2#640ea7b788cdd0420409bd8479f023f9
https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlienc-1.0.9-h1a8c8d9_8.tar.bz2#572907b78be867937c258421bc0807a8
https://conda.anaconda.org/conda-forge/osx-arm64/libcrc32c-1.1.2-hbdafb3b_0.tar.bz2#32bd82a6a625ea6ce090a81c3d34edeb
https://conda.anaconda.org/conda-forge/osx-arm64/libedit-3.1.20191231-hc8eb9b7_2.tar.bz2#30e4362988a2623e9eb34337b83e01f9
-https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran5-11.3.0-hdaf2cc0_28.conda#21e620d9f8e17c55dc47dfc687de5185
+https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran5-12.2.0-h0eea778_31.conda#244a7665228221cc951d5126b8bc1465
https://conda.anaconda.org/conda-forge/osx-arm64/libpng-1.6.39-h76d750c_0.conda#0078e6327c13cfdeae6ff7601e360383
-https://conda.anaconda.org/conda-forge/osx-arm64/libprotobuf-3.20.2-hb5ab8b9_0.tar.bz2#a6f25546f30d4cd56bc37b0b56ab954c
+https://conda.anaconda.org/conda-forge/osx-arm64/libprotobuf-3.21.12-hb5ab8b9_0.conda#7adb342474af442e3842c422f07fbf68
https://conda.anaconda.org/conda-forge/osx-arm64/libspatialindex-1.9.3-hbdafb3b_4.tar.bz2#311816a2511df4bceeeebe7c06af63e7
https://conda.anaconda.org/conda-forge/osx-arm64/libsqlite-3.40.0-h76d750c_0.tar.bz2#d090fcec993f4ef0a90e6df7f231a273
https://conda.anaconda.org/conda-forge/osx-arm64/libxcb-1.13-h9b22ae9_1004.tar.bz2#6b3457a192f8091cb413962f65740ac4
https://conda.anaconda.org/conda-forge/osx-arm64/lz4-c-1.9.4-hb7217d7_0.conda#45505bec548634f7d05e02fb25262cb9
https://conda.anaconda.org/conda-forge/osx-arm64/nspr-4.35-hb7217d7_0.conda#f81b5ec944dbbcff3dd08375eb036efa
-https://conda.anaconda.org/conda-forge/osx-arm64/openssl-1.1.1t-h03a7124_0.conda#eb1a3168d0381724415629dd31854d42
+https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.1.0-h03a7124_0.conda#a67e5c82b81441e972733d95e2d8832b
https://conda.anaconda.org/conda-forge/osx-arm64/pcre2-10.40-hb34f9b4_0.tar.bz2#721b7288270bafc83586b0f01c2a67f2
-https://conda.anaconda.org/conda-forge/osx-arm64/re2-2022.06.01-h9a09cb3_1.conda#e95b6f8c99f9d0edfb1356c4c7ea8f43
-https://conda.anaconda.org/conda-forge/osx-arm64/readline-8.1.2-h46ed386_0.tar.bz2#dc790f296d94409efb3f22af84ee968d
-https://conda.anaconda.org/conda-forge/osx-arm64/snappy-1.1.9-h17c5cce_2.tar.bz2#a0735d35df2c7146f49705c286502cef
+https://conda.anaconda.org/conda-forge/osx-arm64/re2-2023.02.02-hb7217d7_0.conda#407639ad13c9dc4d2510c5e2a99c2ada
+https://conda.anaconda.org/conda-forge/osx-arm64/readline-8.2-h92ec313_1.conda#8cbb776a2f641b943d413b3e19df71f4
+https://conda.anaconda.org/conda-forge/osx-arm64/snappy-1.1.10-h17c5cce_0.conda#ac82a611d1a67a598096ebaa857198e3
https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.12-he1e0b03_0.tar.bz2#2cb3d18eac154109107f093860bd545f
https://conda.anaconda.org/conda-forge/osx-arm64/zeromq-4.3.4-hbdafb3b_1.tar.bz2#49132c08da6545dc68351ff8b659ac8e
https://conda.anaconda.org/conda-forge/osx-arm64/zlib-1.2.13-h03a7124_4.tar.bz2#34161cff4e29cc45e536abf2f13fd6b4
https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.2-hf913c23_6.conda#8f346953ef63bf5fb482488a659adcf3
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-cal-0.5.11-h4530763_0.tar.bz2#ce11646fafb17267c81d929ca42cdb5c
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-cal-0.5.21-h134b2d6_2.conda#d7024e289c587a6a6d93dd99977bb0f4
https://conda.anaconda.org/conda-forge/osx-arm64/blosc-1.21.3-h1d6ff8b_0.conda#827988373085c97417e51c30e40967c3
https://conda.anaconda.org/conda-forge/osx-arm64/boost-cpp-1.78.0-h1cb353e_1.tar.bz2#f2a34b853f0aeee4db721a1f70da6905
https://conda.anaconda.org/conda-forge/osx-arm64/brotli-bin-1.0.9-h1a8c8d9_8.tar.bz2#f212620a4f3606ff8f800b8b1077415a
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
https://conda.anaconda.org/conda-forge/osx-arm64/freetype-2.12.1-hd633e50_1.conda#33ea6326e26d1da25eb8dfa768195b82
https://conda.anaconda.org/conda-forge/osx-arm64/glog-0.6.0-h6da1cb0_0.tar.bz2#5a570729c7709399cf8511aeeda6f989
-https://conda.anaconda.org/conda-forge/osx-arm64/grpc-cpp-1.46.4-haeec53e_7.tar.bz2#a03c4a2cbdd278f0307dafe856799519
https://conda.anaconda.org/conda-forge/osx-arm64/hdf4-4.2.15-h1a38d6a_5.tar.bz2#33632080213c000ced85118a4265256d
-https://conda.anaconda.org/conda-forge/osx-arm64/krb5-1.19.3-hf9b2bbe_0.tar.bz2#e6987ad4d068dfe9037280e239b3d5a9
-https://conda.anaconda.org/conda-forge/osx-arm64/libevent-2.1.10-hbae9a57_4.tar.bz2#a1f2aca3c5999a24527d6f8a3a8e9320
-https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran-5.0.0-11_3_0_hd922786_28.conda#d91a6e1915d3f47dc65180859b75203f
+https://conda.anaconda.org/conda-forge/osx-arm64/krb5-1.20.1-h69eda48_0.conda#a85db53e45b1173f270fc998dd40ec03
+https://conda.anaconda.org/conda-forge/osx-arm64/libevent-2.1.10-h7673551_4.tar.bz2#762bda55783500f923a559e21c1cd096
+https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran-5.0.0-12_2_0_hd922786_31.conda#dfc3dff1ce831c8e821f19d5d218825a
https://conda.anaconda.org/conda-forge/osx-arm64/libglib-2.74.1-h4646484_1.tar.bz2#4321cf67e46674567f419e95bae18522
-https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.51.0-hd184df1_0.conda#bbc8d6defa81887dc055d9e074d751fa
+https://conda.anaconda.org/conda-forge/osx-arm64/libgrpc-1.52.1-he98ff75_1.conda#45f3e9e7299d2a01a4d90d28c3528727
+https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.52.0-hae82a92_0.conda#1d319e95a0216f801293626a00337712
https://conda.anaconda.org/conda-forge/osx-arm64/librttopo-1.1.0-h844f84d_12.tar.bz2#abf6c60dfde69d6e632780c7b44fff6e
-https://conda.anaconda.org/conda-forge/osx-arm64/libssh2-1.10.0-hb80f160_3.tar.bz2#60f87fd8eb881a4c8094824dd112140c
-https://conda.anaconda.org/conda-forge/osx-arm64/libtiff-4.4.0-heb92581_5.conda#fb564626ea319252c2b3a5edc2f7640f
-https://conda.anaconda.org/conda-forge/osx-arm64/libxml2-2.10.3-h87b0503_0.tar.bz2#35980b9d069648c553d9322bc89ecfbf
-https://conda.anaconda.org/conda-forge/osx-arm64/libzip-1.9.2-h96606af_1.tar.bz2#66e39d7149b191cdf17804bd587d5d04
-https://conda.anaconda.org/conda-forge/osx-arm64/nss-3.88-h789eff7_0.conda#fbb3a48e2d960b2af828b1e265246acc
-https://conda.anaconda.org/conda-forge/osx-arm64/orc-1.7.6-hb9d09c9_0.tar.bz2#1bb57ec3792df86dfcde3cc1d0bbe53f
-https://conda.anaconda.org/conda-forge/osx-arm64/python-3.8.15-hf452327_0_cpython.conda#4019c257ab32f347b073138f34bd81e6
+https://conda.anaconda.org/conda-forge/osx-arm64/libssh2-1.10.0-h7a5bd25_3.tar.bz2#1ffa4340e73809db5a7516cb1a7425a7
+https://conda.anaconda.org/conda-forge/osx-arm64/libtiff-4.5.0-h5dffbdd_2.conda#8e08eae60de32c940096ee9b4da35685
+https://conda.anaconda.org/conda-forge/osx-arm64/libxml2-2.10.3-h67585b2_4.conda#3b3f67d1c9d66e873ca91c87640a1d1b
+https://conda.anaconda.org/conda-forge/osx-arm64/libzip-1.9.2-h76ab92c_1.tar.bz2#eee3b4ab0b5b71fbda7900785f3a46fa
+https://conda.anaconda.org/conda-forge/osx-arm64/nss-3.89-h789eff7_0.conda#dbb6be9468b513522e0b03d30cc7f1fd
+https://conda.anaconda.org/conda-forge/osx-arm64/orc-1.8.3-hef0d403_0.conda#5fe39445f76fa6f2a02b8033f2e5872b
+https://conda.anaconda.org/conda-forge/osx-arm64/python-3.8.16-h3ba56d0_1_cpython.conda#fd032a04786a23534c417bcc7dd50a84
https://conda.anaconda.org/conda-forge/osx-arm64/sqlite-3.40.0-h2229b38_0.tar.bz2#e0176ac0a33639feca897a66ed1fe177
https://conda.anaconda.org/conda-forge/osx-arm64/unixodbc-2.3.10-hb39ff51_0.tar.bz2#a5a930a1c270a9c9d571179463e571c0
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
https://conda.anaconda.org/conda-forge/noarch/appnope-0.1.3-pyhd8ed1ab_0.tar.bz2#54ac328d703bff191256ffa1183126d1
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/osx-arm64/atk-1.0-2.38.0-hcb7b3dd_1.tar.bz2#3c98bfeed7717a9cf5af18c295f49f3a
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-io-0.10.5-hea86ef8_0.tar.bz2#03d1eeb5706292ae6570456b98f38dcb
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-io-0.13.19-ha2443f3_3.conda#e1d454418cb21d2a4fdf456afa81f37a
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
-https://conda.anaconda.org/conda-forge/osx-arm64/bitarray-2.7.2-py38hb991d35_0.conda#cfd808e57e669ce38d40f3ecefe33316
+https://conda.anaconda.org/conda-forge/osx-arm64/bitarray-2.7.3-py38hb991d35_0.conda#e4e26e547b49b35682b3c4ed79a1cbd3
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/osx-arm64/brotli-1.0.9-h1a8c8d9_8.tar.bz2#e2a5e381ddd6529eb62e7710270b2ec5
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.2.1-pyhd8ed1ab_0.conda#b325bfc4cff7d7f8a868f1f7ecc4ed16
@@ -118,31 +121,34 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/osx-arm64/debugpy-1.6.6-py38h2b1e499_0.conda#ceec087a850c3bec414a1fd3e1174521
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/osx-arm64/fontconfig-2.14.2-h82840c6_0.conda#f77d47ddb6d3cc5b39b9bdf65635afbb
-https://conda.anaconda.org/conda-forge/osx-arm64/freetds-1.3.16-h10014b9_0.conda#ec7c9ba65cec93f9f81df151448d2ccc
+https://conda.anaconda.org/conda-forge/osx-arm64/freetds-1.1.15-h27bbca2_1.tar.bz2#0a00830573641771b858bdc392707e0a
https://conda.anaconda.org/conda-forge/osx-arm64/frozenlist-1.3.3-py38hb991d35_0.tar.bz2#92d0e58acb530d98508f6a12f39d93e7
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
-https://conda.anaconda.org/conda-forge/osx-arm64/gdk-pixbuf-2.42.8-h4f389bb_1.tar.bz2#062a406a54b8feb09213e0de74c17abf
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/osx-arm64/gdk-pixbuf-2.42.10-h9bcf4fe_0.conda#9e8a24e2ffa9bb8200cef965af01af06
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/osx-arm64/greenlet-2.0.2-py38h2b1e499_0.conda#07614b4949c26d7c4b4b890a402f2896
+https://conda.anaconda.org/conda-forge/osx-arm64/grpcio-1.52.1-py38h2b1e499_1.conda#33ce03a963c43ed9e45860aaca633cf5
https://conda.anaconda.org/conda-forge/osx-arm64/gts-0.7.6-h4b6d4d6_2.tar.bz2#285247d54dbf40121f79a6e025c04df4
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.5-pyhd8ed1ab_0.conda#953a312b272f37d39fe9d09f46734622
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/osx-arm64/kiwisolver-1.4.4-py38h9dc3d6a_1.tar.bz2#89f8e0551699eebf6fda52c8bf32af6d
-https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.14-h8193b64_0.tar.bz2#9bc9a1c491795c92568481b6ab59d9c5
-https://conda.anaconda.org/conda-forge/osx-arm64/libcurl-7.86.0-hd538317_1.tar.bz2#64af094274984c756c18dbbe59327a45
+https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.15-h481adae_0.conda#806395a21421da524d72aa4e0b69d54c
+https://conda.anaconda.org/conda-forge/osx-arm64/libcurl-7.88.1-h9049daf_1.conda#148e2e109774943f699768703502a918
https://conda.anaconda.org/conda-forge/osx-arm64/libkml-1.3.0-h41464e4_1015.tar.bz2#6404f2ec1ee91e48175d9e5ee1dbca5f
https://conda.anaconda.org/conda-forge/osx-arm64/libopenblas-0.3.21-openmp_hc731615_3.tar.bz2#2a980a5d8cc34ce70d339b983f9920de
-https://conda.anaconda.org/conda-forge/osx-arm64/libpq-15.1-hb650857_1.conda#0ffee7d6b76a2b69c0bf8ed8ba97bf82
-https://conda.anaconda.org/conda-forge/osx-arm64/libthrift-0.16.0-h1a74c4f_2.tar.bz2#8949545ae9641f7483a88abc3635b07a
-https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-1.2.4-h328b37c_0.tar.bz2#194c8df68e6966f8e012cd326e42c31d
+https://conda.anaconda.org/conda-forge/osx-arm64/libpq-15.2-h1a28acd_0.conda#36fd96c2586fb726f9aa4dccea769efa
+https://conda.anaconda.org/conda-forge/osx-arm64/libthrift-0.18.1-h6635e49_0.conda#c6f3d11f5df3a9cce701b4e7853cf907
+https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-1.2.4-h999c80f_1.conda#8e0866db2c7808ad9058848c47e6d6ff
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/osx-arm64/lz4-4.3.2-py38h76a69a3_0.conda#2b394ecc4ef9bea6db1a7c0036a66a7b
https://conda.anaconda.org/conda-forge/osx-arm64/markupsafe-2.1.2-py38hb991d35_0.conda#bd1689d6fc13b6e15f205f5e6a09d8dd
@@ -150,18 +156,18 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/osx-arm64/msgpack-python-1.0.4-py38h9dc3d6a_1.tar.bz2#5f5f89f5d9c51fb109faf18c24b25e0c
+https://conda.anaconda.org/conda-forge/osx-arm64/msgpack-python-1.0.5-py38h9dc3d6a_0.conda#bdc443fe57e340151de0a8fdb0853d0b
https://conda.anaconda.org/conda-forge/osx-arm64/multidict-6.0.4-py38hb991d35_0.conda#0152d96256c83655a22d8a6acb4d303d
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
-https://conda.anaconda.org/conda-forge/osx-arm64/openjpeg-2.5.0-h5d4e404_1.tar.bz2#4d65dff04bceb645c98a514c52df217f
+https://conda.anaconda.org/conda-forge/osx-arm64/openjpeg-2.5.0-hbc2ba62_2.conda#c3e184f0810a4614863569488b1ac709
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
@@ -176,26 +182,24 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/osx-arm64/pycryptodomex-3.16.0-py38hb991d35_0.conda#81bffa1a5f73a95e2999830672d33d25
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/osx-arm64/pyrsistent-0.19.3-py38hb991d35_0.conda#d05aae84024354f0385b40b666ad2ab7
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/osx-arm64/pyyaml-6.0-py38hb991d35_5.tar.bz2#b2ac48bd209afc364158e533f7f237a2
-https://conda.anaconda.org/conda-forge/osx-arm64/pyzmq-25.0.0-py38hb72be9f_0.conda#c9d81306ee318a7f2339f8053a8ec422
-https://conda.anaconda.org/conda-forge/osx-arm64/regex-2022.10.31-py38hb991d35_0.tar.bz2#6682f46ce535fe53c7c10a86cf77f10b
+https://conda.anaconda.org/conda-forge/osx-arm64/pyzmq-25.0.2-py38hb72be9f_0.conda#0cdcfdf439e0ebad790d3a9d3e0224c6
+https://conda.anaconda.org/conda-forge/osx-arm64/regex-2023.3.23-py38hb991d35_0.conda#8a7881935ae7d7791cd4138baea1ef81
https://conda.anaconda.org/conda-forge/osx-arm64/rtree-1.0.1-py38hb34dff0_1.tar.bz2#5bcbcec94894463367b1c2be498972a3
-https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.0.249-py38h0bfa62c_0.conda#c677f92db9f84b302903b8465f43adcd
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.0.259-py38h0bfa62c_0.conda#8cd7357b72c7965c8be858405d34a53e
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -205,20 +209,22 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/osx-arm64/tornado-6.2-py38hb991d35_1.tar.bz2#b883f8e965c8968fc5e08ade58a87841
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/osx-arm64/unicodedata2-15.0.0-py38hb991d35_0.tar.bz2#b37f15dbb5e742a8499e058a6fc551ca
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.5-pyhd8ed1ab_0.conda#2af53b3894fb9bdbb3679c0d31028b1b
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-event-stream-0.2.7-h9972306_13.tar.bz2#1aa327d20aec700b23809ce8c1da34cd
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-event-stream-0.2.20-ha370d96_4.conda#06f67e990e792f186eaef7d90042bf49
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-http-0.7.6-hca61f3c_0.conda#a31434a64509cd494d92442ed1ad4371
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
https://conda.anaconda.org/conda-forge/osx-arm64/backports.zoneinfo-0.2.1-py38hb991d35_7.tar.bz2#e6b09dcbf26e515752a1b6fafa0ac52d
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/osx-arm64/cairo-1.16.0-h73a0509_1014.tar.bz2#be2ea75899a7b1f1dd59a862fac655ee
@@ -226,40 +232,40 @@ https://conda.anaconda.org/conda-forge/osx-arm64/cffi-1.15.1-py38ha45ccd6_3.cond
https://conda.anaconda.org/conda-forge/osx-arm64/cfitsio-4.2.0-h2f961c4_0.conda#10112a8b1b7b479c7d4e87c9ade892eb
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
-https://conda.anaconda.org/conda-forge/osx-arm64/coverage-7.1.0-py38hb991d35_0.conda#7d2bcf91067c9ad216e43faef316efa8
-https://conda.anaconda.org/conda-forge/osx-arm64/curl-7.86.0-hd538317_1.tar.bz2#068fc793cf5223be665bcd6d35a2f28f
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/osx-arm64/coverage-7.2.2-py38hb991d35_0.conda#c32f46ea7a9d48b5a8fecca4260c4a14
+https://conda.anaconda.org/conda-forge/osx-arm64/curl-7.88.1-h9049daf_1.conda#8df5e92aeb9de416919a64f116698761
https://conda.anaconda.org/conda-forge/osx-arm64/cytoolz-0.12.0-py38hb991d35_1.tar.bz2#d9251830c741b5b1599a2733bc0ce2ba
-https://conda.anaconda.org/conda-forge/osx-arm64/fastavro-1.7.1-py38hb991d35_0.conda#f2eeb7b46af8956361bbb795b6599527
-https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.38.0-py38hb991d35_1.tar.bz2#36d2b5c982deee87a70580d6ad18110e
+https://conda.anaconda.org/conda-forge/osx-arm64/fastavro-1.7.3-py38hb991d35_0.conda#f3179accf56bdd5bd42c9509a8c288bd
+https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.39.2-py38hb991d35_0.conda#53fb96da5e2046c4477cea0e4e2d59db
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/osx-arm64/grpcio-1.46.4-py38h63e8d1b_7.tar.bz2#7d0435014f467acf89b7ec6e9361cf5e
-https://conda.anaconda.org/conda-forge/osx-arm64/hdf5-1.12.2-nompi_h8968d4b_100.tar.bz2#6013e6a360be49d947d42b82f6a5a682
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/osx-arm64/hdf5-1.12.2-nompi_ha7af310_101.conda#050df57fed623d4b6aa817e9c8bdbfaa
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
https://conda.anaconda.org/conda-forge/osx-arm64/libblas-3.9.0-16_osxarm64_openblas.tar.bz2#53d6d5097f0d62e24db8c1979a21102e
-https://conda.anaconda.org/conda-forge/osx-arm64/libgd-2.3.3-hede1055_3.tar.bz2#8bbd974c213208687dc289d50feb5c65
-https://conda.anaconda.org/conda-forge/osx-arm64/libgoogle-cloud-2.1.0-hec15cb4_1.tar.bz2#ab0eccace6b28dbf2515897b7105fa68
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/osx-arm64/libgd-2.3.3-h90fb8ed_4.conda#03c52c3cdcf9f4cf70e07135254b799f
+https://conda.anaconda.org/conda-forge/osx-arm64/libgoogle-cloud-2.8.0-h7206bc8_1.conda#4101b82f92955893124421a303673986
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
-https://conda.anaconda.org/conda-forge/osx-arm64/pillow-9.2.0-py38hf86a106_3.tar.bz2#0970f5fdfe3deb64bf6e316024ef2cb8
+https://conda.anaconda.org/conda-forge/osx-arm64/pillow-9.4.0-py38h1bb68ce_1.conda#8168fd9a81bc392ae6954e588dd8eebe
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-15.1-hf80b784_1.conda#69956ca98448a03365575522744fc9f2
-https://conda.anaconda.org/conda-forge/osx-arm64/proj-9.1.0-h3bdf472_0.tar.bz2#84796e1049fba379566c5b1cc3ac9e2b
-https://conda.anaconda.org/conda-forge/osx-arm64/protobuf-3.20.2-py38h2b1e499_1.conda#fd3fbc8e9ecbeab62f2e5cedaacea86e
-https://conda.anaconda.org/conda-forge/osx-arm64/psycopg2-2.9.3-py38h219f6f9_2.conda#d7edc26ad117456b1b4678202b3df072
+https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-15.2-h45c140d_0.conda#9f35737220640a8de16d09b59914498f
+https://conda.anaconda.org/conda-forge/osx-arm64/proj-9.1.1-h13f728c_2.conda#6924682abbbe34aa837c64ca0016ec8e
+https://conda.anaconda.org/conda-forge/osx-arm64/protobuf-4.21.12-py38h2b1e499_0.conda#61cb55e52bdff7e7458800746300ebc0
+https://conda.anaconda.org/conda-forge/osx-arm64/psycopg2-2.9.3-py38hb6e8bb4_2.conda#419f6b32007bde38b3425b7ecba510b0
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
-https://conda.anaconda.org/conda-forge/osx-arm64/pymssql-2.2.5-py38h2b1e499_3.conda#a140d73d350914a5d8710ebb4204159c
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/osx-arm64/pymssql-2.2.5-py38h2b1e499_2.tar.bz2#297eed153b3012ffe946e7c172a26e19
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
@@ -267,142 +273,150 @@ https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf4
https://conda.anaconda.org/conda-forge/osx-arm64/sqlalchemy-1.4.46-py38hb991d35_0.conda#cc16b91ae35cd9d70e56f58e4aade7da
https://conda.anaconda.org/conda-forge/osx-arm64/thrift-0.16.0-py38h2b1e499_2.tar.bz2#7a9edb69dbe41bb52b1678b66ba1fd85
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/osx-arm64/watchdog-2.2.1-py38hb991d35_0.conda#69b98c8e56509f4d48fe9549f3f019c0
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/osx-arm64/watchdog-3.0.0-py38hb991d35_0.conda#52da4b600d76799c485b1f763f7eaf0f
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/osx-arm64/xerces-c-3.2.4-h627aa08_1.tar.bz2#e690c8c477c96c9f8ad9f7c63f1f94d2
https://conda.anaconda.org/conda-forge/osx-arm64/yarl-1.8.2-py38hb991d35_0.conda#6536ee74cdd6bb3806fe0ecfae07f01d
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-sdk-cpp-1.8.186-h392f50b_4.tar.bz2#d27eeebe0e48c6c4cbd21a09f575f496
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-auth-0.6.26-h9ec8a34_1.conda#9b6e888da325885e2afc3be552fc6191
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-mqtt-0.8.6-hcd3fa0e_12.conda#3ebeacc4c1ec79ba87cd5a0bab192910
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/osx-arm64/brotlipy-0.7.0-py38hb991d35_1005.tar.bz2#e8689834a9efb0ade1194ffa8461fd4c
-https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-38.0.4-py38h5eb7249_0.conda#a22a2c768ff4d46432d77c190fee41a5
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-38.0.4-py38h23f6d3d_0.conda#ee1d43d5a75a46e2617fe5ab3b953829
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
-https://conda.anaconda.org/conda-forge/osx-arm64/geotiff-1.7.1-h90559a4_4.tar.bz2#01946796ab730299feff7026b1f0d222
+https://conda.anaconda.org/conda-forge/osx-arm64/geotiff-1.7.1-hdcdc974_6.conda#6cb68e5148f9c41564eb840c89b8f7bc
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
https://conda.anaconda.org/conda-forge/osx-arm64/google-crc32c-1.1.2-py38h7f16d20_4.tar.bz2#876babd5b04b19d31564dcf2284cb805
https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
https://conda.anaconda.org/conda-forge/osx-arm64/harfbuzz-6.0.0-hddbc195_0.conda#bc6503f2956775e3d6e481d7588b7998
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
https://conda.anaconda.org/conda-forge/noarch/importlib-resources-5.12.0-pyhd8ed1ab_0.conda#3544c818f0720c89eb16ae6940ab440b
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/osx-arm64/kealib-1.5.0-hfd766a6_0.conda#3041514025aa54cad642e24061b6b6f6
https://conda.anaconda.org/conda-forge/osx-arm64/libcblas-3.9.0-16_osxarm64_openblas.tar.bz2#c7cfc18378f00d3faf7f8a9a2553be3c
-https://conda.anaconda.org/conda-forge/osx-arm64/libdap4-3.20.6-h8510809_2.tar.bz2#b61547e8f0c4fb57318482666c07d6ca
https://conda.anaconda.org/conda-forge/osx-arm64/liblapack-3.9.0-16_osxarm64_openblas.tar.bz2#52d270c579bfca986d6cdd81eb5ed6e7
-https://conda.anaconda.org/conda-forge/osx-arm64/libnetcdf-4.8.1-nompi_h2510be2_106.tar.bz2#c5d2afa0f2bc4eca5be78c438a41de2e
-https://conda.anaconda.org/conda-forge/osx-arm64/libspatialite-5.0.1-h558e587_22.tar.bz2#e766cf477817d5fcce530d40c9d97a96
+https://conda.anaconda.org/conda-forge/osx-arm64/libnetcdf-4.9.1-nompi_h232cb48_101.conda#87dd4b0e9fe52d1b43bf0d5e7be28fc3
+https://conda.anaconda.org/conda-forge/osx-arm64/libspatialite-5.0.1-h14115fc_23.conda#2f80ac3b18bf574bb497f9f52966cd4e
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
-https://conda.anaconda.org/conda-forge/osx-arm64/poppler-22.12.0-hae7f5f0_0.conda#8bc158f737f4119d494e288ee0880cd2
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/osx-arm64/poppler-23.03.0-h9564b9f_0.conda#a04f2bd0e84b74d694ae65ab9ec09c0b
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
-https://conda.anaconda.org/conda-forge/osx-arm64/pyproj-3.4.1-py38h35ce115_0.conda#27422e91da4da2b15a1a7151fc9b0927
+https://conda.anaconda.org/conda-forge/osx-arm64/pyproj-3.4.1-py38hba7aebe_1.conda#543659ccbca6cae33aeec78d1b4e649f
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
https://conda.anaconda.org/conda-forge/osx-arm64/pytz-deprecation-shim-0.1.0.post0-py38h10201cd_3.tar.bz2#c8718bd406c1370ce1814d57706497c2
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/osx-arm64/tiledb-2.13.2-hc7ac4c9_0.conda#71844097f1f47854bb55d8928482cf25
+https://conda.anaconda.org/conda-forge/osx-arm64/tiledb-2.13.2-h9bd36d0_0.conda#d3a88ffe0cbfbd8d3532bb8ef46f0626
+https://conda.anaconda.org/conda-forge/osx-arm64/ukkonen-1.0.1-py38h9dc3d6a_3.tar.bz2#c7c9ef3c05099bf3ab733d68b991fe6d
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
https://conda.anaconda.org/conda-forge/osx-arm64/aiohttp-3.8.4-py38hb991d35_0.conda#9750bf94473281f7897f28f06248bdd4
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-s3-0.2.7-hc514de9_1.conda#d585d309fcced2a4e7b94a439f204d42
https://conda.anaconda.org/conda-forge/osx-arm64/black-23.1.0-py38h10201cd_0.conda#f2eabea61bc0fb7ae8479b1384d25efa
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/osx-arm64/jupyter_core-5.2.0-py38h10201cd_0.conda#c2cbdd2773cb7fd2de197d70542f85de
-https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.5.3-h28a98fa_10.conda#92ee56461fa1874bcc69ea168dfbe94e
+https://conda.anaconda.org/conda-forge/osx-arm64/jupyter_core-5.3.0-py38h10201cd_0.conda#f9d32c721293c470e495b2ef0646429f
+https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.6.2-h8d4b95d_9.conda#2f2e0c9c1ec238e79fd94c5f0ba35827
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/osx-arm64/numpy-1.24.2-py38hac8ee1c_0.conda#a41451735087a578283680ab46528430
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
-https://conda.anaconda.org/conda-forge/osx-arm64/pango-1.50.13-h6c112b8_0.conda#3ffd7fede31a774ad8f3dc9114897daa
+https://conda.anaconda.org/conda-forge/osx-arm64/pango-1.50.14-h6c112b8_0.conda#1e6300d15e38bad0d52871251190b5e8
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/osx-arm64/tzlocal-4.2-py38h10201cd_2.tar.bz2#27c9852d382f9bb2f9ce1aabd8884c47
-https://conda.anaconda.org/conda-forge/osx-arm64/arrow-cpp-8.0.1-py38h7d92150_2_cpu.tar.bz2#c62d95c67a1495c67ac7c0fae13186a3
+https://conda.anaconda.org/conda-forge/osx-arm64/tzlocal-4.3-py38h10201cd_0.conda#586e662856e705c367687a959f6a24f2
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-crt-cpp-0.19.8-h6be2766_12.conda#cdfee90317474a42d31eb3ea3752e60c
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/osx-arm64/contourpy-1.0.7-py38h9dc3d6a_0.conda#1cb30a108720e4ab123bb342568aefec
-https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.5.3-py38hd915ca2_10.conda#a30eb67098615c68cdbfe7fbc12314dd
+https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.6.2-py38ha69993d_9.conda#e35656e2044bd6117550fbe39ca883af
https://conda.anaconda.org/conda-forge/osx-arm64/gtk2-2.24.33-h57013de_2.tar.bz2#144fb77338d90012ebe80d3dd13fc725
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyhd1c38e8_0.conda#e67b634578fefbb312cd6cfd34b63d86
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/osx-arm64/librsvg-2.54.4-ha2634a2_0.tar.bz2#a9fe78f1beab7f0a90581518a0e11311
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
https://conda.anaconda.org/conda-forge/osx-arm64/pandas-1.5.3-py38h61dac83_0.conda#d2aae53a6cc1cf1f3d739eecadab3219
-https://conda.anaconda.org/conda-forge/osx-arm64/polars-0.16.7-py38he903e8d_0.conda#582b37aecb3006507ceceab98b6a9f62
+https://conda.anaconda.org/conda-forge/osx-arm64/polars-0.16.16-py38he903e8d_0.conda#eebe05b529406dc488d28d8835230129
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
https://conda.anaconda.org/conda-forge/osx-arm64/shapely-1.8.5-py38he1a84b8_2.tar.bz2#efa860edb817bbca5830e8c88d430260
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/osx-arm64/fiona-1.8.22-py38h150fa43_2.tar.bz2#465918e83ecfc42e72fad15e80fe3bb3
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-sdk-cpp-1.10.57-h3daea3c_8.conda#c35e6a52b070dfabe03e4fb63b5da47d
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/osx-arm64/fiona-1.9.1-py38h262eea0_0.conda#497df8e436ed25375d64c8ce1c40e92f
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
-https://conda.anaconda.org/conda-forge/osx-arm64/graphviz-7.0.5-h4f8fbd6_0.conda#88ead4365a188ffd036644a0b7931b0e
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh736e0ef_0.conda#aa43ffb10a39d9eb2538761a3f838a87
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
-https://conda.anaconda.org/conda-forge/osx-arm64/matplotlib-base-3.7.0-py38hbbe890c_0.conda#3ab167588140266047ea5704cff84018
+https://conda.anaconda.org/conda-forge/osx-arm64/graphviz-7.1.0-h4f8fbd6_0.conda#6840266ed0788c5c4c8429bf42c4b36d
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyhd1c38e8_0.conda#e88ca7d30e60645b2621c888029b85f1
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/osx-arm64/matplotlib-base-3.7.1-py38hbbe890c_0.conda#394897da28b753a32ca53529320f5f65
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.4-pyhd8ed1ab_0.conda#9dea5ab3cc33084f7a3680a98859731e
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh736e0ef_0.conda#3bbe4a71a9d5d8e13c1504e3cd077b32
+https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-11.0.0-hdcd110a_13_cpu.conda#b8915aea8d4857228a292d672f01460a
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
-https://conda.anaconda.org/conda-forge/osx-arm64/pyarrow-8.0.1-py38h0b65abd_2_cpu.tar.bz2#a9e131d33bf6e35d1f3dcf4543725b06
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/osx-arm64/arrow-cpp-11.0.0-hce30654_13_cpu.conda#ecd5efe74f31a2c6c244f81038ec9e35
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/osx-arm64/python-duckdb-0.7.0-py38h105019d_1.conda#53d862acd347ad548cf5c42dd0e5e462
-https://conda.anaconda.org/conda-forge/osx-arm64/scipy-1.10.0-py38h7b4f323_2.conda#6aa04c34b9ebac870ce12c071c237669
-https://conda.anaconda.org/conda-forge/osx-arm64/snowflake-connector-python-2.8.3-py38h35b95ce_0.conda#b045348c726731246765d9fd808f29d6
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/osx-arm64/scipy-1.10.1-py38h7b4f323_0.conda#470ae87736d43506d7782a113aae3c45
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/osx-arm64/scikit-learn-1.2.1-py38h0c332d6_0.conda#9e81f5dd0bed78f5b216d51494a053ff
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
+https://conda.anaconda.org/conda-forge/osx-arm64/scikit-learn-1.2.2-py38h4253db4_1.conda#b7d2a23b8063cc5070d4631126d339cd
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/osx-arm64/pyarrow-11.0.0-py38h32b283d_13_cpu.conda#1a657694f2068fcf9d6025614fb12e47
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.1.0-pyhd8ed1ab_0.tar.bz2#b0816cdad1ed5f376831b1c36a74106b
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.1.0-pyhd8ed1ab_0.tar.bz2#1d66863d0c73e517fbcfd859e89d3b4d
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/osx-arm64/python-duckdb-0.7.1-py38h105019d_0.conda#026ddc5111e314c62792abdf433a2f20
+https://conda.anaconda.org/conda-forge/osx-arm64/snowflake-connector-python-3.0.2-py38he604189_0.conda#a717d90d97d0c3dd774da42b75a8c585
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
diff --git a/osx-arm64-3.9.lock b/osx-arm64-3.9.lock
index 357dafe..3c2a74c 100644
--- a/osx-arm64-3.9.lock
+++ b/osx-arm64-3.9.lock
@@ -1,8 +1,8 @@
# Generated by conda-lock.
# platform: osx-arm64
-# input_hash: 444907000251681a28a995519702499e49824cbb5a4141009ecea025d32fb160
+# input_hash: 75f6202e82e6f3a8f3ba3aa5f4ce362f69c4e854423b1555370239c36592725b
@EXPLICIT
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-common-0.6.2-h3422bc3_0.tar.bz2#e6c0dfc1c6e34241720983abb66ec35e
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-common-0.8.14-h1a8c8d9_0.conda#029e3775088eae34a2b978e7efea7caa
https://conda.anaconda.org/conda-forge/osx-arm64/bzip2-1.0.8-h3422bc3_4.tar.bz2#fc76ace7b94fb1f694988ab1b14dd248
https://conda.anaconda.org/conda-forge/osx-arm64/c-ares-1.18.1-h3422bc3_0.tar.bz2#5dd04dad345af4f1e8f3f0d5afc03b67
https://conda.anaconda.org/conda-forge/osx-arm64/ca-certificates-2022.12.7-h4653dfc_0.conda#7dc111916edc905957b7417a247583b6
@@ -12,34 +12,36 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77
https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
https://conda.anaconda.org/conda-forge/osx-arm64/freexl-1.0.6-h1a8c8d9_1.tar.bz2#f9e99c94afe28d7558a5dd106fef0936
https://conda.anaconda.org/conda-forge/osx-arm64/fribidi-1.0.10-h27ca646_0.tar.bz2#c64443234ff91d70cb9c7dc926c58834
-https://conda.anaconda.org/conda-forge/osx-arm64/giflib-5.2.1-h27ca646_2.tar.bz2#fcfaa10e989b15ef30f93b6329c35add
+https://conda.anaconda.org/conda-forge/osx-arm64/giflib-5.2.1-h1a8c8d9_3.conda#f39a05d3dbb0e5024b7deabb2c0993f1
https://conda.anaconda.org/conda-forge/osx-arm64/jpeg-9e-h1a8c8d9_3.conda#ef1cce2ab799e0c2f32c3344125ff218
https://conda.anaconda.org/conda-forge/osx-arm64/json-c-0.16-hc449e50_0.tar.bz2#0091e6c603f58202c026d3e63fc93f39
https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlicommon-1.0.9-h1a8c8d9_8.tar.bz2#84eb0c3c995a865079080d092e4a3c06
-https://conda.anaconda.org/conda-forge/osx-arm64/libcxx-14.0.6-h2692d47_0.tar.bz2#716c4b72ff3808ade65748fd9b49cc44
-https://conda.anaconda.org/conda-forge/osx-arm64/libdeflate-1.14-h1a8c8d9_0.tar.bz2#cb64374f9f7ad86b6194e294c56e06a5
+https://conda.anaconda.org/conda-forge/osx-arm64/libcxx-15.0.7-h75e25f2_0.conda#16d9581f4cdc3406a059a607dd2ed816
+https://conda.anaconda.org/conda-forge/osx-arm64/libdeflate-1.17-h1a8c8d9_0.conda#cae34d3f6ab02e0abf92ec3caaf0bd39
https://conda.anaconda.org/conda-forge/osx-arm64/libev-4.33-h642e427_1.tar.bz2#566dbf70fe79eacdb3c3d3d195a27f55
https://conda.anaconda.org/conda-forge/osx-arm64/libffi-3.4.2-h3422bc3_5.tar.bz2#086914b672be056eb70fd4285b6783b6
https://conda.anaconda.org/conda-forge/osx-arm64/libiconv-1.17-he4db4b2_0.tar.bz2#686f9c755574aa221f29fbcf36a67265
https://conda.anaconda.org/conda-forge/osx-arm64/libsodium-1.0.18-h27ca646_1.tar.bz2#90859688dbca4735b74c02af14c4c793
https://conda.anaconda.org/conda-forge/osx-arm64/libtool-2.4.7-hb7217d7_0.conda#fe8efc3385f58f0055e8100b07225055
https://conda.anaconda.org/conda-forge/osx-arm64/libutf8proc-2.8.0-h1a8c8d9_0.tar.bz2#f8c9c41a122ab3abdf8943b13f4957ee
-https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-base-1.2.4-h57fd34a_0.tar.bz2#23f90b9f28c585445c52184a3388d01d
+https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-base-1.2.4-h1a8c8d9_0.conda#480b5b992632e7d17778abf01bad473b
https://conda.anaconda.org/conda-forge/osx-arm64/libzlib-1.2.13-h03a7124_4.tar.bz2#780852dc54c4c07e64b276a97f89c162
-https://conda.anaconda.org/conda-forge/osx-arm64/llvm-openmp-15.0.7-h7cfbb63_0.conda#358164e15a9320f11b84a53fb8d8e446
+https://conda.anaconda.org/conda-forge/osx-arm64/llvm-openmp-16.0.0-h7cfbb63_0.conda#791063135f975b2fd7329d30728cb903
https://conda.anaconda.org/conda-forge/osx-arm64/ncurses-6.3-h07bb92c_1.tar.bz2#db86e5a978380a13f5559f97afdfe99d
-https://conda.anaconda.org/conda-forge/osx-arm64/pandoc-2.19.2-hce30654_1.tar.bz2#0503c9d6f2633bee5976d84f91c8050d
+https://conda.anaconda.org/conda-forge/osx-arm64/pandoc-2.19.2-hce30654_2.conda#e79494b8d990189fe4701f498f99cd8b
https://conda.anaconda.org/conda-forge/osx-arm64/pixman-0.40.0-h27ca646_0.tar.bz2#0cedfe37c9aee28f5e926a870965466a
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/osx-arm64/pthread-stubs-0.4-h27ca646_1001.tar.bz2#d3f26c6494d4105d4ecb85203d687102
https://conda.anaconda.org/conda-forge/osx-arm64/python_abi-3.9-3_cp39.conda#f8fb5fb65327a2429b084833c8ff1dbc
-https://conda.anaconda.org/conda-forge/osx-arm64/tzcode-2022g-h1a8c8d9_0.conda#bae4ee8009209ecc0fbdb0c1581adff1
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/osx-arm64/tzcode-2023b-h1a8c8d9_0.conda#502a17fc9bd613bc65c0fd59677a4228
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/osx-arm64/xorg-libxau-1.0.9-h27ca646_0.tar.bz2#e2fa1f5a28cf0ce02516baf910be132e
https://conda.anaconda.org/conda-forge/osx-arm64/xorg-libxdmcp-1.1.3-h27ca646_0.tar.bz2#6738b13f7fadc18725965abdd4129c36
https://conda.anaconda.org/conda-forge/osx-arm64/xz-5.2.6-h57fd34a_0.tar.bz2#39c6b54e94014701dd157f4f576ed211
https://conda.anaconda.org/conda-forge/osx-arm64/yaml-0.2.5-h3422bc3_2.tar.bz2#4bb3f014845110883a3c5ee811fd84b4
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-checksums-0.1.11-h487e1a8_7.tar.bz2#edf91bd9464b05ca9d29be2a730b9468
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-compression-0.2.16-h59b28b2_5.conda#999039f6d7b6b14e30ed08c50ea50369
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-sdkutils-0.1.8-h59b28b2_0.conda#47f10d872256c2e7079387eaf16da6e9
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-checksums-0.1.14-h59b28b2_5.conda#a47c0a55e816e14663239492983b8eef
https://conda.anaconda.org/conda-forge/osx-arm64/expat-2.5.0-hb7217d7_0.tar.bz2#88defcdff52e5c8b7238239bc53c02d2
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/osx-arm64/geos-3.11.1-hb7217d7_0.tar.bz2#945d93c362ba338531455e0f0cf54ae2
@@ -49,68 +51,69 @@ https://conda.anaconda.org/conda-forge/osx-arm64/gmp-6.2.1-h9f76cd9_0.tar.bz2#f8
https://conda.anaconda.org/conda-forge/osx-arm64/graphite2-1.3.13-h9f76cd9_1001.tar.bz2#288b591645cb9cb9c0af7309ac1114f5
https://conda.anaconda.org/conda-forge/osx-arm64/icu-70.1-h6b3803e_0.tar.bz2#5fbe318a6be2e8d0f9b0b0c730a62748
https://conda.anaconda.org/conda-forge/osx-arm64/lerc-4.0.0-h9a09cb3_0.tar.bz2#de462d5aacda3b30721b512c5da4e742
-https://conda.anaconda.org/conda-forge/osx-arm64/libabseil-20220623.0-cxx17_h28b99d4_6.conda#0d3775e19ec3fe5257dd84cdd333cfcc
+https://conda.anaconda.org/conda-forge/osx-arm64/libabseil-20230125.0-cxx17_hb7217d7_1.conda#22a5254be25ace5abcd06468f58f08bc
+https://conda.anaconda.org/conda-forge/osx-arm64/libaec-1.0.6-hb7217d7_1.conda#4f04770bf6f12d22fb6c1d91a04e0c8c
https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlidec-1.0.9-h1a8c8d9_8.tar.bz2#640ea7b788cdd0420409bd8479f023f9
https://conda.anaconda.org/conda-forge/osx-arm64/libbrotlienc-1.0.9-h1a8c8d9_8.tar.bz2#572907b78be867937c258421bc0807a8
https://conda.anaconda.org/conda-forge/osx-arm64/libcrc32c-1.1.2-hbdafb3b_0.tar.bz2#32bd82a6a625ea6ce090a81c3d34edeb
https://conda.anaconda.org/conda-forge/osx-arm64/libedit-3.1.20191231-hc8eb9b7_2.tar.bz2#30e4362988a2623e9eb34337b83e01f9
-https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran5-11.3.0-hdaf2cc0_28.conda#21e620d9f8e17c55dc47dfc687de5185
+https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran5-12.2.0-h0eea778_31.conda#244a7665228221cc951d5126b8bc1465
https://conda.anaconda.org/conda-forge/osx-arm64/libpng-1.6.39-h76d750c_0.conda#0078e6327c13cfdeae6ff7601e360383
-https://conda.anaconda.org/conda-forge/osx-arm64/libprotobuf-3.20.2-hb5ab8b9_0.tar.bz2#a6f25546f30d4cd56bc37b0b56ab954c
+https://conda.anaconda.org/conda-forge/osx-arm64/libprotobuf-3.21.12-hb5ab8b9_0.conda#7adb342474af442e3842c422f07fbf68
https://conda.anaconda.org/conda-forge/osx-arm64/libspatialindex-1.9.3-hbdafb3b_4.tar.bz2#311816a2511df4bceeeebe7c06af63e7
https://conda.anaconda.org/conda-forge/osx-arm64/libsqlite-3.40.0-h76d750c_0.tar.bz2#d090fcec993f4ef0a90e6df7f231a273
https://conda.anaconda.org/conda-forge/osx-arm64/libxcb-1.13-h9b22ae9_1004.tar.bz2#6b3457a192f8091cb413962f65740ac4
https://conda.anaconda.org/conda-forge/osx-arm64/lz4-c-1.9.4-hb7217d7_0.conda#45505bec548634f7d05e02fb25262cb9
https://conda.anaconda.org/conda-forge/osx-arm64/nspr-4.35-hb7217d7_0.conda#f81b5ec944dbbcff3dd08375eb036efa
-https://conda.anaconda.org/conda-forge/osx-arm64/openssl-1.1.1t-h03a7124_0.conda#eb1a3168d0381724415629dd31854d42
+https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.1.0-h03a7124_0.conda#a67e5c82b81441e972733d95e2d8832b
https://conda.anaconda.org/conda-forge/osx-arm64/pcre2-10.40-hb34f9b4_0.tar.bz2#721b7288270bafc83586b0f01c2a67f2
-https://conda.anaconda.org/conda-forge/osx-arm64/re2-2022.06.01-h9a09cb3_1.conda#e95b6f8c99f9d0edfb1356c4c7ea8f43
-https://conda.anaconda.org/conda-forge/osx-arm64/readline-8.1.2-h46ed386_0.tar.bz2#dc790f296d94409efb3f22af84ee968d
-https://conda.anaconda.org/conda-forge/osx-arm64/snappy-1.1.9-h17c5cce_2.tar.bz2#a0735d35df2c7146f49705c286502cef
+https://conda.anaconda.org/conda-forge/osx-arm64/re2-2023.02.02-hb7217d7_0.conda#407639ad13c9dc4d2510c5e2a99c2ada
+https://conda.anaconda.org/conda-forge/osx-arm64/readline-8.2-h92ec313_1.conda#8cbb776a2f641b943d413b3e19df71f4
+https://conda.anaconda.org/conda-forge/osx-arm64/snappy-1.1.10-h17c5cce_0.conda#ac82a611d1a67a598096ebaa857198e3
https://conda.anaconda.org/conda-forge/osx-arm64/tk-8.6.12-he1e0b03_0.tar.bz2#2cb3d18eac154109107f093860bd545f
https://conda.anaconda.org/conda-forge/osx-arm64/zeromq-4.3.4-hbdafb3b_1.tar.bz2#49132c08da6545dc68351ff8b659ac8e
https://conda.anaconda.org/conda-forge/osx-arm64/zlib-1.2.13-h03a7124_4.tar.bz2#34161cff4e29cc45e536abf2f13fd6b4
https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.2-hf913c23_6.conda#8f346953ef63bf5fb482488a659adcf3
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-cal-0.5.11-h4530763_0.tar.bz2#ce11646fafb17267c81d929ca42cdb5c
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-cal-0.5.21-h134b2d6_2.conda#d7024e289c587a6a6d93dd99977bb0f4
https://conda.anaconda.org/conda-forge/osx-arm64/blosc-1.21.3-h1d6ff8b_0.conda#827988373085c97417e51c30e40967c3
https://conda.anaconda.org/conda-forge/osx-arm64/boost-cpp-1.78.0-h1cb353e_1.tar.bz2#f2a34b853f0aeee4db721a1f70da6905
https://conda.anaconda.org/conda-forge/osx-arm64/brotli-bin-1.0.9-h1a8c8d9_8.tar.bz2#f212620a4f3606ff8f800b8b1077415a
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
https://conda.anaconda.org/conda-forge/osx-arm64/freetype-2.12.1-hd633e50_1.conda#33ea6326e26d1da25eb8dfa768195b82
https://conda.anaconda.org/conda-forge/osx-arm64/glog-0.6.0-h6da1cb0_0.tar.bz2#5a570729c7709399cf8511aeeda6f989
-https://conda.anaconda.org/conda-forge/osx-arm64/grpc-cpp-1.46.4-haeec53e_7.tar.bz2#a03c4a2cbdd278f0307dafe856799519
https://conda.anaconda.org/conda-forge/osx-arm64/hdf4-4.2.15-h1a38d6a_5.tar.bz2#33632080213c000ced85118a4265256d
-https://conda.anaconda.org/conda-forge/osx-arm64/krb5-1.19.3-hf9b2bbe_0.tar.bz2#e6987ad4d068dfe9037280e239b3d5a9
-https://conda.anaconda.org/conda-forge/osx-arm64/libevent-2.1.10-hbae9a57_4.tar.bz2#a1f2aca3c5999a24527d6f8a3a8e9320
-https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran-5.0.0-11_3_0_hd922786_28.conda#d91a6e1915d3f47dc65180859b75203f
+https://conda.anaconda.org/conda-forge/osx-arm64/krb5-1.20.1-h69eda48_0.conda#a85db53e45b1173f270fc998dd40ec03
+https://conda.anaconda.org/conda-forge/osx-arm64/libevent-2.1.10-h7673551_4.tar.bz2#762bda55783500f923a559e21c1cd096
+https://conda.anaconda.org/conda-forge/osx-arm64/libgfortran-5.0.0-12_2_0_hd922786_31.conda#dfc3dff1ce831c8e821f19d5d218825a
https://conda.anaconda.org/conda-forge/osx-arm64/libglib-2.74.1-h4646484_1.tar.bz2#4321cf67e46674567f419e95bae18522
-https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.51.0-hd184df1_0.conda#bbc8d6defa81887dc055d9e074d751fa
+https://conda.anaconda.org/conda-forge/osx-arm64/libgrpc-1.52.1-he98ff75_1.conda#45f3e9e7299d2a01a4d90d28c3528727
+https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.52.0-hae82a92_0.conda#1d319e95a0216f801293626a00337712
https://conda.anaconda.org/conda-forge/osx-arm64/librttopo-1.1.0-h844f84d_12.tar.bz2#abf6c60dfde69d6e632780c7b44fff6e
-https://conda.anaconda.org/conda-forge/osx-arm64/libssh2-1.10.0-hb80f160_3.tar.bz2#60f87fd8eb881a4c8094824dd112140c
-https://conda.anaconda.org/conda-forge/osx-arm64/libtiff-4.4.0-heb92581_5.conda#fb564626ea319252c2b3a5edc2f7640f
-https://conda.anaconda.org/conda-forge/osx-arm64/libxml2-2.10.3-h87b0503_0.tar.bz2#35980b9d069648c553d9322bc89ecfbf
-https://conda.anaconda.org/conda-forge/osx-arm64/libzip-1.9.2-h96606af_1.tar.bz2#66e39d7149b191cdf17804bd587d5d04
-https://conda.anaconda.org/conda-forge/osx-arm64/nss-3.88-h789eff7_0.conda#fbb3a48e2d960b2af828b1e265246acc
-https://conda.anaconda.org/conda-forge/osx-arm64/orc-1.7.6-hb9d09c9_0.tar.bz2#1bb57ec3792df86dfcde3cc1d0bbe53f
-https://conda.anaconda.org/conda-forge/osx-arm64/python-3.9.15-h2d96c93_0_cpython.conda#7c2f3d3b1483cdf61899b4fab18633d0
+https://conda.anaconda.org/conda-forge/osx-arm64/libssh2-1.10.0-h7a5bd25_3.tar.bz2#1ffa4340e73809db5a7516cb1a7425a7
+https://conda.anaconda.org/conda-forge/osx-arm64/libtiff-4.5.0-h5dffbdd_2.conda#8e08eae60de32c940096ee9b4da35685
+https://conda.anaconda.org/conda-forge/osx-arm64/libxml2-2.10.3-h67585b2_4.conda#3b3f67d1c9d66e873ca91c87640a1d1b
+https://conda.anaconda.org/conda-forge/osx-arm64/libzip-1.9.2-h76ab92c_1.tar.bz2#eee3b4ab0b5b71fbda7900785f3a46fa
+https://conda.anaconda.org/conda-forge/osx-arm64/nss-3.89-h789eff7_0.conda#dbb6be9468b513522e0b03d30cc7f1fd
+https://conda.anaconda.org/conda-forge/osx-arm64/orc-1.8.3-hef0d403_0.conda#5fe39445f76fa6f2a02b8033f2e5872b
+https://conda.anaconda.org/conda-forge/osx-arm64/python-3.9.16-hea58f1e_0_cpython.conda#d2dfc4fe1da1624e020334b1000c6a3d
https://conda.anaconda.org/conda-forge/osx-arm64/sqlite-3.40.0-h2229b38_0.tar.bz2#e0176ac0a33639feca897a66ed1fe177
https://conda.anaconda.org/conda-forge/osx-arm64/unixodbc-2.3.10-hb39ff51_0.tar.bz2#a5a930a1c270a9c9d571179463e571c0
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
https://conda.anaconda.org/conda-forge/noarch/appnope-0.1.3-pyhd8ed1ab_0.tar.bz2#54ac328d703bff191256ffa1183126d1
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/osx-arm64/atk-1.0-2.38.0-hcb7b3dd_1.tar.bz2#3c98bfeed7717a9cf5af18c295f49f3a
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-io-0.10.5-hea86ef8_0.tar.bz2#03d1eeb5706292ae6570456b98f38dcb
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-io-0.13.19-ha2443f3_3.conda#e1d454418cb21d2a4fdf456afa81f37a
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
https://conda.anaconda.org/conda-forge/osx-arm64/backports.zoneinfo-0.2.1-py39h2804cbe_7.tar.bz2#53ed254446fa05b6c7efda9cabe03630
-https://conda.anaconda.org/conda-forge/osx-arm64/bitarray-2.7.2-py39h02fc5c5_0.conda#316fce23e62ec0d4ebf50a0ea8f06e37
+https://conda.anaconda.org/conda-forge/osx-arm64/bitarray-2.7.3-py39h02fc5c5_0.conda#cfa653492a35af0678ac00864bc45ed2
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/osx-arm64/brotli-1.0.9-h1a8c8d9_8.tar.bz2#e2a5e381ddd6529eb62e7710270b2ec5
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-unix_pyhd8ed1ab_2.tar.bz2#20e4087407c7cb04a40817114b333dbf
https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.2.1-pyhd8ed1ab_0.conda#b325bfc4cff7d7f8a868f1f7ecc4ed16
@@ -119,31 +122,34 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/osx-arm64/debugpy-1.6.6-py39h23fbdae_0.conda#fba081090f706bbba45457d160ddb76c
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/osx-arm64/fontconfig-2.14.2-h82840c6_0.conda#f77d47ddb6d3cc5b39b9bdf65635afbb
-https://conda.anaconda.org/conda-forge/osx-arm64/freetds-1.3.16-h10014b9_0.conda#ec7c9ba65cec93f9f81df151448d2ccc
+https://conda.anaconda.org/conda-forge/osx-arm64/freetds-1.1.15-h27bbca2_1.tar.bz2#0a00830573641771b858bdc392707e0a
https://conda.anaconda.org/conda-forge/osx-arm64/frozenlist-1.3.3-py39h02fc5c5_0.tar.bz2#4b03833708b32a3f45e518853f82733b
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
-https://conda.anaconda.org/conda-forge/osx-arm64/gdk-pixbuf-2.42.8-h4f389bb_1.tar.bz2#062a406a54b8feb09213e0de74c17abf
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/osx-arm64/gdk-pixbuf-2.42.10-h9bcf4fe_0.conda#9e8a24e2ffa9bb8200cef965af01af06
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/osx-arm64/greenlet-2.0.2-py39h23fbdae_0.conda#aa5770d74752f0ecf2cb50586cde7f41
+https://conda.anaconda.org/conda-forge/osx-arm64/grpcio-1.52.1-py39h23fbdae_1.conda#b5788df8787a2116eea6253a80082e5a
https://conda.anaconda.org/conda-forge/osx-arm64/gts-0.7.6-h4b6d4d6_2.tar.bz2#285247d54dbf40121f79a6e025c04df4
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.5-pyhd8ed1ab_0.conda#953a312b272f37d39fe9d09f46734622
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/osx-arm64/kiwisolver-1.4.4-py39haaf3ac1_1.tar.bz2#5f43e4d5437b93606167c640ea2d06c1
-https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.14-h8193b64_0.tar.bz2#9bc9a1c491795c92568481b6ab59d9c5
-https://conda.anaconda.org/conda-forge/osx-arm64/libcurl-7.86.0-hd538317_1.tar.bz2#64af094274984c756c18dbbe59327a45
+https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.15-h481adae_0.conda#806395a21421da524d72aa4e0b69d54c
+https://conda.anaconda.org/conda-forge/osx-arm64/libcurl-7.88.1-h9049daf_1.conda#148e2e109774943f699768703502a918
https://conda.anaconda.org/conda-forge/osx-arm64/libkml-1.3.0-h41464e4_1015.tar.bz2#6404f2ec1ee91e48175d9e5ee1dbca5f
https://conda.anaconda.org/conda-forge/osx-arm64/libopenblas-0.3.21-openmp_hc731615_3.tar.bz2#2a980a5d8cc34ce70d339b983f9920de
-https://conda.anaconda.org/conda-forge/osx-arm64/libpq-15.1-hb650857_1.conda#0ffee7d6b76a2b69c0bf8ed8ba97bf82
-https://conda.anaconda.org/conda-forge/osx-arm64/libthrift-0.16.0-h1a74c4f_2.tar.bz2#8949545ae9641f7483a88abc3635b07a
-https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-1.2.4-h328b37c_0.tar.bz2#194c8df68e6966f8e012cd326e42c31d
+https://conda.anaconda.org/conda-forge/osx-arm64/libpq-15.2-h1a28acd_0.conda#36fd96c2586fb726f9aa4dccea769efa
+https://conda.anaconda.org/conda-forge/osx-arm64/libthrift-0.18.1-h6635e49_0.conda#c6f3d11f5df3a9cce701b4e7853cf907
+https://conda.anaconda.org/conda-forge/osx-arm64/libwebp-1.2.4-h999c80f_1.conda#8e0866db2c7808ad9058848c47e6d6ff
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/osx-arm64/lz4-4.3.2-py39hb35ce34_0.conda#6c875c9de482e081dc1de53854e58a94
https://conda.anaconda.org/conda-forge/osx-arm64/markupsafe-2.1.2-py39h02fc5c5_0.conda#525d6fb3283d4b90cd9f92c9811214af
@@ -151,18 +157,18 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/osx-arm64/msgpack-python-1.0.4-py39haaf3ac1_1.tar.bz2#69aa331a4a84802bdc3a003a98b454aa
+https://conda.anaconda.org/conda-forge/osx-arm64/msgpack-python-1.0.5-py39haaf3ac1_0.conda#8e142afe3469a80ffd282864a71b793c
https://conda.anaconda.org/conda-forge/osx-arm64/multidict-6.0.4-py39h02fc5c5_0.conda#e7999ad8adcd7fc5ba9a3088cf3f72c5
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
-https://conda.anaconda.org/conda-forge/osx-arm64/openjpeg-2.5.0-h5d4e404_1.tar.bz2#4d65dff04bceb645c98a514c52df217f
+https://conda.anaconda.org/conda-forge/osx-arm64/openjpeg-2.5.0-hbc2ba62_2.conda#c3e184f0810a4614863569488b1ac709
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
@@ -177,26 +183,24 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/osx-arm64/pycryptodomex-3.16.0-py39h02fc5c5_0.conda#c4d7f6373d8f3ffc13790e26c4cf181e
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/osx-arm64/pyrsistent-0.19.3-py39h02fc5c5_0.conda#750d82d39fc4c317590580dbf2e7a943
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/osx-arm64/pyyaml-6.0-py39h02fc5c5_5.tar.bz2#0f0d3b67c91d129e1fd912985880eaa5
-https://conda.anaconda.org/conda-forge/osx-arm64/pyzmq-25.0.0-py39h0553236_0.conda#cd341977316dbfd3f12f54c7f2ecda21
-https://conda.anaconda.org/conda-forge/osx-arm64/regex-2022.10.31-py39h02fc5c5_0.tar.bz2#4fc77163804525b05a455f7fac6233b7
+https://conda.anaconda.org/conda-forge/osx-arm64/pyzmq-25.0.2-py39h0553236_0.conda#b800d745c90896b65ebffc7e54ede8cc
+https://conda.anaconda.org/conda-forge/osx-arm64/regex-2023.3.23-py39h02fc5c5_0.conda#d5d5c022807167aef3b4a1b11af14719
https://conda.anaconda.org/conda-forge/osx-arm64/rtree-1.0.1-py39hb28b0e7_1.tar.bz2#9fbe11ad3786a4ff0cbb3b5950b177cd
-https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.0.249-py39hd82242d_0.conda#26ede36088f7baa23c75218c1b19bf70
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.0.259-py39hd82242d_0.conda#cb671e690e247bd28e0b62b4a69a057a
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -206,19 +210,21 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/osx-arm64/tornado-6.2-py39h02fc5c5_1.tar.bz2#54bb01d39f399f9e846530f824db4b03
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/osx-arm64/unicodedata2-15.0.0-py39h02fc5c5_0.tar.bz2#1371c4d91f9c3edf170200a1374cb3e8
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.5-pyhd8ed1ab_0.conda#2af53b3894fb9bdbb3679c0d31028b1b
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-event-stream-0.2.7-h9972306_13.tar.bz2#1aa327d20aec700b23809ce8c1da34cd
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-event-stream-0.2.20-ha370d96_4.conda#06f67e990e792f186eaef7d90042bf49
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-http-0.7.6-hca61f3c_0.conda#a31434a64509cd494d92442ed1ad4371
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/osx-arm64/cairo-1.16.0-h73a0509_1014.tar.bz2#be2ea75899a7b1f1dd59a862fac655ee
@@ -226,41 +232,41 @@ https://conda.anaconda.org/conda-forge/osx-arm64/cffi-1.15.1-py39h7e6b969_3.cond
https://conda.anaconda.org/conda-forge/osx-arm64/cfitsio-4.2.0-h2f961c4_0.conda#10112a8b1b7b479c7d4e87c9ade892eb
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
-https://conda.anaconda.org/conda-forge/osx-arm64/coverage-7.1.0-py39h02fc5c5_0.conda#abe9ca542c29c3b9963f5baaf64bf827
-https://conda.anaconda.org/conda-forge/osx-arm64/curl-7.86.0-hd538317_1.tar.bz2#068fc793cf5223be665bcd6d35a2f28f
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/osx-arm64/coverage-7.2.2-py39h02fc5c5_0.conda#3ce044d44d8e4e4200dbe0dac2dd63e7
+https://conda.anaconda.org/conda-forge/osx-arm64/curl-7.88.1-h9049daf_1.conda#8df5e92aeb9de416919a64f116698761
https://conda.anaconda.org/conda-forge/osx-arm64/cytoolz-0.12.0-py39h02fc5c5_1.tar.bz2#97df64efb321b00139181cbbb9615a66
-https://conda.anaconda.org/conda-forge/osx-arm64/fastavro-1.7.1-py39h02fc5c5_0.conda#fda897c6835fe721ac1d3f281b3deb68
-https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.38.0-py39h02fc5c5_1.tar.bz2#bad1666f9a5aa9743e2be7b6818d752a
+https://conda.anaconda.org/conda-forge/osx-arm64/fastavro-1.7.3-py39h02fc5c5_0.conda#17a6f3459c5cb03c68a418f51be28b9f
+https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.39.2-py39h02fc5c5_0.conda#e5e6b3430008049193c9a090cb8784e0
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/osx-arm64/grpcio-1.46.4-py39h8e34ec7_7.tar.bz2#6b37200f00300837e7aacea76bc4b8d8
-https://conda.anaconda.org/conda-forge/osx-arm64/hdf5-1.12.2-nompi_h8968d4b_100.tar.bz2#6013e6a360be49d947d42b82f6a5a682
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/osx-arm64/hdf5-1.12.2-nompi_ha7af310_101.conda#050df57fed623d4b6aa817e9c8bdbfaa
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
https://conda.anaconda.org/conda-forge/osx-arm64/libblas-3.9.0-16_osxarm64_openblas.tar.bz2#53d6d5097f0d62e24db8c1979a21102e
-https://conda.anaconda.org/conda-forge/osx-arm64/libgd-2.3.3-hede1055_3.tar.bz2#8bbd974c213208687dc289d50feb5c65
-https://conda.anaconda.org/conda-forge/osx-arm64/libgoogle-cloud-2.1.0-hec15cb4_1.tar.bz2#ab0eccace6b28dbf2515897b7105fa68
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/osx-arm64/libgd-2.3.3-h90fb8ed_4.conda#03c52c3cdcf9f4cf70e07135254b799f
+https://conda.anaconda.org/conda-forge/osx-arm64/libgoogle-cloud-2.8.0-h7206bc8_1.conda#4101b82f92955893124421a303673986
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
-https://conda.anaconda.org/conda-forge/osx-arm64/pillow-9.2.0-py39h139752e_3.tar.bz2#9a8ba1da3956c2f1a1b1f8f866adcacb
+https://conda.anaconda.org/conda-forge/osx-arm64/pillow-9.4.0-py39h8bd98a6_1.conda#90500f863712b55483294662f1f5f5f1
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-15.1-hf80b784_1.conda#69956ca98448a03365575522744fc9f2
-https://conda.anaconda.org/conda-forge/osx-arm64/proj-9.1.0-h3bdf472_0.tar.bz2#84796e1049fba379566c5b1cc3ac9e2b
-https://conda.anaconda.org/conda-forge/osx-arm64/protobuf-3.20.2-py39h23fbdae_1.conda#ba8b97d316b66e699cfba77833d732c1
-https://conda.anaconda.org/conda-forge/osx-arm64/psycopg2-2.9.3-py39h74ffc5b_2.conda#f025b3a31bd05ad2df698d96df0e8ce4
+https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-15.2-h45c140d_0.conda#9f35737220640a8de16d09b59914498f
+https://conda.anaconda.org/conda-forge/osx-arm64/proj-9.1.1-h13f728c_2.conda#6924682abbbe34aa837c64ca0016ec8e
+https://conda.anaconda.org/conda-forge/osx-arm64/protobuf-4.21.12-py39h23fbdae_0.conda#0b221c03b2823acffb6365b8cc31e887
+https://conda.anaconda.org/conda-forge/osx-arm64/psycopg2-2.9.3-py39hf0b313e_2.conda#c614ae5b1b8eb9178063022c6061432a
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
-https://conda.anaconda.org/conda-forge/osx-arm64/pymssql-2.2.7-py39h23fbdae_0.conda#19880cdb3e323fb9d95d4ec42449dc63
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/osx-arm64/pymssql-2.2.5-py39h23fbdae_2.tar.bz2#4be75185e9ee55c9dc443c6a9439eb02
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/osx-arm64/pytz-deprecation-shim-0.1.0.post0-py39h2804cbe_3.tar.bz2#e976c04572369421dba4ad535407d3e1
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
@@ -269,23 +275,23 @@ https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf4
https://conda.anaconda.org/conda-forge/osx-arm64/sqlalchemy-1.4.46-py39h02fc5c5_0.conda#2af39c1b565e2b3ac9107e958839f37f
https://conda.anaconda.org/conda-forge/osx-arm64/thrift-0.16.0-py39h23fbdae_2.tar.bz2#87c45dcd82b83aedb358fba251671fc8
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/osx-arm64/watchdog-2.2.1-py39h02fc5c5_0.conda#fa89fc8892a56242757300c265957e73
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/osx-arm64/watchdog-3.0.0-py39h02fc5c5_0.conda#832eeb2465b00f3b8371592323cad54c
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/osx-arm64/xerces-c-3.2.4-h627aa08_1.tar.bz2#e690c8c477c96c9f8ad9f7c63f1f94d2
https://conda.anaconda.org/conda-forge/osx-arm64/yarl-1.8.2-py39h02fc5c5_0.conda#853f734f0c77512e4fa012a2f8dfc9cd
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
-https://conda.anaconda.org/conda-forge/osx-arm64/aws-sdk-cpp-1.8.186-h392f50b_4.tar.bz2#d27eeebe0e48c6c4cbd21a09f575f496
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-auth-0.6.26-h9ec8a34_1.conda#9b6e888da325885e2afc3be552fc6191
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-mqtt-0.8.6-hcd3fa0e_12.conda#3ebeacc4c1ec79ba87cd5a0bab192910
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/osx-arm64/brotlipy-0.7.0-py39h02fc5c5_1005.tar.bz2#cf0b1f6f29ee28e7b20d49cb66bae19e
-https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-38.0.4-py39haa0b8cc_0.conda#9b6d42619d774e81695ae50d1cafa76c
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-38.0.4-py39he2a39a8_0.conda#d6194b87c80eec7698dd65fecfba8bba
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
-https://conda.anaconda.org/conda-forge/osx-arm64/geotiff-1.7.1-h90559a4_4.tar.bz2#01946796ab730299feff7026b1f0d222
+https://conda.anaconda.org/conda-forge/osx-arm64/geotiff-1.7.1-hdcdc974_6.conda#6cb68e5148f9c41564eb840c89b8f7bc
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
https://conda.anaconda.org/conda-forge/osx-arm64/google-crc32c-1.1.2-py39h17a57db_4.tar.bz2#c9e1b71cc9d98d32ac2c8a9d22b67dee
@@ -293,116 +299,124 @@ https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-py
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
https://conda.anaconda.org/conda-forge/osx-arm64/harfbuzz-6.0.0-hddbc195_0.conda#bc6503f2956775e3d6e481d7588b7998
https://conda.anaconda.org/conda-forge/noarch/importlib-resources-5.12.0-pyhd8ed1ab_0.conda#3544c818f0720c89eb16ae6940ab440b
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/osx-arm64/kealib-1.5.0-hfd766a6_0.conda#3041514025aa54cad642e24061b6b6f6
https://conda.anaconda.org/conda-forge/osx-arm64/libcblas-3.9.0-16_osxarm64_openblas.tar.bz2#c7cfc18378f00d3faf7f8a9a2553be3c
-https://conda.anaconda.org/conda-forge/osx-arm64/libdap4-3.20.6-h8510809_2.tar.bz2#b61547e8f0c4fb57318482666c07d6ca
https://conda.anaconda.org/conda-forge/osx-arm64/liblapack-3.9.0-16_osxarm64_openblas.tar.bz2#52d270c579bfca986d6cdd81eb5ed6e7
-https://conda.anaconda.org/conda-forge/osx-arm64/libnetcdf-4.8.1-nompi_h2510be2_106.tar.bz2#c5d2afa0f2bc4eca5be78c438a41de2e
-https://conda.anaconda.org/conda-forge/osx-arm64/libspatialite-5.0.1-h558e587_22.tar.bz2#e766cf477817d5fcce530d40c9d97a96
+https://conda.anaconda.org/conda-forge/osx-arm64/libnetcdf-4.9.1-nompi_h232cb48_101.conda#87dd4b0e9fe52d1b43bf0d5e7be28fc3
+https://conda.anaconda.org/conda-forge/osx-arm64/libspatialite-5.0.1-h14115fc_23.conda#2f80ac3b18bf574bb497f9f52966cd4e
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
-https://conda.anaconda.org/conda-forge/osx-arm64/poppler-22.12.0-hae7f5f0_0.conda#8bc158f737f4119d494e288ee0880cd2
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/osx-arm64/poppler-23.03.0-h9564b9f_0.conda#a04f2bd0e84b74d694ae65ab9ec09c0b
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
-https://conda.anaconda.org/conda-forge/osx-arm64/pyproj-3.4.1-py39h8a4ac70_0.conda#3d7e5383a3e63d6be81b915359b1a8b5
+https://conda.anaconda.org/conda-forge/osx-arm64/pyproj-3.4.1-py39hbb572e0_1.conda#72c46159aefe35590254e9a6bb1e5773
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/osx-arm64/tiledb-2.13.2-hc7ac4c9_0.conda#71844097f1f47854bb55d8928482cf25
-https://conda.anaconda.org/conda-forge/osx-arm64/tzlocal-4.2-py39h2804cbe_2.tar.bz2#427d4289a3e6b2d6394da0195adf59d3
+https://conda.anaconda.org/conda-forge/osx-arm64/tiledb-2.13.2-h9bd36d0_0.conda#d3a88ffe0cbfbd8d3532bb8ef46f0626
+https://conda.anaconda.org/conda-forge/osx-arm64/tzlocal-4.3-py39h2804cbe_0.conda#28a9180c8c8a3c77d7809217cf94b2d6
+https://conda.anaconda.org/conda-forge/osx-arm64/ukkonen-1.0.1-py39haaf3ac1_3.tar.bz2#a16daaebbfd9a3e4d1f71c0c6283dc57
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
https://conda.anaconda.org/conda-forge/osx-arm64/aiohttp-3.8.4-py39h02fc5c5_0.conda#4d2b451aa718fd0d38e35e84206f996f
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-s3-0.2.7-hc514de9_1.conda#d585d309fcced2a4e7b94a439f204d42
https://conda.anaconda.org/conda-forge/osx-arm64/black-23.1.0-py39h2804cbe_0.conda#dd7e4a908ad555a887e36533df9fac9d
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/osx-arm64/jupyter_core-5.2.0-py39h2804cbe_0.conda#f2b8d1874e8dec1334004d09cbcd112c
-https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.5.3-h28a98fa_10.conda#92ee56461fa1874bcc69ea168dfbe94e
+https://conda.anaconda.org/conda-forge/osx-arm64/jupyter_core-5.3.0-py39h2804cbe_0.conda#bc0f16edb3ef7d3c5e1cb975d85201a8
+https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.6.2-h8d4b95d_9.conda#2f2e0c9c1ec238e79fd94c5f0ba35827
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/osx-arm64/numpy-1.24.2-py39hff61c6a_0.conda#894fca4ee0ea0bfef6ebca15d6d8196e
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
-https://conda.anaconda.org/conda-forge/osx-arm64/pango-1.50.13-h6c112b8_0.conda#3ffd7fede31a774ad8f3dc9114897daa
+https://conda.anaconda.org/conda-forge/osx-arm64/pango-1.50.14-h6c112b8_0.conda#1e6300d15e38bad0d52871251190b5e8
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/osx-arm64/arrow-cpp-8.0.1-py39h744a0ab_2_cpu.tar.bz2#6fc2da9911d50ab3e6e1d6572eeba55c
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-crt-cpp-0.19.8-h6be2766_12.conda#cdfee90317474a42d31eb3ea3752e60c
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/osx-arm64/contourpy-1.0.7-py39haaf3ac1_0.conda#221d648082c1ebdd89e6968441b5a9c5
-https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.5.3-py39h07a3771_10.conda#db7dc96a0c7bf72b6e7f5d34676fb98a
+https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.6.2-py39h766d3fc_9.conda#440612bb309cfb8792ac85c10077688f
https://conda.anaconda.org/conda-forge/osx-arm64/gtk2-2.24.33-h57013de_2.tar.bz2#144fb77338d90012ebe80d3dd13fc725
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyhd1c38e8_0.conda#e67b634578fefbb312cd6cfd34b63d86
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/osx-arm64/librsvg-2.54.4-ha2634a2_0.tar.bz2#a9fe78f1beab7f0a90581518a0e11311
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
https://conda.anaconda.org/conda-forge/osx-arm64/pandas-1.5.3-py39hde7b980_0.conda#694bdfe194977ddb7588e05f57ce295c
-https://conda.anaconda.org/conda-forge/osx-arm64/polars-0.16.7-py39hb39fadb_0.conda#8ec0c4d13c25069018f7684ab6fbb623
+https://conda.anaconda.org/conda-forge/osx-arm64/polars-0.16.16-py39hb39fadb_0.conda#0a332013217b00e9c14c12da9aa1ac45
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
https://conda.anaconda.org/conda-forge/osx-arm64/shapely-1.8.5-py39h472ea82_2.tar.bz2#d7691e859f86d4535844430fdf8a3953
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/osx-arm64/fiona-1.8.22-py39hb828934_2.tar.bz2#f3441723062974c537d68a0d5af91de7
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/osx-arm64/aws-sdk-cpp-1.10.57-h3daea3c_8.conda#c35e6a52b070dfabe03e4fb63b5da47d
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/osx-arm64/fiona-1.9.1-py39h9e5269e_0.conda#ad8c1ba7bf631a2af8fb24d749c3147e
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
-https://conda.anaconda.org/conda-forge/osx-arm64/graphviz-7.0.5-h4f8fbd6_0.conda#88ead4365a188ffd036644a0b7931b0e
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh736e0ef_0.conda#aa43ffb10a39d9eb2538761a3f838a87
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
-https://conda.anaconda.org/conda-forge/osx-arm64/matplotlib-base-3.7.0-py39h35e9e80_0.conda#b1cb106fe4b56bc144c7b18d4f1c2ec1
+https://conda.anaconda.org/conda-forge/osx-arm64/graphviz-7.1.0-h4f8fbd6_0.conda#6840266ed0788c5c4c8429bf42c4b36d
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyhd1c38e8_0.conda#e88ca7d30e60645b2621c888029b85f1
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/osx-arm64/matplotlib-base-3.7.1-py39h35e9e80_0.conda#d988ccc3ef2c093353ad1bb8ed9805ea
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.4-pyhd8ed1ab_0.conda#9dea5ab3cc33084f7a3680a98859731e
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh736e0ef_0.conda#3bbe4a71a9d5d8e13c1504e3cd077b32
+https://conda.anaconda.org/conda-forge/osx-arm64/libarrow-11.0.0-hdcd110a_13_cpu.conda#b8915aea8d4857228a292d672f01460a
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
-https://conda.anaconda.org/conda-forge/osx-arm64/pyarrow-8.0.1-py39ha7dbb43_2_cpu.tar.bz2#830643d45718ad21e5212e1b64f81b6d
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/osx-arm64/arrow-cpp-11.0.0-hce30654_13_cpu.conda#ecd5efe74f31a2c6c244f81038ec9e35
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/osx-arm64/python-duckdb-0.7.0-py39h1305b9c_1.conda#0d26171f31caa4b5e0aa0ce6cd34bc12
-https://conda.anaconda.org/conda-forge/osx-arm64/scipy-1.10.0-py39h18313fe_2.conda#fdd930b6cca23bb9867e4731fa345d6a
-https://conda.anaconda.org/conda-forge/osx-arm64/snowflake-connector-python-2.8.3-py39ha423d07_0.conda#d03394aa1b297a982593808ff0c24b1b
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/osx-arm64/scipy-1.10.1-py39h18313fe_0.conda#2ee2f9d93cfbd4e9836ad2de9421907d
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/osx-arm64/scikit-learn-1.2.1-py39h57c6424_0.conda#ae5a8a14380ca801f88b671590088199
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
+https://conda.anaconda.org/conda-forge/osx-arm64/scikit-learn-1.2.2-py39h6180588_1.conda#a512813627bf4f2feb19bb4e114a5ce0
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/osx-arm64/pyarrow-11.0.0-py39hfdcab31_13_cpu.conda#13a5329547c27e098700732b923298ce
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.1.0-pyhd8ed1ab_0.tar.bz2#b0816cdad1ed5f376831b1c36a74106b
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.1.0-pyhd8ed1ab_0.tar.bz2#1d66863d0c73e517fbcfd859e89d3b4d
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/osx-arm64/python-duckdb-0.7.1-py39h1305b9c_0.conda#843fed8f70bc029a0466e22ca7cab037
+https://conda.anaconda.org/conda-forge/osx-arm64/snowflake-connector-python-3.0.2-py39h779302d_0.conda#790b86b2493cec5c4c03c53d26ae87ec
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
diff --git a/win-64-3.10.lock b/win-64-3.10.lock
index 8cb8a23..81ccc14 100644
--- a/win-64-3.10.lock
+++ b/win-64-3.10.lock
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
-# input_hash: bd86aaeca87ae7374ef3a55c244cd8ac9e90098ce102c67524cb11f0871ac21a
+# input_hash: 0fd828c02ea928c72e8eddbfbac00fa4ae207714eed301526c5e7a47fd5a6047
@EXPLICIT
https://conda.anaconda.org/conda-forge/win-64/ca-certificates-2022.12.7-h5b45459_0.conda#31de4d9887dc8eaed9e6230a5dfbb9d6
https://conda.anaconda.org/conda-forge/noarch/font-ttf-dejavu-sans-mono-2.37-hab24e00_0.tar.bz2#0c96522c6bdaed4b1566d11387caaf45
@@ -9,11 +9,11 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77
https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2023.0.0-h57928b3_25922.conda#8ecf3a448f5a35bd30cb39ddc2a19058
https://conda.anaconda.org/conda-forge/win-64/msys2-conda-epoch-20160418-1.tar.bz2#b0309b72560df66f71a9d5e34a5efdfa
-https://conda.anaconda.org/conda-forge/win-64/pandoc-2.19.2-h57928b3_1.tar.bz2#94bac372f90d1402ddd1df0f4cf67656
+https://conda.anaconda.org/conda-forge/win-64/pandoc-3.1.1-h57928b3_0.conda#71f11eb19ae575ee0b52d0d58fb018f3
https://conda.anaconda.org/conda-forge/win-64/perl-5.32.1.1-2_h57928b3_strawberry.tar.bz2#c2f85039cbc767518ff2f701638e37c4
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/win-64/python_abi-3.10-3_cp310.conda#f4cfd883c0d91bb17164d8e34f4900d5
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/win-64/ucrt-10.0.22621.0-h57928b3_0.tar.bz2#72608f6cd3e5898229c3ea16deb1ac43
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/win-64/m2w64-gmp-6.1.0-2.tar.bz2#53a1c73e1e3d185516d7e3af177596d9
@@ -22,7 +22,7 @@ https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.34.31931-h4c5c07
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libs-core-5.3.0-7.tar.bz2#4289d80fb4d272f1f3b56cfe87ac90bd
https://conda.anaconda.org/conda-forge/win-64/vc-14.3-hb6edc58_10.conda#52d246d8d14b83c516229be5bb03a163
-https://conda.anaconda.org/conda-forge/win-64/aws-c-common-0.6.2-h8ffe710_0.tar.bz2#7eb3e6859d0da38fe0bff50391e7f9dc
+https://conda.anaconda.org/conda-forge/win-64/aws-c-common-0.8.14-hcfcfb64_0.conda#6bc5797d31bbbd38b993a5c8356cbb87
https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-h8ffe710_4.tar.bz2#7c03c66026944073040cb19a4f3ec3c9
https://conda.anaconda.org/conda-forge/win-64/c-ares-1.18.1-h8ffe710_0.tar.bz2#6aa55bbdfe054ea36c1c99d3adace8d9
https://conda.anaconda.org/conda-forge/win-64/expat-2.5.0-h1537add_0.tar.bz2#6b20c31bd735d2dd5c79ddb5b3524619
@@ -34,7 +34,7 @@ https://conda.anaconda.org/conda-forge/win-64/graphite2-1.3.13-1000.tar.bz2#8fc0
https://conda.anaconda.org/conda-forge/win-64/icu-70.1-h0e60522_0.tar.bz2#64073396a905b6df895ab2489fae3847
https://conda.anaconda.org/conda-forge/win-64/jpeg-9e-hcfcfb64_3.conda#824f1e030d224e9e376a4655032fdbc7
https://conda.anaconda.org/conda-forge/win-64/lerc-4.0.0-h63175ca_0.tar.bz2#1900cb3cab5055833cfddb0ba233b074
-https://conda.anaconda.org/conda-forge/win-64/libabseil-20220623.0-cxx17_h1a56200_6.conda#5a3b4c52be0bd9dd8718c560e38db140
+https://conda.anaconda.org/conda-forge/win-64/libabseil-20230125.0-cxx17_h63175ca_1.conda#768d0974049a1146ff45579a05b112ca
https://conda.anaconda.org/conda-forge/win-64/libaec-1.0.6-h63175ca_1.conda#f98474a8245f55f4a273889dbe7bf193
https://conda.anaconda.org/conda-forge/win-64/libbrotlicommon-1.0.9-hcfcfb64_8.tar.bz2#e8078e37208cd7d3e1eb5053f370ded8
https://conda.anaconda.org/conda-forge/win-64/libcrc32c-1.1.2-h0e60522_0.tar.bz2#cd4cc2d0c610c8cb5419ccc979f2d6ce
@@ -45,52 +45,53 @@ https://conda.anaconda.org/conda-forge/win-64/libsodium-1.0.18-h8d14728_1.tar.bz
https://conda.anaconda.org/conda-forge/win-64/libspatialindex-1.9.3-h39d44d4_4.tar.bz2#51c172496e828258d04eba9971f2af1a
https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.40.0-hcfcfb64_0.tar.bz2#5e5a97795de72f8cc3baf3d9ea6327a2
https://conda.anaconda.org/conda-forge/win-64/libutf8proc-2.8.0-h82a8f57_0.tar.bz2#076894846fe9f068f91c57d158c90cba
-https://conda.anaconda.org/conda-forge/win-64/libwebp-base-1.2.4-h8ffe710_0.tar.bz2#0a09bd195ebeaff5711ccae93ac132ad
+https://conda.anaconda.org/conda-forge/win-64/libwebp-base-1.3.0-hcfcfb64_0.conda#381a3645c51cbf478872899b16490318
https://conda.anaconda.org/conda-forge/win-64/libzlib-1.2.13-hcfcfb64_4.tar.bz2#0cc5c5cc64ee1637f37f8540a175854c
https://conda.anaconda.org/conda-forge/win-64/lz4-c-1.9.4-hcfcfb64_0.conda#e34720eb20a33fc3bfb8451dd837ab7a
https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libgfortran-5.3.0-6.tar.bz2#066552ac6b907ec6d72c0ddab29050dc
-https://conda.anaconda.org/conda-forge/win-64/openssl-1.1.1t-hcfcfb64_0.conda#f47342fb350e6d2a233304f750c3502d
+https://conda.anaconda.org/conda-forge/win-64/openssl-3.1.0-hcfcfb64_0.conda#4245a25fae1aaf85bc3fbf6fc29c2d5d
https://conda.anaconda.org/conda-forge/win-64/pixman-0.40.0-h8ffe710_0.tar.bz2#32b45d3fcffddc84cc1a014a0b5f0d58
https://conda.anaconda.org/conda-forge/win-64/pthreads-win32-2.9.1-hfa6e2cd_3.tar.bz2#e2da8758d7d51ff6aa78a14dfb9dbed4
-https://conda.anaconda.org/conda-forge/win-64/re2-2022.06.01-h0e60522_1.conda#dcff2309ccfcec47248ebb6f502c35ff
-https://conda.anaconda.org/conda-forge/win-64/snappy-1.1.9-hfb803bf_2.tar.bz2#073b08c65807f205d990ace14ccacdb2
+https://conda.anaconda.org/conda-forge/win-64/re2-2023.02.02-h63175ca_0.conda#586130698a48cd88f76e3fba5f091243
+https://conda.anaconda.org/conda-forge/win-64/snappy-1.1.10-hfb803bf_0.conda#cff1df79c9cff719460eb2dd172568de
https://conda.anaconda.org/conda-forge/win-64/tk-8.6.12-h8ffe710_0.tar.bz2#c69a5047cc9291ae40afd4a1ad6f0c0f
-https://conda.anaconda.org/conda-forge/win-64/xerces-c-3.2.4-h63175ca_1.tar.bz2#b026982f81a6aba1e8ce2525ba640632
+https://conda.anaconda.org/conda-forge/win-64/xerces-c-3.2.4-h63175ca_2.conda#8ba57760b15d0c2493192908317bdf5e
https://conda.anaconda.org/conda-forge/win-64/xz-5.2.6-h8d14728_0.tar.bz2#515d77642eaa3639413c6b1bc3f94219
https://conda.anaconda.org/conda-forge/win-64/yaml-0.2.5-h8ffe710_2.tar.bz2#adbfb9f45d1004a26763652246a33764
-https://conda.anaconda.org/conda-forge/win-64/aws-c-cal-0.5.11-he19cf47_0.tar.bz2#c8b314ff705e4de32640c748e5b9c8d2
-https://conda.anaconda.org/conda-forge/win-64/aws-checksums-0.1.11-h1e232aa_7.tar.bz2#c9fde0c43dce1a8eecbef5368396742c
-https://conda.anaconda.org/conda-forge/win-64/freetds-1.3.16-pl5321hfe0aba9_0.conda#40463ad15ddabdd29c419a5eeb92b10b
+https://conda.anaconda.org/conda-forge/win-64/aws-c-cal-0.5.21-h7cda486_2.conda#049fc3fb095e7838621382a696abcfda
+https://conda.anaconda.org/conda-forge/win-64/aws-c-compression-0.2.16-h8a79959_5.conda#0a790b22ec9cf8aff76fdd3150d784aa
+https://conda.anaconda.org/conda-forge/win-64/aws-c-sdkutils-0.1.8-h8a79959_0.conda#2bf14b763bda622122577f11b03579d5
+https://conda.anaconda.org/conda-forge/win-64/aws-checksums-0.1.14-h8a79959_5.conda#427baa843cb7d3bbac662efb193d27ed
+https://conda.anaconda.org/conda-forge/win-64/freetds-1.3.16-pl5321hf43717d_0.conda#ca29852204cf1fb50fbc56c9f0a8681a
https://conda.anaconda.org/conda-forge/win-64/freexl-1.0.6-h67ca5e6_1.tar.bz2#7ddb6e879c46e78eec37f956b3ffe743
https://conda.anaconda.org/conda-forge/win-64/gettext-0.21.1-h5728263_0.tar.bz2#299d4fd6798a45337042ff5a48219e5f
https://conda.anaconda.org/conda-forge/win-64/glog-0.6.0-h4797de2_0.tar.bz2#fdc11ab9a621f009995e89f52bea3004
-https://conda.anaconda.org/conda-forge/win-64/krb5-1.20.1-h6609f42_0.conda#a962b5937824124553d53bd9f535cc71
+https://conda.anaconda.org/conda-forge/win-64/krb5-1.20.1-heb0366b_0.conda#a07b05ee8f451ab15698397185efe989
https://conda.anaconda.org/conda-forge/win-64/libbrotlidec-1.0.9-hcfcfb64_8.tar.bz2#99839d9d81f33afa173c0fa82a702038
https://conda.anaconda.org/conda-forge/win-64/libbrotlienc-1.0.9-hcfcfb64_8.tar.bz2#88e62627120c20289bf8982b15e0a6a1
https://conda.anaconda.org/conda-forge/win-64/libpng-1.6.39-h19919ed_0.conda#ab6febdb2dbd9c00803609079db4de71
-https://conda.anaconda.org/conda-forge/win-64/libprotobuf-3.20.2-h12be248_0.tar.bz2#672e32cebe446a63a26b9eb36c58422f
+https://conda.anaconda.org/conda-forge/win-64/libprotobuf-3.21.12-h12be248_0.conda#065644957b64030c520c732a0b7eb43d
https://conda.anaconda.org/conda-forge/win-64/librttopo-1.1.0-he22b5cd_12.tar.bz2#115a51fda72ff01d7b7eb275183d6c72
-https://conda.anaconda.org/conda-forge/win-64/libssh2-1.10.0-h680486a_3.tar.bz2#3b2aa0d4ede640c471bd0e8f122fcbd5
-https://conda.anaconda.org/conda-forge/win-64/libthrift-0.16.0-h9f558f2_2.tar.bz2#0b49bcb47e1a3c55a098cc3e78f3ee8f
-https://conda.anaconda.org/conda-forge/win-64/libwebp-1.2.4-hcfcfb64_1.conda#ccde94ca6504af175b76f654bcad6e9f
-https://conda.anaconda.org/conda-forge/win-64/libxml2-2.10.3-hc3477c8_0.tar.bz2#6dcf17bf780618ddb559d992ea3b6961
-https://conda.anaconda.org/conda-forge/win-64/libzip-1.9.2-hfed4ece_1.tar.bz2#1964ebe1dd5f092b9512aaa41f5f2a8b
+https://conda.anaconda.org/conda-forge/win-64/libssh2-1.10.0-h9a1e1f7_3.tar.bz2#c2b344e960a173c777bb3ed172c38cd8
+https://conda.anaconda.org/conda-forge/win-64/libthrift-0.18.1-h9ce19ad_0.conda#c6b9481c37361790ff1b0d16899d2142
+https://conda.anaconda.org/conda-forge/win-64/libwebp-1.3.0-hcfcfb64_0.conda#0c1f2c4b45406631c600ec22ca9523fc
+https://conda.anaconda.org/conda-forge/win-64/libxml2-2.10.3-hc3477c8_6.conda#a56f8a52bc13d7eee23457f0e253e055
+https://conda.anaconda.org/conda-forge/win-64/libzip-1.9.2-h519de47_1.tar.bz2#9c3138e53e36c0c161a23d20db91297b
https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libs-5.3.0-7.tar.bz2#fe759119b8b3bfa720b8762c6fdc35de
https://conda.anaconda.org/conda-forge/win-64/pcre2-10.40-h17e33f8_0.tar.bz2#2519de0d9620dc2bc7e19caf6867136d
-https://conda.anaconda.org/conda-forge/win-64/python-3.10.8-h0269646_0_cpython.conda#9c11e051f478e2dc3699fdba9d5dd9a5
+https://conda.anaconda.org/conda-forge/win-64/python-3.10.10-h4de0772_0_cpython.conda#3f6ad634efe9e6fe40a916eb68cc3ee4
https://conda.anaconda.org/conda-forge/win-64/sqlite-3.40.0-hcfcfb64_0.tar.bz2#c71d4be22d8402e7e17386aeb18b930e
https://conda.anaconda.org/conda-forge/win-64/zeromq-4.3.4-h0e60522_1.tar.bz2#e1aff0583dda5fb917eb3d2c1025aa80
https://conda.anaconda.org/conda-forge/win-64/zlib-1.2.13-hcfcfb64_4.tar.bz2#eed9fec3e6d2e8865135b09d24ca040c
https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.2-h12be248_6.conda#62826565682d013b3e2346aaf7bded0e
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/win-64/aws-c-io-0.10.5-h2fe331c_0.tar.bz2#d38ee034f93fb73f3f222d1be1e9c3a3
+https://conda.anaconda.org/conda-forge/win-64/aws-c-io-0.13.19-h0d2781e_3.conda#075e2d0fc0b2ca759d61ceddfaeae87d
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
https://conda.anaconda.org/conda-forge/win-64/backports.zoneinfo-0.2.1-py310h5588dad_7.tar.bz2#0f18779fbc505ab486e92c654c004f59
-https://conda.anaconda.org/conda-forge/win-64/bitarray-2.7.2-py310h8d17308_0.conda#c5426b869222495df66e226d5175e99e
+https://conda.anaconda.org/conda-forge/win-64/bitarray-2.7.3-py310h8d17308_0.conda#07aba5ad0a54f3c7c28bab08a82fd26b
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/win-64/blosc-1.21.3-hdccc3a2_0.conda#b3fe9abd77808553a7d0a0cbf73b6ec9
https://conda.anaconda.org/conda-forge/win-64/boost-cpp-1.78.0-h9f4b32c_1.tar.bz2#11a4273e974d63a99da36b89d6f918a9
@@ -98,6 +99,7 @@ https://conda.anaconda.org/conda-forge/win-64/brotli-bin-1.0.9-hcfcfb64_8.tar.bz
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.2.1-pyhd8ed1ab_0.conda#b325bfc4cff7d7f8a868f1f7ecc4ed16
https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_0.tar.bz2#3faab06a954c2a04039983f2c4a50d99
@@ -105,27 +107,29 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/win-64/debugpy-1.6.6-py310h00ffb61_0.conda#5c1ccd98ca59fa7e37a34b8938a27bdf
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/win-64/freetype-2.12.1-h546665d_1.conda#1b513009cd012591f3fdc9e03a74ec0a
https://conda.anaconda.org/conda-forge/win-64/frozenlist-1.3.3-py310h8d17308_0.tar.bz2#550271ca005a4c805cd7391cef008dc6
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/win-64/greenlet-2.0.2-py310h00ffb61_0.conda#ebce3ec31341d09dbbb0893a1c9c4054
-https://conda.anaconda.org/conda-forge/win-64/grpc-cpp-1.46.4-hcb02dd0_7.tar.bz2#22d5b60176875da20518c4ea94a77037
https://conda.anaconda.org/conda-forge/win-64/hdf4-4.2.15-h1b1b6ef_5.tar.bz2#bfb6a2d82ef9a30455cc0900d89eed20
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.5-pyhd8ed1ab_0.conda#953a312b272f37d39fe9d09f46734622
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/win-64/kiwisolver-1.4.4-py310h232114e_1.tar.bz2#c55fe943d5f212d49d27d08580f5a610
-https://conda.anaconda.org/conda-forge/win-64/libcurl-7.88.1-h68f0423_0.conda#382f59d4d1e98d89b32402c07e7c5017
+https://conda.anaconda.org/conda-forge/win-64/libcurl-7.88.1-h68f0423_1.conda#e73c24dd32b88acab08e46ddeb173fee
https://conda.anaconda.org/conda-forge/win-64/libglib-2.74.1-he8f3873_1.tar.bz2#09e1cbabfd9d733729843c3b35cb0b6d
-https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.8.0-h039e092_1.tar.bz2#e84839b06cdd039130a1d1aa875146d3
-https://conda.anaconda.org/conda-forge/win-64/libpq-15.1-he840576_3.conda#26b3842062eca8f6a95cb9065d92841c
+https://conda.anaconda.org/conda-forge/win-64/libgrpc-1.52.1-h32da247_1.conda#3c9082d6dda43261e0e0cb49c362fca8
+https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.9.0-h51c2c0f_0.conda#6cbde93c514acb846762631c15c5d3c2
+https://conda.anaconda.org/conda-forge/win-64/libpq-15.2-ha9684e8_0.conda#dd4e0f2881b08f08b76c2c4d1763b38a
https://conda.anaconda.org/conda-forge/win-64/libtiff-4.5.0-hf8721a0_2.conda#2e003e276cc1375192569c96afd3d984
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/win-64/lz4-4.3.2-py310hbbb2075_0.conda#6402ef89ed20be188dbf48a238a5c337
@@ -134,17 +138,18 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/win-64/msgpack-python-1.0.4-py310h232114e_1.tar.bz2#037a60d74aadd3a2f10e1e9580a42a9b
+https://conda.anaconda.org/conda-forge/win-64/msgpack-python-1.0.5-py310h232114e_0.conda#03f6096e23f3861934af853ac987c185
https://conda.anaconda.org/conda-forge/win-64/multidict-6.0.4-py310h8d17308_0.conda#23a55d74d8f91c7667555b81030034bf
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
+https://conda.anaconda.org/conda-forge/win-64/orc-1.8.3-hada7b9e_0.conda#d2c4ea49865e0838df46e74545fb8414
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
@@ -159,27 +164,25 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/win-64/pycryptodomex-3.16.0-py310h8d17308_0.conda#05477dec16d9aa494693abe5bb9287f0
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
https://conda.anaconda.org/conda-forge/win-64/pymssql-2.2.7-py310h00ffb61_0.conda#7f354d990fc8a04f01b7f92b657e79af
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/win-64/pyrsistent-0.19.3-py310h8d17308_0.conda#ddba6aad7d1857d16675d41a6e8b0224
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/win-64/pywin32-304-py310h00ffb61_2.tar.bz2#e1401844b4f4ec959e099452a953e764
https://conda.anaconda.org/conda-forge/win-64/pyyaml-6.0-py310h8d17308_5.tar.bz2#d0daf3eed98dd2bf4337ed08d8011eb8
-https://conda.anaconda.org/conda-forge/win-64/pyzmq-25.0.0-py310hcd737a0_0.conda#a209a5ab6fa74a330a904f68375e30f5
-https://conda.anaconda.org/conda-forge/win-64/regex-2022.10.31-py310h8d17308_0.tar.bz2#2170efa2fade1a873918245fc1f7e454
+https://conda.anaconda.org/conda-forge/win-64/pyzmq-25.0.2-py310hcd737a0_0.conda#8908f8a24967cf912284fd882f7da00d
+https://conda.anaconda.org/conda-forge/win-64/regex-2023.3.23-py310h8d17308_0.conda#fbbda3e7f18fc1176dcb4680e2f0dcca
https://conda.anaconda.org/conda-forge/win-64/rtree-1.0.1-py310h1cbd46b_1.tar.bz2#da35b972cbb9b41a4a73db959b810ad8
-https://conda.anaconda.org/conda-forge/win-64/ruff-0.0.249-py310h298983d_0.conda#c9098aed3e35f55874e96ac6f693d2ed
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/win-64/ruff-0.0.259-py310h298983d_0.conda#8dfa9622ffc5d88e81792a77e8fad760
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -189,95 +192,98 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/win-64/tornado-6.2-py310h8d17308_1.tar.bz2#09f089ca5a0e8854c3eb720854816972
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/win-64/unicodedata2-15.0.0-py310h8d17308_0.tar.bz2#5d14ba562f7740b64be9c8059498cfbf
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.5-pyhd8ed1ab_0.conda#2af53b3894fb9bdbb3679c0d31028b1b
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
https://conda.anaconda.org/conda-forge/noarch/win_inet_pton-1.1.0-pyhd8ed1ab_6.tar.bz2#30878ecc4bd36e8deeea1e3c151b2e0b
https://conda.anaconda.org/conda-forge/win-64/xorg-kbproto-1.0.7-hcd874cb_1002.tar.bz2#8d11c1dac4756ca57e78c1bfe173bba4
https://conda.anaconda.org/conda-forge/win-64/xorg-libice-1.0.10-hcd874cb_0.tar.bz2#8f45beee385cb67e42d6732bdb1b6a40
https://conda.anaconda.org/conda-forge/win-64/xorg-libxau-1.0.9-hcd874cb_0.tar.bz2#9cef622e75683c17d05ae62d66e69e6c
https://conda.anaconda.org/conda-forge/win-64/xorg-libxdmcp-1.1.3-hcd874cb_0.tar.bz2#46878ebb6b9cbd8afcf8088d7ef00ece
-https://conda.anaconda.org/conda-forge/win-64/xorg-xextproto-7.3.0-hcd874cb_1002.tar.bz2#4e2fb1b05e6f44190127b600b8f01645
+https://conda.anaconda.org/conda-forge/win-64/xorg-xextproto-7.3.0-hcd874cb_1003.conda#6e6c2639620e436bddb7c040cd4f3adb
https://conda.anaconda.org/conda-forge/win-64/xorg-xproto-7.0.31-hcd874cb_1007.tar.bz2#88f3c65d2ad13826a9e0b162063be023
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/win-64/aws-c-event-stream-0.2.7-h70e1b0c_13.tar.bz2#c5946a20e3d686659e2173f4921160a7
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/win-64/aws-c-event-stream-0.2.20-h5f78564_4.conda#427ca70288aa9baf7514ee02c800f87c
+https://conda.anaconda.org/conda-forge/win-64/aws-c-http-0.7.6-h2545be9_0.conda#e0cb706b5e7856ebf28d3228e008d5c3
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/win-64/brotli-1.0.9-hcfcfb64_8.tar.bz2#2e661f21e1741c11506bdc7226e6b0bc
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/win-64/cffi-1.15.1-py310h628cb3f_3.conda#b7ca236d34501eb6a70691c1e29a0234
https://conda.anaconda.org/conda-forge/win-64/cfitsio-4.2.0-h9ebe7e4_0.conda#cccd314cbeea4f2f70f73c763d9660e8
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-win_pyhd8ed1ab_2.tar.bz2#6b58680207b526c42dcff68b543803dd
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
-https://conda.anaconda.org/conda-forge/win-64/coverage-7.1.0-py310h8d17308_0.conda#78964ddbe4f7e66f31d8cf69dcf8f4a4
-https://conda.anaconda.org/conda-forge/win-64/curl-7.88.1-h68f0423_0.conda#692a21a3ee4119c67f6e99f2c903d50b
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/win-64/coverage-7.2.2-py310h8d17308_0.conda#2dde53123830e3f8791201bd4b0ff3f1
+https://conda.anaconda.org/conda-forge/win-64/curl-7.88.1-h68f0423_1.conda#61bac43f1aad61a834f9eb718421a87c
https://conda.anaconda.org/conda-forge/win-64/cytoolz-0.12.0-py310h8d17308_1.tar.bz2#2bea7d6cc097ca31b83f1fe452a9bf84
-https://conda.anaconda.org/conda-forge/win-64/fastavro-1.7.1-py310h8d17308_0.conda#edd06432d1082b58bf1abda20b1fb267
+https://conda.anaconda.org/conda-forge/win-64/fastavro-1.7.3-py310h8d17308_0.conda#994f64be8cb59396782f2b948b9cabda
https://conda.anaconda.org/conda-forge/win-64/fontconfig-2.14.2-hbde0cde_0.conda#08767992f1a4f1336a257af1241034bd
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/win-64/grpcio-1.46.4-py310h1177ea7_7.tar.bz2#74c5f62e4ced8893ef8d7610ec58e217
+https://conda.anaconda.org/conda-forge/win-64/grpcio-1.52.1-py310h76bb054_1.conda#e9326a8f9c6e9890a1314c11c44ac528
https://conda.anaconda.org/conda-forge/win-64/gts-0.7.6-h7c369d9_2.tar.bz2#509e4ea898407220d7bdbc6f8a02fe63
-https://conda.anaconda.org/conda-forge/win-64/hdf5-1.12.2-nompi_h2a0e4a3_101.conda#fc009523b37055956ca02475539e144c
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/win-64/hdf5-1.12.2-nompi_h57737ce_101.conda#3e2b84f2f7bcf6915d1baa21e5b1a862
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
-https://conda.anaconda.org/conda-forge/win-64/lcms2-2.14-ha5c8aab_1.conda#135bd65be6768b2bc84e864e7141ab77
-https://conda.anaconda.org/conda-forge/win-64/libgoogle-cloud-2.1.0-h1006c2c_1.tar.bz2#0e19cfef9029c1a74d70b82d1f8a827e
+https://conda.anaconda.org/conda-forge/win-64/lcms2-2.15-ha5c8aab_0.conda#5ebe92728f44a8b2461410ffb3628c18
+https://conda.anaconda.org/conda-forge/win-64/libgoogle-cloud-2.8.0-hf2ff781_1.conda#97fc6c786071aea9d5d7d439e5f26635
https://conda.anaconda.org/conda-forge/win-64/libkml-1.3.0-hf2ab4e4_1015.tar.bz2#1f50b25e87cefda820cb71fb643bc021
https://conda.anaconda.org/conda-forge/win-64/libxcb-1.13-hcd874cb_1004.tar.bz2#a6d7fd030532378ecb6ba435cd9f8234
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/win-64/openjpeg-2.5.0-ha2aaf27_2.conda#db0490689232e8e38c312281df6f31a2
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/win-64/postgresql-15.1-h09b8c1b_3.conda#50e0acf0eaf90abff3f96a5895e2b582
+https://conda.anaconda.org/conda-forge/win-64/postgresql-15.2-hd87cd2b_0.conda#9148e8b6b7ec9e7dedf9bf9987f606cd
https://conda.anaconda.org/conda-forge/win-64/proj-9.1.1-heca977f_2.conda#eb88b5bc4d13493971408c3131022aec
-https://conda.anaconda.org/conda-forge/win-64/protobuf-3.20.2-py310h5588dad_1.conda#0e842d7a25a9e42f6c538fe3ca207be5
-https://conda.anaconda.org/conda-forge/win-64/psycopg2-2.9.3-py310h1aa7a9d_2.conda#7cf896dd9b8dfd63ec04c6b83bdcdf3b
+https://conda.anaconda.org/conda-forge/win-64/protobuf-4.21.12-py310h00ffb61_0.conda#bc7af38de2d06a42df22de09b94eea75
+https://conda.anaconda.org/conda-forge/win-64/psycopg2-2.9.3-py310h709a2f1_2.conda#48e48c95d55c1c75b478e7ffd8fddfd8
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyh0701188_6.tar.bz2#56cd9fe388baac0e90c7149cfac95b60
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/win-64/pytz-deprecation-shim-0.1.0.post0-py310h5588dad_3.tar.bz2#002aa0e5a4b75deaf280cda53d625bbc
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf410858b2cefc267316408a77c436
https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-1.4.46-py310h8d17308_0.conda#41d74047d854ee77ca51191682a01ba1
-https://conda.anaconda.org/conda-forge/win-64/tbb-2021.7.0-h91493d7_1.conda#39365b918d4f04909485f3055b131c86
+https://conda.anaconda.org/conda-forge/win-64/tbb-2021.8.0-h91493d7_0.conda#e155410da447d8e37302a561b911dcb8
https://conda.anaconda.org/conda-forge/win-64/thrift-0.16.0-py310h00ffb61_2.tar.bz2#ba9249abad1b29625aabbe34e85a7930
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/win-64/watchdog-2.2.1-py310h5588dad_0.conda#4edd9c0863c03f222b2a118e6e0d150b
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/win-64/watchdog-3.0.0-py310h5588dad_0.conda#7dffd715879d876d5101bad90ef0bf86
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/win-64/xorg-libsm-1.2.3-hcd874cb_1000.tar.bz2#76a765e735668a9922da3d58e746a7a6
https://conda.anaconda.org/conda-forge/win-64/yarl-1.8.2-py310h8d17308_0.conda#ca778392f9e76350e1bd0914823baeb5
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
-https://conda.anaconda.org/conda-forge/win-64/aws-sdk-cpp-1.8.186-h93d3aa3_4.tar.bz2#b67b8f43c04fac75e8932d6023b22ef2
+https://conda.anaconda.org/conda-forge/win-64/aws-c-auth-0.6.26-h1262f0c_1.conda#2090318f4a24eec3680efbd0395b1697
+https://conda.anaconda.org/conda-forge/win-64/aws-c-mqtt-0.8.6-hd211e0c_12.conda#6eadc1f9b2b273f574cc24227a3390c6
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/win-64/brotlipy-0.7.0-py310h8d17308_1005.tar.bz2#6cb010e0fa21d7b606a13038a89ccbc2
https://conda.anaconda.org/conda-forge/win-64/cairo-1.16.0-hd694305_1014.tar.bz2#91f08ed9ff25a969ddd06237454dae0d
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/win-64/cryptography-38.0.4-py310h52f42fa_0.conda#9f7c511e8f08c120ea76267400a12ca8
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/win-64/cryptography-38.0.4-py310h6e82f81_0.conda#0e8b49bc425a99afa3c8d48776c6e6ed
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
-https://conda.anaconda.org/conda-forge/win-64/fonttools-4.38.0-py310h8d17308_1.tar.bz2#278ceddad4295cdeb1a2c60537cd20a5
+https://conda.anaconda.org/conda-forge/win-64/fonttools-4.39.2-py310h8d17308_0.conda#a62195ea396a2fb13edc53c252428c40
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
https://conda.anaconda.org/conda-forge/win-64/geotiff-1.7.1-hc256dc0_6.conda#d147f5504f1b29faa112aa72e9c59599
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
@@ -285,123 +291,132 @@ https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.cond
https://conda.anaconda.org/conda-forge/win-64/google-crc32c-1.1.2-py310ha7be474_4.tar.bz2#a15b9bdf00b8b18c2af01fba0f2ab361
https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/win-64/kealib-1.5.0-h61be68b_0.conda#59e439387b2ca19699b8ce1f077ebe0a
-https://conda.anaconda.org/conda-forge/win-64/libnetcdf-4.8.1-nompi_h8c042bf_106.tar.bz2#90515eee0f7575b5fd296b6ba8d91dae
+https://conda.anaconda.org/conda-forge/win-64/libnetcdf-4.9.1-nompi_hc41bf00_101.conda#cc79e202db8167cfc78ce4edfcf43c17
https://conda.anaconda.org/conda-forge/win-64/libspatialite-5.0.1-hfdcade0_23.conda#7661a11b21d23f6f21648a787045b825
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
https://conda.anaconda.org/conda-forge/win-64/mkl-2022.1.0-h6a75c08_874.tar.bz2#2ff89a7337a9636029b4db9466e9f8e3
https://conda.anaconda.org/conda-forge/win-64/pillow-9.4.0-py310hdbb7713_1.conda#79fd90da956353feaf83e1fcd9e8ec15
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
https://conda.anaconda.org/conda-forge/win-64/pyproj-3.4.1-py310hcdd211a_1.conda#45b4a4828397fef0b539a3bff8706390
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/win-64/tiledb-2.13.2-h5689973_0.conda#931a7aedaa3ae50e4fca6982e3dda4ba
-https://conda.anaconda.org/conda-forge/win-64/tzlocal-4.2-py310h5588dad_2.tar.bz2#f27c4592774f57b565eb50fa4e9a4415
+https://conda.anaconda.org/conda-forge/win-64/tiledb-2.13.2-h3132609_0.conda#07426c5e1301448738f66686548d41ff
+https://conda.anaconda.org/conda-forge/win-64/tzlocal-4.3-py310h5588dad_0.conda#0e61da38a4d0a48e43c657dc859e50be
+https://conda.anaconda.org/conda-forge/win-64/ukkonen-1.0.1-py310h232114e_3.tar.bz2#e058ad110afa0356b03a91ad949c510d
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
-https://conda.anaconda.org/conda-forge/win-64/xorg-libx11-1.7.2-hcd874cb_0.tar.bz2#fc83d322fcfa4ca466b8529c4a2d259c
+https://conda.anaconda.org/conda-forge/win-64/xorg-libx11-1.8.4-hcd874cb_0.conda#ebdb02b455647e13fa697da89d9bdf84
https://conda.anaconda.org/conda-forge/win-64/aiohttp-3.8.4-py310h8d17308_0.conda#1b9c65dd95d828865f4b7d0dbb3d501b
+https://conda.anaconda.org/conda-forge/win-64/aws-c-s3-0.2.7-h8113e7b_1.conda#4f322af22c19df5e1d2c4d77dd68fa7c
https://conda.anaconda.org/conda-forge/win-64/black-23.1.0-py310h5588dad_0.conda#e376fe05d9f4feaed353cdeeffc171d8
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
https://conda.anaconda.org/conda-forge/win-64/harfbuzz-6.0.0-he256f1b_0.conda#15422d4ff786ed835173cfb8e6735679
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/win-64/jupyter_core-5.2.0-py310h5588dad_0.conda#7a4e9c207e4cc3143ddfccef107235ba
+https://conda.anaconda.org/conda-forge/win-64/jupyter_core-5.3.0-py310h5588dad_0.conda#637134be9eeb27207be68efa21e841cc
https://conda.anaconda.org/conda-forge/win-64/libblas-3.9.0-16_win64_mkl.tar.bz2#d2e6f4e86cee2b4e8c27ff6884ccdc61
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/win-64/poppler-23.01.0-h183ae7b_0.conda#e783b13dd5053ac11ecb77b0edc8eafc
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/win-64/poppler-23.03.0-h183ae7b_0.conda#0908fe0f0432ac13c3411822c68da81d
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/win-64/xorg-libxext-1.3.4-hcd874cb_1.tar.bz2#237e70b849a9440c2fce725b74412cd6
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/win-64/xorg-libxext-1.3.4-hcd874cb_2.conda#2aa695ac3c56193fd8d526e3b511e021
https://conda.anaconda.org/conda-forge/win-64/xorg-libxt-1.2.1-hcd874cb_2.tar.bz2#75788d7a4edf041cdd0a830f9bcaa3fb
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyh08f2357_0.conda#ad7524fdf746f7141b6c3dbffc2a9548
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/win-64/aws-crt-cpp-0.19.8-he6d3b81_12.conda#10db42f355afa5c3c552391d1037a979
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/win-64/libcblas-3.9.0-16_win64_mkl.tar.bz2#14c2fb03b2bb14dfa3806186ca91d557
-https://conda.anaconda.org/conda-forge/win-64/libgdal-3.6.2-hb852d34_5.conda#86b77837f2f7ce8f5d63f9f071d520d5
+https://conda.anaconda.org/conda-forge/win-64/libgdal-3.6.2-h221c0cb_9.conda#88c3283cd62901b1d33e51a15f8e981d
https://conda.anaconda.org/conda-forge/win-64/liblapack-3.9.0-16_win64_mkl.tar.bz2#be2f9d5712a5bb05cd900005ee752a05
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
-https://conda.anaconda.org/conda-forge/win-64/pango-1.50.13-hdffb7b3_0.conda#a2db50ec796a95c44f6fae10eb7ae39e
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
+https://conda.anaconda.org/conda-forge/win-64/pango-1.50.14-hdffb7b3_0.conda#a613f324e0f213238baec720d5c4ed00
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
https://conda.anaconda.org/conda-forge/win-64/xorg-libxpm-3.5.13-hcd874cb_0.tar.bz2#4b31b88585f696327ba79fea3b41f973
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh025b116_0.conda#2f0ef6a37b24f898508d7a5026e32c02
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
+https://conda.anaconda.org/conda-forge/win-64/aws-sdk-cpp-1.10.57-h64004b3_8.conda#1c1266961221f698336f672757c27ff2
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyh08f2357_0.conda#260ed8a8cbb42c30f8b17a9daeb78353
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
https://conda.anaconda.org/conda-forge/win-64/libgd-2.3.3-hf5a96e7_4.conda#07f0bd616b51dbd898cabf14646cdf5d
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
https://conda.anaconda.org/conda-forge/win-64/numpy-1.24.2-py310hd02465a_0.conda#bf67b852c970df4ea3e41313bcf09fc2
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/win-64/arrow-cpp-8.0.1-py310h8b1cf1d_2_cpu.tar.bz2#e2b7d79a83b68aef26efd6781f25fded
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/win-64/contourpy-1.0.7-py310h232114e_0.conda#357f1ccd3fa2bbf3661146467f7afd44
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/win-64/gdal-3.6.2-py310h198874d_5.conda#e037731b045a68a5c227ccb35ccf7f81
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
+https://conda.anaconda.org/conda-forge/win-64/gdal-3.6.2-py310h644bc08_9.conda#78e1cc7339050d48a915a06846b13b40
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
https://conda.anaconda.org/conda-forge/win-64/graphviz-7.1.0-h51cb2cd_0.conda#2ab84ffaa7b47e0118c10e9e5d29bd37
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.4-pyhd8ed1ab_0.conda#9dea5ab3cc33084f7a3680a98859731e
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh025b116_0.conda#4d594953555f43826532ab5c5f7754f5
+https://conda.anaconda.org/conda-forge/win-64/libarrow-11.0.0-h04c43f8_13_cpu.conda#0872ce0cc56d710e1467c996b3142cb4
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
https://conda.anaconda.org/conda-forge/win-64/pandas-1.5.3-py310h1c4a608_0.conda#9804d59dd8ea7d363ac2ccbba29c950c
-https://conda.anaconda.org/conda-forge/win-64/polars-0.16.6-py310h87d50f1_0.conda#ced19f81b23213f9dab539932028f1e7
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
+https://conda.anaconda.org/conda-forge/win-64/polars-0.16.16-py310h87d50f1_0.conda#74306fc9c3c3d4800fa79d51a9fbb778
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
https://conda.anaconda.org/conda-forge/win-64/shapely-1.8.5-py310h8c82734_2.tar.bz2#76b4d1b25e5ba9d036700b6a0da8cdbc
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/win-64/arrow-cpp-11.0.0-h57928b3_13_cpu.conda#7d096783fc97ffadf0961772786a67a3
https://conda.anaconda.org/conda-forge/win-64/fiona-1.9.1-py310h4a685fe_0.conda#7a62281f141df79bf2f1248d2873567b
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
-https://conda.anaconda.org/conda-forge/win-64/matplotlib-base-3.7.0-py310h51140c5_0.conda#050298ca11576d5dc47cb9fffca7af5c
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
+https://conda.anaconda.org/conda-forge/win-64/matplotlib-base-3.7.1-py310h51140c5_0.conda#d8c42a72d04ad1b93ba7269e9949738e
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
-https://conda.anaconda.org/conda-forge/win-64/scipy-1.10.0-py310h578b7cb_2.conda#e6842a664dc7dd2e084fca47138ba08e
+https://conda.anaconda.org/conda-forge/win-64/scipy-1.10.1-py310h578b7cb_0.conda#0fb710fe01eb0107d700d20d19117e73
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
-https://conda.anaconda.org/conda-forge/win-64/pyarrow-8.0.1-py310h0c37ab2_2_cpu.tar.bz2#b4588c0be5791753e9119877a9078311
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/win-64/scikit-learn-1.2.1-py310had3394f_0.conda#89c45b9f5f2941375946722eb7a03ff8
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/win-64/scikit-learn-1.2.2-py310hd266714_1.conda#58ec4d53193a74a09d8a862f98a730e5
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/win-64/python-duckdb-0.7.0-py310hfd7f7d5_1.conda#a453090fc710c0585a90f0939d201769
-https://conda.anaconda.org/conda-forge/win-64/snowflake-connector-python-2.8.3-py310h97c4d07_0.conda#b568cd12353b19066bf61b9efc966445
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/win-64/pyarrow-11.0.0-py310hd1a9178_13_cpu.conda#4d8d8c48984fd8c7e1a4e74a8c2ee16d
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.1.0-pyhd8ed1ab_0.tar.bz2#b0816cdad1ed5f376831b1c36a74106b
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.1.0-pyhd8ed1ab_0.tar.bz2#1d66863d0c73e517fbcfd859e89d3b4d
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/win-64/python-duckdb-0.7.1-py310hfd7f7d5_0.conda#c12a01d1dc3edd027392fb862d886027
+https://conda.anaconda.org/conda-forge/win-64/snowflake-connector-python-3.0.2-py310h9327e8f_0.conda#56512902e1fe1577a519a9f934479cf1
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
diff --git a/win-64-3.11.lock b/win-64-3.11.lock
index 03cadb7..6539600 100644
--- a/win-64-3.11.lock
+++ b/win-64-3.11.lock
@@ -0,0 +1,421 @@
+# Generated by conda-lock.
+# platform: win-64
+# input_hash: 0d8e5f3a147557bbc68b5fa63eda56b5ea6902af97bf9f95e4cf17586859aab8
+@EXPLICIT
+https://conda.anaconda.org/conda-forge/win-64/ca-certificates-2022.12.7-h5b45459_0.conda#31de4d9887dc8eaed9e6230a5dfbb9d6
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-dejavu-sans-mono-2.37-hab24e00_0.tar.bz2#0c96522c6bdaed4b1566d11387caaf45
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-3.000-h77eed37_0.tar.bz2#34893075a5c9e55cdafac56607368fc6
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77eed37_0.tar.bz2#4d59c254e01d9cde7957100457e2d5fb
+https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
+https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2023.0.0-h57928b3_25922.conda#8ecf3a448f5a35bd30cb39ddc2a19058
+https://conda.anaconda.org/conda-forge/win-64/msys2-conda-epoch-20160418-1.tar.bz2#b0309b72560df66f71a9d5e34a5efdfa
+https://conda.anaconda.org/conda-forge/win-64/pandoc-3.1.1-h57928b3_0.conda#71f11eb19ae575ee0b52d0d58fb018f3
+https://conda.anaconda.org/conda-forge/win-64/perl-5.32.1.1-2_h57928b3_strawberry.tar.bz2#c2f85039cbc767518ff2f701638e37c4
+https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
+https://conda.anaconda.org/conda-forge/win-64/python_abi-3.11-3_cp311.conda#fd1634ba85cfea9376e1fc02d6f592e9
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
+https://conda.anaconda.org/conda-forge/win-64/ucrt-10.0.22621.0-h57928b3_0.tar.bz2#72608f6cd3e5898229c3ea16deb1ac43
+https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
+https://conda.anaconda.org/conda-forge/win-64/m2w64-gmp-6.1.0-2.tar.bz2#53a1c73e1e3d185516d7e3af177596d9
+https://conda.anaconda.org/conda-forge/win-64/m2w64-libwinpthread-git-5.0.0.4634.697f757-2.tar.bz2#774130a326dee16f1ceb05cc687ee4f0
+https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.34.31931-h4c5c07a_10.conda#25640086ba777e79e5d233d079d7c5fc
+https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
+https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libs-core-5.3.0-7.tar.bz2#4289d80fb4d272f1f3b56cfe87ac90bd
+https://conda.anaconda.org/conda-forge/win-64/vc-14.3-hb6edc58_10.conda#52d246d8d14b83c516229be5bb03a163
+https://conda.anaconda.org/conda-forge/win-64/aws-c-common-0.8.14-hcfcfb64_0.conda#6bc5797d31bbbd38b993a5c8356cbb87
+https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-h8ffe710_4.tar.bz2#7c03c66026944073040cb19a4f3ec3c9
+https://conda.anaconda.org/conda-forge/win-64/c-ares-1.18.1-h8ffe710_0.tar.bz2#6aa55bbdfe054ea36c1c99d3adace8d9
+https://conda.anaconda.org/conda-forge/win-64/expat-2.5.0-h1537add_0.tar.bz2#6b20c31bd735d2dd5c79ddb5b3524619
+https://conda.anaconda.org/conda-forge/win-64/fribidi-1.0.10-h8d14728_0.tar.bz2#807e81d915f2bb2e49951648615241f6
+https://conda.anaconda.org/conda-forge/win-64/geos-3.11.1-h1537add_0.tar.bz2#97225394895a9c6939175c936ab1a4b0
+https://conda.anaconda.org/conda-forge/win-64/getopt-win32-0.1-h8ffe710_0.tar.bz2#9ac4874e2958f18e01c386649208fe40
+https://conda.anaconda.org/conda-forge/win-64/gflags-2.2.2-ha925a31_1004.tar.bz2#e9442160f56fa442d4ff3eb2e4cf0f22
+https://conda.anaconda.org/conda-forge/win-64/graphite2-1.3.13-1000.tar.bz2#8fc0e04e5c852cadf2cad68b86a906ab
+https://conda.anaconda.org/conda-forge/win-64/icu-70.1-h0e60522_0.tar.bz2#64073396a905b6df895ab2489fae3847
+https://conda.anaconda.org/conda-forge/win-64/jpeg-9e-hcfcfb64_3.conda#824f1e030d224e9e376a4655032fdbc7
+https://conda.anaconda.org/conda-forge/win-64/lerc-4.0.0-h63175ca_0.tar.bz2#1900cb3cab5055833cfddb0ba233b074
+https://conda.anaconda.org/conda-forge/win-64/libabseil-20230125.0-cxx17_h63175ca_1.conda#768d0974049a1146ff45579a05b112ca
+https://conda.anaconda.org/conda-forge/win-64/libaec-1.0.6-h63175ca_1.conda#f98474a8245f55f4a273889dbe7bf193
+https://conda.anaconda.org/conda-forge/win-64/libbrotlicommon-1.0.9-hcfcfb64_8.tar.bz2#e8078e37208cd7d3e1eb5053f370ded8
+https://conda.anaconda.org/conda-forge/win-64/libcrc32c-1.1.2-h0e60522_0.tar.bz2#cd4cc2d0c610c8cb5419ccc979f2d6ce
+https://conda.anaconda.org/conda-forge/win-64/libdeflate-1.17-hcfcfb64_0.conda#ae9dfb57bcb42093a2417aceabb530f7
+https://conda.anaconda.org/conda-forge/win-64/libffi-3.4.2-h8ffe710_5.tar.bz2#2c96d1b6915b408893f9472569dee135
+https://conda.anaconda.org/conda-forge/win-64/libiconv-1.17-h8ffe710_0.tar.bz2#050119977a86e4856f0416e2edcf81bb
+https://conda.anaconda.org/conda-forge/win-64/libsodium-1.0.18-h8d14728_1.tar.bz2#5c1fb45b5e2912c19098750ae8a32604
+https://conda.anaconda.org/conda-forge/win-64/libspatialindex-1.9.3-h39d44d4_4.tar.bz2#51c172496e828258d04eba9971f2af1a
+https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.40.0-hcfcfb64_0.tar.bz2#5e5a97795de72f8cc3baf3d9ea6327a2
+https://conda.anaconda.org/conda-forge/win-64/libutf8proc-2.8.0-h82a8f57_0.tar.bz2#076894846fe9f068f91c57d158c90cba
+https://conda.anaconda.org/conda-forge/win-64/libwebp-base-1.3.0-hcfcfb64_0.conda#381a3645c51cbf478872899b16490318
+https://conda.anaconda.org/conda-forge/win-64/libzlib-1.2.13-hcfcfb64_4.tar.bz2#0cc5c5cc64ee1637f37f8540a175854c
+https://conda.anaconda.org/conda-forge/win-64/lz4-c-1.9.4-hcfcfb64_0.conda#e34720eb20a33fc3bfb8451dd837ab7a
+https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libgfortran-5.3.0-6.tar.bz2#066552ac6b907ec6d72c0ddab29050dc
+https://conda.anaconda.org/conda-forge/win-64/openssl-3.1.0-hcfcfb64_0.conda#4245a25fae1aaf85bc3fbf6fc29c2d5d
+https://conda.anaconda.org/conda-forge/win-64/pixman-0.40.0-h8ffe710_0.tar.bz2#32b45d3fcffddc84cc1a014a0b5f0d58
+https://conda.anaconda.org/conda-forge/win-64/pthreads-win32-2.9.1-hfa6e2cd_3.tar.bz2#e2da8758d7d51ff6aa78a14dfb9dbed4
+https://conda.anaconda.org/conda-forge/win-64/re2-2023.02.02-h63175ca_0.conda#586130698a48cd88f76e3fba5f091243
+https://conda.anaconda.org/conda-forge/win-64/snappy-1.1.10-hfb803bf_0.conda#cff1df79c9cff719460eb2dd172568de
+https://conda.anaconda.org/conda-forge/win-64/tk-8.6.12-h8ffe710_0.tar.bz2#c69a5047cc9291ae40afd4a1ad6f0c0f
+https://conda.anaconda.org/conda-forge/win-64/xerces-c-3.2.4-h63175ca_2.conda#8ba57760b15d0c2493192908317bdf5e
+https://conda.anaconda.org/conda-forge/win-64/xz-5.2.6-h8d14728_0.tar.bz2#515d77642eaa3639413c6b1bc3f94219
+https://conda.anaconda.org/conda-forge/win-64/yaml-0.2.5-h8ffe710_2.tar.bz2#adbfb9f45d1004a26763652246a33764
+https://conda.anaconda.org/conda-forge/win-64/aws-c-cal-0.5.21-h7cda486_2.conda#049fc3fb095e7838621382a696abcfda
+https://conda.anaconda.org/conda-forge/win-64/aws-c-compression-0.2.16-h8a79959_5.conda#0a790b22ec9cf8aff76fdd3150d784aa
+https://conda.anaconda.org/conda-forge/win-64/aws-c-sdkutils-0.1.8-h8a79959_0.conda#2bf14b763bda622122577f11b03579d5
+https://conda.anaconda.org/conda-forge/win-64/aws-checksums-0.1.14-h8a79959_5.conda#427baa843cb7d3bbac662efb193d27ed
+https://conda.anaconda.org/conda-forge/win-64/freetds-1.3.16-pl5321hf43717d_0.conda#ca29852204cf1fb50fbc56c9f0a8681a
+https://conda.anaconda.org/conda-forge/win-64/freexl-1.0.6-h67ca5e6_1.tar.bz2#7ddb6e879c46e78eec37f956b3ffe743
+https://conda.anaconda.org/conda-forge/win-64/gettext-0.21.1-h5728263_0.tar.bz2#299d4fd6798a45337042ff5a48219e5f
+https://conda.anaconda.org/conda-forge/win-64/glog-0.6.0-h4797de2_0.tar.bz2#fdc11ab9a621f009995e89f52bea3004
+https://conda.anaconda.org/conda-forge/win-64/krb5-1.20.1-heb0366b_0.conda#a07b05ee8f451ab15698397185efe989
+https://conda.anaconda.org/conda-forge/win-64/libbrotlidec-1.0.9-hcfcfb64_8.tar.bz2#99839d9d81f33afa173c0fa82a702038
+https://conda.anaconda.org/conda-forge/win-64/libbrotlienc-1.0.9-hcfcfb64_8.tar.bz2#88e62627120c20289bf8982b15e0a6a1
+https://conda.anaconda.org/conda-forge/win-64/libpng-1.6.39-h19919ed_0.conda#ab6febdb2dbd9c00803609079db4de71
+https://conda.anaconda.org/conda-forge/win-64/libprotobuf-3.21.12-h12be248_0.conda#065644957b64030c520c732a0b7eb43d
+https://conda.anaconda.org/conda-forge/win-64/librttopo-1.1.0-he22b5cd_12.tar.bz2#115a51fda72ff01d7b7eb275183d6c72
+https://conda.anaconda.org/conda-forge/win-64/libssh2-1.10.0-h9a1e1f7_3.tar.bz2#c2b344e960a173c777bb3ed172c38cd8
+https://conda.anaconda.org/conda-forge/win-64/libthrift-0.18.1-h9ce19ad_0.conda#c6b9481c37361790ff1b0d16899d2142
+https://conda.anaconda.org/conda-forge/win-64/libwebp-1.3.0-hcfcfb64_0.conda#0c1f2c4b45406631c600ec22ca9523fc
+https://conda.anaconda.org/conda-forge/win-64/libxml2-2.10.3-hc3477c8_6.conda#a56f8a52bc13d7eee23457f0e253e055
+https://conda.anaconda.org/conda-forge/win-64/libzip-1.9.2-h519de47_1.tar.bz2#9c3138e53e36c0c161a23d20db91297b
+https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libs-5.3.0-7.tar.bz2#fe759119b8b3bfa720b8762c6fdc35de
+https://conda.anaconda.org/conda-forge/win-64/pcre2-10.40-h17e33f8_0.tar.bz2#2519de0d9620dc2bc7e19caf6867136d
+https://conda.anaconda.org/conda-forge/win-64/python-3.11.0-hcf16a7b_0_cpython.tar.bz2#13ee3577afc291dabd2d9edc59736688
+https://conda.anaconda.org/conda-forge/win-64/sqlite-3.40.0-hcfcfb64_0.tar.bz2#c71d4be22d8402e7e17386aeb18b930e
+https://conda.anaconda.org/conda-forge/win-64/zeromq-4.3.4-h0e60522_1.tar.bz2#e1aff0583dda5fb917eb3d2c1025aa80
+https://conda.anaconda.org/conda-forge/win-64/zlib-1.2.13-hcfcfb64_4.tar.bz2#eed9fec3e6d2e8865135b09d24ca040c
+https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.2-h12be248_6.conda#62826565682d013b3e2346aaf7bded0e
+https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
+https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
+https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
+https://conda.anaconda.org/conda-forge/win-64/aws-c-io-0.13.19-h0d2781e_3.conda#075e2d0fc0b2ca759d61ceddfaeae87d
+https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
+https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
+https://conda.anaconda.org/conda-forge/win-64/backports.zoneinfo-0.2.1-py311h1ea47a8_7.tar.bz2#0a1982afb30e272f1fc4354bfb4863af
+https://conda.anaconda.org/conda-forge/win-64/bitarray-2.7.3-py311ha68e1ae_0.conda#a84ae0be80e36c31597f8e038600b1b5
+https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
+https://conda.anaconda.org/conda-forge/win-64/blosc-1.21.3-hdccc3a2_0.conda#b3fe9abd77808553a7d0a0cbf73b6ec9
+https://conda.anaconda.org/conda-forge/win-64/boost-cpp-1.78.0-h9f4b32c_1.tar.bz2#11a4273e974d63a99da36b89d6f918a9
+https://conda.anaconda.org/conda-forge/win-64/brotli-bin-1.0.9-hcfcfb64_8.tar.bz2#e18b70ed349d96086fd60a9c642b1b58
+https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
+https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
+https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
+https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
+https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.2.1-pyhd8ed1ab_0.conda#b325bfc4cff7d7f8a868f1f7ecc4ed16
+https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_0.tar.bz2#3faab06a954c2a04039983f2c4a50d99
+https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2#a50559fad0affdbb33729a68669ca1cb
+https://conda.anaconda.org/conda-forge/win-64/debugpy-1.6.6-py311h12c1d0e_0.conda#5ade06101d9638f230c71507b10a05d2
+https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
+https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
+https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
+https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
+https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
+https://conda.anaconda.org/conda-forge/win-64/freetype-2.12.1-h546665d_1.conda#1b513009cd012591f3fdc9e03a74ec0a
+https://conda.anaconda.org/conda-forge/win-64/frozenlist-1.3.3-py311ha68e1ae_0.tar.bz2#e4cc8c6ea80d6cf4e81e5050e6006536
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
+https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
+https://conda.anaconda.org/conda-forge/win-64/greenlet-2.0.2-py311h12c1d0e_0.conda#767327dc881818d8becef41f38ffffaf
+https://conda.anaconda.org/conda-forge/win-64/hdf4-4.2.15-h1b1b6ef_5.tar.bz2#bfb6a2d82ef9a30455cc0900d89eed20
+https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
+https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
+https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
+https://conda.anaconda.org/conda-forge/win-64/kiwisolver-1.4.4-py311h005e61a_1.tar.bz2#564530d9dd01d102b5ec76c34381f3b7
+https://conda.anaconda.org/conda-forge/win-64/libcurl-7.88.1-h68f0423_1.conda#e73c24dd32b88acab08e46ddeb173fee
+https://conda.anaconda.org/conda-forge/win-64/libglib-2.74.1-he8f3873_1.tar.bz2#09e1cbabfd9d733729843c3b35cb0b6d
+https://conda.anaconda.org/conda-forge/win-64/libgrpc-1.52.1-h32da247_1.conda#3c9082d6dda43261e0e0cb49c362fca8
+https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.9.0-h51c2c0f_0.conda#6cbde93c514acb846762631c15c5d3c2
+https://conda.anaconda.org/conda-forge/win-64/libpq-15.2-ha9684e8_0.conda#dd4e0f2881b08f08b76c2c4d1763b38a
+https://conda.anaconda.org/conda-forge/win-64/libtiff-4.5.0-hf8721a0_2.conda#2e003e276cc1375192569c96afd3d984
+https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
+https://conda.anaconda.org/conda-forge/win-64/lz4-4.3.2-py311haddf500_0.conda#029635effbf99cd6eb59b60d6173b870
+https://conda.anaconda.org/conda-forge/win-64/markupsafe-2.1.2-py311ha68e1ae_0.conda#96e7ffe6ea438ba4517152abe3b39874
+https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f8dab71fdc13b1bf29a01248b156d268
+https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
+https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
+https://conda.anaconda.org/conda-forge/win-64/msgpack-python-1.0.5-py311h005e61a_0.conda#01a252f384a5d1ad338cff1184d9a9c0
+https://conda.anaconda.org/conda-forge/win-64/multidict-6.0.4-py311ha68e1ae_0.conda#8fdb245e445799fedebfb01c769621d5
+https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
+https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
+https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
+https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
+https://conda.anaconda.org/conda-forge/win-64/orc-1.8.3-hada7b9e_0.conda#d2c4ea49865e0838df46e74545fb8414
+https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
+https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
+https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
+https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
+https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
+https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
+https://conda.anaconda.org/conda-forge/noarch/pprintpp-0.4.0-pyhd8ed1ab_5.conda#3c9f3f3f7e0a9f0b2fd9d0e2064729ba
+https://conda.anaconda.org/conda-forge/win-64/psutil-5.9.4-py311ha68e1ae_0.tar.bz2#2484db2971c44ba7fc486a7cf2a456bf
+https://conda.anaconda.org/conda-forge/win-64/pthread-stubs-0.4-hcd874cb_1001.tar.bz2#a1f820480193ea83582b13249a7e7bd9
+https://conda.anaconda.org/conda-forge/noarch/pure-sasl-0.6.2-pyhd8ed1ab_0.tar.bz2#ac695eecf21ab48093bc33fd60b4102d
+https://conda.anaconda.org/conda-forge/noarch/pure_eval-0.2.2-pyhd8ed1ab_0.tar.bz2#6784285c7e55cb7212efabc79e4c2883
+https://conda.anaconda.org/conda-forge/noarch/py-cpuinfo-9.0.0-pyhd8ed1ab_0.tar.bz2#6f6d42b894118f8378fce11887ccdaff
+https://conda.anaconda.org/conda-forge/noarch/py4j-0.10.9.5-pyhd8ed1ab_0.tar.bz2#aa4b90e96537b3178e500ecb0d7913ce
+https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f8f72ac77911db942eda24fb9
+https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
+https://conda.anaconda.org/conda-forge/win-64/pycryptodomex-3.16.0-py311ha68e1ae_0.conda#5311772ba3a59e6377dcda94cb8e5efd
+https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
+https://conda.anaconda.org/conda-forge/win-64/pymssql-2.2.7-py311h12c1d0e_0.conda#f67fc8aafab8b491f9dadd613e2a9f23
+https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
+https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
+https://conda.anaconda.org/conda-forge/win-64/pyrsistent-0.19.3-py311ha68e1ae_0.conda#3f2780a49f0b4bb2c622f7cf098e3d06
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
+https://conda.anaconda.org/conda-forge/win-64/pywin32-304-py311h12c1d0e_2.tar.bz2#20a2d8e73b0be8e27ca4096d4f3a7053
+https://conda.anaconda.org/conda-forge/win-64/pyyaml-6.0-py311ha68e1ae_5.tar.bz2#0c97d59d54eb52e170224b3de6ade906
+https://conda.anaconda.org/conda-forge/win-64/pyzmq-25.0.2-py311h7b3f143_0.conda#b371e2ff34ce2f6c057f132dab68a126
+https://conda.anaconda.org/conda-forge/win-64/regex-2023.3.23-py311ha68e1ae_0.conda#55663edf6b4d5b1b2ffb8132a0ab19f3
+https://conda.anaconda.org/conda-forge/win-64/rtree-1.0.1-py311hcacb13a_1.tar.bz2#5196f6012592bfcfabc7d1c4bb5447a6
+https://conda.anaconda.org/conda-forge/win-64/ruff-0.0.259-py311hc14472d_0.conda#0987b7bcca03f9fc9b5c8dfc019ba535
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
+https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
+https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
+https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
+https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
+https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
+https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
+https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
+https://conda.anaconda.org/conda-forge/noarch/toml-0.10.2-pyhd8ed1ab_0.tar.bz2#f832c45a477c78bebd107098db465095
+https://conda.anaconda.org/conda-forge/noarch/tomli-2.0.1-pyhd8ed1ab_0.tar.bz2#5844808ffab9ebdb694585b50ba02a96
+https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#92facfec94bc02d6ccf42e7173831a36
+https://conda.anaconda.org/conda-forge/win-64/tornado-6.2-py311ha68e1ae_1.tar.bz2#d10c673cd263e4f63c1355abb9082dff
+https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
+https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
+https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
+https://conda.anaconda.org/conda-forge/noarch/win_inet_pton-1.1.0-pyhd8ed1ab_6.tar.bz2#30878ecc4bd36e8deeea1e3c151b2e0b
+https://conda.anaconda.org/conda-forge/win-64/xorg-kbproto-1.0.7-hcd874cb_1002.tar.bz2#8d11c1dac4756ca57e78c1bfe173bba4
+https://conda.anaconda.org/conda-forge/win-64/xorg-libice-1.0.10-hcd874cb_0.tar.bz2#8f45beee385cb67e42d6732bdb1b6a40
+https://conda.anaconda.org/conda-forge/win-64/xorg-libxau-1.0.9-hcd874cb_0.tar.bz2#9cef622e75683c17d05ae62d66e69e6c
+https://conda.anaconda.org/conda-forge/win-64/xorg-libxdmcp-1.1.3-hcd874cb_0.tar.bz2#46878ebb6b9cbd8afcf8088d7ef00ece
+https://conda.anaconda.org/conda-forge/win-64/xorg-xextproto-7.3.0-hcd874cb_1003.conda#6e6c2639620e436bddb7c040cd4f3adb
+https://conda.anaconda.org/conda-forge/win-64/xorg-xproto-7.0.31-hcd874cb_1007.tar.bz2#88f3c65d2ad13826a9e0b162063be023
+https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
+https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
+https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
+https://conda.anaconda.org/conda-forge/win-64/aws-c-event-stream-0.2.20-h5f78564_4.conda#427ca70288aa9baf7514ee02c800f87c
+https://conda.anaconda.org/conda-forge/win-64/aws-c-http-0.7.6-h2545be9_0.conda#e0cb706b5e7856ebf28d3228e008d5c3
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
+https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
+https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
+https://conda.anaconda.org/conda-forge/win-64/brotli-1.0.9-hcfcfb64_8.tar.bz2#2e661f21e1741c11506bdc7226e6b0bc
+https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
+https://conda.anaconda.org/conda-forge/win-64/cffi-1.15.1-py311h7d9ee11_3.conda#a8524727eb956b4741e25a64af79edb8
+https://conda.anaconda.org/conda-forge/win-64/cfitsio-4.2.0-h9ebe7e4_0.conda#cccd314cbeea4f2f70f73c763d9660e8
+https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-win_pyhd8ed1ab_2.tar.bz2#6b58680207b526c42dcff68b543803dd
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/win-64/coverage-7.2.2-py311ha68e1ae_0.conda#8f48b3d36fc69a5ed9b8d3f3d89e361a
+https://conda.anaconda.org/conda-forge/win-64/curl-7.88.1-h68f0423_1.conda#61bac43f1aad61a834f9eb718421a87c
+https://conda.anaconda.org/conda-forge/win-64/cytoolz-0.12.0-py311ha68e1ae_1.tar.bz2#baf24232498604d651158e6e242a3d32
+https://conda.anaconda.org/conda-forge/win-64/fastavro-1.7.3-py311ha68e1ae_0.conda#c286af417f18605e2031b39ace01f304
+https://conda.anaconda.org/conda-forge/win-64/fontconfig-2.14.2-hbde0cde_0.conda#08767992f1a4f1336a257af1241034bd
+https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
+https://conda.anaconda.org/conda-forge/win-64/grpcio-1.52.1-py311h5f90226_1.conda#30378cc508ce66eb17651408795380d0
+https://conda.anaconda.org/conda-forge/win-64/gts-0.7.6-h7c369d9_2.tar.bz2#509e4ea898407220d7bdbc6f8a02fe63
+https://conda.anaconda.org/conda-forge/win-64/hdf5-1.12.2-nompi_h57737ce_101.conda#3e2b84f2f7bcf6915d1baa21e5b1a862
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
+https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
+https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
+https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
+https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
+https://conda.anaconda.org/conda-forge/win-64/lcms2-2.15-ha5c8aab_0.conda#5ebe92728f44a8b2461410ffb3628c18
+https://conda.anaconda.org/conda-forge/win-64/libgoogle-cloud-2.8.0-hf2ff781_1.conda#97fc6c786071aea9d5d7d439e5f26635
+https://conda.anaconda.org/conda-forge/win-64/libkml-1.3.0-hf2ab4e4_1015.tar.bz2#1f50b25e87cefda820cb71fb643bc021
+https://conda.anaconda.org/conda-forge/win-64/libxcb-1.13-hcd874cb_1004.tar.bz2#a6d7fd030532378ecb6ba435cd9f8234
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
+https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
+https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
+https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
+https://conda.anaconda.org/conda-forge/win-64/openjpeg-2.5.0-ha2aaf27_2.conda#db0490689232e8e38c312281df6f31a2
+https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
+https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
+https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
+https://conda.anaconda.org/conda-forge/win-64/postgresql-15.2-hd87cd2b_0.conda#9148e8b6b7ec9e7dedf9bf9987f606cd
+https://conda.anaconda.org/conda-forge/win-64/proj-9.1.1-heca977f_2.conda#eb88b5bc4d13493971408c3131022aec
+https://conda.anaconda.org/conda-forge/win-64/protobuf-4.21.12-py311h12c1d0e_0.conda#c01e81ea74ec35cf823ed5499743f372
+https://conda.anaconda.org/conda-forge/win-64/psycopg2-2.9.3-py311hb12f294_2.conda#9f925d3a9f22927fc039a69d16de8548
+https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
+https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
+https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyh0701188_6.tar.bz2#56cd9fe388baac0e90c7149cfac95b60
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
+https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
+https://conda.anaconda.org/conda-forge/win-64/pytz-deprecation-shim-0.1.0.post0-py311h1ea47a8_3.tar.bz2#04c42bed4fdd52895fd29b66d1dbc5b1
+https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
+https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
+https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf410858b2cefc267316408a77c436
+https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-1.4.46-py311ha68e1ae_0.conda#f0c5f7f520e0a1e619b7501450a0fef7
+https://conda.anaconda.org/conda-forge/win-64/tbb-2021.8.0-h91493d7_0.conda#e155410da447d8e37302a561b911dcb8
+https://conda.anaconda.org/conda-forge/win-64/thrift-0.16.0-py311h12c1d0e_2.tar.bz2#3fad59967e1b54b10aabd63f5fcd79f0
+https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/win-64/watchdog-3.0.0-py311h1ea47a8_0.conda#0b230f93a075fce059f6cd52bcc4aea7
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
+https://conda.anaconda.org/conda-forge/win-64/xorg-libsm-1.2.3-hcd874cb_1000.tar.bz2#76a765e735668a9922da3d58e746a7a6
+https://conda.anaconda.org/conda-forge/win-64/yarl-1.8.2-py311ha68e1ae_0.conda#5801ed875c8cce8bb3962e200a10a671
+https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
+https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
+https://conda.anaconda.org/conda-forge/win-64/aws-c-auth-0.6.26-h1262f0c_1.conda#2090318f4a24eec3680efbd0395b1697
+https://conda.anaconda.org/conda-forge/win-64/aws-c-mqtt-0.8.6-hd211e0c_12.conda#6eadc1f9b2b273f574cc24227a3390c6
+https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
+https://conda.anaconda.org/conda-forge/win-64/brotlipy-0.7.0-py311ha68e1ae_1005.tar.bz2#dd9604ece454103e7210110c6d343e37
+https://conda.anaconda.org/conda-forge/win-64/cairo-1.16.0-hd694305_1014.tar.bz2#91f08ed9ff25a969ddd06237454dae0d
+https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
+https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
+https://conda.anaconda.org/conda-forge/win-64/cryptography-38.0.4-py311h28e9c30_0.conda#369bad555cfdd4094409411ac563de32
+https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
+https://conda.anaconda.org/conda-forge/win-64/fonttools-4.39.2-py311ha68e1ae_0.conda#c3bd4a39c46fb1a0c477cd3ab9ec77d8
+https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
+https://conda.anaconda.org/conda-forge/win-64/geotiff-1.7.1-hc256dc0_6.conda#d147f5504f1b29faa112aa72e9c59599
+https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
+https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.conda#f6e6b482110246a81c3f03e81c68752d
+https://conda.anaconda.org/conda-forge/win-64/google-crc32c-1.1.2-py311h48d9ab2_4.tar.bz2#45d8a9fce4eb8e0c01571783d9c8e62f
+https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
+https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
+https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
+https://conda.anaconda.org/conda-forge/win-64/kealib-1.5.0-h61be68b_0.conda#59e439387b2ca19699b8ce1f077ebe0a
+https://conda.anaconda.org/conda-forge/win-64/libnetcdf-4.9.1-nompi_hc41bf00_101.conda#cc79e202db8167cfc78ce4edfcf43c17
+https://conda.anaconda.org/conda-forge/win-64/libspatialite-5.0.1-hfdcade0_23.conda#7661a11b21d23f6f21648a787045b825
+https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
+https://conda.anaconda.org/conda-forge/win-64/mkl-2022.1.0-h6a75c08_874.tar.bz2#2ff89a7337a9636029b4db9466e9f8e3
+https://conda.anaconda.org/conda-forge/win-64/pillow-9.4.0-py311h76d9071_1.conda#4104956aac6095ab7ac82c1a7eaf97a5
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
+https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
+https://conda.anaconda.org/conda-forge/win-64/pyproj-3.4.1-py311h36482e4_1.conda#0573a07c55714f579a3e96f6fa59c0ea
+https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
+https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
+https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
+https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
+https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
+https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
+https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
+https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
+https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
+https://conda.anaconda.org/conda-forge/win-64/tiledb-2.13.2-h3132609_0.conda#07426c5e1301448738f66686548d41ff
+https://conda.anaconda.org/conda-forge/win-64/tzlocal-4.3-py311h1ea47a8_0.conda#94152fbff99176e4b834eea73bb252f5
+https://conda.anaconda.org/conda-forge/win-64/ukkonen-1.0.1-py311h005e61a_3.tar.bz2#345c6b3bee32bb1d87a4e8759ec6cbff
+https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
+https://conda.anaconda.org/conda-forge/win-64/xorg-libx11-1.8.4-hcd874cb_0.conda#ebdb02b455647e13fa697da89d9bdf84
+https://conda.anaconda.org/conda-forge/win-64/aiohttp-3.8.4-py311ha68e1ae_0.conda#4428840f2595506190dcf8e2fb571b9a
+https://conda.anaconda.org/conda-forge/win-64/aws-c-s3-0.2.7-h8113e7b_1.conda#4f322af22c19df5e1d2c4d77dd68fa7c
+https://conda.anaconda.org/conda-forge/win-64/black-23.1.0-py311h1ea47a8_0.conda#01243cbab42864de6da52df59bb7e745
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
+https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
+https://conda.anaconda.org/conda-forge/win-64/harfbuzz-6.0.0-he256f1b_0.conda#15422d4ff786ed835173cfb8e6735679
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
+https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
+https://conda.anaconda.org/conda-forge/win-64/jupyter_core-5.3.0-py311h1ea47a8_0.conda#2b81965b74e70b89053845d1bc287561
+https://conda.anaconda.org/conda-forge/win-64/libblas-3.9.0-16_win64_mkl.tar.bz2#d2e6f4e86cee2b4e8c27ff6884ccdc61
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
+https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
+https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
+https://conda.anaconda.org/conda-forge/win-64/poppler-23.03.0-h183ae7b_0.conda#0908fe0f0432ac13c3411822c68da81d
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
+https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
+https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/win-64/xorg-libxext-1.3.4-hcd874cb_2.conda#2aa695ac3c56193fd8d526e3b511e021
+https://conda.anaconda.org/conda-forge/win-64/xorg-libxt-1.2.1-hcd874cb_2.tar.bz2#75788d7a4edf041cdd0a830f9bcaa3fb
+https://conda.anaconda.org/conda-forge/win-64/aws-crt-cpp-0.19.8-he6d3b81_12.conda#10db42f355afa5c3c552391d1037a979
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
+https://conda.anaconda.org/conda-forge/win-64/libcblas-3.9.0-16_win64_mkl.tar.bz2#14c2fb03b2bb14dfa3806186ca91d557
+https://conda.anaconda.org/conda-forge/win-64/libgdal-3.6.2-h221c0cb_9.conda#88c3283cd62901b1d33e51a15f8e981d
+https://conda.anaconda.org/conda-forge/win-64/liblapack-3.9.0-16_win64_mkl.tar.bz2#be2f9d5712a5bb05cd900005ee752a05
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
+https://conda.anaconda.org/conda-forge/win-64/pango-1.50.14-hdffb7b3_0.conda#a613f324e0f213238baec720d5c4ed00
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
+https://conda.anaconda.org/conda-forge/win-64/xorg-libxpm-3.5.13-hcd874cb_0.tar.bz2#4b31b88585f696327ba79fea3b41f973
+https://conda.anaconda.org/conda-forge/win-64/aws-sdk-cpp-1.10.57-h64004b3_8.conda#1c1266961221f698336f672757c27ff2
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyh08f2357_0.conda#260ed8a8cbb42c30f8b17a9daeb78353
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
+https://conda.anaconda.org/conda-forge/win-64/libgd-2.3.3-hf5a96e7_4.conda#07f0bd616b51dbd898cabf14646cdf5d
+https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
+https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
+https://conda.anaconda.org/conda-forge/win-64/numpy-1.24.2-py311h0b4df5a_0.conda#2596fad79689a38b6061f185c1fc3498
+https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
+https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
+https://conda.anaconda.org/conda-forge/win-64/contourpy-1.0.7-py311h005e61a_0.conda#e7cb4befb5b37231881c2b9b5dc00bee
+https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
+https://conda.anaconda.org/conda-forge/win-64/gdal-3.6.2-py311h4bd9738_9.conda#3afa92c9d8031993e05d8073755c9bca
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
+https://conda.anaconda.org/conda-forge/win-64/graphviz-7.1.0-h51cb2cd_0.conda#2ab84ffaa7b47e0118c10e9e5d29bd37
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh025b116_0.conda#4d594953555f43826532ab5c5f7754f5
+https://conda.anaconda.org/conda-forge/win-64/libarrow-11.0.0-h04c43f8_13_cpu.conda#0872ce0cc56d710e1467c996b3142cb4
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
+https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
+https://conda.anaconda.org/conda-forge/win-64/pandas-1.5.3-py311hf63dbb6_0.conda#6bd7d08da09b8fd7ca3d076af9040d82
+https://conda.anaconda.org/conda-forge/win-64/polars-0.16.8-py311hc37eb10_0.conda#02cd9229296c61066dcb4654a4e21778
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
+https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
+https://conda.anaconda.org/conda-forge/win-64/shapely-1.8.5-py311habfe8a2_2.tar.bz2#1446a03ee7e308ba21d165c5fca501fb
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/win-64/arrow-cpp-11.0.0-h57928b3_13_cpu.conda#7d096783fc97ffadf0961772786a67a3
+https://conda.anaconda.org/conda-forge/win-64/fiona-1.9.1-py311ha4db88c_0.conda#a66df24116e037cede7ec65add5b88f9
+https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
+https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
+https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
+https://conda.anaconda.org/conda-forge/win-64/matplotlib-base-3.7.1-py311h6e989c2_0.conda#8220277205fbdf07ddfa7a124346c2dd
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
+https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
+https://conda.anaconda.org/conda-forge/win-64/scipy-1.10.1-py311h37ff6ca_0.conda#a4640d56699fbcb381485d749d126a8f
+https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
+https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
+https://conda.anaconda.org/conda-forge/win-64/scikit-learn-1.2.2-py311h142b183_1.conda#ce1dbe81f1199a0e2719c9876715f7d4
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
+https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/win-64/pyarrow-11.0.0-py311h6a6099b_13_cpu.conda#ae424522a9d435d4fcda67f4488ef2c4
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/win-64/python-duckdb-0.7.1-py311h9511c57_0.conda#cb955db4b9d92082b9c9b7f7a05284d4
+https://conda.anaconda.org/conda-forge/win-64/snowflake-connector-python-3.0.2-py311h778996e_0.conda#d7a663a9f964bb493a11540faa13ce85
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
diff --git a/win-64-3.8.lock b/win-64-3.8.lock
index 14b46c1..bd36754 100644
--- a/win-64-3.8.lock
+++ b/win-64-3.8.lock
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
-# input_hash: 90d901b48a455398588df3e8186703b31ca47318a42cb90bbbe9f73c23cd9b36
+# input_hash: 97b516ac5bb64b074f10013184432826fff3ee13d7e74b09008d699ef273c061
@EXPLICIT
https://conda.anaconda.org/conda-forge/win-64/ca-certificates-2022.12.7-h5b45459_0.conda#31de4d9887dc8eaed9e6230a5dfbb9d6
https://conda.anaconda.org/conda-forge/noarch/font-ttf-dejavu-sans-mono-2.37-hab24e00_0.tar.bz2#0c96522c6bdaed4b1566d11387caaf45
@@ -9,11 +9,11 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77
https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2023.0.0-h57928b3_25922.conda#8ecf3a448f5a35bd30cb39ddc2a19058
https://conda.anaconda.org/conda-forge/win-64/msys2-conda-epoch-20160418-1.tar.bz2#b0309b72560df66f71a9d5e34a5efdfa
-https://conda.anaconda.org/conda-forge/win-64/pandoc-2.19.2-h57928b3_1.tar.bz2#94bac372f90d1402ddd1df0f4cf67656
+https://conda.anaconda.org/conda-forge/win-64/pandoc-3.1.1-h57928b3_0.conda#71f11eb19ae575ee0b52d0d58fb018f3
https://conda.anaconda.org/conda-forge/win-64/perl-5.32.1.1-2_h57928b3_strawberry.tar.bz2#c2f85039cbc767518ff2f701638e37c4
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/win-64/python_abi-3.8-3_cp38.conda#c6df946723dadd4a5830a8ff8c6b9a20
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/win-64/ucrt-10.0.22621.0-h57928b3_0.tar.bz2#72608f6cd3e5898229c3ea16deb1ac43
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/win-64/m2w64-gmp-6.1.0-2.tar.bz2#53a1c73e1e3d185516d7e3af177596d9
@@ -22,7 +22,7 @@ https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.34.31931-h4c5c07
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libs-core-5.3.0-7.tar.bz2#4289d80fb4d272f1f3b56cfe87ac90bd
https://conda.anaconda.org/conda-forge/win-64/vc-14.3-hb6edc58_10.conda#52d246d8d14b83c516229be5bb03a163
-https://conda.anaconda.org/conda-forge/win-64/aws-c-common-0.6.2-h8ffe710_0.tar.bz2#7eb3e6859d0da38fe0bff50391e7f9dc
+https://conda.anaconda.org/conda-forge/win-64/aws-c-common-0.8.14-hcfcfb64_0.conda#6bc5797d31bbbd38b993a5c8356cbb87
https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-h8ffe710_4.tar.bz2#7c03c66026944073040cb19a4f3ec3c9
https://conda.anaconda.org/conda-forge/win-64/c-ares-1.18.1-h8ffe710_0.tar.bz2#6aa55bbdfe054ea36c1c99d3adace8d9
https://conda.anaconda.org/conda-forge/win-64/expat-2.5.0-h1537add_0.tar.bz2#6b20c31bd735d2dd5c79ddb5b3524619
@@ -34,7 +34,7 @@ https://conda.anaconda.org/conda-forge/win-64/graphite2-1.3.13-1000.tar.bz2#8fc0
https://conda.anaconda.org/conda-forge/win-64/icu-70.1-h0e60522_0.tar.bz2#64073396a905b6df895ab2489fae3847
https://conda.anaconda.org/conda-forge/win-64/jpeg-9e-hcfcfb64_3.conda#824f1e030d224e9e376a4655032fdbc7
https://conda.anaconda.org/conda-forge/win-64/lerc-4.0.0-h63175ca_0.tar.bz2#1900cb3cab5055833cfddb0ba233b074
-https://conda.anaconda.org/conda-forge/win-64/libabseil-20220623.0-cxx17_h1a56200_6.conda#5a3b4c52be0bd9dd8718c560e38db140
+https://conda.anaconda.org/conda-forge/win-64/libabseil-20230125.0-cxx17_h63175ca_1.conda#768d0974049a1146ff45579a05b112ca
https://conda.anaconda.org/conda-forge/win-64/libaec-1.0.6-h63175ca_1.conda#f98474a8245f55f4a273889dbe7bf193
https://conda.anaconda.org/conda-forge/win-64/libbrotlicommon-1.0.9-hcfcfb64_8.tar.bz2#e8078e37208cd7d3e1eb5053f370ded8
https://conda.anaconda.org/conda-forge/win-64/libcrc32c-1.1.2-h0e60522_0.tar.bz2#cd4cc2d0c610c8cb5419ccc979f2d6ce
@@ -45,51 +45,52 @@ https://conda.anaconda.org/conda-forge/win-64/libsodium-1.0.18-h8d14728_1.tar.bz
https://conda.anaconda.org/conda-forge/win-64/libspatialindex-1.9.3-h39d44d4_4.tar.bz2#51c172496e828258d04eba9971f2af1a
https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.40.0-hcfcfb64_0.tar.bz2#5e5a97795de72f8cc3baf3d9ea6327a2
https://conda.anaconda.org/conda-forge/win-64/libutf8proc-2.8.0-h82a8f57_0.tar.bz2#076894846fe9f068f91c57d158c90cba
-https://conda.anaconda.org/conda-forge/win-64/libwebp-base-1.2.4-h8ffe710_0.tar.bz2#0a09bd195ebeaff5711ccae93ac132ad
+https://conda.anaconda.org/conda-forge/win-64/libwebp-base-1.3.0-hcfcfb64_0.conda#381a3645c51cbf478872899b16490318
https://conda.anaconda.org/conda-forge/win-64/libzlib-1.2.13-hcfcfb64_4.tar.bz2#0cc5c5cc64ee1637f37f8540a175854c
https://conda.anaconda.org/conda-forge/win-64/lz4-c-1.9.4-hcfcfb64_0.conda#e34720eb20a33fc3bfb8451dd837ab7a
https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libgfortran-5.3.0-6.tar.bz2#066552ac6b907ec6d72c0ddab29050dc
-https://conda.anaconda.org/conda-forge/win-64/openssl-1.1.1t-hcfcfb64_0.conda#f47342fb350e6d2a233304f750c3502d
+https://conda.anaconda.org/conda-forge/win-64/openssl-3.1.0-hcfcfb64_0.conda#4245a25fae1aaf85bc3fbf6fc29c2d5d
https://conda.anaconda.org/conda-forge/win-64/pixman-0.40.0-h8ffe710_0.tar.bz2#32b45d3fcffddc84cc1a014a0b5f0d58
https://conda.anaconda.org/conda-forge/win-64/pthreads-win32-2.9.1-hfa6e2cd_3.tar.bz2#e2da8758d7d51ff6aa78a14dfb9dbed4
-https://conda.anaconda.org/conda-forge/win-64/re2-2022.06.01-h0e60522_1.conda#dcff2309ccfcec47248ebb6f502c35ff
-https://conda.anaconda.org/conda-forge/win-64/snappy-1.1.9-hfb803bf_2.tar.bz2#073b08c65807f205d990ace14ccacdb2
+https://conda.anaconda.org/conda-forge/win-64/re2-2023.02.02-h63175ca_0.conda#586130698a48cd88f76e3fba5f091243
+https://conda.anaconda.org/conda-forge/win-64/snappy-1.1.10-hfb803bf_0.conda#cff1df79c9cff719460eb2dd172568de
https://conda.anaconda.org/conda-forge/win-64/tk-8.6.12-h8ffe710_0.tar.bz2#c69a5047cc9291ae40afd4a1ad6f0c0f
-https://conda.anaconda.org/conda-forge/win-64/xerces-c-3.2.4-h63175ca_1.tar.bz2#b026982f81a6aba1e8ce2525ba640632
+https://conda.anaconda.org/conda-forge/win-64/xerces-c-3.2.4-h63175ca_2.conda#8ba57760b15d0c2493192908317bdf5e
https://conda.anaconda.org/conda-forge/win-64/xz-5.2.6-h8d14728_0.tar.bz2#515d77642eaa3639413c6b1bc3f94219
https://conda.anaconda.org/conda-forge/win-64/yaml-0.2.5-h8ffe710_2.tar.bz2#adbfb9f45d1004a26763652246a33764
-https://conda.anaconda.org/conda-forge/win-64/aws-c-cal-0.5.11-he19cf47_0.tar.bz2#c8b314ff705e4de32640c748e5b9c8d2
-https://conda.anaconda.org/conda-forge/win-64/aws-checksums-0.1.11-h1e232aa_7.tar.bz2#c9fde0c43dce1a8eecbef5368396742c
-https://conda.anaconda.org/conda-forge/win-64/freetds-1.3.16-pl5321hfe0aba9_0.conda#40463ad15ddabdd29c419a5eeb92b10b
+https://conda.anaconda.org/conda-forge/win-64/aws-c-cal-0.5.21-h7cda486_2.conda#049fc3fb095e7838621382a696abcfda
+https://conda.anaconda.org/conda-forge/win-64/aws-c-compression-0.2.16-h8a79959_5.conda#0a790b22ec9cf8aff76fdd3150d784aa
+https://conda.anaconda.org/conda-forge/win-64/aws-c-sdkutils-0.1.8-h8a79959_0.conda#2bf14b763bda622122577f11b03579d5
+https://conda.anaconda.org/conda-forge/win-64/aws-checksums-0.1.14-h8a79959_5.conda#427baa843cb7d3bbac662efb193d27ed
+https://conda.anaconda.org/conda-forge/win-64/freetds-1.3.16-pl5321hf43717d_0.conda#ca29852204cf1fb50fbc56c9f0a8681a
https://conda.anaconda.org/conda-forge/win-64/freexl-1.0.6-h67ca5e6_1.tar.bz2#7ddb6e879c46e78eec37f956b3ffe743
https://conda.anaconda.org/conda-forge/win-64/gettext-0.21.1-h5728263_0.tar.bz2#299d4fd6798a45337042ff5a48219e5f
https://conda.anaconda.org/conda-forge/win-64/glog-0.6.0-h4797de2_0.tar.bz2#fdc11ab9a621f009995e89f52bea3004
-https://conda.anaconda.org/conda-forge/win-64/krb5-1.20.1-h6609f42_0.conda#a962b5937824124553d53bd9f535cc71
+https://conda.anaconda.org/conda-forge/win-64/krb5-1.20.1-heb0366b_0.conda#a07b05ee8f451ab15698397185efe989
https://conda.anaconda.org/conda-forge/win-64/libbrotlidec-1.0.9-hcfcfb64_8.tar.bz2#99839d9d81f33afa173c0fa82a702038
https://conda.anaconda.org/conda-forge/win-64/libbrotlienc-1.0.9-hcfcfb64_8.tar.bz2#88e62627120c20289bf8982b15e0a6a1
https://conda.anaconda.org/conda-forge/win-64/libpng-1.6.39-h19919ed_0.conda#ab6febdb2dbd9c00803609079db4de71
-https://conda.anaconda.org/conda-forge/win-64/libprotobuf-3.20.2-h12be248_0.tar.bz2#672e32cebe446a63a26b9eb36c58422f
+https://conda.anaconda.org/conda-forge/win-64/libprotobuf-3.21.12-h12be248_0.conda#065644957b64030c520c732a0b7eb43d
https://conda.anaconda.org/conda-forge/win-64/librttopo-1.1.0-he22b5cd_12.tar.bz2#115a51fda72ff01d7b7eb275183d6c72
-https://conda.anaconda.org/conda-forge/win-64/libssh2-1.10.0-h680486a_3.tar.bz2#3b2aa0d4ede640c471bd0e8f122fcbd5
-https://conda.anaconda.org/conda-forge/win-64/libthrift-0.16.0-h9f558f2_2.tar.bz2#0b49bcb47e1a3c55a098cc3e78f3ee8f
-https://conda.anaconda.org/conda-forge/win-64/libwebp-1.2.4-hcfcfb64_1.conda#ccde94ca6504af175b76f654bcad6e9f
-https://conda.anaconda.org/conda-forge/win-64/libxml2-2.10.3-hc3477c8_0.tar.bz2#6dcf17bf780618ddb559d992ea3b6961
-https://conda.anaconda.org/conda-forge/win-64/libzip-1.9.2-hfed4ece_1.tar.bz2#1964ebe1dd5f092b9512aaa41f5f2a8b
+https://conda.anaconda.org/conda-forge/win-64/libssh2-1.10.0-h9a1e1f7_3.tar.bz2#c2b344e960a173c777bb3ed172c38cd8
+https://conda.anaconda.org/conda-forge/win-64/libthrift-0.18.1-h9ce19ad_0.conda#c6b9481c37361790ff1b0d16899d2142
+https://conda.anaconda.org/conda-forge/win-64/libwebp-1.3.0-hcfcfb64_0.conda#0c1f2c4b45406631c600ec22ca9523fc
+https://conda.anaconda.org/conda-forge/win-64/libxml2-2.10.3-hc3477c8_6.conda#a56f8a52bc13d7eee23457f0e253e055
+https://conda.anaconda.org/conda-forge/win-64/libzip-1.9.2-h519de47_1.tar.bz2#9c3138e53e36c0c161a23d20db91297b
https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libs-5.3.0-7.tar.bz2#fe759119b8b3bfa720b8762c6fdc35de
https://conda.anaconda.org/conda-forge/win-64/pcre2-10.40-h17e33f8_0.tar.bz2#2519de0d9620dc2bc7e19caf6867136d
-https://conda.anaconda.org/conda-forge/win-64/python-3.8.15-h0269646_0_cpython.conda#c357e563492a7239723e3bf192151780
+https://conda.anaconda.org/conda-forge/win-64/python-3.8.16-h4de0772_1_cpython.conda#461d9fc92cfde68f2ca7ef0988f6326a
https://conda.anaconda.org/conda-forge/win-64/sqlite-3.40.0-hcfcfb64_0.tar.bz2#c71d4be22d8402e7e17386aeb18b930e
https://conda.anaconda.org/conda-forge/win-64/zeromq-4.3.4-h0e60522_1.tar.bz2#e1aff0583dda5fb917eb3d2c1025aa80
https://conda.anaconda.org/conda-forge/win-64/zlib-1.2.13-hcfcfb64_4.tar.bz2#eed9fec3e6d2e8865135b09d24ca040c
https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.2-h12be248_6.conda#62826565682d013b3e2346aaf7bded0e
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/win-64/aws-c-io-0.10.5-h2fe331c_0.tar.bz2#d38ee034f93fb73f3f222d1be1e9c3a3
+https://conda.anaconda.org/conda-forge/win-64/aws-c-io-0.13.19-h0d2781e_3.conda#075e2d0fc0b2ca759d61ceddfaeae87d
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
-https://conda.anaconda.org/conda-forge/win-64/bitarray-2.7.2-py38h91455d4_0.conda#ce2f3e7535fbfcb222a5957cb8f665e4
+https://conda.anaconda.org/conda-forge/win-64/bitarray-2.7.3-py38h91455d4_0.conda#fb26c9d1ec6025b16415f3690de6412f
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/win-64/blosc-1.21.3-hdccc3a2_0.conda#b3fe9abd77808553a7d0a0cbf73b6ec9
https://conda.anaconda.org/conda-forge/win-64/boost-cpp-1.78.0-h9f4b32c_1.tar.bz2#11a4273e974d63a99da36b89d6f918a9
@@ -97,6 +98,7 @@ https://conda.anaconda.org/conda-forge/win-64/brotli-bin-1.0.9-hcfcfb64_8.tar.bz
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.2.1-pyhd8ed1ab_0.conda#b325bfc4cff7d7f8a868f1f7ecc4ed16
https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_0.tar.bz2#3faab06a954c2a04039983f2c4a50d99
@@ -104,27 +106,29 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/win-64/debugpy-1.6.6-py38hd3f51b4_0.conda#c0e723925312ad99aef82e6e591ab3e8
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/win-64/freetype-2.12.1-h546665d_1.conda#1b513009cd012591f3fdc9e03a74ec0a
https://conda.anaconda.org/conda-forge/win-64/frozenlist-1.3.3-py38h91455d4_0.tar.bz2#5078ec13d403c55bbbc72cbc4c821270
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/win-64/greenlet-2.0.2-py38hd3f51b4_0.conda#4ef7ea69641a9151c426245e83ddf2f9
-https://conda.anaconda.org/conda-forge/win-64/grpc-cpp-1.46.4-hcb02dd0_7.tar.bz2#22d5b60176875da20518c4ea94a77037
https://conda.anaconda.org/conda-forge/win-64/hdf4-4.2.15-h1b1b6ef_5.tar.bz2#bfb6a2d82ef9a30455cc0900d89eed20
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.5-pyhd8ed1ab_0.conda#953a312b272f37d39fe9d09f46734622
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/win-64/kiwisolver-1.4.4-py38hb1fd069_1.tar.bz2#1dcc50e3241f9e4e59713eec2653abd5
-https://conda.anaconda.org/conda-forge/win-64/libcurl-7.88.1-h68f0423_0.conda#382f59d4d1e98d89b32402c07e7c5017
+https://conda.anaconda.org/conda-forge/win-64/libcurl-7.88.1-h68f0423_1.conda#e73c24dd32b88acab08e46ddeb173fee
https://conda.anaconda.org/conda-forge/win-64/libglib-2.74.1-he8f3873_1.tar.bz2#09e1cbabfd9d733729843c3b35cb0b6d
-https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.8.0-h039e092_1.tar.bz2#e84839b06cdd039130a1d1aa875146d3
-https://conda.anaconda.org/conda-forge/win-64/libpq-15.1-he840576_3.conda#26b3842062eca8f6a95cb9065d92841c
+https://conda.anaconda.org/conda-forge/win-64/libgrpc-1.52.1-h32da247_1.conda#3c9082d6dda43261e0e0cb49c362fca8
+https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.9.0-h51c2c0f_0.conda#6cbde93c514acb846762631c15c5d3c2
+https://conda.anaconda.org/conda-forge/win-64/libpq-15.2-ha9684e8_0.conda#dd4e0f2881b08f08b76c2c4d1763b38a
https://conda.anaconda.org/conda-forge/win-64/libtiff-4.5.0-hf8721a0_2.conda#2e003e276cc1375192569c96afd3d984
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/win-64/lz4-4.3.2-py38hb6d8784_0.conda#63f9d25c2c45503307f2a730e2fd36d4
@@ -133,17 +137,18 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/win-64/msgpack-python-1.0.4-py38hb1fd069_1.tar.bz2#ef8a190d49a8b436e5a23ef0ba39e570
+https://conda.anaconda.org/conda-forge/win-64/msgpack-python-1.0.5-py38hb1fd069_0.conda#766477345ea8870d47d2dd2988f5c1f8
https://conda.anaconda.org/conda-forge/win-64/multidict-6.0.4-py38h91455d4_0.conda#4cf563f10a20a9d369642914b4570a07
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
+https://conda.anaconda.org/conda-forge/win-64/orc-1.8.3-hada7b9e_0.conda#d2c4ea49865e0838df46e74545fb8414
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
@@ -158,27 +163,25 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/win-64/pycryptodomex-3.16.0-py38h91455d4_0.conda#05c0f86c433991317361a11b7f7433c0
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
https://conda.anaconda.org/conda-forge/win-64/pymssql-2.2.7-py38hd3f51b4_0.conda#3e773c2b7cbe709ed8b78d44e08717e1
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/win-64/pyrsistent-0.19.3-py38h91455d4_0.conda#fb4aa6d774c3a286a8561af24ff87185
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/win-64/pywin32-304-py38hd3f51b4_2.tar.bz2#cfefffaad808b61f2932f64c079417b8
https://conda.anaconda.org/conda-forge/win-64/pyyaml-6.0-py38h91455d4_5.tar.bz2#f62ab7e18711e3cbc068319448ecf771
-https://conda.anaconda.org/conda-forge/win-64/pyzmq-25.0.0-py38ha85f68a_0.conda#9a9a808052bf38bcb72997b20497ac94
-https://conda.anaconda.org/conda-forge/win-64/regex-2022.10.31-py38h91455d4_0.tar.bz2#8f3115b972ad9530a0747d49939b1885
+https://conda.anaconda.org/conda-forge/win-64/pyzmq-25.0.2-py38ha85f68a_0.conda#de7ef1838740970039f695e2fb1df9f5
+https://conda.anaconda.org/conda-forge/win-64/regex-2023.3.23-py38h91455d4_0.conda#d4723697d37732527aeeb8331054dcab
https://conda.anaconda.org/conda-forge/win-64/rtree-1.0.1-py38h8b54edf_1.tar.bz2#78d18e3c87ba3096647f4b5a95d1ce20
-https://conda.anaconda.org/conda-forge/win-64/ruff-0.0.249-py38h5e48be7_0.conda#bb2668690421eb3c0a111ff520c1924f
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/win-64/ruff-0.0.259-py38h5e48be7_0.conda#c3c893e5be2cd98d0485f72461bd5683
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -188,95 +191,98 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/win-64/tornado-6.2-py38h91455d4_1.tar.bz2#ed09a022d62a1550692f856c104d929e
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/win-64/unicodedata2-15.0.0-py38h91455d4_0.tar.bz2#7a135e40d9f26c15419e5e82e1c436c0
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.5-pyhd8ed1ab_0.conda#2af53b3894fb9bdbb3679c0d31028b1b
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
https://conda.anaconda.org/conda-forge/noarch/win_inet_pton-1.1.0-pyhd8ed1ab_6.tar.bz2#30878ecc4bd36e8deeea1e3c151b2e0b
https://conda.anaconda.org/conda-forge/win-64/xorg-kbproto-1.0.7-hcd874cb_1002.tar.bz2#8d11c1dac4756ca57e78c1bfe173bba4
https://conda.anaconda.org/conda-forge/win-64/xorg-libice-1.0.10-hcd874cb_0.tar.bz2#8f45beee385cb67e42d6732bdb1b6a40
https://conda.anaconda.org/conda-forge/win-64/xorg-libxau-1.0.9-hcd874cb_0.tar.bz2#9cef622e75683c17d05ae62d66e69e6c
https://conda.anaconda.org/conda-forge/win-64/xorg-libxdmcp-1.1.3-hcd874cb_0.tar.bz2#46878ebb6b9cbd8afcf8088d7ef00ece
-https://conda.anaconda.org/conda-forge/win-64/xorg-xextproto-7.3.0-hcd874cb_1002.tar.bz2#4e2fb1b05e6f44190127b600b8f01645
+https://conda.anaconda.org/conda-forge/win-64/xorg-xextproto-7.3.0-hcd874cb_1003.conda#6e6c2639620e436bddb7c040cd4f3adb
https://conda.anaconda.org/conda-forge/win-64/xorg-xproto-7.0.31-hcd874cb_1007.tar.bz2#88f3c65d2ad13826a9e0b162063be023
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/win-64/aws-c-event-stream-0.2.7-h70e1b0c_13.tar.bz2#c5946a20e3d686659e2173f4921160a7
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/win-64/aws-c-event-stream-0.2.20-h5f78564_4.conda#427ca70288aa9baf7514ee02c800f87c
+https://conda.anaconda.org/conda-forge/win-64/aws-c-http-0.7.6-h2545be9_0.conda#e0cb706b5e7856ebf28d3228e008d5c3
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
https://conda.anaconda.org/conda-forge/win-64/backports.zoneinfo-0.2.1-py38h91455d4_7.tar.bz2#0257d9c2e8f1495e74296465d78f8a07
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/win-64/brotli-1.0.9-hcfcfb64_8.tar.bz2#2e661f21e1741c11506bdc7226e6b0bc
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/win-64/cffi-1.15.1-py38h57701bc_3.conda#9b94af390cfdf924a063302a2ddb3860
https://conda.anaconda.org/conda-forge/win-64/cfitsio-4.2.0-h9ebe7e4_0.conda#cccd314cbeea4f2f70f73c763d9660e8
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-win_pyhd8ed1ab_2.tar.bz2#6b58680207b526c42dcff68b543803dd
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
-https://conda.anaconda.org/conda-forge/win-64/coverage-7.1.0-py38h91455d4_0.conda#9b54e09d1a76713fd186f2e905421afe
-https://conda.anaconda.org/conda-forge/win-64/curl-7.88.1-h68f0423_0.conda#692a21a3ee4119c67f6e99f2c903d50b
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/win-64/coverage-7.2.2-py38h91455d4_0.conda#f580488152afd50b99f830b075d55be9
+https://conda.anaconda.org/conda-forge/win-64/curl-7.88.1-h68f0423_1.conda#61bac43f1aad61a834f9eb718421a87c
https://conda.anaconda.org/conda-forge/win-64/cytoolz-0.12.0-py38h91455d4_1.tar.bz2#387f44e5cf4f48ca957b4ed6e8fd2e93
-https://conda.anaconda.org/conda-forge/win-64/fastavro-1.7.1-py38h91455d4_0.conda#3dabd2ec047ee250d5011b23bc7ccfde
+https://conda.anaconda.org/conda-forge/win-64/fastavro-1.7.3-py38h91455d4_0.conda#fbd7754d65035fc583d2a582fe669f86
https://conda.anaconda.org/conda-forge/win-64/fontconfig-2.14.2-hbde0cde_0.conda#08767992f1a4f1336a257af1241034bd
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/win-64/grpcio-1.46.4-py38h7557e77_7.tar.bz2#ac3f13f1e64b5fc0e9453e65cc689c18
+https://conda.anaconda.org/conda-forge/win-64/grpcio-1.52.1-py38h7cc6c9e_1.conda#580c3e1de43d25bdfacfe762f34d1ef2
https://conda.anaconda.org/conda-forge/win-64/gts-0.7.6-h7c369d9_2.tar.bz2#509e4ea898407220d7bdbc6f8a02fe63
-https://conda.anaconda.org/conda-forge/win-64/hdf5-1.12.2-nompi_h2a0e4a3_101.conda#fc009523b37055956ca02475539e144c
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/win-64/hdf5-1.12.2-nompi_h57737ce_101.conda#3e2b84f2f7bcf6915d1baa21e5b1a862
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
-https://conda.anaconda.org/conda-forge/win-64/lcms2-2.14-ha5c8aab_1.conda#135bd65be6768b2bc84e864e7141ab77
-https://conda.anaconda.org/conda-forge/win-64/libgoogle-cloud-2.1.0-h1006c2c_1.tar.bz2#0e19cfef9029c1a74d70b82d1f8a827e
+https://conda.anaconda.org/conda-forge/win-64/lcms2-2.15-ha5c8aab_0.conda#5ebe92728f44a8b2461410ffb3628c18
+https://conda.anaconda.org/conda-forge/win-64/libgoogle-cloud-2.8.0-hf2ff781_1.conda#97fc6c786071aea9d5d7d439e5f26635
https://conda.anaconda.org/conda-forge/win-64/libkml-1.3.0-hf2ab4e4_1015.tar.bz2#1f50b25e87cefda820cb71fb643bc021
https://conda.anaconda.org/conda-forge/win-64/libxcb-1.13-hcd874cb_1004.tar.bz2#a6d7fd030532378ecb6ba435cd9f8234
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/win-64/openjpeg-2.5.0-ha2aaf27_2.conda#db0490689232e8e38c312281df6f31a2
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/win-64/postgresql-15.1-h09b8c1b_3.conda#50e0acf0eaf90abff3f96a5895e2b582
+https://conda.anaconda.org/conda-forge/win-64/postgresql-15.2-hd87cd2b_0.conda#9148e8b6b7ec9e7dedf9bf9987f606cd
https://conda.anaconda.org/conda-forge/win-64/proj-9.1.1-heca977f_2.conda#eb88b5bc4d13493971408c3131022aec
-https://conda.anaconda.org/conda-forge/win-64/protobuf-3.20.2-py38haa244fe_1.conda#bb788a10478a1b83828d3903d58de733
-https://conda.anaconda.org/conda-forge/win-64/psycopg2-2.9.3-py38h92f1765_2.conda#516564b1c07ae8d645c0f645a2d19fe5
+https://conda.anaconda.org/conda-forge/win-64/protobuf-4.21.12-py38hd3f51b4_0.conda#d57104e1d122e17dce4e8d7f3fe428f7
+https://conda.anaconda.org/conda-forge/win-64/psycopg2-2.9.3-py38hf4f1dbe_2.conda#ca1a430a96ed91d07fc15d391b7077fc
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyh0701188_6.tar.bz2#56cd9fe388baac0e90c7149cfac95b60
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf410858b2cefc267316408a77c436
https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-1.4.46-py38h91455d4_0.conda#61e48528c84c8cdb630d7aefe678d921
-https://conda.anaconda.org/conda-forge/win-64/tbb-2021.7.0-h91493d7_1.conda#39365b918d4f04909485f3055b131c86
+https://conda.anaconda.org/conda-forge/win-64/tbb-2021.8.0-h91493d7_0.conda#e155410da447d8e37302a561b911dcb8
https://conda.anaconda.org/conda-forge/win-64/thrift-0.16.0-py38hd3f51b4_2.tar.bz2#7e92153fdc6f01a8f6e16d880386ef8d
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/win-64/watchdog-2.2.1-py38haa244fe_0.conda#795324f37776e087124c30f31ea5a47f
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/win-64/watchdog-3.0.0-py38haa244fe_0.conda#3438f867739fe1763a6a5df9ecd9c0db
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/win-64/xorg-libsm-1.2.3-hcd874cb_1000.tar.bz2#76a765e735668a9922da3d58e746a7a6
https://conda.anaconda.org/conda-forge/win-64/yarl-1.8.2-py38h91455d4_0.conda#2a801dfae7a5b2f25cd36059ae5cc847
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
-https://conda.anaconda.org/conda-forge/win-64/aws-sdk-cpp-1.8.186-h93d3aa3_4.tar.bz2#b67b8f43c04fac75e8932d6023b22ef2
+https://conda.anaconda.org/conda-forge/win-64/aws-c-auth-0.6.26-h1262f0c_1.conda#2090318f4a24eec3680efbd0395b1697
+https://conda.anaconda.org/conda-forge/win-64/aws-c-mqtt-0.8.6-hd211e0c_12.conda#6eadc1f9b2b273f574cc24227a3390c6
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/win-64/brotlipy-0.7.0-py38h91455d4_1005.tar.bz2#9fabc7fadfb37addbe91cc67c09cda69
https://conda.anaconda.org/conda-forge/win-64/cairo-1.16.0-hd694305_1014.tar.bz2#91f08ed9ff25a969ddd06237454dae0d
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/win-64/cryptography-38.0.4-py38h086c683_0.conda#12f19d2311a22211553fc84025ec85eb
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/win-64/cryptography-38.0.4-py38h95f5157_0.conda#6818f6038a87bd2cc20efcba38a1cf11
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
-https://conda.anaconda.org/conda-forge/win-64/fonttools-4.38.0-py38h91455d4_1.tar.bz2#45aa8e4d44d4b82db1ba373b6b7fbd61
+https://conda.anaconda.org/conda-forge/win-64/fonttools-4.39.2-py38h91455d4_0.conda#add310032aa2cbae67f78ef5189b033a
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
https://conda.anaconda.org/conda-forge/win-64/geotiff-1.7.1-hc256dc0_6.conda#d147f5504f1b29faa112aa72e9c59599
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
@@ -284,125 +290,134 @@ https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.cond
https://conda.anaconda.org/conda-forge/win-64/google-crc32c-1.1.2-py38h40ab01b_4.tar.bz2#fe9687c3adcb0ab87c926e7831e04039
https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
https://conda.anaconda.org/conda-forge/noarch/importlib-resources-5.12.0-pyhd8ed1ab_0.conda#3544c818f0720c89eb16ae6940ab440b
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/win-64/kealib-1.5.0-h61be68b_0.conda#59e439387b2ca19699b8ce1f077ebe0a
-https://conda.anaconda.org/conda-forge/win-64/libnetcdf-4.8.1-nompi_h8c042bf_106.tar.bz2#90515eee0f7575b5fd296b6ba8d91dae
+https://conda.anaconda.org/conda-forge/win-64/libnetcdf-4.9.1-nompi_hc41bf00_101.conda#cc79e202db8167cfc78ce4edfcf43c17
https://conda.anaconda.org/conda-forge/win-64/libspatialite-5.0.1-hfdcade0_23.conda#7661a11b21d23f6f21648a787045b825
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
https://conda.anaconda.org/conda-forge/win-64/mkl-2022.1.0-h6a75c08_874.tar.bz2#2ff89a7337a9636029b4db9466e9f8e3
https://conda.anaconda.org/conda-forge/win-64/pillow-9.4.0-py38h087119c_1.conda#22f3a5dc5b508c0da8c972991825fdee
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
https://conda.anaconda.org/conda-forge/win-64/pyproj-3.4.1-py38h3bccd86_1.conda#f8c7722350e52037069add8646c146a5
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
https://conda.anaconda.org/conda-forge/win-64/pytz-deprecation-shim-0.1.0.post0-py38haa244fe_3.tar.bz2#65e2a775e12b13ded1d6577b26c018af
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/win-64/tiledb-2.13.2-h5689973_0.conda#931a7aedaa3ae50e4fca6982e3dda4ba
+https://conda.anaconda.org/conda-forge/win-64/tiledb-2.13.2-h3132609_0.conda#07426c5e1301448738f66686548d41ff
+https://conda.anaconda.org/conda-forge/win-64/ukkonen-1.0.1-py38hb1fd069_3.tar.bz2#8f1c0c4b1de3472bc880fd55648d36ab
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
-https://conda.anaconda.org/conda-forge/win-64/xorg-libx11-1.7.2-hcd874cb_0.tar.bz2#fc83d322fcfa4ca466b8529c4a2d259c
+https://conda.anaconda.org/conda-forge/win-64/xorg-libx11-1.8.4-hcd874cb_0.conda#ebdb02b455647e13fa697da89d9bdf84
https://conda.anaconda.org/conda-forge/win-64/aiohttp-3.8.4-py38h91455d4_0.conda#306b286eedd23756bdd34d19bfc20174
+https://conda.anaconda.org/conda-forge/win-64/aws-c-s3-0.2.7-h8113e7b_1.conda#4f322af22c19df5e1d2c4d77dd68fa7c
https://conda.anaconda.org/conda-forge/win-64/black-23.1.0-py38haa244fe_0.conda#dec2c966aa05cc6de5df7c3ae6009359
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
https://conda.anaconda.org/conda-forge/win-64/harfbuzz-6.0.0-he256f1b_0.conda#15422d4ff786ed835173cfb8e6735679
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/win-64/jupyter_core-5.2.0-py38haa244fe_0.conda#acd4ba37f297f756dc36d6cf5c298b55
+https://conda.anaconda.org/conda-forge/win-64/jupyter_core-5.3.0-py38haa244fe_0.conda#ff05e328ef5915b4a8176844f5effddd
https://conda.anaconda.org/conda-forge/win-64/libblas-3.9.0-16_win64_mkl.tar.bz2#d2e6f4e86cee2b4e8c27ff6884ccdc61
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/win-64/poppler-23.01.0-h183ae7b_0.conda#e783b13dd5053ac11ecb77b0edc8eafc
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/win-64/poppler-23.03.0-h183ae7b_0.conda#0908fe0f0432ac13c3411822c68da81d
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/win-64/tzlocal-4.2-py38haa244fe_2.tar.bz2#c5588990fac693c6c8565f0f1cb631f9
-https://conda.anaconda.org/conda-forge/win-64/xorg-libxext-1.3.4-hcd874cb_1.tar.bz2#237e70b849a9440c2fce725b74412cd6
+https://conda.anaconda.org/conda-forge/win-64/tzlocal-4.3-py38haa244fe_0.conda#cf2fe29d9e209affaa0eea6792996540
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/win-64/xorg-libxext-1.3.4-hcd874cb_2.conda#2aa695ac3c56193fd8d526e3b511e021
https://conda.anaconda.org/conda-forge/win-64/xorg-libxt-1.2.1-hcd874cb_2.tar.bz2#75788d7a4edf041cdd0a830f9bcaa3fb
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyh08f2357_0.conda#ad7524fdf746f7141b6c3dbffc2a9548
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/win-64/aws-crt-cpp-0.19.8-he6d3b81_12.conda#10db42f355afa5c3c552391d1037a979
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/win-64/libcblas-3.9.0-16_win64_mkl.tar.bz2#14c2fb03b2bb14dfa3806186ca91d557
-https://conda.anaconda.org/conda-forge/win-64/libgdal-3.6.2-hb852d34_5.conda#86b77837f2f7ce8f5d63f9f071d520d5
+https://conda.anaconda.org/conda-forge/win-64/libgdal-3.6.2-h221c0cb_9.conda#88c3283cd62901b1d33e51a15f8e981d
https://conda.anaconda.org/conda-forge/win-64/liblapack-3.9.0-16_win64_mkl.tar.bz2#be2f9d5712a5bb05cd900005ee752a05
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
-https://conda.anaconda.org/conda-forge/win-64/pango-1.50.13-hdffb7b3_0.conda#a2db50ec796a95c44f6fae10eb7ae39e
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
+https://conda.anaconda.org/conda-forge/win-64/pango-1.50.14-hdffb7b3_0.conda#a613f324e0f213238baec720d5c4ed00
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
https://conda.anaconda.org/conda-forge/win-64/xorg-libxpm-3.5.13-hcd874cb_0.tar.bz2#4b31b88585f696327ba79fea3b41f973
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh025b116_0.conda#2f0ef6a37b24f898508d7a5026e32c02
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
+https://conda.anaconda.org/conda-forge/win-64/aws-sdk-cpp-1.10.57-h64004b3_8.conda#1c1266961221f698336f672757c27ff2
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyh08f2357_0.conda#260ed8a8cbb42c30f8b17a9daeb78353
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
https://conda.anaconda.org/conda-forge/win-64/libgd-2.3.3-hf5a96e7_4.conda#07f0bd616b51dbd898cabf14646cdf5d
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
https://conda.anaconda.org/conda-forge/win-64/numpy-1.24.2-py38h7ec9225_0.conda#c3f278e36ed9128fcb6acfd8e2f46449
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/win-64/arrow-cpp-8.0.1-py38hbab55ff_2_cpu.tar.bz2#759a55d2f455ec1d189ba31d53ca9aff
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/win-64/contourpy-1.0.7-py38hb1fd069_0.conda#6b53200dddcec578cdd90cac146eeadd
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/win-64/gdal-3.6.2-py38h658b046_5.conda#746f2b77ec9663c5f630ef2c425d622d
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
+https://conda.anaconda.org/conda-forge/win-64/gdal-3.6.2-py38h5a6f081_9.conda#8227f8dee15e614201e52f81bdd774cc
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
https://conda.anaconda.org/conda-forge/win-64/graphviz-7.1.0-h51cb2cd_0.conda#2ab84ffaa7b47e0118c10e9e5d29bd37
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.4-pyhd8ed1ab_0.conda#9dea5ab3cc33084f7a3680a98859731e
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh025b116_0.conda#4d594953555f43826532ab5c5f7754f5
+https://conda.anaconda.org/conda-forge/win-64/libarrow-11.0.0-h04c43f8_13_cpu.conda#0872ce0cc56d710e1467c996b3142cb4
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
https://conda.anaconda.org/conda-forge/win-64/pandas-1.5.3-py38h5846ac1_0.conda#ca579bb262dcfbe6fc82f6758d2307b2
-https://conda.anaconda.org/conda-forge/win-64/polars-0.16.6-py38h4900a04_0.conda#326200900bf2843cc61264f75964540b
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
+https://conda.anaconda.org/conda-forge/win-64/polars-0.16.13-py38h4900a04_0.conda#dc0bdfbf1c9978fcaf68143c5598d588
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
https://conda.anaconda.org/conda-forge/win-64/shapely-1.8.5-py38h9c0aba1_2.tar.bz2#123f28c0c8c931a1ad4a506fb49c94ce
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/win-64/arrow-cpp-11.0.0-h57928b3_13_cpu.conda#7d096783fc97ffadf0961772786a67a3
https://conda.anaconda.org/conda-forge/win-64/fiona-1.9.1-py38hc97cbf3_0.conda#70a2ff5fc4851164924a2655e5a7a832
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
-https://conda.anaconda.org/conda-forge/win-64/matplotlib-base-3.7.0-py38h528a6c7_0.conda#e4a707baf4bc86081cf6b5702f330071
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
+https://conda.anaconda.org/conda-forge/win-64/matplotlib-base-3.7.1-py38h528a6c7_0.conda#0aebccad15d74ec7f1bc3d62497ad1a8
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
-https://conda.anaconda.org/conda-forge/win-64/scipy-1.10.0-py38h0f6ee2a_2.conda#4ec63f891fe6fff7940c0bef00d2a481
+https://conda.anaconda.org/conda-forge/win-64/scipy-1.10.1-py38h0f6ee2a_0.conda#ad604d9c7b391da227489d25c38faab7
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
-https://conda.anaconda.org/conda-forge/win-64/pyarrow-8.0.1-py38hb2e333c_2_cpu.tar.bz2#ad3455af769710c73edb566867b13026
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/win-64/scikit-learn-1.2.1-py38h69724d7_0.conda#dc7c965f44dd2cbc5db4e188d83d2d18
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/win-64/scikit-learn-1.2.2-py38h42e183d_1.conda#49b8b48dbe38b9799ea4115c0a2fbdeb
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/win-64/python-duckdb-0.7.0-py38hd99a6a2_1.conda#21f4c02465655cc45e43bca5a864ffd6
-https://conda.anaconda.org/conda-forge/win-64/snowflake-connector-python-2.8.3-py38h1372981_0.conda#1b2e87056742355b0427bcfd9c3eb037
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/win-64/pyarrow-11.0.0-py38hc72dcf3_13_cpu.conda#39bda66eb687b54c40a03b2a4e00244b
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.1.0-pyhd8ed1ab_0.tar.bz2#b0816cdad1ed5f376831b1c36a74106b
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.1.0-pyhd8ed1ab_0.tar.bz2#1d66863d0c73e517fbcfd859e89d3b4d
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/win-64/python-duckdb-0.7.1-py38hd99a6a2_0.conda#6d8db32de87a2734fb666c0dcfed6125
+https://conda.anaconda.org/conda-forge/win-64/snowflake-connector-python-3.0.2-py38h24e69a6_0.conda#04b51d8605b54f19f7fad569275f3afb
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
diff --git a/win-64-3.9.lock b/win-64-3.9.lock
index 6888085..2147f60 100644
--- a/win-64-3.9.lock
+++ b/win-64-3.9.lock
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: win-64
-# input_hash: a47f04c127d70b01fce4ce8db355731eb3c45226b73cf9c5e3617ec296625ea0
+# input_hash: f9c4b49012841ef1b3dfea897ff8f2d42d53d984b1a62d1b02e411a45901a908
@EXPLICIT
https://conda.anaconda.org/conda-forge/win-64/ca-certificates-2022.12.7-h5b45459_0.conda#31de4d9887dc8eaed9e6230a5dfbb9d6
https://conda.anaconda.org/conda-forge/noarch/font-ttf-dejavu-sans-mono-2.37-hab24e00_0.tar.bz2#0c96522c6bdaed4b1566d11387caaf45
@@ -9,11 +9,11 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77
https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
https://conda.anaconda.org/conda-forge/win-64/intel-openmp-2023.0.0-h57928b3_25922.conda#8ecf3a448f5a35bd30cb39ddc2a19058
https://conda.anaconda.org/conda-forge/win-64/msys2-conda-epoch-20160418-1.tar.bz2#b0309b72560df66f71a9d5e34a5efdfa
-https://conda.anaconda.org/conda-forge/win-64/pandoc-2.19.2-h57928b3_1.tar.bz2#94bac372f90d1402ddd1df0f4cf67656
+https://conda.anaconda.org/conda-forge/win-64/pandoc-3.1.1-h57928b3_0.conda#71f11eb19ae575ee0b52d0d58fb018f3
https://conda.anaconda.org/conda-forge/win-64/perl-5.32.1.1-2_h57928b3_strawberry.tar.bz2#c2f85039cbc767518ff2f701638e37c4
https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
https://conda.anaconda.org/conda-forge/win-64/python_abi-3.9-3_cp39.conda#c7f654abbee61f9a03f54e9064e79e89
-https://conda.anaconda.org/conda-forge/noarch/tzdata-2022g-h191b570_0.conda#51fc4fcfb19f5d95ffc8c339db5068e8
+https://conda.anaconda.org/conda-forge/noarch/tzdata-2023b-h71feb2d_0.conda#6c80c63151d7f493dab457a0ba6c2523
https://conda.anaconda.org/conda-forge/win-64/ucrt-10.0.22621.0-h57928b3_0.tar.bz2#72608f6cd3e5898229c3ea16deb1ac43
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
https://conda.anaconda.org/conda-forge/win-64/m2w64-gmp-6.1.0-2.tar.bz2#53a1c73e1e3d185516d7e3af177596d9
@@ -22,7 +22,7 @@ https://conda.anaconda.org/conda-forge/win-64/vs2015_runtime-14.34.31931-h4c5c07
https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libs-core-5.3.0-7.tar.bz2#4289d80fb4d272f1f3b56cfe87ac90bd
https://conda.anaconda.org/conda-forge/win-64/vc-14.3-hb6edc58_10.conda#52d246d8d14b83c516229be5bb03a163
-https://conda.anaconda.org/conda-forge/win-64/aws-c-common-0.6.2-h8ffe710_0.tar.bz2#7eb3e6859d0da38fe0bff50391e7f9dc
+https://conda.anaconda.org/conda-forge/win-64/aws-c-common-0.8.14-hcfcfb64_0.conda#6bc5797d31bbbd38b993a5c8356cbb87
https://conda.anaconda.org/conda-forge/win-64/bzip2-1.0.8-h8ffe710_4.tar.bz2#7c03c66026944073040cb19a4f3ec3c9
https://conda.anaconda.org/conda-forge/win-64/c-ares-1.18.1-h8ffe710_0.tar.bz2#6aa55bbdfe054ea36c1c99d3adace8d9
https://conda.anaconda.org/conda-forge/win-64/expat-2.5.0-h1537add_0.tar.bz2#6b20c31bd735d2dd5c79ddb5b3524619
@@ -34,7 +34,7 @@ https://conda.anaconda.org/conda-forge/win-64/graphite2-1.3.13-1000.tar.bz2#8fc0
https://conda.anaconda.org/conda-forge/win-64/icu-70.1-h0e60522_0.tar.bz2#64073396a905b6df895ab2489fae3847
https://conda.anaconda.org/conda-forge/win-64/jpeg-9e-hcfcfb64_3.conda#824f1e030d224e9e376a4655032fdbc7
https://conda.anaconda.org/conda-forge/win-64/lerc-4.0.0-h63175ca_0.tar.bz2#1900cb3cab5055833cfddb0ba233b074
-https://conda.anaconda.org/conda-forge/win-64/libabseil-20220623.0-cxx17_h1a56200_6.conda#5a3b4c52be0bd9dd8718c560e38db140
+https://conda.anaconda.org/conda-forge/win-64/libabseil-20230125.0-cxx17_h63175ca_1.conda#768d0974049a1146ff45579a05b112ca
https://conda.anaconda.org/conda-forge/win-64/libaec-1.0.6-h63175ca_1.conda#f98474a8245f55f4a273889dbe7bf193
https://conda.anaconda.org/conda-forge/win-64/libbrotlicommon-1.0.9-hcfcfb64_8.tar.bz2#e8078e37208cd7d3e1eb5053f370ded8
https://conda.anaconda.org/conda-forge/win-64/libcrc32c-1.1.2-h0e60522_0.tar.bz2#cd4cc2d0c610c8cb5419ccc979f2d6ce
@@ -45,52 +45,53 @@ https://conda.anaconda.org/conda-forge/win-64/libsodium-1.0.18-h8d14728_1.tar.bz
https://conda.anaconda.org/conda-forge/win-64/libspatialindex-1.9.3-h39d44d4_4.tar.bz2#51c172496e828258d04eba9971f2af1a
https://conda.anaconda.org/conda-forge/win-64/libsqlite-3.40.0-hcfcfb64_0.tar.bz2#5e5a97795de72f8cc3baf3d9ea6327a2
https://conda.anaconda.org/conda-forge/win-64/libutf8proc-2.8.0-h82a8f57_0.tar.bz2#076894846fe9f068f91c57d158c90cba
-https://conda.anaconda.org/conda-forge/win-64/libwebp-base-1.2.4-h8ffe710_0.tar.bz2#0a09bd195ebeaff5711ccae93ac132ad
+https://conda.anaconda.org/conda-forge/win-64/libwebp-base-1.3.0-hcfcfb64_0.conda#381a3645c51cbf478872899b16490318
https://conda.anaconda.org/conda-forge/win-64/libzlib-1.2.13-hcfcfb64_4.tar.bz2#0cc5c5cc64ee1637f37f8540a175854c
https://conda.anaconda.org/conda-forge/win-64/lz4-c-1.9.4-hcfcfb64_0.conda#e34720eb20a33fc3bfb8451dd837ab7a
https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libgfortran-5.3.0-6.tar.bz2#066552ac6b907ec6d72c0ddab29050dc
-https://conda.anaconda.org/conda-forge/win-64/openssl-1.1.1t-hcfcfb64_0.conda#f47342fb350e6d2a233304f750c3502d
+https://conda.anaconda.org/conda-forge/win-64/openssl-3.1.0-hcfcfb64_0.conda#4245a25fae1aaf85bc3fbf6fc29c2d5d
https://conda.anaconda.org/conda-forge/win-64/pixman-0.40.0-h8ffe710_0.tar.bz2#32b45d3fcffddc84cc1a014a0b5f0d58
https://conda.anaconda.org/conda-forge/win-64/pthreads-win32-2.9.1-hfa6e2cd_3.tar.bz2#e2da8758d7d51ff6aa78a14dfb9dbed4
-https://conda.anaconda.org/conda-forge/win-64/re2-2022.06.01-h0e60522_1.conda#dcff2309ccfcec47248ebb6f502c35ff
-https://conda.anaconda.org/conda-forge/win-64/snappy-1.1.9-hfb803bf_2.tar.bz2#073b08c65807f205d990ace14ccacdb2
+https://conda.anaconda.org/conda-forge/win-64/re2-2023.02.02-h63175ca_0.conda#586130698a48cd88f76e3fba5f091243
+https://conda.anaconda.org/conda-forge/win-64/snappy-1.1.10-hfb803bf_0.conda#cff1df79c9cff719460eb2dd172568de
https://conda.anaconda.org/conda-forge/win-64/tk-8.6.12-h8ffe710_0.tar.bz2#c69a5047cc9291ae40afd4a1ad6f0c0f
-https://conda.anaconda.org/conda-forge/win-64/xerces-c-3.2.4-h63175ca_1.tar.bz2#b026982f81a6aba1e8ce2525ba640632
+https://conda.anaconda.org/conda-forge/win-64/xerces-c-3.2.4-h63175ca_2.conda#8ba57760b15d0c2493192908317bdf5e
https://conda.anaconda.org/conda-forge/win-64/xz-5.2.6-h8d14728_0.tar.bz2#515d77642eaa3639413c6b1bc3f94219
https://conda.anaconda.org/conda-forge/win-64/yaml-0.2.5-h8ffe710_2.tar.bz2#adbfb9f45d1004a26763652246a33764
-https://conda.anaconda.org/conda-forge/win-64/aws-c-cal-0.5.11-he19cf47_0.tar.bz2#c8b314ff705e4de32640c748e5b9c8d2
-https://conda.anaconda.org/conda-forge/win-64/aws-checksums-0.1.11-h1e232aa_7.tar.bz2#c9fde0c43dce1a8eecbef5368396742c
-https://conda.anaconda.org/conda-forge/win-64/freetds-1.3.16-pl5321hfe0aba9_0.conda#40463ad15ddabdd29c419a5eeb92b10b
+https://conda.anaconda.org/conda-forge/win-64/aws-c-cal-0.5.21-h7cda486_2.conda#049fc3fb095e7838621382a696abcfda
+https://conda.anaconda.org/conda-forge/win-64/aws-c-compression-0.2.16-h8a79959_5.conda#0a790b22ec9cf8aff76fdd3150d784aa
+https://conda.anaconda.org/conda-forge/win-64/aws-c-sdkutils-0.1.8-h8a79959_0.conda#2bf14b763bda622122577f11b03579d5
+https://conda.anaconda.org/conda-forge/win-64/aws-checksums-0.1.14-h8a79959_5.conda#427baa843cb7d3bbac662efb193d27ed
+https://conda.anaconda.org/conda-forge/win-64/freetds-1.3.16-pl5321hf43717d_0.conda#ca29852204cf1fb50fbc56c9f0a8681a
https://conda.anaconda.org/conda-forge/win-64/freexl-1.0.6-h67ca5e6_1.tar.bz2#7ddb6e879c46e78eec37f956b3ffe743
https://conda.anaconda.org/conda-forge/win-64/gettext-0.21.1-h5728263_0.tar.bz2#299d4fd6798a45337042ff5a48219e5f
https://conda.anaconda.org/conda-forge/win-64/glog-0.6.0-h4797de2_0.tar.bz2#fdc11ab9a621f009995e89f52bea3004
-https://conda.anaconda.org/conda-forge/win-64/krb5-1.20.1-h6609f42_0.conda#a962b5937824124553d53bd9f535cc71
+https://conda.anaconda.org/conda-forge/win-64/krb5-1.20.1-heb0366b_0.conda#a07b05ee8f451ab15698397185efe989
https://conda.anaconda.org/conda-forge/win-64/libbrotlidec-1.0.9-hcfcfb64_8.tar.bz2#99839d9d81f33afa173c0fa82a702038
https://conda.anaconda.org/conda-forge/win-64/libbrotlienc-1.0.9-hcfcfb64_8.tar.bz2#88e62627120c20289bf8982b15e0a6a1
https://conda.anaconda.org/conda-forge/win-64/libpng-1.6.39-h19919ed_0.conda#ab6febdb2dbd9c00803609079db4de71
-https://conda.anaconda.org/conda-forge/win-64/libprotobuf-3.20.2-h12be248_0.tar.bz2#672e32cebe446a63a26b9eb36c58422f
+https://conda.anaconda.org/conda-forge/win-64/libprotobuf-3.21.12-h12be248_0.conda#065644957b64030c520c732a0b7eb43d
https://conda.anaconda.org/conda-forge/win-64/librttopo-1.1.0-he22b5cd_12.tar.bz2#115a51fda72ff01d7b7eb275183d6c72
-https://conda.anaconda.org/conda-forge/win-64/libssh2-1.10.0-h680486a_3.tar.bz2#3b2aa0d4ede640c471bd0e8f122fcbd5
-https://conda.anaconda.org/conda-forge/win-64/libthrift-0.16.0-h9f558f2_2.tar.bz2#0b49bcb47e1a3c55a098cc3e78f3ee8f
-https://conda.anaconda.org/conda-forge/win-64/libwebp-1.2.4-hcfcfb64_1.conda#ccde94ca6504af175b76f654bcad6e9f
-https://conda.anaconda.org/conda-forge/win-64/libxml2-2.10.3-hc3477c8_0.tar.bz2#6dcf17bf780618ddb559d992ea3b6961
-https://conda.anaconda.org/conda-forge/win-64/libzip-1.9.2-hfed4ece_1.tar.bz2#1964ebe1dd5f092b9512aaa41f5f2a8b
+https://conda.anaconda.org/conda-forge/win-64/libssh2-1.10.0-h9a1e1f7_3.tar.bz2#c2b344e960a173c777bb3ed172c38cd8
+https://conda.anaconda.org/conda-forge/win-64/libthrift-0.18.1-h9ce19ad_0.conda#c6b9481c37361790ff1b0d16899d2142
+https://conda.anaconda.org/conda-forge/win-64/libwebp-1.3.0-hcfcfb64_0.conda#0c1f2c4b45406631c600ec22ca9523fc
+https://conda.anaconda.org/conda-forge/win-64/libxml2-2.10.3-hc3477c8_6.conda#a56f8a52bc13d7eee23457f0e253e055
+https://conda.anaconda.org/conda-forge/win-64/libzip-1.9.2-h519de47_1.tar.bz2#9c3138e53e36c0c161a23d20db91297b
https://conda.anaconda.org/conda-forge/win-64/m2w64-gcc-libs-5.3.0-7.tar.bz2#fe759119b8b3bfa720b8762c6fdc35de
https://conda.anaconda.org/conda-forge/win-64/pcre2-10.40-h17e33f8_0.tar.bz2#2519de0d9620dc2bc7e19caf6867136d
-https://conda.anaconda.org/conda-forge/win-64/python-3.9.15-h0269646_0_cpython.conda#d8fe5fbfa7ddebd3a1690b84194dba59
+https://conda.anaconda.org/conda-forge/win-64/python-3.9.16-h4de0772_0_cpython.conda#83b66ea4ff5c437502a06cd2de8cd681
https://conda.anaconda.org/conda-forge/win-64/sqlite-3.40.0-hcfcfb64_0.tar.bz2#c71d4be22d8402e7e17386aeb18b930e
https://conda.anaconda.org/conda-forge/win-64/zeromq-4.3.4-h0e60522_1.tar.bz2#e1aff0583dda5fb917eb3d2c1025aa80
https://conda.anaconda.org/conda-forge/win-64/zlib-1.2.13-hcfcfb64_4.tar.bz2#eed9fec3e6d2e8865135b09d24ca040c
https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.2-h12be248_6.conda#62826565682d013b3e2346aaf7bded0e
-https://conda.anaconda.org/conda-forge/noarch/appdirs-1.4.4-pyh9f0ad1d_0.tar.bz2#5f095bc6454094e96f146491fd03633b
https://conda.anaconda.org/conda-forge/noarch/asn1crypto-1.5.1-pyhd8ed1ab_0.tar.bz2#f3f2ab3ce28979a24d1a988ba211eb9b
https://conda.anaconda.org/conda-forge/noarch/atpublic-3.0.1-pyhd8ed1ab_0.tar.bz2#39904aaf8de88f03fe9c27286dc35681
https://conda.anaconda.org/conda-forge/noarch/attrs-22.2.0-pyh71513ae_0.conda#8b76db7818a4e401ed4486c4c1635cd9
-https://conda.anaconda.org/conda-forge/win-64/aws-c-io-0.10.5-h2fe331c_0.tar.bz2#d38ee034f93fb73f3f222d1be1e9c3a3
+https://conda.anaconda.org/conda-forge/win-64/aws-c-io-0.13.19-h0d2781e_3.conda#075e2d0fc0b2ca759d61ceddfaeae87d
https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
https://conda.anaconda.org/conda-forge/win-64/backports.zoneinfo-0.2.1-py39hcbf5309_7.tar.bz2#a92d68f8824381b3f8ea4d367ae66720
-https://conda.anaconda.org/conda-forge/win-64/bitarray-2.7.2-py39ha55989b_0.conda#d46f92620b97e5aa963baa395dd8a03e
+https://conda.anaconda.org/conda-forge/win-64/bitarray-2.7.3-py39ha55989b_0.conda#2445eecbaf41da32cfe96388aaec57a9
https://conda.anaconda.org/conda-forge/noarch/blinker-1.5-pyhd8ed1ab_0.tar.bz2#f473c4e32d8180733ba5594d122cb637
https://conda.anaconda.org/conda-forge/win-64/blosc-1.21.3-hdccc3a2_0.conda#b3fe9abd77808553a7d0a0cbf73b6ec9
https://conda.anaconda.org/conda-forge/win-64/boost-cpp-1.78.0-h9f4b32c_1.tar.bz2#11a4273e974d63a99da36b89d6f918a9
@@ -98,6 +99,7 @@ https://conda.anaconda.org/conda-forge/win-64/brotli-bin-1.0.9-hcfcfb64_8.tar.bz
https://conda.anaconda.org/conda-forge/noarch/cached_property-1.5.2-pyha770c72_1.tar.bz2#576d629e47797577ab0f1b351297ef4a
https://conda.anaconda.org/conda-forge/noarch/cachetools-5.3.0-pyhd8ed1ab_0.conda#fd006afc4115740d8d52887ee813f262
https://conda.anaconda.org/conda-forge/noarch/certifi-2022.12.7-pyhd8ed1ab_0.conda#fb9addc3db06e56abe03e0e9f21a63e6
+https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-2.1.1-pyhd8ed1ab_0.tar.bz2#c1d5b294fbf9a795dec349a6f4d8be8e
https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.2.1-pyhd8ed1ab_0.conda#b325bfc4cff7d7f8a868f1f7ecc4ed16
https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_0.tar.bz2#3faab06a954c2a04039983f2c4a50d99
@@ -105,27 +107,29 @@ https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2
https://conda.anaconda.org/conda-forge/win-64/debugpy-1.6.6-py39h99910a6_0.conda#77c24634d38bfe0d5d7d802390c7b979
https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
+https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.6-pyhd8ed1ab_0.tar.bz2#b65b4d50dbd2d50fa0aeac367ec9eed7
https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.0-pyhd8ed1ab_0.conda#a385c3e8968b4cf8fbc426ace915fd1a
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.1-pyhd8ed1ab_0.conda#7312299d7a0ea4993159229b7d2dceb2
https://conda.anaconda.org/conda-forge/noarch/execnet-1.9.0-pyhd8ed1ab_0.tar.bz2#0e521f7a5e60d508b121d38b04874fb2
https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.9.0-pyhd8ed1ab_0.conda#1addc115923d646ca19ed90edc413506
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.10.7-pyhd8ed1ab_0.conda#6a0601f92717ce555d79d83d693b6fa3
https://conda.anaconda.org/conda-forge/win-64/freetype-2.12.1-h546665d_1.conda#1b513009cd012591f3fdc9e03a74ec0a
https://conda.anaconda.org/conda-forge/win-64/frozenlist-1.3.3-py39ha55989b_0.tar.bz2#b8762916559d3e14831d6e10caad214b
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.1.0-pyhd8ed1ab_0.conda#44f6828b8f7cc3433d68d1d1c0e9add2
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.3.0-pyhd8ed1ab_1.conda#0db48a2f5a68e28e5af8d3df276f2255
https://conda.anaconda.org/conda-forge/noarch/gprof2dot-2019.11.30-py_0.tar.bz2#9000d491cc90b7020b6422660d23cbe0
https://conda.anaconda.org/conda-forge/win-64/greenlet-2.0.2-py39h99910a6_0.conda#d3521625b406aa27d94a0000ec5d7c1c
-https://conda.anaconda.org/conda-forge/win-64/grpc-cpp-1.46.4-hcb02dd0_7.tar.bz2#22d5b60176875da20518c4ea94a77037
https://conda.anaconda.org/conda-forge/win-64/hdf4-4.2.15-h1b1b6ef_5.tar.bz2#bfb6a2d82ef9a30455cc0900d89eed20
https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
-https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.5-pyhd8ed1ab_0.conda#953a312b272f37d39fe9d09f46734622
+https://conda.anaconda.org/conda-forge/noarch/ipython_genutils-0.2.0-py_1.tar.bz2#5071c982548b3a20caf70462f04f5287
+https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.6-pyhd8ed1ab_0.conda#67e397a2877c4cb83144fcf823b1f479
https://conda.anaconda.org/conda-forge/win-64/kiwisolver-1.4.4-py39h1f6ef14_1.tar.bz2#de04861ceb137d2952d3f2d0a13e9d46
-https://conda.anaconda.org/conda-forge/win-64/libcurl-7.88.1-h68f0423_0.conda#382f59d4d1e98d89b32402c07e7c5017
+https://conda.anaconda.org/conda-forge/win-64/libcurl-7.88.1-h68f0423_1.conda#e73c24dd32b88acab08e46ddeb173fee
https://conda.anaconda.org/conda-forge/win-64/libglib-2.74.1-he8f3873_1.tar.bz2#09e1cbabfd9d733729843c3b35cb0b6d
-https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.8.0-h039e092_1.tar.bz2#e84839b06cdd039130a1d1aa875146d3
-https://conda.anaconda.org/conda-forge/win-64/libpq-15.1-he840576_3.conda#26b3842062eca8f6a95cb9065d92841c
+https://conda.anaconda.org/conda-forge/win-64/libgrpc-1.52.1-h32da247_1.conda#3c9082d6dda43261e0e0cb49c362fca8
+https://conda.anaconda.org/conda-forge/win-64/libhwloc-2.9.0-h51c2c0f_0.conda#6cbde93c514acb846762631c15c5d3c2
+https://conda.anaconda.org/conda-forge/win-64/libpq-15.2-ha9684e8_0.conda#dd4e0f2881b08f08b76c2c4d1763b38a
https://conda.anaconda.org/conda-forge/win-64/libtiff-4.5.0-hf8721a0_2.conda#2e003e276cc1375192569c96afd3d984
https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
https://conda.anaconda.org/conda-forge/win-64/lz4-4.3.2-py39hf617134_0.conda#6102f85df33cac99d21853bc21563150
@@ -134,17 +138,18 @@ https://conda.anaconda.org/conda-forge/noarch/mdurl-0.1.0-pyhd8ed1ab_0.tar.bz2#f
https://conda.anaconda.org/conda-forge/noarch/mergedeep-1.3.4-pyhd8ed1ab_0.tar.bz2#1a160a3cab5cb6bd46264b52cd6f69a2
https://conda.anaconda.org/conda-forge/noarch/mistune-2.0.5-pyhd8ed1ab_0.conda#61a07195cfc935f1c1901d8ecf4af441
https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-extensions-1.1.1-pyhd8ed1ab_0.conda#f94b8726e7c9ec2b4aabae2af77d7fe3
-https://conda.anaconda.org/conda-forge/win-64/msgpack-python-1.0.4-py39h1f6ef14_1.tar.bz2#9afe90a33529768bb9854058398d620c
+https://conda.anaconda.org/conda-forge/win-64/msgpack-python-1.0.5-py39h1f6ef14_0.conda#b5e111aee8fac27f002b1d71b75da941
https://conda.anaconda.org/conda-forge/win-64/multidict-6.0.4-py39ha55989b_0.conda#1af5a2528e09d6b6f78deaced0ccaa5e
https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
https://conda.anaconda.org/conda-forge/noarch/nest-asyncio-1.5.6-pyhd8ed1ab_0.tar.bz2#7b868f21adde0d9b8b38f9c16836589b
https://conda.anaconda.org/conda-forge/noarch/networkx-3.0-pyhd8ed1ab_0.conda#88e40007414ea9a13f8df20fcffa87e2
+https://conda.anaconda.org/conda-forge/win-64/orc-1.8.3-hada7b9e_0.conda#d2c4ea49865e0838df46e74545fb8414
https://conda.anaconda.org/conda-forge/noarch/packaging-23.0-pyhd8ed1ab_0.conda#1ff2e3ca41f0ce16afec7190db28288b
https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
-https://conda.anaconda.org/conda-forge/noarch/parsy-2.0-pyhd8ed1ab_0.conda#ae56c17f98be29fec311a2fc36608685
-https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.0-pyhd8ed1ab_0.conda#641ebf6fbbb8d5576c5280ba23ceaf76
+https://conda.anaconda.org/conda-forge/noarch/parsy-2.1-pyhd8ed1ab_0.conda#0423aa726dfb35b9a236ea3d572b8b74
+https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.1-pyhd8ed1ab_0.conda#dbb80d1e8dc2dba5c8b106dc0768ad45
https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
https://conda.anaconda.org/conda-forge/noarch/pluggy-1.0.0-pyhd8ed1ab_5.tar.bz2#7d301a0d25f424d96175f810935f0da9
@@ -159,27 +164,25 @@ https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.4.8-py_0.tar.bz2#06d04c9f
https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
https://conda.anaconda.org/conda-forge/win-64/pycryptodomex-3.16.0-py39ha55989b_0.conda#23c3d7a270918e02a4d053a59472cb60
https://conda.anaconda.org/conda-forge/noarch/pyjwt-2.6.0-pyhd8ed1ab_0.tar.bz2#56d08bbebf5b3719ca2b1688fcfd98a4
-https://conda.anaconda.org/conda-forge/noarch/pympler-1.0.1-pyhd8ed1ab_0.tar.bz2#e6932cc2794f4a961c3d6c14022e55d0
https://conda.anaconda.org/conda-forge/win-64/pymssql-2.2.7-py39h99910a6_0.conda#541f23a61edc1eb267df5977416e90a0
https://conda.anaconda.org/conda-forge/noarch/pymysql-1.0.2-pyhd8ed1ab_0.tar.bz2#6b3c16769e390b5b60729d2eb46b8144
https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
https://conda.anaconda.org/conda-forge/win-64/pyrsistent-0.19.3-py39ha55989b_0.conda#3c40136690d8023e73c5dcfe38e03f95
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.2-pyhd8ed1ab_0.tar.bz2#5fe4b6002f505336734ce92961b3e6a0
-https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2022.7-pyhd8ed1ab_0.conda#b8afba5fbf891019eae564c3edb28b9e
-https://conda.anaconda.org/conda-forge/noarch/pytz-2022.7.1-pyhd8ed1ab_0.conda#f59d49a7b464901cf714b9e7984d01a2
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.16.3-pyhd8ed1ab_0.conda#7aa330a4d88b7ab891a42c39d5d2e742
+https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.2-pyhd8ed1ab_0.conda#de631f19ba156d224d80241e3fc7d32f
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.2-pyhd8ed1ab_0.conda#d74d285d6628e55752df22fc84910279
https://conda.anaconda.org/conda-forge/win-64/pywin32-304-py39h99910a6_2.tar.bz2#4cb6e4e7a9a0c2889967a4f436e589bc
https://conda.anaconda.org/conda-forge/win-64/pyyaml-6.0-py39ha55989b_5.tar.bz2#03968ff66723b72b793e94033d0fbb2f
-https://conda.anaconda.org/conda-forge/win-64/pyzmq-25.0.0-py39hea35a22_0.conda#a423a0cc38b23afcd0dd1b7ca9ca0c24
-https://conda.anaconda.org/conda-forge/win-64/regex-2022.10.31-py39ha55989b_0.tar.bz2#516e31913d21c6eb6e2df66fd85616ab
+https://conda.anaconda.org/conda-forge/win-64/pyzmq-25.0.2-py39hea35a22_0.conda#54d2590519d9044bddebac0c459302f2
+https://conda.anaconda.org/conda-forge/win-64/regex-2023.3.23-py39ha55989b_0.conda#a057ddce3a7dcae4b2272de2d5338128
https://conda.anaconda.org/conda-forge/win-64/rtree-1.0.1-py39h09fdee3_1.tar.bz2#84a721accc992a5462483e4512efe4a7
-https://conda.anaconda.org/conda-forge/win-64/ruff-0.0.249-py39h756cfbc_0.conda#2540015044592feb08d85a4091c9b054
-https://conda.anaconda.org/conda-forge/noarch/semver-2.13.0-pyh9f0ad1d_0.tar.bz2#2cab9f3a9683cb40a2176ccaf76e66c6
-https://conda.anaconda.org/conda-forge/noarch/setuptools-67.3.2-pyhd8ed1ab_0.conda#543af74c4042aee5702a033e03a216d0
+https://conda.anaconda.org/conda-forge/win-64/ruff-0.0.259-py39h756cfbc_0.conda#bb11e0a60e11d2311cdd102b86009a2d
+https://conda.anaconda.org/conda-forge/noarch/setuptools-67.6.0-pyhd8ed1ab_0.conda#e18ed61c37145bb9b48d1d98801960f7
https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
-https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.2.0-pyhd8ed1ab_0.conda#cc77ca257e506b36a14e1878c79d2693
+https://conda.anaconda.org/conda-forge/noarch/sqlglot-11.4.3-pyhd8ed1ab_0.conda#e4b8587a8411653dd4fb30056b71b675
https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
https://conda.anaconda.org/conda-forge/noarch/termcolor-2.2.0-pyhd8ed1ab_0.conda#778f524c3d149577a6e873264d85ec68
https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.1.0-pyh8a188c0_0.tar.bz2#a2995ee828f65687ac5b1e71a2ab1e0c
@@ -189,95 +192,98 @@ https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#
https://conda.anaconda.org/conda-forge/win-64/tornado-6.2-py39ha55989b_1.tar.bz2#702e8f5ca3fde634b435132e13de7c15
https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
https://conda.anaconda.org/conda-forge/noarch/typing-3.10.0.0-pyhd8ed1ab_0.tar.bz2#e6573ac68718f17b9d4f5c8eda3190f2
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.4.0-pyha770c72_0.tar.bz2#2d93b130d148d7fc77e583677792fc6a
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.5.0-pyha770c72_0.conda#43e7d9e50261fb11deb76e17d8431aac
https://conda.anaconda.org/conda-forge/win-64/unicodedata2-15.0.0-py39ha55989b_0.tar.bz2#3be582ed58b3e289836a1fdc4e41d0b8
https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.38.4-pyhd8ed1ab_0.tar.bz2#c829cfb8cb826acb9de0ac1a2df0a940
-https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.5-pyhd8ed1ab_0.conda#2af53b3894fb9bdbb3679c0d31028b1b
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.40.0-pyhd8ed1ab_0.conda#49bb0d9e60ce1db25e151780331bb5f3
+https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.6-pyhd8ed1ab_0.conda#35aff5e9b804e17cceb9f99a59349b3b
https://conda.anaconda.org/conda-forge/noarch/win_inet_pton-1.1.0-pyhd8ed1ab_6.tar.bz2#30878ecc4bd36e8deeea1e3c151b2e0b
https://conda.anaconda.org/conda-forge/win-64/xorg-kbproto-1.0.7-hcd874cb_1002.tar.bz2#8d11c1dac4756ca57e78c1bfe173bba4
https://conda.anaconda.org/conda-forge/win-64/xorg-libice-1.0.10-hcd874cb_0.tar.bz2#8f45beee385cb67e42d6732bdb1b6a40
https://conda.anaconda.org/conda-forge/win-64/xorg-libxau-1.0.9-hcd874cb_0.tar.bz2#9cef622e75683c17d05ae62d66e69e6c
https://conda.anaconda.org/conda-forge/win-64/xorg-libxdmcp-1.1.3-hcd874cb_0.tar.bz2#46878ebb6b9cbd8afcf8088d7ef00ece
-https://conda.anaconda.org/conda-forge/win-64/xorg-xextproto-7.3.0-hcd874cb_1002.tar.bz2#4e2fb1b05e6f44190127b600b8f01645
+https://conda.anaconda.org/conda-forge/win-64/xorg-xextproto-7.3.0-hcd874cb_1003.conda#6e6c2639620e436bddb7c040cd4f3adb
https://conda.anaconda.org/conda-forge/win-64/xorg-xproto-7.0.31-hcd874cb_1007.tar.bz2#88f3c65d2ad13826a9e0b162063be023
https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.2.0-pyhd8ed1ab_0.conda#df61644536ee98e50e1e022489588b32
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.14.0-pyhd8ed1ab_0.conda#01ea04980fa39d7b6dbdd6c67016d177
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.15.0-pyhd8ed1ab_0.conda#13018819ca8f5b7cc675a8faf1f5fedf
https://conda.anaconda.org/conda-forge/noarch/aiosignal-1.3.1-pyhd8ed1ab_0.tar.bz2#d1e1eb7e21a9e2c74279d87dafb68156
https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/win-64/aws-c-event-stream-0.2.7-h70e1b0c_13.tar.bz2#c5946a20e3d686659e2173f4921160a7
-https://conda.anaconda.org/conda-forge/noarch/babel-2.11.0-pyhd8ed1ab_0.tar.bz2#2ea70fde8d581ba9425a761609eed6ba
+https://conda.anaconda.org/conda-forge/win-64/aws-c-event-stream-0.2.20-h5f78564_4.conda#427ca70288aa9baf7514ee02c800f87c
+https://conda.anaconda.org/conda-forge/win-64/aws-c-http-0.7.6-h2545be9_0.conda#e0cb706b5e7856ebf28d3228e008d5c3
+https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.4-pyhd8ed1ab_0.tar.bz2#c5b3edc62d6309088f4970b3eaaa65a6
-https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.11.2-pyha770c72_0.conda#88b59f6989f0ed5ab3433af0b82555e1
+https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.0-pyha770c72_0.conda#84f54c3bd1a542c8fe696bc8947b040b
+https://conda.anaconda.org/conda-forge/noarch/bidict-0.22.1-pyhd8ed1ab_0.conda#2b69d5cbd3d301c9ceee2cfbf9fc87b7
https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
https://conda.anaconda.org/conda-forge/win-64/brotli-1.0.9-hcfcfb64_8.tar.bz2#2e661f21e1741c11506bdc7226e6b0bc
https://conda.anaconda.org/conda-forge/noarch/cached-property-1.5.2-hd8ed1ab_1.tar.bz2#9b347a7ec10940d3f7941ff6c460b551
https://conda.anaconda.org/conda-forge/win-64/cffi-1.15.1-py39h68f70e3_3.conda#5e7cb1054cd6f3036a4bdbfe6e23fdfd
https://conda.anaconda.org/conda-forge/win-64/cfitsio-4.2.0-h9ebe7e4_0.conda#cccd314cbeea4f2f70f73c763d9660e8
https://conda.anaconda.org/conda-forge/noarch/click-8.1.3-win_pyhd8ed1ab_2.tar.bz2#6b58680207b526c42dcff68b543803dd
-https://conda.anaconda.org/conda-forge/noarch/comm-0.1.2-pyhd8ed1ab_0.conda#3c78af4752bb1600ebe5e83ef4588eaa
-https://conda.anaconda.org/conda-forge/win-64/coverage-7.1.0-py39ha55989b_0.conda#db58b8e4e6ed3347ca2272cbf9d77aff
-https://conda.anaconda.org/conda-forge/win-64/curl-7.88.1-h68f0423_0.conda#692a21a3ee4119c67f6e99f2c903d50b
+https://conda.anaconda.org/conda-forge/noarch/comm-0.1.3-pyhd8ed1ab_0.conda#168ae0f82cdf7505048e81054c7354e4
+https://conda.anaconda.org/conda-forge/win-64/coverage-7.2.2-py39ha55989b_0.conda#2c8ec2398966d1ab15b8eefd4f3cc01b
+https://conda.anaconda.org/conda-forge/win-64/curl-7.88.1-h68f0423_1.conda#61bac43f1aad61a834f9eb718421a87c
https://conda.anaconda.org/conda-forge/win-64/cytoolz-0.12.0-py39ha55989b_1.tar.bz2#1bf852998240d1c7c9c26516c7c1323d
-https://conda.anaconda.org/conda-forge/win-64/fastavro-1.7.1-py39ha55989b_0.conda#41d29735eb76a7e6fcf5642854bb8834
+https://conda.anaconda.org/conda-forge/win-64/fastavro-1.7.3-py39ha55989b_0.conda#4b4ebac214cfd7dc263cf2437d360271
https://conda.anaconda.org/conda-forge/win-64/fontconfig-2.14.2-hbde0cde_0.conda#08767992f1a4f1336a257af1241034bd
https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/win-64/grpcio-1.46.4-py39hf834a4b_7.tar.bz2#44929d881c2d8737d7a939332f4358b8
+https://conda.anaconda.org/conda-forge/win-64/grpcio-1.52.1-py39hd0003e1_1.conda#c83b44cba62a4e1bf5edd52357807d35
https://conda.anaconda.org/conda-forge/win-64/gts-0.7.6-h7c369d9_2.tar.bz2#509e4ea898407220d7bdbc6f8a02fe63
-https://conda.anaconda.org/conda-forge/win-64/hdf5-1.12.2-nompi_h2a0e4a3_101.conda#fc009523b37055956ca02475539e144c
-https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.0.0-pyha770c72_0.conda#691644becbcdca9f73243450b1c63e62
+https://conda.anaconda.org/conda-forge/win-64/hdf5-1.12.2-nompi_h57737ce_101.conda#3e2b84f2f7bcf6915d1baa21e5b1a862
+https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.1.0-pyha770c72_0.conda#30b3127c385ca2ed5ef87f3d53d466bc
https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.12.0-pyhd8ed1ab_0.conda#e5fd2260a231ee63b6969f4801082f2b
https://conda.anaconda.org/conda-forge/noarch/jedi-0.18.2-pyhd8ed1ab_0.conda#b5e695ef9c3f0d27d6cd96bf5adc9e07
https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
-https://conda.anaconda.org/conda-forge/win-64/lcms2-2.14-ha5c8aab_1.conda#135bd65be6768b2bc84e864e7141ab77
-https://conda.anaconda.org/conda-forge/win-64/libgoogle-cloud-2.1.0-h1006c2c_1.tar.bz2#0e19cfef9029c1a74d70b82d1f8a827e
+https://conda.anaconda.org/conda-forge/win-64/lcms2-2.15-ha5c8aab_0.conda#5ebe92728f44a8b2461410ffb3628c18
+https://conda.anaconda.org/conda-forge/win-64/libgoogle-cloud-2.8.0-hf2ff781_1.conda#97fc6c786071aea9d5d7d439e5f26635
https://conda.anaconda.org/conda-forge/win-64/libkml-1.3.0-hf2ab4e4_1015.tar.bz2#1f50b25e87cefda820cb71fb643bc021
https://conda.anaconda.org/conda-forge/win-64/libxcb-1.13-hcd874cb_1004.tar.bz2#a6d7fd030532378ecb6ba435cd9f8234
-https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.1.0-pyhd8ed1ab_0.tar.bz2#d821ebc1ebe21d4cac2555278c2cd970
+https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
https://conda.anaconda.org/conda-forge/noarch/multipledispatch-0.6.0-py_0.tar.bz2#1073dc92c8f247d94ac14dd79ca0bbec
https://conda.anaconda.org/conda-forge/noarch/munch-2.5.0-py_0.tar.bz2#31d9e9be500e25ff0050bc9f57a6bcd7
+https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.7.0-pyhd8ed1ab_0.tar.bz2#fbe1182f650c04513046d6894046cd6c
https://conda.anaconda.org/conda-forge/win-64/openjpeg-2.5.0-ha2aaf27_2.conda#db0490689232e8e38c312281df6f31a2
https://conda.anaconda.org/conda-forge/noarch/oscrypto-1.2.1-pyhd3deb0d_0.tar.bz2#a717f22c057a91fc7b4517f94dc5240e
https://conda.anaconda.org/conda-forge/noarch/partd-1.3.0-pyhd8ed1ab_0.tar.bz2#af8c82d121e63082926062d61d9abb54
https://conda.anaconda.org/conda-forge/noarch/pip-23.0.1-pyhd8ed1ab_0.conda#8025ca83b8ba5430b640b83917c2a6f7
-https://conda.anaconda.org/conda-forge/win-64/postgresql-15.1-h09b8c1b_3.conda#50e0acf0eaf90abff3f96a5895e2b582
+https://conda.anaconda.org/conda-forge/win-64/postgresql-15.2-hd87cd2b_0.conda#9148e8b6b7ec9e7dedf9bf9987f606cd
https://conda.anaconda.org/conda-forge/win-64/proj-9.1.1-heca977f_2.conda#eb88b5bc4d13493971408c3131022aec
-https://conda.anaconda.org/conda-forge/win-64/protobuf-3.20.2-py39hcbf5309_1.conda#5e3097553fd5730ac7bf4cb63ec6893d
-https://conda.anaconda.org/conda-forge/win-64/psycopg2-2.9.3-py39hc7c70e1_2.conda#7fecb8cf7f340e9324e9e11ffbcc07db
+https://conda.anaconda.org/conda-forge/win-64/protobuf-4.21.12-py39h99910a6_0.conda#5336f718b1bd02058a244f59f4e85dd5
+https://conda.anaconda.org/conda-forge/win-64/psycopg2-2.9.3-py39h0213f17_2.conda#c964f0d4c06f9482100843540d25a680
https://conda.anaconda.org/conda-forge/noarch/pyasn1-modules-0.2.7-py_0.tar.bz2#ad1e886d09700b2304975335f714bd9c
https://conda.anaconda.org/conda-forge/noarch/pygments-2.14.0-pyhd8ed1ab_0.conda#c78cd16b11cd6a295484bd6c8f24bea1
https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyh0701188_6.tar.bz2#56cd9fe388baac0e90c7149cfac95b60
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.1-pyhd8ed1ab_0.conda#f0be05afc9c9ab45e273c088e00c258b
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.2.2-pyhd8ed1ab_0.conda#60958b19354e0ec295b43f6ab5cfab86
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
https://conda.anaconda.org/conda-forge/win-64/pytz-deprecation-shim-0.1.0.post0-py39hcbf5309_3.tar.bz2#91bfbc68f3f26da3a4b99738c8d7191a
https://conda.anaconda.org/conda-forge/noarch/pyu2f-0.1.5-pyhd8ed1ab_0.tar.bz2#caabbeaa83928d0c3e3949261daa18eb
https://conda.anaconda.org/conda-forge/noarch/pyyaml-env-tag-0.1-pyhd8ed1ab_0.tar.bz2#626ed9060ddeb681ddc42bcad89156ab
https://conda.anaconda.org/conda-forge/noarch/rsa-4.9-pyhd8ed1ab_0.tar.bz2#03bf410858b2cefc267316408a77c436
https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-1.4.46-py39ha55989b_0.conda#3cf0b27784f5bff072c178c805ec7491
-https://conda.anaconda.org/conda-forge/win-64/tbb-2021.7.0-h91493d7_1.conda#39365b918d4f04909485f3055b131c86
+https://conda.anaconda.org/conda-forge/win-64/tbb-2021.8.0-h91493d7_0.conda#e155410da447d8e37302a561b911dcb8
https://conda.anaconda.org/conda-forge/win-64/thrift-0.16.0-py39h99910a6_2.tar.bz2#3cd38b0a50335abea8c3f5749cdb1fe6
https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.6-pyha770c72_0.tar.bz2#471bf9e605820b59988e830382b8d654
-https://conda.anaconda.org/conda-forge/noarch/tqdm-4.64.1-pyhd8ed1ab_0.tar.bz2#5526ff3f88f9db87bb0924b9ce575345
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.4.0-hd8ed1ab_0.tar.bz2#be969210b61b897775a0de63cd9e9026
-https://conda.anaconda.org/conda-forge/noarch/validators-0.20.0-pyhd8ed1ab_0.conda#7788d86bd60f6b6f7662609fc8a6c324
-https://conda.anaconda.org/conda-forge/win-64/watchdog-2.2.1-py39hcbf5309_0.conda#4b560f27fa4bc16bc784a982e5c40639
+https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.11.7-pyha770c72_0.conda#547d15e217a398578900787bf39ef01d
+https://conda.anaconda.org/conda-forge/noarch/tqdm-4.65.0-pyhd8ed1ab_1.conda#ed792aff3acb977d09c7013358097f83
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.5.0-hd8ed1ab_0.conda#b3c594fde1a80a1fc3eb9cc4a5dfe392
+https://conda.anaconda.org/conda-forge/win-64/watchdog-3.0.0-py39hcbf5309_0.conda#0b899317556b1ba289448e7362c7abde
+https://conda.anaconda.org/conda-forge/noarch/werkzeug-2.2.3-pyhd8ed1ab_0.conda#94dea682ba9d8e091e1f46872886fb1f
https://conda.anaconda.org/conda-forge/win-64/xorg-libsm-1.2.3-hcd874cb_1000.tar.bz2#76a765e735668a9922da3d58e746a7a6
https://conda.anaconda.org/conda-forge/win-64/yarl-1.8.2-py39ha55989b_0.conda#e62d2a54b20aeeb2f4f6c85056fccb88
https://conda.anaconda.org/conda-forge/noarch/zict-2.2.0-pyhd8ed1ab_0.tar.bz2#cd563d01df94e51f968645dbf3b310b0
https://conda.anaconda.org/conda-forge/noarch/async-timeout-4.0.2-pyhd8ed1ab_0.tar.bz2#25e79f9a1133556671becbd65a170c78
-https://conda.anaconda.org/conda-forge/win-64/aws-sdk-cpp-1.8.186-h93d3aa3_4.tar.bz2#b67b8f43c04fac75e8932d6023b22ef2
+https://conda.anaconda.org/conda-forge/win-64/aws-c-auth-0.6.26-h1262f0c_1.conda#2090318f4a24eec3680efbd0395b1697
+https://conda.anaconda.org/conda-forge/win-64/aws-c-mqtt-0.8.6-hd211e0c_12.conda#6eadc1f9b2b273f574cc24227a3390c6
https://conda.anaconda.org/conda-forge/noarch/branca-0.6.0-pyhd8ed1ab_0.tar.bz2#f4cc65697763ef8c2f7555f1ec355a6b
https://conda.anaconda.org/conda-forge/win-64/brotlipy-0.7.0-py39ha55989b_1005.tar.bz2#5ffea1498e831c783af65e274d6c58f5
https://conda.anaconda.org/conda-forge/win-64/cairo-1.16.0-hd694305_1014.tar.bz2#91f08ed9ff25a969ddd06237454dae0d
https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/win-64/cryptography-38.0.4-py39h58e9bdb_0.conda#5bb18b28a87f948a58da5562835822e1
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.2.0-pyhd8ed1ab_0.conda#156fb994a4e07091c4fad2c148589eb2
+https://conda.anaconda.org/conda-forge/win-64/cryptography-38.0.4-py39hb6bd5e6_0.conda#b578d1ccc2d34452cced2bbf5c4bbe38
https://conda.anaconda.org/conda-forge/noarch/dunamai-1.16.0-pyhd8ed1ab_0.conda#110d09bb5b0a0cfeebd384ad34758f54
-https://conda.anaconda.org/conda-forge/win-64/fonttools-4.38.0-py39ha55989b_1.tar.bz2#391cedb9f2da5280ea060097d3c8652d
+https://conda.anaconda.org/conda-forge/win-64/fonttools-4.39.2-py39ha55989b_0.conda#364c83a8b134b43a425779cc1285216f
https://conda.anaconda.org/conda-forge/noarch/geoalchemy2-0.13.1-pyhd8ed1ab_0.conda#960bfe729d9e0453b415b08492235d89
https://conda.anaconda.org/conda-forge/win-64/geotiff-1.7.1-hc256dc0_6.conda#d147f5504f1b29faa112aa72e9c59599
https://conda.anaconda.org/conda-forge/noarch/ghp-import-2.1.0-pyhd8ed1ab_0.tar.bz2#6d8d61116031a3f5b1f32e7899785866
@@ -285,124 +291,133 @@ https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.31-pyhd8ed1ab_0.cond
https://conda.anaconda.org/conda-forge/win-64/google-crc32c-1.1.2-py39h0def995_4.tar.bz2#29dbf781cbc0dc87c188001163cf8391
https://conda.anaconda.org/conda-forge/noarch/googleapis-common-protos-1.57.1-pyhd8ed1ab_0.conda#cbf8b4569c1d2a0a6077d34a2d38333e
https://conda.anaconda.org/conda-forge/noarch/griffe-0.25.5-pyhd8ed1ab_0.conda#bae2e1b21d42d8578b56d4a9f1f354fb
-https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.68.2-pyha770c72_0.conda#987bfe1fc5c1eb5bf616eccae0c3b71d
+https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.70.0-pyha770c72_0.conda#a1e728a4049af44ab9ae8fc641e79ae0
https://conda.anaconda.org/conda-forge/noarch/importlib-resources-5.12.0-pyhd8ed1ab_0.conda#3544c818f0720c89eb16ae6940ab440b
-https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.0.0-hd8ed1ab_0.conda#a67d43e1527a37199dd8db913366f68e
+https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.1.0-hd8ed1ab_0.conda#90bab1d97fdb6bb40c8e00207bf222dc
https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.17.3-pyhd8ed1ab_0.conda#723268a468177cd44568eb8f794e0d80
https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
https://conda.anaconda.org/conda-forge/win-64/kealib-1.5.0-h61be68b_0.conda#59e439387b2ca19699b8ce1f077ebe0a
-https://conda.anaconda.org/conda-forge/win-64/libnetcdf-4.8.1-nompi_h8c042bf_106.tar.bz2#90515eee0f7575b5fd296b6ba8d91dae
+https://conda.anaconda.org/conda-forge/win-64/libnetcdf-4.9.1-nompi_hc41bf00_101.conda#cc79e202db8167cfc78ce4edfcf43c17
https://conda.anaconda.org/conda-forge/win-64/libspatialite-5.0.1-hfdcade0_23.conda#7661a11b21d23f6f21648a787045b825
https://conda.anaconda.org/conda-forge/noarch/markdown-3.3.7-pyhd8ed1ab_0.tar.bz2#0a0bed31742342688a8570b3b8a50f36
-https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.3-pyhd8ed1ab_0.conda#7a69c057183706bc7ba6ac7c9130566a
+https://conda.anaconda.org/conda-forge/noarch/mdit-py-plugins-0.3.5-pyhd8ed1ab_0.conda#9eeb66a24c8f6d950eb55a9f1128da20
https://conda.anaconda.org/conda-forge/win-64/mkl-2022.1.0-h6a75c08_874.tar.bz2#2ff89a7337a9636029b4db9466e9f8e3
https://conda.anaconda.org/conda-forge/win-64/pillow-9.4.0-py39hcebd2be_1.conda#7cf5bb13bc3823aa5159e00c7d1cb18f
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.0.0-pyhd8ed1ab_0.conda#c34694044915d7f291ef257029f2e2af
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.2.0-pyhd8ed1ab_0.conda#f10c2cf447ca96f12a326b83c75b8e33
https://conda.anaconda.org/conda-forge/noarch/proto-plus-1.22.2-pyhd8ed1ab_0.conda#66f3f2b12d75e745fecf163d41bf3220
https://conda.anaconda.org/conda-forge/win-64/pyproj-3.4.1-py39hc799f2e_1.conda#b4a6e56b9ba3cc0c0ccac4b8f8e33c2a
https://conda.anaconda.org/conda-forge/noarch/pytest-benchmark-4.0.0-pyhd8ed1ab_0.tar.bz2#8c3168375e2ac100c17b133f4e2eb536
https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.0.0-pyhd8ed1ab_0.tar.bz2#c9e3f8bfdb9bfc34aa1836a6ed4b25d7
+https://conda.anaconda.org/conda-forge/noarch/pytest-httpserver-1.0.5-pyhd8ed1ab_0.tar.bz2#e627fb0e11e55afe5ed444e81a778bea
https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.10.0-pyhd8ed1ab_0.tar.bz2#db93caa9fe182f0cd20291aeb22f57ac
https://conda.anaconda.org/conda-forge/noarch/pytest-profiling-1.7.0-py_1.tar.bz2#4dc5c2917451a73cc7532fc893e2daea
https://conda.anaconda.org/conda-forge/noarch/pytest-randomly-3.12.0-pyhd8ed1ab_0.tar.bz2#c428aad352580a0d3264740a4dd5aeae
https://conda.anaconda.org/conda-forge/noarch/pytest-repeat-0.9.1-pyhd8ed1ab_0.tar.bz2#654827090748fa1cf4a375df7d99fcaf
https://conda.anaconda.org/conda-forge/noarch/pytest-snapshot-0.9.0-pyhd8ed1ab_0.conda#fe1008ddb91eed708d93ac866ef80a7c
-https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.0-pyhd8ed1ab_0.conda#70ab87b96126f35d1e68de2ad9fb6423
-https://conda.anaconda.org/conda-forge/noarch/rich-13.3.1-pyhd8ed1ab_1.conda#7f6cbdc439f3fe4c7a65fbeb4edad507
-https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.1-pyhd8ed1ab_0.conda#cf622f971962bc7bc45b7da01eb41d55
+https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.2.1-pyhd8ed1ab_0.conda#6fe4c2689d1b10fec1ee65819f0c4fd5
+https://conda.anaconda.org/conda-forge/noarch/rich-13.3.3-pyhd8ed1ab_0.conda#f4ea5e85c4cdf52fe83f7d33526c70d2
+https://conda.anaconda.org/conda-forge/noarch/sqlalchemy-views-0.3.2-pyhd8ed1ab_0.conda#8a0884a535e9ef935bbd977e575e8115
https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
https://conda.anaconda.org/conda-forge/noarch/thrift_sasl-0.4.3-pyhd8ed1ab_2.tar.bz2#0340a97c4990a5bb5ecf1a27fef9f9c3
-https://conda.anaconda.org/conda-forge/win-64/tiledb-2.13.2-h5689973_0.conda#931a7aedaa3ae50e4fca6982e3dda4ba
-https://conda.anaconda.org/conda-forge/win-64/tzlocal-4.2-py39hcbf5309_2.tar.bz2#64067862b4171504c87309a285ab02c1
+https://conda.anaconda.org/conda-forge/win-64/tiledb-2.13.2-h3132609_0.conda#07426c5e1301448738f66686548d41ff
+https://conda.anaconda.org/conda-forge/win-64/tzlocal-4.3-py39hcbf5309_0.conda#de99cc0e710f804585b67d22f3b6bdf3
+https://conda.anaconda.org/conda-forge/win-64/ukkonen-1.0.1-py39h1f6ef14_3.tar.bz2#56f8cce1c3df2ae1a861b0f12245c46f
https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
-https://conda.anaconda.org/conda-forge/win-64/xorg-libx11-1.7.2-hcd874cb_0.tar.bz2#fc83d322fcfa4ca466b8529c4a2d259c
+https://conda.anaconda.org/conda-forge/win-64/xorg-libx11-1.8.4-hcd874cb_0.conda#ebdb02b455647e13fa697da89d9bdf84
https://conda.anaconda.org/conda-forge/win-64/aiohttp-3.8.4-py39ha55989b_0.conda#19de97190004a407011b98bdd9752b26
+https://conda.anaconda.org/conda-forge/win-64/aws-c-s3-0.2.7-h8113e7b_1.conda#4f322af22c19df5e1d2c4d77dd68fa7c
https://conda.anaconda.org/conda-forge/win-64/black-23.1.0-py39hcbf5309_0.conda#9d6fe0ed7d1ebdba10acfadcffc3c388
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.3.2-pyhd8ed1ab_0.conda#a3552db3a43810551cc93f9a4272380e
https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.4.1-pyhd8ed1ab_0.conda#a0d4c902824b3188a61df18c1e8bbf5e
-https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.46.3-pyhd8ed1ab_0.tar.bz2#296839af9c3367492bed586613ea9aa6
+https://conda.anaconda.org/conda-forge/noarch/grpcio-status-1.52.0-pyhd8ed1ab_0.conda#e927804a2875873aa5673b47bd67606c
https://conda.anaconda.org/conda-forge/win-64/harfbuzz-6.0.0-he256f1b_0.conda#15422d4ff786ed835173cfb8e6735679
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.22-pyhd8ed1ab_0.conda#b8d16e273396a0115199a83769a39246
https://conda.anaconda.org/conda-forge/noarch/impyla-0.18.0-pyhd8ed1ab_0.tar.bz2#851fd5b28a65b6be38db252706f43d6b
-https://conda.anaconda.org/conda-forge/win-64/jupyter_core-5.2.0-py39hcbf5309_0.conda#1bf82794b668b8818ba7a96d46d948e9
+https://conda.anaconda.org/conda-forge/win-64/jupyter_core-5.3.0-py39hcbf5309_0.conda#314e017a3e027d822d6fb34e1c3998b0
https://conda.anaconda.org/conda-forge/win-64/libblas-3.9.0-16_win64_mkl.tar.bz2#d2e6f4e86cee2b4e8c27ff6884ccdc61
https://conda.anaconda.org/conda-forge/noarch/mkdocs-1.4.2-pyhd8ed1ab_0.tar.bz2#521b5c1a67f0f35b11a981299b9e4b9b
https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2#8f882b197fd9c4941a787926baea4868
https://conda.anaconda.org/conda-forge/noarch/poetry-dynamic-versioning-0.21.4-pyhd8ed1ab_0.conda#193b33386a14f40addd3ea12b7714548
-https://conda.anaconda.org/conda-forge/win-64/poppler-23.01.0-h183ae7b_0.conda#e783b13dd5053ac11ecb77b0edc8eafc
-https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.36-pyha770c72_0.conda#4d79ec192e0bfd530a254006d123b9a6
-https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.9.2-pyhd8ed1ab_0.conda#2af5fe494e07ea7d54e3c00e89df6ea8
+https://conda.anaconda.org/conda-forge/win-64/poppler-23.03.0-h183ae7b_0.conda#0908fe0f0432ac13c3411822c68da81d
+https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.38-pyha770c72_0.conda#59ba1bf8ea558751a0d391249a248765
+https://conda.anaconda.org/conda-forge/noarch/pymdown-extensions-9.10-pyhd8ed1ab_0.conda#45cb8e1efb6441b16ee3c0d19533a910
https://conda.anaconda.org/conda-forge/noarch/pyopenssl-22.1.0-pyhd8ed1ab_0.tar.bz2#fbfa0a180d48c800f922a10a114a8632
https://conda.anaconda.org/conda-forge/noarch/pytest-clarity-1.0.1-pyhd8ed1ab_0.tar.bz2#76a7925032ca23744cf6c7a9fc0ef243
-https://conda.anaconda.org/conda-forge/win-64/xorg-libxext-1.3.4-hcd874cb_1.tar.bz2#237e70b849a9440c2fce725b74412cd6
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.21.0-pyhd8ed1ab_0.conda#cb9a711f7c9f3074fe522e5a34481e60
+https://conda.anaconda.org/conda-forge/win-64/xorg-libxext-1.3.4-hcd874cb_2.conda#2aa695ac3c56193fd8d526e3b511e021
https://conda.anaconda.org/conda-forge/win-64/xorg-libxt-1.2.1-hcd874cb_2.tar.bz2#75788d7a4edf041cdd0a830f9bcaa3fb
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.10.0-pyh08f2357_0.conda#ad7524fdf746f7141b6c3dbffc2a9548
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.0.3-pyhd8ed1ab_0.conda#c279256b9f2195976b0168585a5adc79
+https://conda.anaconda.org/conda-forge/win-64/aws-crt-cpp-0.19.8-he6d3b81_12.conda#10db42f355afa5c3c552391d1037a979
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.1.0-pyhd8ed1ab_0.conda#ad497b55d36d20d4bbc6f95d8fb6eb6d
https://conda.anaconda.org/conda-forge/win-64/libcblas-3.9.0-16_win64_mkl.tar.bz2#14c2fb03b2bb14dfa3806186ca91d557
-https://conda.anaconda.org/conda-forge/win-64/libgdal-3.6.2-hb852d34_5.conda#86b77837f2f7ce8f5d63f9f071d520d5
+https://conda.anaconda.org/conda-forge/win-64/libgdal-3.6.2-h221c0cb_9.conda#88c3283cd62901b1d33e51a15f8e981d
https://conda.anaconda.org/conda-forge/win-64/liblapack-3.9.0-16_win64_mkl.tar.bz2#be2f9d5712a5bb05cd900005ee752a05
https://conda.anaconda.org/conda-forge/noarch/mkdocs-autorefs-0.4.1-pyhd8ed1ab_1.tar.bz2#49e4c30dd48438c2c71a71d40ecb384d
https://conda.anaconda.org/conda-forge/noarch/mkdocs-exclude-1.0.2-pyhd8ed1ab_0.tar.bz2#4a0af4399e9b3e4142f3dcabd35b7553
https://conda.anaconda.org/conda-forge/noarch/mkdocs-gen-files-0.4.0-pyhd8ed1ab_0.tar.bz2#ea350040131e9a179817f620a704411a
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.1.0-pyhd8ed1ab_0.tar.bz2#8a4d2c572d7d862a74f1083ae723ce98
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-git-revision-date-localized-plugin-1.2.0-pyhd8ed1ab_0.conda#bb62770212e6547d281ba03d03048a38
https://conda.anaconda.org/conda-forge/noarch/mkdocs-literate-nav-0.4.1-pyhd8ed1ab_0.tar.bz2#93e0ddb91f9fb615fa3f9cda31434447
-https://conda.anaconda.org/conda-forge/noarch/nbformat-5.7.3-pyhd8ed1ab_0.conda#9714111cb6c7dbbc9a9f34de205c2f29
-https://conda.anaconda.org/conda-forge/win-64/pango-1.50.13-hdffb7b3_0.conda#a2db50ec796a95c44f6fae10eb7ae39e
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.14-pyhd8ed1ab_0.conda#01f33ad2e0aaf6b5ba4add50dad5ad29
+https://conda.anaconda.org/conda-forge/noarch/nbformat-5.8.0-pyhd8ed1ab_0.conda#1ca43103a08456b19222d93fd9d119ac
+https://conda.anaconda.org/conda-forge/win-64/pango-1.50.14-hdffb7b3_0.conda#a613f324e0f213238baec720d5c4ed00
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.2.0-pyha770c72_0.conda#9a160452d1d88a9f10c373888f93586b
+https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.conda#45b74f64d8808eda7e6f6e6b1d641fd2
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
https://conda.anaconda.org/conda-forge/win-64/xorg-libxpm-3.5.13-hcd874cb_0.tar.bz2#4b31b88585f696327ba79fea3b41f973
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.2.0-pyhd8ed1ab_0.conda#908e176bdb542b900f1c044bac70683b
-https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.21.2-pyh025b116_0.conda#2f0ef6a37b24f898508d7a5026e32c02
-https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.4-pyhcff175f_0.conda#bd45bc0e2e0af96e2a18dba3f70c71f3
+https://conda.anaconda.org/conda-forge/win-64/aws-sdk-cpp-1.10.57-h64004b3_8.conda#1c1266961221f698336f672757c27ff2
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.3.2-pyhd8ed1ab_0.conda#972a8221136c71c6954cf900ce020ed5
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.11.0-pyh08f2357_0.conda#260ed8a8cbb42c30f8b17a9daeb78353
+https://conda.anaconda.org/conda-forge/noarch/jupytext-1.14.5-pyhcff175f_0.conda#b65bbb7f428ab4de2227827672ee9ba4
https://conda.anaconda.org/conda-forge/win-64/libgd-2.3.3-hf5a96e7_4.conda#07f0bd616b51dbd898cabf14646cdf5d
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-0.20.0-pyhd8ed1ab_0.conda#d83092b104a5879e97f9e4b6fa910564
https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.2-pyhd8ed1ab_0.conda#6c7b0d75b66a220274bb5a28c23197f2
https://conda.anaconda.org/conda-forge/win-64/numpy-1.24.2-py39h16ffa76_0.conda#22f75ab631b8da1b0e8224f0106f6e59
https://conda.anaconda.org/conda-forge/noarch/requests-2.28.2-pyhd8ed1ab_0.conda#11d178fc55199482ee48d6812ea83983
-https://conda.anaconda.org/conda-forge/win-64/arrow-cpp-8.0.1-py39h4f3435e_2_cpu.tar.bz2#62c112f93455fcfbd16071d4caf2b2e2
https://conda.anaconda.org/conda-forge/noarch/bokeh-2.4.3-pyhd8ed1ab_3.tar.bz2#e4c6e6d99add99cede5328d811cacb21
https://conda.anaconda.org/conda-forge/win-64/contourpy-1.0.7-py39h1f6ef14_0.conda#a9349020a5d31dc6eed3580e35f5f45a
https://conda.anaconda.org/conda-forge/noarch/folium-0.14.0-pyhd8ed1ab_0.conda#48c8bb19df0d0268f1a9d30ffc56c5b0
-https://conda.anaconda.org/conda-forge/win-64/gdal-3.6.2-py39h34c8707_5.conda#0b5a2cb8987d055dfb4299dc1335bf92
-https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.1-pyh1a96a4e_0.conda#77235e975f133a69c63068c4b42478f2
+https://conda.anaconda.org/conda-forge/win-64/gdal-3.6.2-py39h3be0312_9.conda#4d2688361e1a4b5a04162a1610efd2a9
+https://conda.anaconda.org/conda-forge/noarch/google-auth-2.16.3-pyh1a96a4e_0.conda#98fe53dfc39c4f76cbf5e46737b68572
https://conda.anaconda.org/conda-forge/win-64/graphviz-7.1.0-h51cb2cd_0.conda#2ab84ffaa7b47e0118c10e9e5d29bd37
-https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.4-pyhd8ed1ab_0.conda#9dea5ab3cc33084f7a3680a98859731e
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.0.1-pyhd8ed1ab_0.conda#eb6166c4ba7da4250e7063753f01af43
+https://conda.anaconda.org/conda-forge/noarch/ipykernel-6.22.0-pyh025b116_0.conda#4d594953555f43826532ab5c5f7754f5
+https://conda.anaconda.org/conda-forge/win-64/libarrow-11.0.0-h04c43f8_13_cpu.conda#0872ce0cc56d710e1467c996b3142cb4
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-material-9.1.4-pyhd8ed1ab_0.conda#c8676c031d982201c0ea7625a97132b2
https://conda.anaconda.org/conda-forge/noarch/mkdocstrings-python-0.8.3-pyhd8ed1ab_0.conda#d7596b7fe476b9c66ef8d00e3505ab83
https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.2.9-pyhd8ed1ab_0.conda#a9e1826152e79416db71c51b0d3af28c
https://conda.anaconda.org/conda-forge/win-64/pandas-1.5.3-py39h2ba5b7c_0.conda#4af5e951fc5ffdf2da95e27a9685321b
-https://conda.anaconda.org/conda-forge/win-64/polars-0.16.6-py39hf21820d_0.conda#b5d73f59f0171371725f63599484faf8
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.6.0-pyhd8ed1ab_0.tar.bz2#6429e1d1091c51f626b5dcfdd38bf429
+https://conda.anaconda.org/conda-forge/win-64/polars-0.16.14-py39hf21820d_0.conda#8109e2e1acb4d6a25a26ea796f144b41
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
https://conda.anaconda.org/conda-forge/noarch/requests-oauthlib-1.3.1-pyhd8ed1ab_0.tar.bz2#61b279f051eef9c89d58f4d813e75e04
https://conda.anaconda.org/conda-forge/win-64/shapely-1.8.5-py39h7c5f289_2.tar.bz2#4930a48fe26c07b57f04706b89182337
-https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.321.0-pyhd8ed1ab_0.conda#d8343ded2050d4e799f73f9e6a46cf6a
-https://conda.anaconda.org/conda-forge/noarch/altair-4.2.2-pyhd8ed1ab_0.conda#afca9c6a93335c55bbc84072011e86dc
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.2.0-pyhd8ed1ab_0.conda#c64c58bf99a686d8bdff8f9c4d33d615
+https://conda.anaconda.org/conda-forge/noarch/trino-python-client-0.322.0-pyhd8ed1ab_0.conda#35b63aad915833b902a40050d6f800df
+https://conda.anaconda.org/conda-forge/win-64/arrow-cpp-11.0.0-h57928b3_13_cpu.conda#7d096783fc97ffadf0961772786a67a3
https://conda.anaconda.org/conda-forge/win-64/fiona-1.9.1-py39hb5a1417_0.conda#03d2272a7863e8bba56765dc566b93c6
https://conda.anaconda.org/conda-forge/noarch/geopandas-base-0.12.2-pyha770c72_0.conda#cf04d066b97dfe698f0d01ebf4af6163
https://conda.anaconda.org/conda-forge/noarch/google-api-core-2.11.0-pyhd8ed1ab_0.conda#72f60923cfbd91eec24e59c41454cecd
https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.0.0-pyhd8ed1ab_0.conda#5ba9d95acb9add67f468ecdee6595c0f
-https://conda.anaconda.org/conda-forge/win-64/matplotlib-base-3.7.0-py39haf65ace_0.conda#f0b61601593071a404737549e29f6821
+https://conda.anaconda.org/conda-forge/noarch/ipywidgets-8.0.0-pyhd8ed1ab_0.tar.bz2#325b4a93cf9567876d4b43d8fe18b2d0
+https://conda.anaconda.org/conda-forge/win-64/matplotlib-base-3.7.1-py39haf65ace_0.conda#67eab77ac976416272dd5c588815a878
https://conda.anaconda.org/conda-forge/noarch/mkdocs-macros-plugin-0.7.0-pyhd8ed1ab_0.tar.bz2#bead57f41507066a63cb9cb62c837e9e
https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.2.9-pyhd8ed1ab_0.conda#4a8dc94c7c2f3736dc4b91ec345d5b4b
-https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
-https://conda.anaconda.org/conda-forge/noarch/pydeck-0.8.0-pyhd8ed1ab_0.tar.bz2#176b16002a5423169bf0f4b4c0ebecaf
https://conda.anaconda.org/conda-forge/noarch/python-graphviz-0.20.1-pyh22cad53_0.tar.bz2#196447bc6fd769c3eb2d51de1aa866a5
-https://conda.anaconda.org/conda-forge/win-64/scipy-1.10.0-py39hfbf2dce_2.conda#ac8c281db29912690f85f253b4b067fa
+https://conda.anaconda.org/conda-forge/win-64/scipy-1.10.1-py39hfbf2dce_0.conda#d0a7cf42190668a87c931af32ffc37c2
https://conda.anaconda.org/conda-forge/noarch/google-api-core-grpc-2.11.0-hd8ed1ab_0.conda#d6ee05e028217ccd803fd9e96e47ceae
https://conda.anaconda.org/conda-forge/noarch/google-cloud-core-2.3.2-pyhd8ed1ab_0.tar.bz2#7a590deea6b9b082c6a24e18c3c83dc9
https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.2.9-pyhd8ed1ab_0.conda#523aaa3affb003ab0e68dbc24c9027f4
-https://conda.anaconda.org/conda-forge/win-64/pyarrow-8.0.1-py39h59190f8_2_cpu.tar.bz2#d99242eafb42e644930aae8f6029ed16
+https://conda.anaconda.org/conda-forge/noarch/parquet-cpp-1.5.1-2.tar.bz2#79a5f78c42817594ae016a7896521a97
https://conda.anaconda.org/conda-forge/noarch/pydata-google-auth-1.7.0-pyhd8ed1ab_0.conda#c28635a73fe7088b263847cf9b6cb157
-https://conda.anaconda.org/conda-forge/win-64/scikit-learn-1.2.1-py39h6fe01c0_0.conda#1968d249f89c219646d40274aa84ba58
-https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
+https://conda.anaconda.org/conda-forge/win-64/scikit-learn-1.2.2-py39hb6325b5_1.conda#7d66569c2ece33d90fcb1a467e62a75e
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.7.0-pyhd8ed1ab_0.conda#35f5073d527a0633b4c1a6c5100a0f73
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-core-2.18.0-pyh1a96a4e_0.conda#25536317a3f02fde94312b4a759a9a1a
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.7.0-pyh1a96a4e_0.conda#b6073f255f6fb03c9248fef84715a74e
https://conda.anaconda.org/conda-forge/noarch/mapclassify-2.5.0-pyhd8ed1ab_1.conda#db1aeaff6e248db425e049feffded7a9
-https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.22.0-pyhd8ed1ab_0.tar.bz2#925b01483f102a0a1aefb74108ed97ca
-https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
-https://conda.anaconda.org/conda-forge/win-64/python-duckdb-0.7.0-py39ha6ea889_1.conda#126d575f4fa7b7315df3e1b4af4faa0c
-https://conda.anaconda.org/conda-forge/win-64/snowflake-connector-python-2.8.3-py39h52e2d10_0.conda#0c06cfdec5bbbbdc89ea58634bca0145
-https://conda.anaconda.org/conda-forge/noarch/streamlit-1.18.1-pyhd8ed1ab_0.conda#a5a0237df302137e15fe7eb184515cf9
-https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.6.8-pyhd8ed1ab_0.conda#945a4bd3cf6a97bbbc80a55c79895e64
+https://conda.anaconda.org/conda-forge/noarch/mkdocs-jupyter-0.24.1-pyhd8ed1ab_0.conda#9329bf1412d932d3ed8adec2d512f47c
+https://conda.anaconda.org/conda-forge/win-64/pyarrow-11.0.0-py39hdb2b141_13_cpu.conda#59c50a1353fa95d7763dda8b42834afe
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.3.2-pyhd8ed1ab_0.conda#f4560f760cb67f9a58aa5b595c08e431
+https://conda.anaconda.org/conda-forge/noarch/db-dtypes-1.0.5-pyhd8ed1ab_1.conda#94d2fbc8ca24af42f13cb9adf8e8cc25
https://conda.anaconda.org/conda-forge/noarch/geopandas-0.12.2-pyhd8ed1ab_0.conda#ee3b330f13297f5839d46e1ca3e57d56
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-core-3.1.0-pyhd8ed1ab_0.tar.bz2#b0816cdad1ed5f376831b1c36a74106b
https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-storage-2.18.0-pyh1a96a4e_0.conda#1dd182ddd36fabde67c01459f60f2267
-https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.6-pyhd8ed1ab_0.conda#d828af2140f74d780c0d6a5ee827295e
-https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.1.0-pyhd8ed1ab_0.tar.bz2#1d66863d0c73e517fbcfd859e89d3b4d
+https://conda.anaconda.org/conda-forge/noarch/pyspark-3.3.2-pyhd8ed1ab_0.conda#bc18e02597c140d3944b0d1908b34792
+https://conda.anaconda.org/conda-forge/win-64/python-duckdb-0.7.1-py39ha6ea889_0.conda#0978014f3c2fc6b725698b482d45c1a1
+https://conda.anaconda.org/conda-forge/win-64/snowflake-connector-python-3.0.2-py39h44145e9_0.conda#5a8468972a3b48434aebd076a7eef6e3
+https://conda.anaconda.org/conda-forge/noarch/duckdb-engine-0.7.0-pyhd8ed1ab_0.conda#1355c16d9fbdf2b4af9f087b28c46966
+https://conda.anaconda.org/conda-forge/noarch/google-cloud-bigquery-3.7.0-pyhd8ed1ab_0.conda#38d8e2d223209a47eff8f06da52fe01d
+https://conda.anaconda.org/conda-forge/noarch/snowflake-sqlalchemy-1.4.7-pyhd8ed1ab_0.conda#79664774190bb9e59979443e6bdef509
|
|
test: avoid memtable in set ops testing to prevent unreliable snowflake random string generation
|
0a4cb1a48ef413b94e144ceb7b210b9f33723fc0
|
test
|
https://github.com/rohankumardubey/ibis/commit/0a4cb1a48ef413b94e144ceb7b210b9f33723fc0
|
avoid memtable in set ops testing to prevent unreliable snowflake random string generation
|
diff --git a/test_set_ops.py b/test_set_ops.py
index f9951e5..9088c43 100644
--- a/test_set_ops.py
+++ b/test_set_ops.py
@@ -145,14 +145,14 @@ def test_empty_set_op(alltypes, method):
@pytest.mark.parametrize("distinct", [True, False])
[email protected](["dask", "pandas"], raises=com.UnboundExpressionError)
@pytest.mark.notimpl(["datafusion", "polars"], raises=com.OperationNotDefinedError)
-def test_top_level_union(backend, con, distinct):
- t1 = ibis.memtable(dict(a=[1]), name="t1")
- t2 = ibis.memtable(dict(a=[2]), name="t2")
[email protected](["dask"], raises=AssertionError, reason="results are incorrect")
+def test_top_level_union(backend, con, alltypes, distinct):
+ t1 = alltypes.select(a="bigint_col").filter(lambda t: t.a == 10).distinct()
+ t2 = alltypes.select(a="bigint_col").filter(lambda t: t.a == 20).distinct()
expr = t1.union(t2, distinct=distinct).limit(2)
result = con.execute(expr)
- expected = pd.DataFrame({"a": [1, 2]})
+ expected = pd.DataFrame({"a": [10, 20]})
backend.assert_frame_equal(result.sort_values("a").reset_index(drop=True), expected)
@@ -162,21 +162,35 @@ def test_top_level_union(backend, con, distinct):
True,
param(
False,
- marks=pytest.mark.notimpl(["bigquery", "mssql", "snowflake", "sqlite"]),
+ marks=pytest.mark.notimpl(
+ ["bigquery", "dask", "mssql", "pandas", "snowflake", "sqlite"]
+ ),
),
],
)
@pytest.mark.parametrize(
("opname", "expected"),
- [("intersect", pd.DataFrame({"a": [2]})), ("difference", pd.DataFrame({"a": [1]}))],
+ [
+ ("intersect", pd.DataFrame({"a": [20]})),
+ ("difference", pd.DataFrame({"a": [10]})),
+ ],
ids=["intersect", "difference"],
)
[email protected](["dask", "pandas"], raises=com.UnboundExpressionError)
@pytest.mark.notimpl(["datafusion", "polars"], raises=com.OperationNotDefinedError)
@pytest.mark.notyet(["impala"], reason="doesn't support intersection or difference")
-def test_top_level_intersect_difference(backend, con, distinct, opname, expected):
- t1 = ibis.memtable(dict(a=[1, 2]), name="t1")
- t2 = ibis.memtable(dict(a=[2, 3]), name="t2")
+def test_top_level_intersect_difference(
+ backend, con, alltypes, distinct, opname, expected
+):
+ t1 = (
+ alltypes.select(a="bigint_col")
+ .filter(lambda t: (t.a == 10) | (t.a == 20))
+ .distinct()
+ )
+ t2 = (
+ alltypes.select(a="bigint_col")
+ .filter(lambda t: (t.a == 20) | (t.a == 30))
+ .distinct()
+ )
op = getattr(t1, opname)
expr = op(t2, distinct=distinct).limit(2)
result = con.execute(expr)
|
|
feat(duckdb): support 0.8.0
|
ae9ae7d07deb3f8e5802365fedfc54c56d04af2e
|
feat
|
https://github.com/ibis-project/ibis/commit/ae9ae7d07deb3f8e5802365fedfc54c56d04af2e
|
support 0.8.0
|
diff --git a/__init__.py b/__init__.py
index 9195845..ce66ad1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -14,6 +14,7 @@ import duckdb
import pyarrow as pa
import sqlalchemy as sa
import toolz
+from packaging.version import parse as vparse
import ibis.common.exceptions as exc
import ibis.expr.datatypes as dt
@@ -168,8 +169,10 @@ class Backend(BaseAlchemyBackend):
@sa.event.listens_for(engine, "connect")
def configure_connection(dbapi_connection, connection_record):
dbapi_connection.execute("SET TimeZone = 'UTC'")
- # the progress bar causes kernel crashes in jupyterlab ¯\\_(ツ)_/¯
- dbapi_connection.execute("SET enable_progress_bar = false")
+ # the progress bar in duckdb <0.8.0 causes kernel crashes in
+ # jupyterlab, fixed in https://github.com/duckdb/duckdb/pull/6831
+ if vparse(duckdb.__version__) < vparse("0.8.0"):
+ dbapi_connection.execute("SET enable_progress_bar = false")
self._record_batch_readers_consumed = {}
super().do_connect(engine)
@@ -297,8 +300,6 @@ class Backend(BaseAlchemyBackend):
Table
An ibis table expression
"""
- from packaging.version import parse as vparse
-
if (version := vparse(self.version)) < vparse("0.7.0"):
raise exc.IbisError(
f"`read_json` requires duckdb >= 0.7.0, duckdb {version} is installed"
@@ -639,9 +640,16 @@ class Backend(BaseAlchemyBackend):
query_ast = self.compiler.to_ast_ensure_limit(expr, limit, params=params)
sql = query_ast.compile()
+ # handle the argument name change in duckdb 0.8.0
+ fetch_record_batch = (
+ (lambda cur: cur.fetch_record_batch(rows_per_batch=chunk_size))
+ if vparse(duckdb.__version__) >= vparse("0.8.0")
+ else (lambda cur: cur.fetch_record_batch(chunk_size=chunk_size))
+ )
+
def batch_producer(con):
with con.begin() as c, contextlib.closing(c.execute(sql)) as cur:
- yield from cur.cursor.fetch_record_batch(chunk_size=chunk_size)
+ yield from fetch_record_batch(cur.cursor)
# batch_producer keeps the `self.con` member alive long enough to
# exhaust the record batch reader, even if the backend or connection
diff --git a/test_export.py b/test_export.py
index 1a9c308..0230e29 100644
--- a/test_export.py
+++ b/test_export.py
@@ -1,6 +1,7 @@
import pandas as pd
import pytest
import sqlalchemy as sa
+from packaging.version import parse as vparse
from pytest import param
import ibis
@@ -110,10 +111,26 @@ def test_scalar_to_pyarrow_scalar(limit, awards_players):
@pytest.mark.notimpl(["dask", "impala", "pyspark", "druid"])
-def test_table_to_pyarrow_table_schema(awards_players):
+def test_table_to_pyarrow_table_schema(con, awards_players):
table = awards_players.to_pyarrow()
assert isinstance(table, pa.Table)
- assert table.schema == awards_players.schema().to_pyarrow()
+
+ string = (
+ pa.large_string()
+ if con.name == "duckdb" and vparse(con.version) >= vparse("0.8.0")
+ else pa.string()
+ )
+ expected_schema = pa.schema(
+ [
+ pa.field("playerID", string),
+ pa.field("awardID", string),
+ pa.field("yearID", pa.int64()),
+ pa.field("lgID", string),
+ pa.field("tie", string),
+ pa.field("notes", string),
+ ]
+ )
+ assert table.schema == expected_schema
@pytest.mark.notimpl(["dask", "impala", "pyspark"])
@@ -121,7 +138,7 @@ def test_column_to_pyarrow_table_schema(awards_players):
expr = awards_players.awardID
array = expr.to_pyarrow()
assert isinstance(array, (pa.ChunkedArray, pa.Array))
- assert array.type == expr.type().to_pyarrow()
+ assert array.type == pa.string() or array.type == pa.large_string()
@pytest.mark.notimpl(["pandas", "dask", "impala", "pyspark", "datafusion", "druid"])
@@ -234,7 +251,8 @@ def test_roundtrip_partitioned_parquet(tmp_path, con, backend, awards_players):
# Reingest and compare schema
reingest = con.read_parquet(outparquet / "*" / "*")
- assert reingest.schema() == awards_players.schema()
+ # avoid type comparison to appease duckdb: as of 0.8.0 it returns large_string
+ assert reingest.schema().names == awards_players.schema().names
backend.assert_frame_equal(awards_players.execute(), awards_players.execute())
diff --git a/test_temporal.py b/test_temporal.py
index 16fbb47..f605bb7 100644
--- a/test_temporal.py
+++ b/test_temporal.py
@@ -916,6 +916,11 @@ timestamp_value = pd.Timestamp('2018-01-01 18:18:18')
raises=TypeError,
reason="unsupported operand type(s) for -: 'StringColumn' and 'TimestampScalar'",
),
+ pytest.mark.xfail_version(
+ duckdb=["duckdb>=0.8.0"],
+ raises=AssertionError,
+ reason="duckdb 0.8.0 returns DateOffset columns",
+ ),
],
),
param(
@@ -2073,6 +2078,11 @@ INTERVAL_BACKEND_TYPES = {
reason="Driver doesn't know how to handle intervals",
raises=ClickhouseOperationalError,
)
[email protected]_version(
+ duckdb=["duckdb>=0.8.0"],
+ raises=AssertionError,
+ reason="duckdb 0.8.0 returns DateOffset columns",
+)
def test_interval_literal(con, backend):
expr = ibis.interval(1, unit="s")
result = con.execute(expr)
diff --git a/api.py b/api.py
index 4e2fe1c..2da357d 100644
--- a/api.py
+++ b/api.py
@@ -913,7 +913,7 @@ def read_json(sources: str | Path | Sequence[str | Path], **kwargs: Any) -> ir.T
┏━━━━━━━┳━━━━━━━━┓
┃ a ┃ b ┃
┡━━━━━━━╇━━━━━━━━┩
- │ int32 │ string │
+ │ int64 │ string │
├───────┼────────┤
│ 1 │ d │
│ 2 │ NULL │
diff --git a/generic.py b/generic.py
index 93a1777..8201b12 100644
--- a/generic.py
+++ b/generic.py
@@ -1018,8 +1018,8 @@ class Column(Value, _FixedTextJupyterMixin):
>>> t = ibis.examples.penguins.fetch()
>>> t.body_mass_g.mode()
3800
- >>> t.body_mass_g.mode(where=t.species == "Gentoo")
- 5000
+ >>> t.body_mass_g.mode(where=(t.species == "Gentoo") & (t.sex == "male"))
+ 5550
"""
return ops.Mode(self, where).to_expr()
diff --git a/pandas.py b/pandas.py
index e9cc018..4e58192 100644
--- a/pandas.py
+++ b/pandas.py
@@ -98,7 +98,12 @@ def convert_datetimetz_to_timestamp(_, out_dtype, column):
@sch.convert.register(np.dtype, dt.Interval, pd.Series)
def convert_any_to_interval(_, out_dtype, column):
- return column.values.astype(out_dtype.to_pandas())
+ values = column.values
+ pandas_dtype = out_dtype.to_pandas()
+ try:
+ return values.astype(pandas_dtype)
+ except ValueError: # can happen when `column` is DateOffsets
+ return column
@sch.convert.register(np.dtype, dt.String, pd.Series)
diff --git a/poetry.lock b/poetry.lock
index 131f52a..7a341eb 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -901,59 +901,59 @@ files = [
[[package]]
name = "duckdb"
-version = "0.7.1"
+version = "0.8.0"
description = "DuckDB embedded database"
category = "main"
optional = true
python-versions = "*"
files = [
- {file = "duckdb-0.7.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3e0170be6cc315c179169dfa3e06485ef7009ef8ce399cd2908f29105ef2c67b"},
- {file = "duckdb-0.7.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6360d41023e726646507d5479ba60960989a09f04527b36abeef3643c61d8c48"},
- {file = "duckdb-0.7.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:578c269d7aa27184e8d45421694f89deda3f41fe6bd2a8ce48b262b9fc975326"},
- {file = "duckdb-0.7.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:36aae9a923c9f78da1cf3fcf75873f62d32ea017d4cef7c706d16d3eca527ca2"},
- {file = "duckdb-0.7.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:630e0122a02f19bb1fafae00786350b2c31ae8422fce97c827bd3686e7c386af"},
- {file = "duckdb-0.7.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:9b9ca2d294725e523ce207bc37f28787478ae6f7a223e2cf3a213a2d498596c3"},
- {file = "duckdb-0.7.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0bd89f388205b6c99b62650169efe9a02933555ee1d46ddf79fbd0fb9e62652b"},
- {file = "duckdb-0.7.1-cp310-cp310-win32.whl", hash = "sha256:a9e987565a268fd8da9f65e54621d28f39c13105b8aee34c96643074babe6d9c"},
- {file = "duckdb-0.7.1-cp310-cp310-win_amd64.whl", hash = "sha256:5d986b5ad1307b069309f9707c0c5051323e29865aefa059eb6c3b22dc9751b6"},
- {file = "duckdb-0.7.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:54606dfd24d7181d3098030ca6858f6be52f3ccbf42fff05f7587f2d9cdf4343"},
- {file = "duckdb-0.7.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:bd9367ae650b6605ffe00412183cf0edb688a5fc9fbb03ed757e8310e7ec3b6c"},
- {file = "duckdb-0.7.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:aaf33aeb543c7816bd915cd10141866d54f92f698e1b5712de9d8b7076da19df"},
- {file = "duckdb-0.7.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2e56b0329c38c0356b40449917bab6fce6ac27d356257b9a9da613d2a0f064e0"},
- {file = "duckdb-0.7.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:604b8b476d6cc6bf91625d8c2722ef9c50c402b3d64bc518c838d6c279e6d93b"},
- {file = "duckdb-0.7.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:32a268508c6d7fdc99d5442736051de74c28a5166c4cc3dcbbf35d383299b941"},
- {file = "duckdb-0.7.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:90794406fa2111414877ee9db154fef940911f3920c312c1cf69947621737c8d"},
- {file = "duckdb-0.7.1-cp311-cp311-win32.whl", hash = "sha256:bf20c5ee62cbbf10b39ebdfd70d454ce914e70545c7cb6cb78cb5befef96328a"},
- {file = "duckdb-0.7.1-cp311-cp311-win_amd64.whl", hash = "sha256:bb2700785cab37cd1e7a76c4547a5ab0f8a7c28ad3f3e4d02a8fae52be223090"},
- {file = "duckdb-0.7.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b09741cfa31388b8f9cdf5c5200e0995d55a5b54d2d1a75b54784e2f5c042f7f"},
- {file = "duckdb-0.7.1-cp36-cp36m-win32.whl", hash = "sha256:766e6390f7ace7f1e322085c2ca5d0ad94767bde78a38d168253d2b0b4d5cd5c"},
- {file = "duckdb-0.7.1-cp36-cp36m-win_amd64.whl", hash = "sha256:6a3f3315e2b553db3463f07324f62dfebaf3b97656a87558e59e2f1f816eaf15"},
- {file = "duckdb-0.7.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:278edb8c912d836b3b77fd1695887e1dbd736137c3912478af3608c9d7307bb0"},
- {file = "duckdb-0.7.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e189b558d10b58fe6ed85ce79f728e143eb4115db1e63147a44db613cd4dd0d9"},
- {file = "duckdb-0.7.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b91ec3544ee4dc9e6abbdf2669475d5adedaaea51987c67acf161673e6b7443"},
- {file = "duckdb-0.7.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:3fe3f3dbd62b76a773144eef31aa29794578c359da932e77fef04516535318ca"},
- {file = "duckdb-0.7.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:1e78c7f59325e99f0b3d9fe7c2bad4aaadf42d2c7711925cc26331d7647a91b2"},
- {file = "duckdb-0.7.1-cp37-cp37m-win32.whl", hash = "sha256:bc2a12d9f4fc8ef2fd1022d610287c9fc9972ea06b7510fc87387f1fa256a390"},
- {file = "duckdb-0.7.1-cp37-cp37m-win_amd64.whl", hash = "sha256:53e3db1bc0f445ee48b23cde47bfba08c7fa5a69976c740ec8cdf89543d2405d"},
- {file = "duckdb-0.7.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:1247cc11bac17f2585d11681329806c86295e32242f84a10a604665e697d5c81"},
- {file = "duckdb-0.7.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5feaff16a012075b49dfa09d4cb24455938d6b0e06b08e1404ec00089119dba2"},
- {file = "duckdb-0.7.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b411a0c361eab9b26dcd0d0c7a0d1bc0ad6b214068555de7e946fbdd2619961a"},
- {file = "duckdb-0.7.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c7c76d8694ecdb579241ecfeaf03c51d640b984dbbe8e1d9f919089ebf3cdea6"},
- {file = "duckdb-0.7.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:193b896eed44d8751a755ccf002a137630020af0bc3505affa21bf19fdc90df3"},
- {file = "duckdb-0.7.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7da132ee452c80a3784b8daffd86429fa698e1b0e3ecb84660db96d36c27ad55"},
- {file = "duckdb-0.7.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5fd08c97c3e8cb5bec3822cf78b966b489213dcaab24b25c05a99f7caf8db467"},
- {file = "duckdb-0.7.1-cp38-cp38-win32.whl", hash = "sha256:9cb956f94fa55c4782352dac7cc7572a58312bd7ce97332bb14591d6059f0ea4"},
- {file = "duckdb-0.7.1-cp38-cp38-win_amd64.whl", hash = "sha256:289a5f65213e66d320ebcd51a94787e7097b9d1c3492d01a121a2c809812bf19"},
- {file = "duckdb-0.7.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8085ad58c9b5854ee3820804fa1797e6b3134429c1506c3faab3cb96e71b07e9"},
- {file = "duckdb-0.7.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b47c19d1f2f662a5951fc6c5f6939d0d3b96689604b529cdcffd9afdcc95bff2"},
- {file = "duckdb-0.7.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6a611f598226fd634b7190f509cc6dd668132ffe436b0a6b43847b4b32b99e4a"},
- {file = "duckdb-0.7.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6730f03b5b78f3943b752c90bdf37b62ae3ac52302282a942cc675825b4a8dc9"},
- {file = "duckdb-0.7.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fe23e938d29cd8ea6953d77dc828b7f5b95a4dbc7cd7fe5bcc3531da8cec3dba"},
- {file = "duckdb-0.7.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:feffe503c2e2a99480e1e5e15176f37796b3675e4dadad446fe7c2cc672aed3c"},
- {file = "duckdb-0.7.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:72fceb06f5bf24ad6bb5974c60d397a7a7e61b3d847507a22276de076f3392e2"},
- {file = "duckdb-0.7.1-cp39-cp39-win32.whl", hash = "sha256:c4d5217437d20d05fe23317bbc161befa1f9363f3622887cd1d2f4719b407936"},
- {file = "duckdb-0.7.1-cp39-cp39-win_amd64.whl", hash = "sha256:066885e1883464ce3b7d1fd844f9431227dcffe1ee39bfd2a05cd6d53f304557"},
- {file = "duckdb-0.7.1.tar.gz", hash = "sha256:a7db6da0366b239ea1e4541fcc19556b286872f5015c9a54c2e347146e25a2ad"},
+ {file = "duckdb-0.8.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:6455aee00af30770c20f4a8c5e4347918cf59b578f49ee996a13807b12911871"},
+ {file = "duckdb-0.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b8cf0622ae7f86d4ce72791f8928af4357a46824aadf1b6879c7936b3db65344"},
+ {file = "duckdb-0.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6132e8183ca3ae08a593e43c97cb189794077dedd48546e27ce43bd6a51a9c33"},
+ {file = "duckdb-0.8.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fe29e5343fa2a95f2cde4519a4f4533f4fd551a48d2d9a8ab5220d40ebf53610"},
+ {file = "duckdb-0.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:945165987ca87c097dc0e578dcf47a100cad77e1c29f5dd8443d53ce159dc22e"},
+ {file = "duckdb-0.8.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:673c60daf7ada1d9a8518286a6893ec45efabb64602954af5f3d98f42912fda6"},
+ {file = "duckdb-0.8.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d5075fe1ff97ae62331ca5c61e3597e6e9f7682a6fdd418c23ba5c4873ed5cd1"},
+ {file = "duckdb-0.8.0-cp310-cp310-win32.whl", hash = "sha256:001f5102f45d3d67f389fa8520046c8f55a99e2c6d43b8e68b38ea93261c5395"},
+ {file = "duckdb-0.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:cb00800f2e1e865584b13221e0121fce9341bb3a39a93e569d563eaed281f528"},
+ {file = "duckdb-0.8.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:b2707096d6df4321044fcde2c9f04da632d11a8be60957fd09d49a42fae71a29"},
+ {file = "duckdb-0.8.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b27df1b70ae74d2c88efb5ffca8490954fdc678099509a9c4404ca30acc53426"},
+ {file = "duckdb-0.8.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:75a97c800271b52dd0f37696d074c50576dcb4b2750b6115932a98696a268070"},
+ {file = "duckdb-0.8.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:804cac261a5e016506a6d67838a65d19b06a237f7949f1704f0e800eb708286a"},
+ {file = "duckdb-0.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c6b9abca7fa6713e1d031c18485343b4de99742c7e1b85c10718aa2f31a4e2c6"},
+ {file = "duckdb-0.8.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:51aa6d606d49072abcfeb3be209eb559ac94c1b5e70f58ac3adbb94aca9cd69f"},
+ {file = "duckdb-0.8.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7c8dc769aaf2be0a1c57995ca657e5b92c1c56fc8437edb720ca6cab571adf14"},
+ {file = "duckdb-0.8.0-cp311-cp311-win32.whl", hash = "sha256:c4207d18b42387c4a035846d8878eb967070198be8ac26fd77797ce320d1a400"},
+ {file = "duckdb-0.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:0c392257547c20794c3072fcbca99a49ef0a49974005d755e93893e2b4875267"},
+ {file = "duckdb-0.8.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:2832379e122020814dbe869af7b9ddf3c9f21474cf345531145b099c63ffe17e"},
+ {file = "duckdb-0.8.0-cp36-cp36m-win32.whl", hash = "sha256:914896526f7caba86b170f2c4f17f11fd06540325deeb0000cb4fb24ec732966"},
+ {file = "duckdb-0.8.0-cp36-cp36m-win_amd64.whl", hash = "sha256:022ebda86d0e3204cdc206e4af45aa9f0ae0668b34c2c68cf88e08355af4a372"},
+ {file = "duckdb-0.8.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:96a31c0f3f4ccbf0f5b18f94319f37691205d82f80aae48c6fe04860d743eb2c"},
+ {file = "duckdb-0.8.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a07c73c6e6a8cf4ce1a634625e0d1b17e5b817242a8a530d26ed84508dfbdc26"},
+ {file = "duckdb-0.8.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:424acbd6e857531b06448d757d7c2557938dbddbff0632092090efbf413b4699"},
+ {file = "duckdb-0.8.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c83cfd2a868f1acb0692b9c3fd5ef1d7da8faa1348c6eabf421fbf5d8c2f3eb8"},
+ {file = "duckdb-0.8.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:5c6f6b2d8db56936f662c649539df81856b5a8cb769a31f9544edf18af2a11ff"},
+ {file = "duckdb-0.8.0-cp37-cp37m-win32.whl", hash = "sha256:0bd6376b40a512172eaf4aa816813b1b9d68994292ca436ce626ccd5f77f8184"},
+ {file = "duckdb-0.8.0-cp37-cp37m-win_amd64.whl", hash = "sha256:931221885bcf1e7dfce2400f11fd048a7beef566b775f1453bb1db89b828e810"},
+ {file = "duckdb-0.8.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:42e7853d963d68e72403ea208bcf806b0f28c7b44db0aa85ce49bb124d56c133"},
+ {file = "duckdb-0.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:fcc338399175be3d43366576600aef7d72e82114d415992a7a95aded98a0f3fd"},
+ {file = "duckdb-0.8.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:03dd08a4624d6b581a59f9f9dbfd34902416398d16795ad19f92361cf21fd9b5"},
+ {file = "duckdb-0.8.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0c7c24ea0c9d8563dbd5ad49ccb54b7a9a3c7b8c2833d35e5d32a08549cacea5"},
+ {file = "duckdb-0.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cb58f6505cc0f34b4e976154302d26563d2e5d16b206758daaa04b65e55d9dd8"},
+ {file = "duckdb-0.8.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ef37ac7880100c4b3f913c8483a29a13f8289313b9a07df019fadfa8e7427544"},
+ {file = "duckdb-0.8.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c2a4f5ee913ca8a6a069c78f8944b9934ffdbc71fd935f9576fdcea2a6f476f1"},
+ {file = "duckdb-0.8.0-cp38-cp38-win32.whl", hash = "sha256:73831c6d7aefcb5f4072cd677b9efebecbf6c578946d21710791e10a1fc41b9a"},
+ {file = "duckdb-0.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:faa36d2854734364d234f37d7ef4f3d763b73cd6b0f799cbc2a0e3b7e2575450"},
+ {file = "duckdb-0.8.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:50a31ec237ed619e50f9ab79eb0ec5111eb9697d4475da6e0ab22c08495ce26b"},
+ {file = "duckdb-0.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:351abb4cc2d229d043920c4bc2a4c29ca31a79fef7d7ef8f6011cf4331f297bf"},
+ {file = "duckdb-0.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:568550a163aca6a787bef8313e358590254de3f4019025a8d68c3a61253fedc1"},
+ {file = "duckdb-0.8.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2b82617f0e7f9fc080eda217090d82b42d4fad083bc9f6d58dfda9cecb7e3b29"},
+ {file = "duckdb-0.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d01c9be34d272532b75e8faedda0ff77fa76d1034cde60b8f5768ae85680d6d3"},
+ {file = "duckdb-0.8.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:8549d6a6bf5f00c012b6916f605416226507e733a3ffc57451682afd6e674d1b"},
+ {file = "duckdb-0.8.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8d145c6d51e55743c3ed1a74cffa109d9e72f82b07e203b436cfa453c925313a"},
+ {file = "duckdb-0.8.0-cp39-cp39-win32.whl", hash = "sha256:f8610dfd21e90d7b04e8598b244bf3ad68599fd6ba0daad3428c03cbfd74dced"},
+ {file = "duckdb-0.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:d0f0f104d30418808bafbe9bccdcd238588a07bd246b3cff13842d60bfd8e8ba"},
+ {file = "duckdb-0.8.0.tar.gz", hash = "sha256:c68da35bab5072a64ada2646a5b343da620ddc75a7a6e84aa4a1e0628a7ec18f"},
]
[[package]]
diff --git a/requirements.txt b/requirements.txt
index 9f51bd6..9f0e2f2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -34,7 +34,7 @@ defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "4.0"
distlib==0.3.6 ; python_version >= "3.8" and python_version < "4.0"
docutils==0.20.1 ; python_version >= "3.8" and python_version < "4.0"
duckdb-engine==0.7.2 ; python_version >= "3.8" and python_version < "4.0"
-duckdb==0.7.1 ; python_version >= "3.8" and python_version < "4.0"
+duckdb==0.8.0 ; python_version >= "3.8" and python_version < "4.0"
dunamai==1.16.1 ; python_version >= "3.8" and python_version < "4.0"
exceptiongroup==1.1.1 ; python_version >= "3.8" and python_version < "3.11"
execnet==1.9.0 ; python_version >= "3.8" and python_version < "4.0"
|
|
feat(core): ensure database exists automatically (#3830)
|
f92da01101fbb212dec5d8648a51068da7122ea8
|
feat
|
https://github.com/mikro-orm/mikro-orm/commit/f92da01101fbb212dec5d8648a51068da7122ea8
|
ensure database exists automatically (#3830)
|
diff --git a/MikroORM.ts b/MikroORM.ts
index 3657f71..1ce1eb4 100644
--- a/MikroORM.ts
+++ b/MikroORM.ts
@@ -98,6 +98,11 @@ export class MikroORM<D extends IDatabaseDriver = IDatabaseDriver> {
if (await this.isConnected()) {
this.logger.log('info', `MikroORM successfully connected to database ${colors.green(db)}`);
+
+ if (this.config.get('ensureDatabase')) {
+ await this.schema.ensureDatabase();
+ }
+
await this.driver.init();
} else {
this.logger.error('info', `MikroORM failed to connect to database ${db}`);
diff --git a/DatabaseDriver.ts b/DatabaseDriver.ts
index f823f72..d6d62ca 100644
--- a/DatabaseDriver.ts
+++ b/DatabaseDriver.ts
@@ -95,7 +95,10 @@ export abstract class DatabaseDriver<C extends Connection> implements IDatabaseD
async reconnect(): Promise<C> {
await this.close(true);
- return this.connect();
+ await this.connect();
+ await this.init();
+
+ return this.connection;
}
getConnection(type: ConnectionType = 'write'): C {
diff --git a/IDatabaseDriver.ts b/IDatabaseDriver.ts
index 020bb6e..95940c6 100644
--- a/IDatabaseDriver.ts
+++ b/IDatabaseDriver.ts
@@ -18,7 +18,7 @@ export interface IDatabaseDriver<C extends Connection = Connection> {
[EntityManagerType]: EntityManager<this>;
readonly config: Configuration;
- init(): void | Promise<void>;
+ init(): Promise<void>;
createEntityManager<D extends IDatabaseDriver = IDatabaseDriver>(useContext?: boolean): D[typeof EntityManagerType];
diff --git a/Configuration.ts b/Configuration.ts
index 6346cdc..0cf375d 100644
--- a/Configuration.ts
+++ b/Configuration.ts
@@ -79,6 +79,7 @@ export class Configuration<D extends IDatabaseDriver = IDatabaseDriver> {
forceEntityConstructor: false,
forceUndefined: false,
forceUtcTimezone: false,
+ ensureDatabase: true,
ensureIndexes: false,
batchSize: 300,
debug: false,
@@ -515,6 +516,7 @@ export interface MikroORMOptions<D extends IDatabaseDriver = IDatabaseDriver> ex
forceUndefined: boolean;
forceUtcTimezone: boolean;
timezone?: string;
+ ensureDatabase: boolean;
ensureIndexes: boolean;
useBatchInserts?: boolean;
useBatchUpdates?: boolean;
diff --git a/MariaDbDriver.ts b/MariaDbDriver.ts
index 74514ba..e77186c 100644
--- a/MariaDbDriver.ts
+++ b/MariaDbDriver.ts
@@ -13,7 +13,9 @@ export class MariaDbDriver extends AbstractSqlDriver<MariaDbConnection, MariaDbP
async init(): Promise<void> {
await super.init();
- this.autoIncrementIncrement = await this.platform.getAutoIncrementIncrement(this.connection);
+ // the increment step may differ when running a cluster, see https://github.com/mikro-orm/mikro-orm/issues/3828
+ const res = await this.connection.execute(`show variables like 'auto_increment_increment'`);
+ this.autoIncrementIncrement = res[0]?.auto_increment_increment ? +res[0]?.auto_increment_increment : 1;
}
async nativeInsertMany<T extends object>(entityName: string, data: EntityDictionary<T>[], options: NativeInsertUpdateManyOptions<T> = {}): Promise<QueryResult<T>> {
diff --git a/MariaDbPlatform.ts b/MariaDbPlatform.ts
index b3d7008..206fbe4 100644
--- a/MariaDbPlatform.ts
+++ b/MariaDbPlatform.ts
@@ -1,4 +1,3 @@
-import type { AbstractSqlConnection } from '@mikro-orm/knex';
import { AbstractSqlPlatform } from '@mikro-orm/knex';
import { MariaDbSchemaHelper } from './MariaDbSchemaHelper';
import { MariaDbExceptionConverter } from './MariaDbExceptionConverter';
@@ -10,15 +9,6 @@ export class MariaDbPlatform extends AbstractSqlPlatform {
protected readonly schemaHelper: MariaDbSchemaHelper = new MariaDbSchemaHelper(this);
protected readonly exceptionConverter = new MariaDbExceptionConverter();
- /**
- * the increment may differ when running a cluster, see https://github.com/mikro-orm/mikro-orm/issues/3828
- * @internal
- */
- async getAutoIncrementIncrement(con: AbstractSqlConnection) {
- const res = await con.execute(`show variables like 'auto_increment_increment'`);
- return res[0]?.auto_increment_increment ? +res[0]?.auto_increment_increment : 1;
- }
-
getDefaultCharset(): string {
return 'utf8mb4';
}
diff --git a/MySqlDriver.ts b/MySqlDriver.ts
index 81edc87..3e8209b 100644
--- a/MySqlDriver.ts
+++ b/MySqlDriver.ts
@@ -13,7 +13,9 @@ export class MySqlDriver extends AbstractSqlDriver<MySqlConnection, MySqlPlatfor
async init(): Promise<void> {
await super.init();
- this.autoIncrementIncrement = await this.platform.getAutoIncrementIncrement(this.connection);
+ // the increment step may differ when running a cluster, see https://github.com/mikro-orm/mikro-orm/issues/3828
+ const res = await this.connection.execute(`show variables like 'auto_increment_increment'`);
+ this.autoIncrementIncrement = res[0]?.auto_increment_increment ? +res[0]?.auto_increment_increment : 1;
}
async nativeInsertMany<T extends object>(entityName: string, data: EntityDictionary<T>[], options: NativeInsertUpdateManyOptions<T> = {}): Promise<QueryResult<T>> {
diff --git a/MySqlPlatform.ts b/MySqlPlatform.ts
index 0d92a0c..6cddca9 100644
--- a/MySqlPlatform.ts
+++ b/MySqlPlatform.ts
@@ -1,4 +1,3 @@
-import type { AbstractSqlConnection } from '@mikro-orm/knex';
import { AbstractSqlPlatform } from '@mikro-orm/knex';
import { MySqlSchemaHelper } from './MySqlSchemaHelper';
import { MySqlExceptionConverter } from './MySqlExceptionConverter';
@@ -10,15 +9,6 @@ export class MySqlPlatform extends AbstractSqlPlatform {
protected readonly schemaHelper: MySqlSchemaHelper = new MySqlSchemaHelper(this);
protected readonly exceptionConverter = new MySqlExceptionConverter();
- /**
- * the increment may differ when running a cluster, see https://github.com/mikro-orm/mikro-orm/issues/3828
- * @internal
- */
- async getAutoIncrementIncrement(con: AbstractSqlConnection): Promise<number> {
- const res = await con.execute(`show variables like 'auto_increment_increment'`);
- return res[0]?.auto_increment_increment ? +res[0]?.auto_increment_increment : 1;
- }
-
getDefaultCharset(): string {
return 'utf8mb4';
}
diff --git a/MikroORM.test.ts b/MikroORM.test.ts
index e89c81d..d350cd5 100644
--- a/MikroORM.test.ts
+++ b/MikroORM.test.ts
@@ -143,6 +143,7 @@ describe('MikroORM', () => {
entities: [Test],
driver: PostgreSqlDriver,
dbName: 'mikro-orm-test',
+ ensureDatabase: false,
};
await MikroORM.init({
diff --git a/GH2930.test.ts b/GH2930.test.ts
index d34e7cf..98c4bb7 100644
--- a/GH2930.test.ts
+++ b/GH2930.test.ts
@@ -84,6 +84,7 @@ describe('GH issue 2930', () => {
entities: [A],
dbName: 'mikro_orm_test_gh2930',
driver: MySqlDriver,
+ port: 3308,
namingStrategy: class extends UnderscoreNamingStrategy {
indexName(tableName: string, columns: string[], type: 'primary' | 'foreign' | 'unique' | 'index' | 'sequence' | 'check'): string {
|
|
ci: cancel in-progress dep update jobs when a new one arrives [skip ci]
|
c2300c94c6b7d1599387272b616e1d79e93723c7
|
ci
|
https://github.com/rohankumardubey/ibis/commit/c2300c94c6b7d1599387272b616e1d79e93723c7
|
cancel in-progress dep update jobs when a new one arrives [skip ci]
|
diff --git a/update-deps.yml b/update-deps.yml
index 4fa2896..b23472c 100644
--- a/update-deps.yml
+++ b/update-deps.yml
@@ -4,6 +4,11 @@ on:
# run every 24 hours at midnight
- cron: "0 */24 * * *"
workflow_dispatch:
+
+concurrency:
+ group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
+ cancel-in-progress: true
+
jobs:
generate_updates:
runs-on: ubuntu-latest
|
|
docs: use png for OG image
|
9257beb646c9e433448e59f616a31456c678fae1
|
docs
|
https://github.com/mikro-orm/mikro-orm/commit/9257beb646c9e433448e59f616a31456c678fae1
|
use png for OG image
|
diff --git a/docusaurus.config.js b/docusaurus.config.js
index ed8557c..2593dd8 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -95,7 +95,7 @@ module.exports = {
},
],
},
- image: 'img/mikro-orm-og.svg',
+ image: 'img/mikro-orm-og.png',
footer: {
style: 'dark',
links: [
diff --git a/mikro-orm-og.png b/mikro-orm-og.png
index 4197b16..6b564bb 100644
--- a/mikro-orm-og.png
+++ b/mikro-orm-og.png
Binary files /dev/null and b/docs/static/img/mikro-orm-og.png differ
|
|
fix(core): do not propagate removal to FK as PK
Closes #2723
|
a0a19c22604586c1f3256aba7759c3204e1f02b0
|
fix
|
https://github.com/mikro-orm/mikro-orm/commit/a0a19c22604586c1f3256aba7759c3204e1f02b0
|
do not propagate removal to FK as PK
Closes #2723
|
diff --git a/UnitOfWork.ts b/UnitOfWork.ts
index c25c624..3a89f35 100644
--- a/UnitOfWork.ts
+++ b/UnitOfWork.ts
@@ -263,12 +263,13 @@ export class UnitOfWork {
this.queuedActions.add(entity.__meta!.className);
this.persistStack.delete(entity);
- // remove from referencing relations
+ // remove from referencing relations (but don't remove FKs as PKs)
for (const prop of entity.__meta!.bidirectionalRelations) {
const inverseProp = prop.mappedBy || prop.inversedBy;
const relation = Reference.unwrapReference(entity[prop.name]);
+ const prop2 = prop.targetMeta!.properties[inverseProp];
- if (prop.reference === ReferenceType.ONE_TO_MANY && Utils.isCollection<AnyEntity>(relation)) {
+ if (prop.reference === ReferenceType.ONE_TO_MANY && !prop2.primary && Utils.isCollection<AnyEntity>(relation)) {
relation.getItems(false).forEach(item => delete item[inverseProp]);
continue;
}
diff --git a/GH2723.test.ts b/GH2723.test.ts
index 6d76a5d..32176ad 100644
--- a/GH2723.test.ts
+++ b/GH2723.test.ts
@@ -0,0 +1,57 @@
+import { Collection, Entity, IdentifiedReference, ManyToOne, MikroORM, OneToMany, PrimaryKey, PrimaryKeyType } from '@mikro-orm/core';
+
+@Entity()
+export class Cat {
+
+ [PrimaryKeyType]: [string, string];
+
+ @PrimaryKey()
+ name!: string;
+
+ // eslint-disable-next-line @typescript-eslint/no-use-before-define
+ @ManyToOne(() => User, { primary: true, onDelete: 'CASCADE', wrappedReference: true })
+ user!: IdentifiedReference<User>;
+
+}
+
+@Entity()
+export class User {
+
+ @PrimaryKey()
+ id!: string;
+
+ @OneToMany(() => Cat, c => c.user, { eager: true, orphanRemoval: true })
+ cats = new Collection<Cat>(this);
+
+}
+
+describe('GH 2723', () => {
+
+ let orm: MikroORM;
+
+ beforeAll(async () => {
+ orm = await MikroORM.init({
+ dbName: ':memory:',
+ type: 'sqlite',
+ entities: [Cat, User],
+ });
+ await orm.getSchemaGenerator().createSchema();
+ });
+
+ afterAll(() => orm.close(true));
+
+ test('FK as PK and orphan removal/cascading', async () => {
+ const user = orm.em.create(User, { id: 'TestUser' }, { persist: true });
+ orm.em.create(Cat, { name: 'TestCat', user }, { persist: true });
+ await orm.em.flush();
+ orm.em.clear();
+
+ const u = await orm.em.findOneOrFail(User, { id: 'TestUser' });
+ orm.em.remove(u).flush();
+
+ const users = await orm.em.count(User, {});
+ const cats = await orm.em.count(User, {});
+ expect(users + cats).toBe(0);
+ });
+
+});
|
|
feat(trino): support years and months in datetime arithmetic
|
1133973eef4192e18e52371e806fb1c6079347c9
|
feat
|
https://github.com/ibis-project/ibis/commit/1133973eef4192e18e52371e806fb1c6079347c9
|
support years and months in datetime arithmetic
|
diff --git a/trino.py b/trino.py
index a73e351..29b5eda 100644
--- a/trino.py
+++ b/trino.py
@@ -442,17 +442,20 @@ class TrinoCompiler(SQLGlotCompiler):
def _make_interval(self, arg, unit):
short = unit.short
- if short in ("Y", "Q", "M", "W"):
+ if short in ("Q", "W"):
raise com.UnsupportedOperationError(f"Interval unit {unit!r} not supported")
+
+ if isinstance(arg, sge.Literal):
+ # force strings in interval literals because trino requires it
+ arg.args["is_string"] = True
+ return super()._make_interval(arg, unit)
+
+ elif short in ("Y", "M"):
+ return arg * super()._make_interval(sge.convert("1"), unit)
elif short in ("D", "h", "m", "s", "ms", "us"):
- if isinstance(arg, sge.Literal):
- # force strings in interval literals because trino requires it
- arg.args["is_string"] = True
- return super()._make_interval(arg, unit)
- else:
- return self.f.parse_duration(
- self.f.concat(self.cast(arg, dt.string), short.lower())
- )
+ return self.f.parse_duration(
+ self.f.concat(self.cast(arg, dt.string), short.lower())
+ )
else:
raise com.UnsupportedOperationError(
f"Interval unit {unit.name!r} not supported"
diff --git a/test_temporal.py b/test_temporal.py
index 79b1f5c..f76db33 100644
--- a/test_temporal.py
+++ b/test_temporal.py
@@ -504,11 +504,6 @@ def test_date_truncate(backend, alltypes, df, unit):
raises=TypeError,
reason="duration() got an unexpected keyword argument 'months'",
),
- pytest.mark.notyet(
- ["trino"],
- raises=com.UnsupportedOperationError,
- reason="month not implemented",
- ),
pytest.mark.notyet(
["oracle"],
raises=OracleInterfaceError,
@@ -624,7 +619,6 @@ def test_integer_to_interval_timestamp(
param(
"Y",
marks=[
- pytest.mark.notyet(["trino"], raises=com.UnsupportedOperationError),
pytest.mark.notyet(
["polars"], raises=TypeError, reason="not supported by polars"
),
@@ -635,7 +629,6 @@ def test_integer_to_interval_timestamp(
param(
"M",
marks=[
- pytest.mark.notyet(["trino"], raises=com.UnsupportedOperationError),
pytest.mark.notyet(
["polars"], raises=TypeError, reason="not supported by polars"
),
|
|
fix: allow mailmaps to change the email by name and email (#1417)
|
ca054713f5aed6c66d55d612a58786eb0b439fb4
|
fix
|
https://github.com/Byron/gitoxide/commit/ca054713f5aed6c66d55d612a58786eb0b439fb4
|
allow mailmaps to change the email by name and email (#1417)
|
diff --git a/entry.rs b/entry.rs
index 3297d77..b8c3f9c 100644
--- a/entry.rs
+++ b/entry.rs
@@ -25,8 +25,8 @@ impl<'a> Entry<'a> {
/// Constructors indicating what kind of mapping is created.
///
/// Only these combinations of values are valid.
-#[allow(missing_docs)]
impl<'a> Entry<'a> {
+ /// An entry that changes the name by an email.
pub fn change_name_by_email(proper_name: impl Into<&'a BStr>, commit_email: impl Into<&'a BStr>) -> Self {
Entry {
new_name: Some(proper_name.into()),
@@ -34,6 +34,7 @@ impl<'a> Entry<'a> {
..Default::default()
}
}
+ /// An entry that changes the email by an email.
pub fn change_email_by_email(proper_email: impl Into<&'a BStr>, commit_email: impl Into<&'a BStr>) -> Self {
Entry {
new_email: Some(proper_email.into()),
@@ -41,6 +42,7 @@ impl<'a> Entry<'a> {
..Default::default()
}
}
+ /// An entry that changes the email by a name and email.
pub fn change_email_by_name_and_email(
proper_email: impl Into<&'a BStr>,
commit_name: impl Into<&'a BStr>,
@@ -53,6 +55,7 @@ impl<'a> Entry<'a> {
..Default::default()
}
}
+ /// An entry that changes a name and the email by an email.
pub fn change_name_and_email_by_email(
proper_name: impl Into<&'a BStr>,
proper_email: impl Into<&'a BStr>,
@@ -65,7 +68,7 @@ impl<'a> Entry<'a> {
..Default::default()
}
}
-
+ /// An entry that changes a name and email by a name and email.
pub fn change_name_and_email_by_name_and_email(
proper_name: impl Into<&'a BStr>,
proper_email: impl Into<&'a BStr>,
diff --git a/parse.rs b/parse.rs
index 60caef7..3c90b74 100644
--- a/parse.rs
+++ b/parse.rs
@@ -77,6 +77,9 @@ fn parse_line(line: &BStr, line_number: usize) -> Result<Entry<'_>, Error> {
(Some(proper_name), Some(proper_email), Some(commit_name), Some(commit_email)) => {
Entry::change_name_and_email_by_name_and_email(proper_name, proper_email, commit_name, commit_email)
}
+ (None, Some(proper_email), Some(commit_name), Some(commit_email)) => {
+ Entry::change_email_by_name_and_email(proper_email, commit_name, commit_email)
+ }
_ => {
return Err(Error::Malformed {
line_number,
|
|
feat: add `external` (type decls dir)
|
88ccfb90783c9c21f3639e719f19451331f178f3
|
feat
|
https://github.com/erg-lang/erg/commit/88ccfb90783c9c21f3639e719f19451331f178f3
|
add `external` (type decls dir)
|
diff --git a/__init__.d.er b/__init__.d.er
index 2343f2f..56eb178 100644
--- a/__init__.d.er
+++ b/__init__.d.er
@@ -0,0 +1 @@
+.setup!: (*Obj,) => NoneType
diff --git a/develop.d.er b/develop.d.er
index f8719a4..c9a4001 100644
--- a/develop.d.er
+++ b/develop.d.er
@@ -0,0 +1,3 @@
+.Develop = 'develop': ClassType
+.Develop.
+ run!: (self: .Develop) => NoneType
diff --git a/install.d.er b/install.d.er
index 4ebd00a..f3d08d2 100644
--- a/install.d.er
+++ b/install.d.er
@@ -0,0 +1,3 @@
+.Install = 'install': ClassType
+.Install.
+ run!: (self: .Install) => NoneType
|
|
refactor(timestamps): remove `timezone` argument to `to_timestamp` API
This argument was only supported in the BigQuery backend, whose
functionality can be acheived by appending a `%Z` to the format string
and appending the desired timezone to the column being parsed.
BREAKING CHANGE: The `timezone` argument to `to_timestamp` is gone. This was only supported in the BigQuery backend. Append `%Z` to the format string and the desired time zone to the input column if necessary.
|
eb4762edc50a0df6718d6281f85fd0cc48107cbb
|
refactor
|
https://github.com/rohankumardubey/ibis/commit/eb4762edc50a0df6718d6281f85fd0cc48107cbb
|
remove `timezone` argument to `to_timestamp` API
This argument was only supported in the BigQuery backend, whose
functionality can be acheived by appending a `%Z` to the format string
and appending the desired timezone to the column being parsed.
BREAKING CHANGE: The `timezone` argument to `to_timestamp` is gone. This was only supported in the BigQuery backend. Append `%Z` to the format string and the desired time zone to the input column if necessary.
|
diff --git a/.commitlintrc.json b/.commitlintrc.json
index 0d03f59..f2b1326 100644
--- a/.commitlintrc.json
+++ b/.commitlintrc.json
@@ -1,9 +1,9 @@
{
"rules": {
"body-leading-blank": [1, "always"],
- "body-max-line-length": [2, "always", 200],
+ "body-max-line-length": [2, "always", 250],
"footer-leading-blank": [1, "always"],
- "footer-max-line-length": [2, "always", 200],
+ "footer-max-line-length": [2, "always", 250],
"header-max-length": [2, "always", 100],
"subject-case": [
2,
diff --git a/registry.py b/registry.py
index 7908c27..eb9a7c0 100644
--- a/registry.py
+++ b/registry.py
@@ -113,11 +113,6 @@ def _timestamp_diff(t, op):
def _string_to_timestamp(t, op):
sa_arg = t.translate(op.arg)
sa_format_str = t.translate(op.format_str)
- if (op.timezone is not None) and op.timezone.value != "UTC":
- raise com.UnsupportedArgumentError(
- 'MySQL backend only supports timezone UTC for converting'
- 'string to timestamp.'
- )
return sa.func.str_to_date(sa_arg, sa_format_str)
diff --git a/test_client.py b/test_client.py
index b931c9b..5dead9d 100644
--- a/test_client.py
+++ b/test_client.py
@@ -308,7 +308,7 @@ def test_string_to_timestamp(client):
datetime.datetime(year=2017, month=2, day=6, hour=5),
tz=pytz.timezone("UTC"),
)
- expr_tz = ibis.literal("2017-02-06").to_timestamp("%F", "America/New_York")
+ expr_tz = ibis.literal("2017-02-06 America/New_York").to_timestamp("%F %Z")
result_tz = client.execute(expr_tz)
assert result_tz == timestamp_tz
diff --git a/out.sql b/out.sql
index 74d1b27..cfdf95f 100644
--- a/out.sql
+++ b/out.sql
@@ -0,0 +1,2 @@
+SELECT PARSE_TIMESTAMP('%F %Z', CONCAT(`date_string_col`, ' America/New_York')) AS `tmp`
+FROM functional_alltypes
\\ No newline at end of file
diff --git a/test_compiler.py b/test_compiler.py
index 7419eb4..c97ec74 100644
--- a/test_compiler.py
+++ b/test_compiler.py
@@ -408,9 +408,13 @@ def test_identical_to(alltypes, snapshot):
snapshot.assert_match(to_sql(expr), "out.sql")
[email protected]("timezone", [None, "America/New_York"])
-def test_to_timestamp(alltypes, timezone, snapshot):
- expr = alltypes.date_string_col.to_timestamp("%F", timezone)
+def test_to_timestamp_no_timezone(alltypes, snapshot):
+ expr = alltypes.date_string_col.to_timestamp("%F")
+ snapshot.assert_match(to_sql(expr), "out.sql")
+
+
+def test_to_timestamp_timezone(alltypes, snapshot):
+ expr = (alltypes.date_string_col + " America/New_York").to_timestamp("%F %Z")
snapshot.assert_match(to_sql(expr), "out.sql")
diff --git a/compiler.py b/compiler.py
index 2eda4bc..de9c338 100644
--- a/compiler.py
+++ b/compiler.py
@@ -1387,13 +1387,6 @@ def compile_timestamp_now(t, op, **kwargs):
def compile_string_to_timestamp(t, op, **kwargs):
src_column = t.translate(op.arg, **kwargs)
fmt = op.format_str.value
-
- if op.timezone is not None and op.timezone.value != "UTC":
- raise com.UnsupportedArgumentError(
- 'PySpark backend only supports timezone UTC for converting string '
- 'to timestamp.'
- )
-
return F.to_timestamp(src_column, fmt)
diff --git a/test_temporal.py b/test_temporal.py
index ab179d1..c83eedd 100644
--- a/test_temporal.py
+++ b/test_temporal.py
@@ -10,7 +10,6 @@ import pytest
from pytest import param
import ibis
-import ibis.common.exceptions as com
import ibis.expr.datatypes as dt
from ibis.backends.pandas.execution.temporal import day_name
@@ -594,12 +593,11 @@ def test_integer_to_timestamp(backend, con, unit):
@pytest.mark.parametrize(
- 'fmt, timezone',
+ "fmt",
[
# "11/01/10" - "month/day/year"
param(
'%m/%d/%y',
- "UTC",
id="mysql_format",
marks=pytest.mark.never(
["pyspark"], reason="datetime formatting style not supported"
@@ -607,10 +605,9 @@ def test_integer_to_timestamp(backend, con, unit):
),
param(
'MM/dd/yy',
- "UTC",
id="pyspark_format",
marks=pytest.mark.never(
- ["bigquery", "mysql", "polars"],
+ ["bigquery", "mysql", "polars", "duckdb"],
reason="datetime formatting style not supported",
),
),
@@ -621,7 +618,6 @@ def test_integer_to_timestamp(backend, con, unit):
'dask',
'pandas',
'postgres',
- 'duckdb',
'clickhouse',
'sqlite',
'impala',
@@ -631,11 +627,9 @@ def test_integer_to_timestamp(backend, con, unit):
'trino',
]
)
-def test_string_to_timestamp(alltypes, fmt, timezone):
+def test_string_to_timestamp(alltypes, fmt):
table = alltypes
- result = table.mutate(
- date=table.date_string_col.to_timestamp(fmt, timezone)
- ).execute()
+ result = table.mutate(date=table.date_string_col.to_timestamp(fmt)).execute()
# TEST: do we get the same date out, that we put in?
# format string assumes that we are using pandas' strftime
@@ -643,32 +637,6 @@ def test_string_to_timestamp(alltypes, fmt, timezone):
assert val.strftime("%m/%d/%y") == result["date_string_col"][i]
[email protected](
- [
- 'bigquery',
- 'dask',
- 'pandas',
- 'postgres',
- 'duckdb',
- 'clickhouse',
- 'sqlite',
- 'impala',
- 'datafusion',
- 'snowflake',
- 'polars',
- 'mssql',
- 'trino',
- ]
-)
-def test_string_to_timestamp_tz_error(alltypes):
- table = alltypes
-
- with pytest.raises(com.UnsupportedArgumentError):
- table.mutate(
- date=table.date_string_col.to_timestamp("%m/%d/%y", 'non-utc-timezone')
- ).compile()
-
-
@pytest.mark.parametrize(
('date', 'expected_index', 'expected_day'),
[
diff --git a/temporal.py b/temporal.py
index 468e8e1..92982c6 100644
--- a/temporal.py
+++ b/temporal.py
@@ -116,7 +116,6 @@ class Strftime(Value):
class StringToTimestamp(Value):
arg = rlz.string
format_str = rlz.string
- timezone = rlz.optional(rlz.string)
output_shape = rlz.shape_like("arg")
output_dtype = dt.Timestamp(timezone='UTC')
diff --git a/strings.py b/strings.py
index 65b8f9b..9748bb9 100644
--- a/strings.py
+++ b/strings.py
@@ -614,17 +614,13 @@ class StringValue(Value):
"""
return ops.StringReplace(self, pattern, replacement).to_expr()
- def to_timestamp(
- self, format_str: str, timezone: str | None = None
- ) -> ir.TimestampValue:
+ def to_timestamp(self, format_str: str) -> ir.TimestampValue:
"""Parse a string and return a timestamp.
Parameters
----------
format_str
Format string in `strptime` format
- timezone
- A string indicating the timezone. For example `'America/New_York'`
Examples
--------
@@ -637,7 +633,7 @@ class StringValue(Value):
TimestampValue
Parsed timestamp value
"""
- return ops.StringToTimestamp(self, format_str, timezone).to_expr()
+ return ops.StringToTimestamp(self, format_str).to_expr()
def parse_url(
self,
|
|
docs: fix inconsistent sidebar link height
|
aca50886bf831ef1daccb718ddd3365496feae80
|
docs
|
https://github.com/wzhiqing/cube/commit/aca50886bf831ef1daccb718ddd3365496feae80
|
fix inconsistent sidebar link height
|
diff --git a/_layout.scss b/_layout.scss
index 6041081..853c471 100644
--- a/_layout.scss
+++ b/_layout.scss
@@ -477,6 +477,7 @@ span.group-header {
font-size: 15px;
line-height: 1.5rem;
min-height: 1.25rem;
+ height: auto;
&:first-child {
margin-top: 6px !important;
|
|
feat(duckdb): implement `RegexSplit`
|
229a1f4e5d5153dea95375c22fadf339cba3f8c6
|
feat
|
https://github.com/rohankumardubey/ibis/commit/229a1f4e5d5153dea95375c22fadf339cba3f8c6
|
implement `RegexSplit`
|
diff --git a/registry.py b/registry.py
index 5235a6e..a9a0911 100644
--- a/registry.py
+++ b/registry.py
@@ -562,6 +562,7 @@ operation_registry.update(
ops.GeoConvert: _geo_convert,
# other ops
ops.TimestampRange: fixed_arity(sa.func.range, 3),
+ ops.RegexSplit: fixed_arity(sa.func.str_split_regex, 2),
}
)
|
|
build: preparing for next branch
|
58cb789d3505312e243ee4acff9e04708f7189d1
|
build
|
https://github.com/tsparticles/tsparticles/commit/58cb789d3505312e243ee4acff9e04708f7189d1
|
preparing for next branch
|
diff --git a/dependabot.yml b/dependabot.yml
index 3ebd554..fa3925d 100644
--- a/dependabot.yml
+++ b/dependabot.yml
@@ -1,7 +1,7 @@
version: 2
updates:
- package-ecosystem: "npm"
- target-branch: "v1"
+ target-branch: "next"
directory: "/" # Location of package manifests
schedule:
interval: "daily"
diff --git a/nodejs.yml b/nodejs.yml
index fd74995..b122152 100644
--- a/nodejs.yml
+++ b/nodejs.yml
@@ -5,9 +5,9 @@ name: Node.js CI
on:
push:
- branches: [ main, staging, dev, v1 ]
+ branches: [ main, staging, dev, v1, next ]
pull_request:
- branches: [ main, staging, dev, v1 ]
+ branches: [ main, staging, dev, v1, next ]
jobs:
build:
diff --git a/renovate.json b/renovate.json
index fc2b7a4..cb7bf0c 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,7 +1,8 @@
{
"baseBranches": [
"dev",
- "v1"
+ "v1",
+ "next"
],
"extends": [
"config:base",
|
|
docs(duckdb): add docstring for do_connect and backend markdown
|
ff3aa75d89c8045e84bd813001b609fc1de3cc4b
|
docs
|
https://github.com/ibis-project/ibis/commit/ff3aa75d89c8045e84bd813001b609fc1de3cc4b
|
add docstring for do_connect and backend markdown
|
diff --git a/DuckDB.md b/DuckDB.md
index ce6d082..5dcbb5f 100644
--- a/DuckDB.md
+++ b/DuckDB.md
@@ -0,0 +1,19 @@
+---
+backend_name: DuckDB
+backend_url: https://duckdb.org/
+backend_module: duckdb
+backend_param_style: a path to a DuckDB database
+backend_connection_example: ibis.duckdb.connect("path/to/my.duckdb")
+development_only: true
+---
+
+{% include 'backends/template.md' %}
+
+## API
+
+<!-- prettier-ignore-start -->
+::: ibis.backends.duckdb.Backend
+ rendering:
+ heading_level: 3
+
+<!-- prettier-ignore-end -->
diff --git a/template.md b/template.md
index 9d1852f..70a00b5 100644
--- a/template.md
+++ b/template.md
@@ -9,6 +9,8 @@
{% if intro %}{{ intro }}{% endif %}
+{% if not development_only %}
+
## Install
Install dependencies for the {{ backend_name }} backend:
@@ -28,6 +30,13 @@ Install dependencies for the {{ backend_name }} backend:
{% endfor %}
+{% else %}
+!!! info "The {{ backend_name }} backend isn't released yet!"
+
+ [Set up a development environment](/contribute/01_environment) to use this backend.
+
+{% endif %}
+
## Connect
<!-- prettier-ignore-start -->
diff --git a/__init__.py b/__init__.py
index e417446..f89f612 100644
--- a/__init__.py
+++ b/__init__.py
@@ -35,7 +35,15 @@ class Backend(BaseAlchemyBackend):
path: str | Path = ":memory:",
read_only: bool = False,
) -> None:
- """Create an Ibis client connected to a DuckDB database."""
+ """Create an Ibis client connected to a DuckDB database.
+
+ Parameters
+ ----------
+ path
+ Path to a duckdb database
+ read_only
+ Whether the database is read-only
+ """
if path != ":memory:":
path = Path(path).absolute()
super().do_connect(
|
|
fix: fixes #2329
|
1982442b6084f15ce40559c9391f097563728ff2
|
fix
|
https://github.com/tsparticles/tsparticles/commit/1982442b6084f15ce40559c9391f097563728ff2
|
fixes #2329
|
diff --git a/plugin.ts b/plugin.ts
index 3eea877..8246202 100644
--- a/plugin.ts
+++ b/plugin.ts
@@ -46,7 +46,11 @@ class Plugin implements IPlugin {
export async function loadPolygonMaskPlugin(tsParticles: Main): Promise<void> {
if (!isSsr() && !window.SVGPathSeg) {
- await import("./pathseg");
+ await import(
+ /* webpackChunkName: "tsparticles-pathseg" */
+ /* webpackMode: "lazy" */
+ "./pathseg"
+ );
}
const plugin = new Plugin();
diff --git a/tsconfig.browser.json b/tsconfig.browser.json
index 53860b6..ab502ae 100644
--- a/tsconfig.browser.json
+++ b/tsconfig.browser.json
@@ -2,6 +2,7 @@
"extends": "./tsconfig.base.json",
"compilerOptions": {
"module": "esnext",
- "outDir": "./dist/browser"
+ "outDir": "./dist/browser",
+ "removeComments": false
}
}
diff --git a/webpack.config.js b/webpack.config.js
index 728232d..c283ece 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -23,11 +23,6 @@ const getConfig = (entry) => {
path: path.resolve(__dirname, "dist"),
filename: "[name].js",
libraryTarget: "umd",
- /*library: {
- root: "tsparticles",
- commonjs: "tsparticles",
- amd: "tsparticles",
- },*/
globalObject: "this"
},
resolve: {
@@ -70,6 +65,22 @@ const getConfig = (entry) => {
}
},
extractComments: false
+ }),
+ new TerserPlugin({
+ exclude: /\\.min\\.js$/,
+ terserOptions: {
+ compress: false,
+ format: {
+ beautify: true,
+ indent_level: 2,
+ semicolons: false,
+ comments: banner
+ },
+ mangle: false,
+ keep_classnames: true,
+ keep_fnames: true,
+ },
+ extractComments: false
})
]
}
|
|
fix(schema): improve diffing of default values for strings and dates
Closes #2385
|
d4ac6385aa84208732f144e6bd9f68e8cf5c6697
|
fix
|
https://github.com/mikro-orm/mikro-orm/commit/d4ac6385aa84208732f144e6bd9f68e8cf5c6697
|
improve diffing of default values for strings and dates
Closes #2385
|
diff --git a/DateTimeType.ts b/DateTimeType.ts
index cad2e4f..88c6895 100644
--- a/DateTimeType.ts
+++ b/DateTimeType.ts
@@ -5,7 +5,7 @@ import type { EntityProperty } from '../typings';
export class DateTimeType extends Type<Date, string> {
getColumnType(prop: EntityProperty, platform: Platform): string {
- return platform.getDateTimeTypeDeclarationSQL({ length: prop.length });
+ return platform.getDateTimeTypeDeclarationSQL({ length: prop.length ?? 0 });
}
compareAsType(): string {
diff --git a/SchemaComparator.ts b/SchemaComparator.ts
index 6cec4ff..70172df 100644
--- a/SchemaComparator.ts
+++ b/SchemaComparator.ts
@@ -1,5 +1,5 @@
import type { Dictionary, EntityProperty } from '@mikro-orm/core';
-import { BooleanType } from '@mikro-orm/core';
+import { BooleanType, DateTimeType } from '@mikro-orm/core';
import type { Column, ForeignKey, Index, SchemaDifference, TableDifference } from '../typings';
import type { DatabaseSchema } from './DatabaseSchema';
import type { DatabaseTable } from './DatabaseTable';
@@ -440,6 +440,14 @@ export class SchemaComparator {
return defaultValueFrom === defaultValueTo;
}
+ if (to.mappedType instanceof DateTimeType && from.default && to.default) {
+ // normalize now/current_timestamp defaults, also remove `()` from the end of default expression
+ const defaultValueFrom = from.default.toLowerCase().replace('current_timestamp', 'now').replace(/\\(\\)$/, '');
+ const defaultValueTo = to.default.toLowerCase().replace('current_timestamp', 'now').replace(/\\(\\)$/, '');
+
+ return defaultValueFrom === defaultValueTo;
+ }
+
if (from.default && to.default) {
return from.default.toString().toLowerCase() === to.default.toString().toLowerCase();
}
diff --git a/MariaDbDriver.ts b/MariaDbDriver.ts
index 37d1123..d05d254 100644
--- a/MariaDbDriver.ts
+++ b/MariaDbDriver.ts
@@ -1,11 +1,12 @@
-import type { AnyEntity, Configuration, EntityDictionary, NativeInsertUpdateManyOptions, QueryResult, Transaction } from '@mikro-orm/core';
-import { AbstractSqlDriver, MySqlPlatform } from '@mikro-orm/mysql-base';
+import type { AnyEntity, Configuration, EntityDictionary, NativeInsertUpdateManyOptions, QueryResult } from '@mikro-orm/core';
+import { AbstractSqlDriver } from '@mikro-orm/mysql-base';
import { MariaDbConnection } from './MariaDbConnection';
+import { MariaDbPlatform } from './MariaDbPlatform';
export class MariaDbDriver extends AbstractSqlDriver<MariaDbConnection> {
constructor(config: Configuration) {
- super(config, new MySqlPlatform(), MariaDbConnection, ['knex', 'mariadb']);
+ super(config, new MariaDbPlatform(), MariaDbConnection, ['knex', 'mariadb']);
}
async nativeInsertMany<T extends AnyEntity<T>>(entityName: string, data: EntityDictionary<T>[], options: NativeInsertUpdateManyOptions<T> = {}): Promise<QueryResult<T>> {
diff --git a/MariaDbPlatform.ts b/MariaDbPlatform.ts
index e325fb8..0e41c00 100644
--- a/MariaDbPlatform.ts
+++ b/MariaDbPlatform.ts
@@ -0,0 +1,8 @@
+import { MySqlPlatform } from '@mikro-orm/mysql-base';
+import { MariaDbSchemaHelper } from './MariaDbSchemaHelper';
+
+export class MariaDbPlatform extends MySqlPlatform {
+
+ protected readonly schemaHelper: MariaDbSchemaHelper = new MariaDbSchemaHelper(this);
+
+}
diff --git a/MariaDbSchemaHelper.ts b/MariaDbSchemaHelper.ts
index efb637c..5203221 100644
--- a/MariaDbSchemaHelper.ts
+++ b/MariaDbSchemaHelper.ts
@@ -0,0 +1,10 @@
+import type { Type } from '@mikro-orm/core';
+import { MySqlSchemaHelper } from '@mikro-orm/mysql-base';
+
+export class MariaDbSchemaHelper extends MySqlSchemaHelper {
+
+ protected wrap(val: string | undefined, _type: Type<unknown>): string | undefined {
+ return val;
+ }
+
+}
diff --git a/index.ts b/index.ts
index 260c7a5..b3f3425 100644
--- a/index.ts
+++ b/index.ts
@@ -1,3 +1,5 @@
export * from '@mikro-orm/mysql-base';
export * from './MariaDbConnection';
+export * from './MariaDbSchemaHelper';
+export * from './MariaDbPlatform';
export * from './MariaDbDriver';
diff --git a/MySqlSchemaHelper.ts b/MySqlSchemaHelper.ts
index eb139fd..b7a6f4b 100644
--- a/MySqlSchemaHelper.ts
+++ b/MySqlSchemaHelper.ts
@@ -1,6 +1,7 @@
import type { AbstractSqlConnection, Column, Index, Knex, TableDifference } from '@mikro-orm/knex';
import { SchemaHelper } from '@mikro-orm/knex';
-import type { Dictionary } from '@mikro-orm/core';
+import type { Dictionary , Type } from '@mikro-orm/core';
+import { StringType, TextType } from '@mikro-orm/core';
export class MySqlSchemaHelper extends SchemaHelper {
@@ -115,17 +116,19 @@ export class MySqlSchemaHelper extends SchemaHelper {
ifnull(datetime_precision, character_maximum_length) length
from information_schema.columns where table_schema = database() and table_name = '${tableName}'`;
const columns = await connection.execute<any[]>(sql);
+ const str = (val: string | number | undefined) => val != null ? '' + val : val;
return columns.map(col => {
const platform = connection.getPlatform();
const mappedType = platform.getMappedType(col.column_type);
+ const defaultValue = str(this.normalizeDefaultValue(col.column_default, col.length));
return ({
name: col.column_name,
type: platform.isNumericColumn(mappedType) ? col.column_type.replace(/ unsigned$/, '').replace(/\\(\\d+\\)$/, '') : col.column_type,
mappedType,
unsigned: col.column_type.endsWith(' unsigned'),
length: col.length,
- default: col.column_default,
+ default: this.wrap(defaultValue, mappedType),
nullable: col.is_nullable === 'YES',
primary: col.column_key === 'PRI',
unique: col.column_key === 'UNI',
@@ -153,4 +156,8 @@ export class MySqlSchemaHelper extends SchemaHelper {
return super.normalizeDefaultValue(defaultValue, length, MySqlSchemaHelper.DEFAULT_VALUES);
}
+ protected wrap(val: string | undefined, type: Type<unknown>): string | undefined {
+ return typeof val === 'string' && val.length > 0 && (type instanceof StringType || type instanceof TextType) ? this.platform.quoteValue(val) : val;
+ }
+
}
diff --git a/PostgreSqlPlatform.ts b/PostgreSqlPlatform.ts
index 468f0af..0630d52 100644
--- a/PostgreSqlPlatform.ts
+++ b/PostgreSqlPlatform.ts
@@ -31,8 +31,8 @@ export class PostgreSqlPlatform extends AbstractSqlPlatform {
return `current_timestamp(${length})`;
}
- getDateTimeTypeDeclarationSQL(column: { length?: number }): string {
- return 'timestamptz' + (column.length != null ? `(${column.length})` : '');
+ getDateTimeTypeDeclarationSQL(column: { length: number }): string {
+ return `timestamptz(${column.length})`;
}
getTimeTypeDeclarationSQL(): string {
diff --git a/SqlitePlatform.ts b/SqlitePlatform.ts
index f343a2a..3c1f02b 100644
--- a/SqlitePlatform.ts
+++ b/SqlitePlatform.ts
@@ -19,8 +19,8 @@ export class SqlitePlatform extends AbstractSqlPlatform {
return super.getCurrentTimestampSQL(0);
}
- getDateTimeTypeDeclarationSQL(column: { length?: number }): string {
- return super.getDateTimeTypeDeclarationSQL({ length: 0 });
+ getDateTimeTypeDeclarationSQL(column: { length: number }): string {
+ return 'datetime';
}
getEnumTypeDeclarationSQL(column: { items?: unknown[]; fieldNames: string[]; length?: number; unsigned?: boolean; autoincrement?: boolean }): string {
diff --git a/EntityGenerator.test.ts.snap b/EntityGenerator.test.ts.snap
index e04247f..10c2762 100644
--- a/EntityGenerator.test.ts.snap
+++ b/EntityGenerator.test.ts.snap
@@ -168,7 +168,7 @@ export class Book2 {
@ManyToOne({ entity: () => Publisher2, onUpdateIntegrity: 'cascade', onDelete: 'cascade', nullable: true })
publisher?: Publisher2;
- @Property({ length: 255, nullable: true, defaultRaw: \\`lol\\` })
+ @Property({ length: 255, nullable: true, default: 'lol' })
foo?: string;
}
diff --git a/Migrator.test.ts.snap b/Migrator.test.ts.snap
index 8874e0c..9fedf22 100644
--- a/Migrator.test.ts.snap
+++ b/Migrator.test.ts.snap
@@ -372,7 +372,7 @@ class Migration20191013214813 extends Migration {
}
async down() {
- this.addSql('alter table \\`book2\\` add \\`foo\\` varchar(255) null default lol;');
+ this.addSql('alter table \\`book2\\` add \\`foo\\` varchar(255) null default \\\\\\\\'lol\\\\\\\\';');
this.addSql('alter table \\`test2\\` add \\`foo___bar\\` int unsigned null, add \\`foo___baz\\` int unsigned null;');
this.addSql('alter table \\`test2\\` add constraint \\`test2_foo___bar_foreign\\` foreign key (\\`foo___bar\\`) references \\`foo_bar2\\` (\\`id\\`) on update cascade on delete set null;');
@@ -385,7 +385,7 @@ exports.Migration20191013214813 = Migration20191013214813;
",
"diff": Object {
"down": Array [
- "alter table \\`book2\\` add \\`foo\\` varchar(255) null default lol;",
+ "alter table \\`book2\\` add \\`foo\\` varchar(255) null default 'lol';",
"",
"alter table \\`test2\\` add \\`foo___bar\\` int unsigned null, add \\`foo___baz\\` int unsigned null;",
"alter table \\`test2\\` add constraint \\`test2_foo___bar_foreign\\` foreign key (\\`foo___bar\\`) references \\`foo_bar2\\` (\\`id\\`) on update cascade on delete set null;",
@@ -425,7 +425,7 @@ export class Migration20191013214813 extends Migration {
}
async down(): Promise<void> {
- this.addSql('alter table \\`book2\\` add \\`foo\\` varchar(255) null default lol;');
+ this.addSql('alter table \\`book2\\` add \\`foo\\` varchar(255) null default \\\\\\\\'lol\\\\\\\\';');
this.addSql('alter table \\`test2\\` add \\`foo___bar\\` int unsigned null, add \\`foo___baz\\` int unsigned null;');
this.addSql('alter table \\`test2\\` add constraint \\`test2_foo___bar_foreign\\` foreign key (\\`foo___bar\\`) references \\`foo_bar2\\` (\\`id\\`) on update cascade on delete set null;');
@@ -437,7 +437,7 @@ export class Migration20191013214813 extends Migration {
",
"diff": Object {
"down": Array [
- "alter table \\`book2\\` add \\`foo\\` varchar(255) null default lol;",
+ "alter table \\`book2\\` add \\`foo\\` varchar(255) null default 'lol';",
"",
"alter table \\`test2\\` add \\`foo___bar\\` int unsigned null, add \\`foo___baz\\` int unsigned null;",
"alter table \\`test2\\` add constraint \\`test2_foo___bar_foreign\\` foreign key (\\`foo___bar\\`) references \\`foo_bar2\\` (\\`id\\`) on update cascade on delete set null;",
@@ -477,7 +477,7 @@ export class Migration20191013214813 extends Migration {
}
async down(): Promise<void> {
- this.addSql('alter table \\`book2\\` add \\`foo\\` varchar(255) null default lol;');
+ this.addSql('alter table \\`book2\\` add \\`foo\\` varchar(255) null default \\\\\\\\'lol\\\\\\\\';');
this.addSql('alter table \\`test2\\` add \\`foo___bar\\` int unsigned null, add \\`foo___baz\\` int unsigned null;');
this.addSql('alter table \\`test2\\` add constraint \\`test2_foo___bar_foreign\\` foreign key (\\`foo___bar\\`) references \\`foo_bar2\\` (\\`id\\`) on update cascade on delete set null;');
@@ -489,7 +489,7 @@ export class Migration20191013214813 extends Migration {
",
"diff": Object {
"down": Array [
- "alter table \\`book2\\` add \\`foo\\` varchar(255) null default lol;",
+ "alter table \\`book2\\` add \\`foo\\` varchar(255) null default 'lol';",
"",
"alter table \\`test2\\` add \\`foo___bar\\` int unsigned null, add \\`foo___baz\\` int unsigned null;",
"alter table \\`test2\\` add constraint \\`test2_foo___bar_foreign\\` foreign key (\\`foo___bar\\`) references \\`foo_bar2\\` (\\`id\\`) on update cascade on delete set null;",
diff --git a/GH491.test.ts b/GH491.test.ts
index 56177a0..9f26a1a 100644
--- a/GH491.test.ts
+++ b/GH491.test.ts
diff --git a/diffing-default-values.test.ts.snap b/diffing-default-values.test.ts.snap
index 100df94..bcbb1ee 100644
--- a/diffing-default-values.test.ts.snap
+++ b/diffing-default-values.test.ts.snap
@@ -0,0 +1,40 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`diffing default values (GH #2385) string defaults do not produce additional diffs [mariadb] 1`] = `
+"set names utf8mb4;
+set foreign_key_checks = 0;
+
+create table \\`foo1\\` (\\`id\\` int unsigned not null auto_increment primary key, \\`bar0\\` varchar(255) not null default 'test', \\`bar1\\` varchar(255) not null default 'test', \\`bar2\\` datetime not null default now(), \\`bar3\\` datetime(6) not null default now(6)) default character set utf8mb4 engine = InnoDB;
+
+set foreign_key_checks = 1;
+"
+`;
+
+exports[`diffing default values (GH #2385) string defaults do not produce additional diffs [mysql] 1`] = `
+"set names utf8mb4;
+set foreign_key_checks = 0;
+
+create table \\`foo1\\` (\\`id\\` int unsigned not null auto_increment primary key, \\`bar0\\` varchar(255) not null default 'test', \\`bar1\\` varchar(255) not null default 'test', \\`bar2\\` datetime not null default now(), \\`bar3\\` datetime(6) not null default now(6)) default character set utf8mb4 engine = InnoDB;
+
+set foreign_key_checks = 1;
+"
+`;
+
+exports[`diffing default values (GH #2385) string defaults do not produce additional diffs [postgres] 1`] = `
+"set names 'utf8';
+set session_replication_role = 'replica';
+
+create table \\\\"foo2\\\\" (\\\\"id\\\\" serial primary key, \\\\"bar0\\\\" varchar(255) not null default 'test', \\\\"bar1\\\\" varchar(255) not null default 'test', \\\\"bar2\\\\" timestamptz(0) not null default now(), \\\\"bar3\\\\" timestamptz(6) not null default now());
+
+set session_replication_role = 'origin';
+"
+`;
+
+exports[`diffing default values (GH #2385) string defaults do not produce additional diffs [sqlite] 1`] = `
+"pragma foreign_keys = off;
+
+create table \\`foo3\\` (\\`id\\` integer not null primary key autoincrement, \\`bar0\\` text not null default 'test', \\`bar1\\` text not null default 'test', \\`bar2\\` datetime not null default now);
+
+pragma foreign_keys = on;
+"
+`;
diff --git a/diffing-default-values.test.ts b/diffing-default-values.test.ts
index 2374a36..5800280 100644
--- a/diffing-default-values.test.ts
+++ b/diffing-default-values.test.ts
@@ -0,0 +1,104 @@
+import { Entity, MikroORM, PrimaryKey, Property } from '@mikro-orm/core';
+
+export class Foo {
+
+ @PrimaryKey()
+ id!: number;
+
+ @Property({ defaultRaw: "'test'" })
+ bar0!: string;
+
+ @Property({ default: 'test' })
+ bar1!: string;
+
+}
+
+@Entity()
+export class Foo1 extends Foo {
+
+ @Property({ defaultRaw: 'now()' })
+ bar2!: Date;
+
+ @Property({ defaultRaw: 'now(6)', length: 6 })
+ bar3!: Date;
+
+}
+
+@Entity()
+export class Foo2 extends Foo {
+
+ @Property({ defaultRaw: 'now()' })
+ bar2!: Date;
+
+ @Property({ defaultRaw: 'now()', length: 6 })
+ bar3!: Date;
+
+}
+
+@Entity()
+export class Foo3 extends Foo {
+
+ @Property({ defaultRaw: 'now' })
+ bar2!: Date;
+
+}
+
+describe('diffing default values (GH #2385)', () => {
+
+ test('string defaults do not produce additional diffs [mysql]', async () => {
+ const orm = await MikroORM.init({
+ entities: [Foo1],
+ dbName: 'mikro_orm_test_gh_2385',
+ type: 'mysql',
+ port: 3307,
+ });
+ await orm.getSchemaGenerator().ensureDatabase();
+ await orm.getSchemaGenerator().dropSchema();
+ await orm.getSchemaGenerator().createSchema();
+ expect(await orm.getSchemaGenerator().getCreateSchemaSQL()).toMatchSnapshot();
+ await expect(orm.getSchemaGenerator().getUpdateSchemaSQL({ wrap: false })).resolves.toBe('');
+ await orm.close();
+ });
+
+ test('string defaults do not produce additional diffs [mariadb]', async () => {
+ const orm = await MikroORM.init({
+ entities: [Foo1],
+ dbName: 'mikro_orm_test_gh_2385',
+ type: 'mariadb',
+ port: 3309,
+ });
+ await orm.getSchemaGenerator().ensureDatabase();
+ await orm.getSchemaGenerator().dropSchema();
+ await orm.getSchemaGenerator().createSchema();
+ expect(await orm.getSchemaGenerator().getCreateSchemaSQL()).toMatchSnapshot();
+ await expect(orm.getSchemaGenerator().getUpdateSchemaSQL({ wrap: false })).resolves.toBe('');
+ await orm.close();
+ });
+
+ test('string defaults do not produce additional diffs [postgres]', async () => {
+ const orm = await MikroORM.init({
+ entities: [Foo2],
+ dbName: 'mikro_orm_test_gh_2385',
+ type: 'postgresql',
+ });
+ await orm.getSchemaGenerator().ensureDatabase();
+ await orm.getSchemaGenerator().dropSchema();
+ await orm.getSchemaGenerator().createSchema();
+ expect(await orm.getSchemaGenerator().getCreateSchemaSQL()).toMatchSnapshot();
+ await expect(orm.getSchemaGenerator().getUpdateSchemaSQL({ wrap: false })).resolves.toBe('');
+ await orm.close();
+ });
+
+ test('string defaults do not produce additional diffs [sqlite]', async () => {
+ const orm = await MikroORM.init({
+ entities: [Foo3],
+ dbName: ':memory:',
+ type: 'sqlite',
+ });
+ await orm.getSchemaGenerator().createSchema();
+ expect(await orm.getSchemaGenerator().getCreateSchemaSQL()).toMatchSnapshot();
+ await expect(orm.getSchemaGenerator().getUpdateSchemaSQL({ wrap: false })).resolves.toBe('');
+ await orm.close();
+ });
+
+});
diff --git a/GH529.test.ts.snap b/GH529.test.ts.snap
index 2efb71d..5b38665 100644
--- a/GH529.test.ts.snap
+++ b/GH529.test.ts.snap
@@ -8,7 +8,7 @@ create table \\\\"product\\\\" (\\\\"id\\\\" serial primary key, \\\\"name\\\\" varchar(255)
create table \\\\"customer\\\\" (\\\\"id\\\\" serial primary key);
-create table \\\\"order\\\\" (\\\\"id\\\\" serial primary key, \\\\"customer_id\\\\" int not null, \\\\"paid\\\\" boolean not null, \\\\"shipped\\\\" boolean not null, \\\\"created\\\\" timestamptz not null);
+create table \\\\"order\\\\" (\\\\"id\\\\" serial primary key, \\\\"customer_id\\\\" int not null, \\\\"paid\\\\" boolean not null, \\\\"shipped\\\\" boolean not null, \\\\"created\\\\" timestamptz(0) not null);
create table \\\\"order_item\\\\" (\\\\"order_id\\\\" int not null, \\\\"product_id\\\\" int not null, \\\\"amount\\\\" int not null, \\\\"offered_price\\\\" int not null);
alter table \\\\"order_item\\\\" add constraint \\\\"order_item_pkey\\\\" primary key (\\\\"order_id\\\\", \\\\"product_id\\\\");
|
|
ci: add quarto branch to docs builds
|
d85f770a86e6598ea3eeca61a466e906bbe94291
|
ci
|
https://github.com/rohankumardubey/ibis/commit/d85f770a86e6598ea3eeca61a466e906bbe94291
|
add quarto branch to docs builds
|
diff --git a/ibis-docs-lint.yml b/ibis-docs-lint.yml
index 7b1573d..f8ad808 100644
--- a/ibis-docs-lint.yml
+++ b/ibis-docs-lint.yml
@@ -5,10 +5,12 @@ on:
branches:
- master
- "*.x.x"
+ - quarto
pull_request:
branches:
- master
- "*.x.x"
+ - quarto
merge_group:
concurrency:
@@ -184,10 +186,10 @@ jobs:
runs-on: ubuntu-latest
if: github.event_name == 'push'
concurrency: docs-${{ github.repository }}
- needs:
- # wait on benchmarks to prevent a race condition when pushing to the
- # gh-pages branch
- - benchmarks
+ # needs:
+ # # wait on benchmarks to prevent a race condition when pushing to the
+ # # gh-pages branch
+ # - benchmarks
steps:
- name: install nix
uses: cachix/install-nix-action@v23
@@ -202,39 +204,20 @@ jobs:
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
extraPullNames: nix-community,poetry2nix
- - name: Generate a GitHub token
- uses: tibdex/github-app-token@v1
- id: generate_token
- with:
- app_id: ${{ secrets.DOCS_BOT_APP_ID }}
- private_key: ${{ secrets.DOCS_BOT_APP_PRIVATE_KEY }}
+ # TODO(cpcloud): what to do with this?
+ # - name: download benchmark data
+ # uses: actions/download-artifact@v3
+ # with:
+ # name: bench
+ # path: docs/bench
- - name: checkout
- uses: actions/checkout@v4
- with:
- fetch-depth: 0
- token: ${{ steps.generate_token.outputs.token }}
-
- - name: Configure git info
- run: |
- set -euo pipefail
-
- git config user.name 'ibis-docs-bot[bot]'
- git config user.email 'ibis-docs-bot[bot]@users.noreply.github.com'
- git config http.postBuffer 157286400
- git config http.version 'HTTP/1.1'
-
- - name: download benchmark data
- uses: actions/download-artifact@v3
- with:
- name: bench
- path: docs/bench
+ - name: build api docs
+ run: nix develop -c quartodoc build --verbose --config docs/_quarto.yml
- name: build and push quarto docs
- # TODO(cpcloud): get az working in the environment, right now this assumes it's installed on the runner
- run: nix develop -c just docs-deploy
+ run: nix develop --ignore-environment --keep NETLIFY_AUTH_TOKEN -c quarto publish --no-prompt --no-browser netlify
env:
- AZURE_STORAGE_SECRET: ${{ secrets.AZURE_STORAGE_SECRET }}
+ NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
simulate_release:
runs-on: ubuntu-latest
|
|
fix: assure passwords aren't returned in percent-encoded form.
|
530257f718d8abe0668eeeed072cc4fee9707cbb
|
fix
|
https://github.com/Byron/gitoxide/commit/530257f718d8abe0668eeeed072cc4fee9707cbb
|
assure passwords aren't returned in percent-encoded form.
|
diff --git a/Cargo.lock b/Cargo.lock
index 16c2d1f..3d77c55 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2792,6 +2792,7 @@ dependencies = [
"gix-features 0.39.1",
"gix-path 0.10.13",
"gix-testtools",
+ "percent-encoding",
"serde",
"thiserror 2.0.3",
"url",
diff --git a/Cargo.toml b/Cargo.toml
index f47635e..7f13851 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,6 +26,7 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
thiserror = "2.0.0"
url = "2.5.2"
bstr = { version = "1.3.0", default-features = false, features = ["std"] }
+percent-encoding = "2.3.1"
document-features = { version = "0.2.0", optional = true }
diff --git a/impls.rs b/impls.rs
index 9479692..fddad3f 100644
--- a/impls.rs
+++ b/impls.rs
@@ -81,7 +81,7 @@ impl std::fmt::Display for Url {
let mut storage;
let to_print = if self.password.is_some() {
storage = self.clone();
- storage.password = Some("<redacted>".into());
+ storage.password = Some("redacted".into());
&storage
} else {
self
diff --git a/lib.rs b/lib.rs
index c14638a..eb8b06d 100644
--- a/lib.rs
+++ b/lib.rs
@@ -308,6 +308,10 @@ impl Url {
}
}
+fn percent_encode(s: &str) -> Cow<'_, str> {
+ percent_encoding::utf8_percent_encode(s, percent_encoding::NON_ALPHANUMERIC).into()
+}
+
/// Serialization
impl Url {
/// Write this URL losslessly to `out`, ready to be parsed again.
@@ -318,10 +322,10 @@ impl Url {
}
match (&self.user, &self.host) {
(Some(user), Some(host)) => {
- out.write_all(user.as_bytes())?;
+ out.write_all(percent_encode(user).as_bytes())?;
if let Some(password) = &self.password {
out.write_all(b":")?;
- out.write_all(password.as_bytes())?;
+ out.write_all(percent_encode(password).as_bytes())?;
}
out.write_all(b"@")?;
out.write_all(host.as_bytes())?;
diff --git a/parse.rs b/parse.rs
index 4ba0cfd..ed210bb 100644
--- a/parse.rs
+++ b/parse.rs
@@ -1,8 +1,8 @@
use std::convert::Infallible;
-use bstr::{BStr, BString, ByteSlice};
-
use crate::Scheme;
+use bstr::{BStr, BString, ByteSlice};
+use percent_encoding::percent_decode_str;
/// The error returned by [parse()](crate::parse()).
#[derive(Debug, thiserror::Error)]
@@ -115,13 +115,20 @@ pub(crate) fn url(input: &BStr, protocol_end: usize) -> Result<crate::Url, Error
serialize_alternative_form: false,
scheme,
user: url_user(&url),
- password: url.password().map(Into::into),
+ password: url.password().map(percent_decoded_utf8),
host: url.host_str().map(Into::into),
port: url.port(),
path: url.path().into(),
})
}
+fn percent_decoded_utf8(s: &str) -> String {
+ percent_decode_str(s)
+ .decode_utf8()
+ .expect("it's not possible to sneak illegal UTF8 into a URL")
+ .into_owned()
+}
+
pub(crate) fn scp(input: &BStr, colon: usize) -> Result<crate::Url, Error> {
let input = input_to_utf8(input, UrlKind::Scp)?;
@@ -151,7 +158,7 @@ pub(crate) fn scp(input: &BStr, colon: usize) -> Result<crate::Url, Error> {
serialize_alternative_form: true,
scheme: url.scheme().into(),
user: url_user(&url),
- password: url.password().map(Into::into),
+ password: url.password().map(percent_decoded_utf8),
host: url.host_str().map(Into::into),
port: url.port(),
path: path.into(),
@@ -162,7 +169,7 @@ fn url_user(url: &url::Url) -> Option<String> {
if url.username().is_empty() && url.password().is_none() {
None
} else {
- Some(url.username().into())
+ Some(percent_decoded_utf8(url.username()))
}
}
diff --git a/mod.rs b/mod.rs
index 49055d9..dc9efad 100644
--- a/mod.rs
+++ b/mod.rs
@@ -174,7 +174,7 @@ fn display() {
compare("/path/to/repo", "/path/to/repo", "same goes for simple paths");
compare(
"https://user:password@host/path",
- "https://user:<redacted>@host/path",
- "it visibly redacts passwords though",
+ "https://user:redacted@host/path",
+ "it visibly redacts passwords though, and it's still a valid URL",
);
}
diff --git a/http.rs b/http.rs
index 896e70f..3132a8d 100644
--- a/http.rs
+++ b/http.rs
@@ -39,6 +39,26 @@ fn username_and_password_and_port() -> crate::Result {
)
}
+#[test]
+fn username_and_password_with_spaces_and_port() -> crate::Result {
+ let expected = gix_url::Url::from_parts(
+ Scheme::Http,
+ Some("user name".into()),
+ Some("password secret".into()),
+ Some("example.com".into()),
+ Some(8080),
+ b"/~byron/hello".into(),
+ false,
+ )?;
+ assert_url_roundtrip(
+ "http://user%20name:password%[email protected]:8080/~byron/hello",
+ expected.clone(),
+ )?;
+ assert_eq!(expected.user(), Some("user name"));
+ assert_eq!(expected.password(), Some("password secret"));
+ Ok(())
+}
+
#[test]
fn only_password() -> crate::Result {
assert_url_roundtrip(
|
|
test(ts): fix useSpring tests
|
069d01836acb285004e5dc53d25f65cfeadfbf49
|
test
|
https://github.com/pmndrs/react-spring/commit/069d01836acb285004e5dc53d25f65cfeadfbf49
|
fix useSpring tests
|
diff --git a/useSpring.tsx b/useSpring.tsx
index 3372979..8f17b24 100644
--- a/useSpring.tsx
+++ b/useSpring.tsx
@@ -88,7 +88,7 @@ test('imperative mode', () => {
const [props, update, stop] = useSpring(() => ({
foo: 0,
onRest(values) {
- assert(values, _ as UnknownProps); // FIXME: should be "UnknownProps & { foo: number }"
+ assert(values, _ as Readonly<UnknownProps>); // FIXME: should be "UnknownProps & { foo: number }"
},
}));
assert(props, _ as {
@@ -108,10 +108,10 @@ test('imperative mode', () => {
// With event listener
update({
onRest(values) {
- assert(values, _ as {
+ assert(values, _ as Readonly<{
[key: string]: unknown;
foo: number;
- });
+ }>);
},
});
});
@@ -143,10 +143,10 @@ test('imperative mode', () => {
assert(anim, _ as any);
},
onFrame(values) {
- assert(values, _ as UnknownProps); // FIXME: should be "UnknownProps & { foo: number }"
+ assert(values, _ as Readonly<UnknownProps>); // FIXME: should be "UnknownProps & { foo: number }"
},
onRest(values) {
- assert(values, _ as UnknownProps); // FIXME: should be "UnknownProps & { foo: number }"
+ assert(values, _ as Readonly<UnknownProps>); // FIXME: should be "UnknownProps & { foo: number }"
},
}));
assert(props, _ as {
@@ -173,10 +173,10 @@ test('basic config', () => {
assert(animation, _ as any);
},
onFrame(values) {
- assert(values, _ as UnknownProps); // FIXME: should be "UnknownProps & { width: number }"
+ assert(values, _ as Readonly<UnknownProps>); // FIXME: should be "UnknownProps & { width: number }"
},
onRest(values) {
- assert(values, _ as UnknownProps); // FIXME: should be "UnknownProps & { width: number }"
+ assert(values, _ as Readonly<UnknownProps>); // FIXME: should be "UnknownProps & { width: number }"
},
});
assert(props, _ as {
@@ -198,7 +198,7 @@ test('function as "to" prop', () => {
delay: 1000,
config: { duration: 1000 },
onRest(values) {
- assert(values, _ as UnknownProps); // FIXME: should be "UnknownProps & { foo: number }"
+ assert(values, _ as Readonly<UnknownProps>); // FIXME: should be "UnknownProps & { foo: number }"
},
});
},
@@ -214,7 +214,7 @@ test('function as "to" prop', () => {
assert(next, _ as SpringUpdateFn); // FIXME: should be "SpringUpdateFn<{ foo: number }>"
await next({
onRest(values) {
- assert(values, _ as UnknownProps); // FIXME: should be "UnknownProps & { foo: number }"
+ assert(values, _ as Readonly<UnknownProps>); // FIXME: should be "UnknownProps & { foo: number }"
},
});
},
|
|
docs: remove old-style schema construction from examples and docstrings
|
1b1c33a29a34f83fcce8d87c7ad3fc491e4cdc8d
|
docs
|
https://github.com/rohankumardubey/ibis/commit/1b1c33a29a34f83fcce8d87c7ad3fc491e4cdc8d
|
remove old-style schema construction from examples and docstrings
|
diff --git a/impala.qmd b/impala.qmd
index d4e44d5..f362051 100644
--- a/impala.qmd
+++ b/impala.qmd
@@ -304,9 +304,7 @@ You can use the `create_table` method either on a database or client
object.
```python
-schema = ibis.schema([('foo', 'string'),
- ('year', 'int32'),
- ('month', 'int16')])
+schema = ibis.schema(dict(foo='string', year='int32', month='int16'))
name = 'new_table'
db.create_table(name, schema=schema)
```
@@ -316,9 +314,7 @@ You can force a particular path with the `location` option.
```python
from getpass import getuser
-schema = ibis.schema([('foo', 'string'),
- ('year', 'int32'),
- ('month', 'int16')])
+schema = ibis.schema(dict(foo='string', year='int32', month='int16'))
name = 'new_table'
location = '/home/{}/new-table-data'.format(getuser())
db.create_table(name, schema=schema, location=location)
@@ -353,9 +349,7 @@ To create an empty partitioned table, include a list of columns to be
used as the partition keys.
```python
-schema = ibis.schema([('foo', 'string'),
- ('year', 'int32'),
- ('month', 'int16')])
+schema = ibis.schema(dict(foo='string', year='int32', month='int16'))
name = 'new_table'
db.create_table(name, schema=schema, partition=['year', 'month'])
```
@@ -389,9 +383,7 @@ specific, you can either use a dict with the partition key names and
values, or pass a list of the partition values:
```python
-schema = ibis.schema([('foo', 'string'),
- ('year', 'int32'),
- ('month', 'int16')])
+schema = ibis.schema(dict(foo='string', year='int32', month='int16'))
name = 'new_table'
db.create_table(name, schema=schema, partition=['year', 'month'])
@@ -1028,12 +1020,8 @@ $ rm -rf csv-files/
The schema here is pretty simple (see `ibis.schema` for more):
```python
->>> schema = ibis.schema([('foo', 'string'),
-... ('bar', 'double'),
-... ('baz', 'int32')])
-
->>> table = con.delimited_file('/__ibis/ibis-testing-data/csv',
-... schema)
+>>> schema = ibis.schema(dict(foo='string', bar='double', baz='int32'))
+>>> table = con.delimited_file('/__ibis/ibis-testing-data/csv', schema)
>>> table.limit(10)
foo bar baz
0 63IEbRheTh 0.679389 6
diff --git a/aggcontext.py b/aggcontext.py
index d81ad73..6354022 100644
--- a/aggcontext.py
+++ b/aggcontext.py
@@ -38,9 +38,7 @@ Ibis
::
>>> import ibis
- >>> schema = [
- ... ('time', 'timestamp'), ('key', 'string'), ('value', 'double')
- ... ]
+ >>> schema = dict(time='timestamp', key='string', value='double')
>>> t = ibis.table(schema, name='t')
>>> t[t, t.value.sum().name('sum_value')].sum_value # quartodoc: +SKIP # doctest: +SKIP
@@ -76,9 +74,7 @@ Ibis
::
>>> import ibis
- >>> schema = [
- ... ('time', 'timestamp'), ('key', 'string'), ('value', 'double')
- ... ]
+ >>> schema = dict(time='timestamp', key='string', value='double')
>>> t = ibis.table(schema, name='t')
>>> t.value.sum().over(ibis.window(group_by=t.key)) # quartodoc: +SKIP # doctest: +SKIP
@@ -120,9 +116,7 @@ Ibis
::
>>> import ibis
- >>> schema = [
- ... ('time', 'timestamp'), ('key', 'string'), ('value', 'double')
- ... ]
+ >>> schema = dict(time='timestamp', key='string', value='double')
>>> t = ibis.table(schema, name='t')
>>> window = ibis.cumulative_window(order_by=t.time)
>>> t.value.sum().over(window) # quartodoc: +SKIP # doctest: +SKIP
@@ -160,9 +154,7 @@ Ibis
::
>>> import ibis
- >>> schema = [
- ... ('time', 'timestamp'), ('key', 'string'), ('value', 'double')
- ... ]
+ >>> schema = dict(time='timestamp', key='string', value='double')
>>> t = ibis.table(schema, name='t')
>>> window = ibis.trailing_window(3, order_by=t.time)
>>> t.value.sum().over(window) # quartodoc: +SKIP # doctest: +SKIP
@@ -206,9 +198,7 @@ Ibis
::
>>> import ibis
- >>> schema = [
- ... ('time', 'timestamp'), ('key', 'string'), ('value', 'double')
- ... ]
+ >>> schema = dict(time='timestamp', key='string', value='double')
>>> t = ibis.table(schema, name='t')
>>> window = ibis.trailing_window(2, order_by=t.time, group_by=t.key)
>>> t.value.sum().over(window) # quartodoc: +SKIP # doctest: +SKIP
|
|
test(bench): add datatype parsing and repr benchmarks
|
b2ad60a869e11333a17760941cd691396e937fc3
|
test
|
https://github.com/ibis-project/ibis/commit/b2ad60a869e11333a17760941cd691396e937fc3
|
add datatype parsing and repr benchmarks
|
diff --git a/test_benchmarks.py b/test_benchmarks.py
index 4c93ac6..d4298c4 100644
--- a/test_benchmarks.py
+++ b/test_benchmarks.py
@@ -461,3 +461,20 @@ def test_op_args(benchmark):
t = ibis.table([("a", "int64")])
expr = t[["a"]]
benchmark(lambda op: op.args, expr.op())
+
+
+def test_complex_datatype_parse(benchmark):
+ type_str = "array<struct<a: array<string>, b: map<string, array<int64>>>>"
+ benchmark(dt.parse_type, type_str)
+
+
[email protected]("func", [str, hash])
+def test_complex_datatype_builtins(benchmark, func):
+ datatype = dt.Array(
+ dt.Struct.from_dict(
+ dict(
+ a=dt.Array(dt.string), b=dt.Map(dt.string, dt.Array(dt.int64))
+ )
+ )
+ )
+ benchmark(func, datatype)
diff --git a/pyproject.toml b/pyproject.toml
index a01c7a8..2c38fff 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -146,7 +146,6 @@ addopts = [
"--ignore=dist-packages",
"--strict-markers",
"--benchmark-skip",
- "--benchmark-autosave",
]
empty_parameter_set_mark = "fail_at_collect"
norecursedirs = ["site-packages", "dist-packages"]
|
|
test(duckdb): isolate tests with `subprocess`
|
9f8d48522c8f3d479812a300e8523f969a0a99d2
|
test
|
https://github.com/ibis-project/ibis/commit/9f8d48522c8f3d479812a300e8523f969a0a99d2
|
isolate tests with `subprocess`
|
diff --git a/conftest.py b/conftest.py
index 8804351..31a59aa 100644
--- a/conftest.py
+++ b/conftest.py
@@ -4,7 +4,6 @@ import contextlib
import importlib
import importlib.metadata
import platform
-import sys
from functools import lru_cache
from pathlib import Path
from typing import Any, TextIO
@@ -731,13 +730,3 @@ def test_employee_data_2():
)
return df2
-
-
[email protected]
-def no_duckdb(backend, monkeypatch):
- monkeypatch.setitem(sys.modules, "duckdb", None)
-
-
[email protected]
-def no_pyarrow(backend, monkeypatch):
- monkeypatch.setitem(sys.modules, "pyarrow", None)
diff --git a/test_client.py b/test_client.py
index 4d093da..0899513 100644
--- a/test_client.py
+++ b/test_client.py
@@ -1,8 +1,9 @@
-import contextlib
import os
import platform
import re
import string
+import subprocess
+import sys
import numpy as np
import pandas as pd
@@ -753,36 +754,50 @@ def test_default_backend_option():
ibis.options.default_backend = orig
-def test_default_backend_no_duckdb(backend):
- # backend is used to ensure that this test runs in CI in the setting
- # where only the dependencies for a a given backend are installed
+# backend is used to ensure that this test runs in CI in the setting
+# where only the dependencies for a given backend are installed
[email protected]("backend")
+def test_default_backend_no_duckdb():
+ script = """\\
+import sys
+sys.modules["duckdb"] = None
- # if duckdb is available then this test won't fail and so we skip it
- with contextlib.suppress(ImportError):
- import duckdb # noqa: F401
+import ibis
- pytest.skip("duckdb is installed; it will be used as the default backend")
+t = ibis.memtable([{'a': 1}, {'a': 2}, {'a': 3}])
+t.execute()"""
- df = pd.DataFrame({'a': [1, 2, 3]})
- t = ibis.memtable(df)
- expr = t.a.sum()
+ args = [sys.executable, "-c", script]
+ with pytest.raises(subprocess.CalledProcessError) as e:
+ subprocess.check_output(args, stderr=subprocess.STDOUT, universal_newlines=True)
+ assert (
+ re.search(
+ "You have used a function that relies on the default backend",
+ e.value.output,
+ )
+ is not None
+ )
- # run this twice to ensure that we hit the optimizations in
- # `_default_backend`
- for _ in range(2):
- with pytest.raises(
- com.IbisError,
- match="You have used a function that relies on the default backend",
- ):
- expr.execute()
-
-
-def test_default_backend_no_duckdb_read_parquet(no_duckdb):
- with pytest.raises(
- com.IbisError,
- match="You have used a function that relies on the default backend",
- ):
- ibis.read_parquet("foo.parquet")
+
[email protected]("backend")
+def test_default_backend_no_duckdb_read_parquet():
+ script = """\\
+import sys
+sys.modules["duckdb"] = None
+
+import ibis
+ibis.read_parquet("foo.parquet")"""
+
+ args = [sys.executable, "-c", script]
+ with pytest.raises(subprocess.CalledProcessError) as e:
+ subprocess.check_output(args, stderr=subprocess.STDOUT, universal_newlines=True)
+ assert (
+ re.search(
+ "You have used a function that relies on the default backend",
+ e.value.output,
+ )
+ is not None
+ )
@pytest.mark.duckdb
diff --git a/test_export.py b/test_export.py
index cc61454..4546a81 100644
--- a/test_export.py
+++ b/test_export.py
@@ -1,3 +1,5 @@
+import sys
+
import pytest
from pytest import param
@@ -150,6 +152,7 @@ def test_to_pyarrow_batches_borked_types(batting):
assert len(batch) == 42
-def test_no_pyarrow_message(awards_players, no_pyarrow):
+def test_no_pyarrow_message(awards_players, monkeypatch):
+ monkeypatch.setitem(sys.modules, "pyarrow", None)
with pytest.raises(ModuleNotFoundError, match="requires `pyarrow` but"):
awards_players.to_pyarrow()
diff --git a/ibis.nix b/ibis.nix
index 7ab8d6c..123373f 100644
--- a/ibis.nix
+++ b/ibis.nix
@@ -47,7 +47,8 @@ poetry2nix.mkPoetryApplication rec {
# the sqlite-on-duckdb tests try to download the sqlite_scanner extension
# but network usage is not allowed in the sandbox
pytest -m '${markers}' --numprocesses "$NIX_BUILD_CORES" --dist loadgroup \\
- --deselect=ibis/backends/duckdb/tests/test_register.py::test_{read,register}_sqlite \\
+ --deselect=ibis/backends/duckdb/tests/test_register.py::test_read_sqlite \\
+ --deselect=ibis/backends/duckdb/tests/test_register.py::test_register_sqlite
runHook postCheck
'';
|
|
feat(udf): support inputs without type annotations
|
99e531d677419716d98843e4001a1d25d0578c8d
|
feat
|
https://github.com/rohankumardubey/ibis/commit/99e531d677419716d98843e4001a1d25d0578c8d
|
support inputs without type annotations
|
diff --git a/html.json b/html.json
index e1706ce..8e7e074 100644
--- a/html.json
+++ b/html.json
@@ -1,7 +1,7 @@
{
- "hash": "00ca1d2fd32eb50acb2ec2e7c7a57931",
+ "hash": "be8b66093ec8d56b7575bd43ecdab2e9",
"result": {
- "markdown": "---\\nfreeze: auto\\ntitle: Reference built-in functions\\n---\\n\\n\\n\\n\\n\\nFunctions that aren't exposed in ibis directly can be accessed using the\\n`@ibis.udf.scalar.builtin` decorator.\\n\\n::: {.callout-tip}\\n## [Ibis APIs](../../reference/index.qmd) may already exist for your function.\\n\\nBuiltin scalar UDFs are designed to be an escape hatch when Ibis doesn't have\\na defined API for a built-in database function.\\n\\nSee [the reference documentation](../../reference/index.qmd) for existing APIs.\\n:::\\n\\n## DuckDB\\n\\nIbis doesn't directly expose many of the DuckDB [text similarity\\nfunctions](https://duckdb.org/docs/sql/functions/char.html#text-similarity-functions).\\nLet's expose the `mismatches` API.\\n\\n\\n::: {#e0a2087b .cell execution_count=1}\\n``` {.python .cell-code}\\nfrom ibis import udf\\n\\[email protected]\\ndef mismatches(left: str, right: str) -> int:\\n ...\\n```\\n:::\\n\\n\\nThe [`...`](https://docs.python.org/3/library/constants.html#Ellipsis) is\\na visual indicator that the function definition is unknown to Ibis.\\n\\n::: {.callout-note collapse=\\"true\\"}\\n## Ibis does not do anything with the function body.\\n\\nIbis will not inspect the function body or otherwise inspect it. Any code you\\nwrite in the function body **will be ignored**.\\n:::\\n\\nWe can now call this function on any ibis expression:\\n\\n::: {#7c520722 .cell execution_count=2}\\n``` {.python .cell-code}\\nimport ibis\\n\\ncon = ibis.duckdb.connect() # <1>\\n```\\n:::\\n\\n\\n1. Connect to an in-memory DuckDB database\\n\\n::: {#ac393010 .cell execution_count=3}\\n``` {.python .cell-code}\\nexpr = mismatches(\\"duck\\", \\"luck\\")\\ncon.execute(expr)\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=3}\\n```\\n1\\n```\\n:::\\n:::\\n\\n\\nLike any other ibis expression you can inspect the SQL:\\n\\n::: {#bb4d8344 .cell execution_count=4}\\n``` {.python .cell-code}\\nimport ibis\\n\\nibis.to_sql(expr, dialect=\\"duckdb\\") # <1>\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=4}\\n```sql\\nSELECT\\n MISMATCHES('duck', 'luck') AS \\"mismatches('duck', 'luck')\\"\\n```\\n:::\\n:::\\n\\n\\n1. The `dialect` keyword argument must be passed, because we constructed\\n a literal expression which has no backend attached.\\n\\nBecause built-in UDFs are ultimately Ibis expressions, they compose with the\\nrest of the library:\\n\\n::: {#1b20bc7e .cell execution_count=5}\\n``` {.python .cell-code}\\nibis.options.interactive = True\\n\\[email protected]\\ndef jaro_winkler_similarity(a: str, b: str) -> float:\\n ...\\n\\npkgs = ibis.read_parquet(\\n \\"https://storage.googleapis.com/ibis-tutorial-data/pypi/packages.parquet\\"\\n)\\npandas_ish = pkgs[jaro_winkler_similarity(pkgs.name, \\"pandas\\") >= 0.9]\\npandas_ish\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=5}\\n```{=html}\\n<pre style=\\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\\">┏━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━┓\\n┃<span style=\\"font-weight: bold\\"> name </span>┃<span style=\\"font-weight: bold\\"> version </span>┃<span style=\\"font-weight: bold\\"> requires_python </span>┃<span style=\\"font-weight: bold\\"> yanked </span>┃<span style=\\"font-weight: bold\\"> has_binary_wheel </span>┃<span style=\\"font-weight: bold\\"> has_vulnerabilities </span>┃<span style=\\"font-weight: bold\\"> first_uploaded_at </span>┃<span style=\\"font-weight: bold\\"> last_uploaded_at </span>┃<span style=\\"font-weight: bold\\"> recorded_at </span>┃<span style=\\"font-weight: bold\\"> downloads </span>┃<span style=\\"font-weight: bold\\"> scorecard_overall </span>┃<span style=\\"font-weight: bold\\"> in_google_assured_oss </span>┃\\n┡━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━┩\\n│ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">string</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">string</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">string</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">boolean</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">boolean</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">boolean</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">timestamp</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">timestamp</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">timestamp</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">int32</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">float64</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">boolean</span> │\\n├──────────┼───────────────────┼─────────────────┼─────────┼──────────────────┼─────────────────────┼─────────────────────┼─────────────────────┼─────────────────────┼───────────┼───────────────────┼───────────────────────┤\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">bcpandas</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">2.4.1 </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">>=3.8.1 </span> │ True │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 06:14:22</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 06:14:23</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 14:31:41</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">espandas</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">1.0.4 </span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">~</span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2018-12-22 20:52:30</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2018-12-22 20:52:30</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 14:58:47</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">3.6</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">fpandas </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.5 </span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">~</span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2020-03-09 02:35:31</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2020-03-09 02:35:31</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:04:23</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">h3pandas</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.2.4 </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">>=3.6 </span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-03-19 17:58:16</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-03-19 17:58:16</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:10:06</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">ipandas </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.0.1 </span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">~</span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2019-05-29 18:46:12</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2019-05-29 18:46:12</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:15:34</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">3.6</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">kpandas </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.0.1 </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">>=3.6,<4.0 </span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2019-05-02 18:00:29</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2019-05-02 18:00:31</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:20:21</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">mpandas </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.0.2.1 </span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">~</span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-07-03 16:21:21</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-07-03 16:21:23</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:30:35</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">mtpandas</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">1.14.202306141807</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">>=3.6 </span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-06-14 18:08:01</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-06-14 18:08:01</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:31:04</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">4.6</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">mypandas</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.1.6 </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">>=3.10 </span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-10-24 21:01:10</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-10-24 21:01:12</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:32:04</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">paandas </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.0.3 </span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">~</span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-11-24 06:11:15</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-11-24 06:11:17</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:43:31</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │\\n└──────────┴───────────────────┴─────────────────┴─────────┴──────────────────┴─────────────────────┴─────────────────────┴─────────────────────┴─────────────────────┴───────────┴───────────────────┴───────────────────────┘\\n</pre>\\n```\\n:::\\n:::\\n\\n\\nLet's count the results:\\n\\n::: {#71158865 .cell execution_count=6}\\n``` {.python .cell-code}\\npandas_ish.count()\\n```\\n\\n::: {.cell-output .cell-output-display}\\n```{=html}\\n<pre style=\\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\\"></pre>\\n```\\n:::\\n\\n::: {.cell-output .cell-output-display execution_count=6}\\n\\n::: {.ansi-escaped-output}\\n```{=html}\\n<pre><span class=\\"ansi-cyan-fg ansi-bold\\">178</span></pre>\\n```\\n:::\\n\\n:::\\n:::\\n\\n\\nThere are a good number of packages that look similar to `pandas`!\\n\\n## Snowflake\\n\\nSimilarly we can expose Snowflake's\\n[`jarowinkler_similarity`](https://docs.snowflake.com/en/sql-reference/functions/jarowinkler_similarity)\\nfunction.\\n\\nLet's alias it to `jw_sim` to illustrate some more of the Ibis `udf` API:\\n\\n::: {#cec67864 .cell execution_count=7}\\n``` {.python .cell-code}\\[email protected](name=\\"jarowinkler_similarity\\") # <1>\\ndef jw_sim(left: str, right: str) -> float:\\n ...\\n```\\n:::\\n\\n\\n1. `target` is the name of the function in the backend. This argument is\\n required in this because the function name is different than the name of the\\n function in ibis.\\n\\n\\nNow let's connect to Snowflake and call our `jw_sim` function:\\n\\n::: {#48696c70 .cell execution_count=8}\\n``` {.python .cell-code}\\nimport os\\n\\ncon = ibis.connect(os.environ[\\"SNOWFLAKE_URL\\"])\\n```\\n:::\\n\\n\\n::: {#b8951169 .cell execution_count=9}\\n``` {.python .cell-code}\\nexpr = jw_sim(\\"snow\\", \\"shoe\\")\\ncon.execute(expr)\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=9}\\n```\\n66.0\\n```\\n:::\\n:::\\n\\n\\nAnd let's take a look at the SQL\\n\\n::: {#1073bf2e .cell execution_count=10}\\n``` {.python .cell-code}\\nibis.to_sql(expr, dialect=\\"snowflake\\")\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=10}\\n```sql\\nSELECT\\n JAROWINKLER_SIMILARITY('snow', 'shoe') AS \\"jarowinkler_similarity('snow', 'shoe')\\"\\n```\\n:::\\n:::\\n\\n\\n",
+ "markdown": "---\\nfreeze: auto\\ntitle: Reference built-in functions\\n---\\n\\n\\n\\n\\n\\nFunctions that aren't exposed in ibis directly can be accessed using the\\n`@ibis.udf.scalar.builtin` decorator.\\n\\n::: {.callout-tip}\\n## [Ibis APIs](../../reference/index.qmd) may already exist for your function.\\n\\nBuiltin scalar UDFs are designed to be an escape hatch when Ibis doesn't have\\na defined API for a built-in database function.\\n\\nSee [the reference documentation](../../reference/index.qmd) for existing APIs.\\n:::\\n\\n## DuckDB\\n\\nIbis doesn't directly expose many of the DuckDB [text similarity\\nfunctions](https://duckdb.org/docs/sql/functions/char.html#text-similarity-functions).\\nLet's expose the `mismatches` API.\\n\\n\\n::: {#a0ce6764 .cell execution_count=1}\\n``` {.python .cell-code}\\nfrom ibis import udf\\n\\[email protected]\\ndef mismatches(left: str, right: str) -> int:\\n ...\\n```\\n:::\\n\\n\\nThe [`...`](https://docs.python.org/3/library/constants.html#Ellipsis) is\\na visual indicator that the function definition is unknown to Ibis.\\n\\n::: {.callout-note collapse=\\"true\\"}\\n## Ibis does not do anything with the function body.\\n\\nIbis will not inspect the function body or otherwise inspect it. Any code you\\nwrite in the function body **will be ignored**.\\n:::\\n\\nWe can now call this function on any ibis expression:\\n\\n::: {#271b9916 .cell execution_count=2}\\n``` {.python .cell-code}\\nimport ibis\\n\\ncon = ibis.duckdb.connect() # <1>\\n```\\n:::\\n\\n\\n1. Connect to an in-memory DuckDB database\\n\\n::: {#ef527d30 .cell execution_count=3}\\n``` {.python .cell-code}\\nexpr = mismatches(\\"duck\\", \\"luck\\")\\ncon.execute(expr)\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=17}\\n```\\n1\\n```\\n:::\\n:::\\n\\n\\nLike any other ibis expression you can inspect the SQL:\\n\\n::: {#69b10261 .cell execution_count=4}\\n``` {.python .cell-code}\\nimport ibis\\n\\nibis.to_sql(expr, dialect=\\"duckdb\\") # <1>\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=18}\\n```sql\\nSELECT\\n MISMATCHES('duck', 'luck') AS \\"mismatches('duck', 'luck')\\"\\n```\\n:::\\n:::\\n\\n\\n1. The `dialect` keyword argument must be passed, because we constructed\\n a literal expression which has no backend attached.\\n\\nBecause built-in UDFs are ultimately Ibis expressions, they compose with the\\nrest of the library:\\n\\n::: {#d44d4edc .cell execution_count=5}\\n``` {.python .cell-code}\\nibis.options.interactive = True\\n\\[email protected]\\ndef jaro_winkler_similarity(a: str, b: str) -> float:\\n ...\\n\\npkgs = ibis.read_parquet(\\n \\"https://storage.googleapis.com/ibis-tutorial-data/pypi/packages.parquet\\"\\n)\\npandas_ish = pkgs[jaro_winkler_similarity(pkgs.name, \\"pandas\\") >= 0.9]\\npandas_ish\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=19}\\n```{=html}\\n<pre style=\\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\\">┏━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━┳━━━━━━━━━┳━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━┓\\n┃<span style=\\"font-weight: bold\\"> name </span>┃<span style=\\"font-weight: bold\\"> version </span>┃<span style=\\"font-weight: bold\\"> requires_python </span>┃<span style=\\"font-weight: bold\\"> yanked </span>┃<span style=\\"font-weight: bold\\"> has_binary_wheel </span>┃<span style=\\"font-weight: bold\\"> has_vulnerabilities </span>┃<span style=\\"font-weight: bold\\"> first_uploaded_at </span>┃<span style=\\"font-weight: bold\\"> last_uploaded_at </span>┃<span style=\\"font-weight: bold\\"> recorded_at </span>┃<span style=\\"font-weight: bold\\"> downloads </span>┃<span style=\\"font-weight: bold\\"> scorecard_overall </span>┃<span style=\\"font-weight: bold\\"> in_google_assured_oss </span>┃\\n┡━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━╇━━━━━━━━━╇━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━┩\\n│ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">string</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">string</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">string</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">boolean</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">boolean</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">boolean</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">timestamp</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">timestamp</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">timestamp</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">int32</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">float64</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">boolean</span> │\\n├──────────┼───────────────────┼─────────────────┼─────────┼──────────────────┼─────────────────────┼─────────────────────┼─────────────────────┼─────────────────────┼───────────┼───────────────────┼───────────────────────┤\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">bcpandas</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">2.4.1 </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">>=3.8.1 </span> │ True │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 06:14:22</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 06:14:23</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 14:31:41</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">espandas</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">1.0.4 </span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">~</span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2018-12-22 20:52:30</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2018-12-22 20:52:30</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 14:58:47</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">3.6</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">fpandas </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.5 </span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">~</span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2020-03-09 02:35:31</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2020-03-09 02:35:31</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:04:23</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">h3pandas</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.2.4 </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">>=3.6 </span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-03-19 17:58:16</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-03-19 17:58:16</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:10:06</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">ipandas </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.0.1 </span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">~</span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2019-05-29 18:46:12</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2019-05-29 18:46:12</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:15:34</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">3.6</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">kpandas </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.0.1 </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">>=3.6,<4.0 </span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2019-05-02 18:00:29</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2019-05-02 18:00:31</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:20:21</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">mpandas </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.0.2.1 </span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">~</span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-07-03 16:21:21</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-07-03 16:21:23</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:30:35</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">mtpandas</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">1.14.202306141807</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">>=3.6 </span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-06-14 18:08:01</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-06-14 18:08:01</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:31:04</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">4.6</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">mypandas</span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.1.6 </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">>=3.10 </span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-10-24 21:01:10</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-10-24 21:01:12</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:32:04</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #008000; text-decoration-color: #008000\\">paandas </span> │ <span style=\\"color: #008000; text-decoration-color: #008000\\">0.0.3 </span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">~</span> │ False │ False │ False │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-11-24 06:11:15</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2022-11-24 06:11:17</span> │ <span style=\\"color: #800080; text-decoration-color: #800080\\">2023-07-12 15:43:31</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">0</span> │ <span style=\\"color: #008080; text-decoration-color: #008080; font-weight: bold\\">nan</span> │ False │\\n│ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │ <span style=\\"color: #7f7f7f; text-decoration-color: #7f7f7f\\">…</span> │\\n└──────────┴───────────────────┴─────────────────┴─────────┴──────────────────┴─────────────────────┴─────────────────────┴─────────────────────┴─────────────────────┴───────────┴───────────────────┴───────────────────────┘\\n</pre>\\n```\\n:::\\n:::\\n\\n\\nLet's count the results:\\n\\n::: {#a363610a .cell execution_count=6}\\n``` {.python .cell-code}\\npandas_ish.count()\\n```\\n\\n::: {.cell-output .cell-output-display}\\n```{=html}\\n<pre style=\\"white-space:pre;overflow-x:auto;line-height:normal;font-family:Menlo,'DejaVu Sans Mono',consolas,'Courier New',monospace\\"></pre>\\n```\\n:::\\n\\n::: {.cell-output .cell-output-display execution_count=20}\\n\\n::: {.ansi-escaped-output}\\n```{=html}\\n<pre><span class=\\"ansi-cyan-fg ansi-bold\\">178</span></pre>\\n```\\n:::\\n\\n:::\\n:::\\n\\n\\nThere are a good number of packages that look similar to `pandas`!\\n\\n## Snowflake\\n\\nSimilarly we can expose Snowflake's\\n[`jarowinkler_similarity`](https://docs.snowflake.com/en/sql-reference/functions/jarowinkler_similarity)\\nfunction.\\n\\nLet's alias it to `jw_sim` to illustrate some more of the Ibis `udf` API:\\n\\n::: {#c6b88f1d .cell execution_count=7}\\n``` {.python .cell-code}\\[email protected](name=\\"jarowinkler_similarity\\") # <1>\\ndef jw_sim(left: str, right: str) -> float:\\n ...\\n```\\n:::\\n\\n\\n1. `target` is the name of the function in the backend. This argument is\\n required in this because the function name is different than the name of the\\n function in ibis.\\n\\n\\nNow let's connect to Snowflake and call our `jw_sim` function:\\n\\n::: {#4b0eeaa8 .cell execution_count=8}\\n``` {.python .cell-code}\\nimport os\\n\\ncon = ibis.connect(os.environ[\\"SNOWFLAKE_URL\\"])\\n```\\n:::\\n\\n\\n::: {#2c651137 .cell execution_count=9}\\n``` {.python .cell-code}\\nexpr = jw_sim(\\"snow\\", \\"shoe\\")\\ncon.execute(expr)\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=23}\\n```\\n66.0\\n```\\n:::\\n:::\\n\\n\\nAnd let's take a look at the SQL\\n\\n::: {#d2c051e5 .cell execution_count=10}\\n``` {.python .cell-code}\\nibis.to_sql(expr, dialect=\\"snowflake\\")\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=24}\\n```sql\\nSELECT\\n JAROWINKLER_SIMILARITY('snow', 'shoe') AS \\"jarowinkler_similarity('snow', 'shoe')\\"\\n```\\n:::\\n:::\\n\\n\\n## Input types\\n\\nSometimes the input types of builtin functions are difficult to spell.\\n\\nConsider a function that computes the length of any array: the elements in the\\narray can be floats, integers, strings and even other arrays. Spelling that\\ntype is difficult.\\n\\nFortunately the `udf.scalar.builtin` decorator doesn't require you to specify\\ninput types in these cases:\\n\\n::: {#7f171163 .cell execution_count=11}\\n``` {.python .cell-code}\\[email protected](name=\\"array_size\\")\\ndef cardinality(arr) -> int:\\n ...\\n```\\n:::\\n\\n\\n::: {.callout-caution}\\n## The return type annotation **is always required**.\\n:::\\n\\nWe can pass arrays with different element types to our `cardinality` function:\\n\\n::: {#636298ba .cell execution_count=12}\\n``` {.python .cell-code}\\ncon.execute(cardinality([1, 2, 3]))\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=26}\\n```\\n3\\n```\\n:::\\n:::\\n\\n\\n::: {#a15e7c06 .cell execution_count=13}\\n``` {.python .cell-code}\\ncon.execute(cardinality([\\"a\\", \\"b\\"]))\\n```\\n\\n::: {.cell-output .cell-output-display execution_count=27}\\n```\\n2\\n```\\n:::\\n:::\\n\\n\\nWhen you bypass input types the errors you get back are backend dependent:\\n\\n::: {#6c4d358c .cell execution_count=14}\\n``` {.python .cell-code}\\ncon.execute(cardinality(\\"foo\\"))\\n```\\n\\n::: {.cell-output .cell-output-error}\\n```\\nProgrammingError: (snowflake.connector.errors.ProgrammingError) 001044 (42P13): SQL compilation error: error line 1 at position 7\\nInvalid argument types for function 'ARRAY_SIZE': (VARCHAR(3))\\n[SQL: SELECT array_size(%(param_1)s) AS \\"array_size('foo')\\"]\\n[parameters: {'param_1': 'foo'}]\\n(Background on this error at: https://sqlalche.me/e/14/f405)\\n```\\n:::\\n:::\\n\\n\\nHere, Snowflake is informing us that the `ARRAY_SIZE` function does not accept\\nstrings as input.\\n\\n",
"supporting": [
"builtin_files"
],
diff --git a/builtin.qmd b/builtin.qmd
index 600f124..bb2238f 100644
--- a/builtin.qmd
+++ b/builtin.qmd
@@ -128,3 +128,44 @@ And let's take a look at the SQL
```{python}
ibis.to_sql(expr, dialect="snowflake")
```
+
+## Input types
+
+Sometimes the input types of builtin functions are difficult to spell.
+
+Consider a function that computes the length of any array: the elements in the
+array can be floats, integers, strings and even other arrays. Spelling that
+type is difficult.
+
+Fortunately the `udf.scalar.builtin` decorator doesn't require you to specify
+input types in these cases:
+
+```{python}
[email protected](name="array_size")
+def cardinality(arr) -> int:
+ ...
+```
+
+::: {.callout-caution}
+## The return type annotation **is always required**.
+:::
+
+We can pass arrays with different element types to our `cardinality` function:
+
+```{python}
+con.execute(cardinality([1, 2, 3]))
+```
+
+```{python}
+con.execute(cardinality(["a", "b"]))
+```
+
+When you bypass input types the errors you get back are backend dependent:
+
+```{python}
+#| error: true
+con.execute(cardinality("foo"))
+```
+
+Here, Snowflake is informing us that the `ARRAY_SIZE` function does not accept
+strings as input.
diff --git a/test_client.py b/test_client.py
index 30a3d59..4211715 100644
--- a/test_client.py
+++ b/test_client.py
@@ -251,12 +251,24 @@ def array_jaccard_index(a: dt.Array[dt.int64], b: dt.Array[dt.int64]) -> float:
...
[email protected](name="arrayJaccardIndex")
+def array_jaccard_index_no_input_types(a, b) -> float:
+ ...
+
+
@udf.scalar.builtin
def arrayJaccardIndex(a: dt.Array[dt.int64], b: dt.Array[dt.int64]) -> float:
...
[email protected]("func", [array_jaccard_index, arrayJaccardIndex])
[email protected](
+ "func",
+ [
+ array_jaccard_index,
+ arrayJaccardIndex,
+ array_jaccard_index_no_input_types,
+ ],
+)
def test_builtin_udf(con, func):
expr = func([1, 2], [2, 3])
result = con.execute(expr)
diff --git a/udf.py b/udf.py
index 4278c62..4e74363 100644
--- a/udf.py
+++ b/udf.py
@@ -298,10 +298,11 @@ class scalar:
func_name = name or fn.__name__
for arg_name, param in inspect.signature(fn).parameters.items():
- if (raw_dtype := annotations.get(arg_name)) is None:
- raise exc.MissingParameterAnnotationError(fn, arg_name)
-
- arg = rlz.ValueOf(dt.dtype(raw_dtype))
+ if (raw_dtype := annotations.get(arg_name)) is not None:
+ dtype = dt.dtype(raw_dtype)
+ else:
+ dtype = raw_dtype
+ arg = rlz.ValueOf(dtype)
fields[arg_name] = Argument(pattern=arg, default=param.default)
fields["dtype"] = dt.dtype(return_annotation)
|
|
feat: `gix remote refs` to list all remote references of a suitable remote. (#450)
This takes into account either a named remote, or the remote associated
with the current branch, or the default remote it could deduce or obtain
from the configuration.
|
5d6d5ca305615568dfedbcc10ea86294c0a0472d
|
feat
|
https://github.com/Byron/gitoxide/commit/5d6d5ca305615568dfedbcc10ea86294c0a0472d
|
`gix remote refs` to list all remote references of a suitable remote. (#450)
This takes into account either a named remote, or the remote associated
with the current branch, or the default remote it could deduce or obtain
from the configuration.
|
diff --git a/Cargo.toml b/Cargo.toml
index dfccdaf..a08cba5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,7 @@ estimate-hours = ["itertools", "rayon", "fs-err"]
blocking-client = ["git-repository/blocking-network-client"]
## The client to connect to git servers will be async, while supporting only the 'git' transport itself.
## It's the most limited and can be seen as example on how to use custom transports for custom servers.
-async-client = ["git-repository/async-network-client", "git-transport-configuration-only/async-std", "async-trait", "futures-io", "async-net", "async-io", "futures-lite", "blocking"]
+async-client = ["git-repository/async-network-client-async-std", "git-transport-configuration-only/async-std", "async-trait", "futures-io", "async-net", "async-io", "futures-lite", "blocking"]
#! ### Other
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
diff --git a/remote.rs b/remote.rs
index ddbc3b7..f5f3f82 100644
--- a/remote.rs
+++ b/remote.rs
@@ -1,17 +1,100 @@
#[cfg(any(feature = "blocking-client", feature = "async-client"))]
mod net {
use crate::OutputFormat;
+ use anyhow::Context;
use git_repository as git;
+ use git_repository::protocol::fetch;
#[git::protocol::maybe_async::maybe_async]
pub async fn refs(
- _repo: git::Repository,
- _name: &str,
- _format: OutputFormat,
- _progress: impl git::Progress,
- _out: impl std::io::Write,
+ repo: git::Repository,
+ name: Option<&str>,
+ format: OutputFormat,
+ mut progress: impl git::Progress,
+ out: impl std::io::Write,
) -> anyhow::Result<()> {
- todo!()
+ let remote = match name {
+ Some(name) => repo.find_remote(name)?,
+ None => repo
+ .head()?
+ .into_remote(git::remote::Direction::Fetch)
+ .context("Cannot find a remote for unborn branch")??,
+ };
+ progress.info(format!(
+ "Connecting to {:?}",
+ remote
+ .url(git::remote::Direction::Fetch)
+ .context("Remote didn't have a URL to connect to")?
+ .to_bstring()
+ ));
+ let refs = remote
+ .connect(git::remote::Direction::Fetch, progress)
+ .await?
+ .list_refs()
+ .await?;
+
+ match format {
+ OutputFormat::Human => drop(print(out, &refs)),
+ #[cfg(feature = "serde1")]
+ OutputFormat::Json => {
+ serde_json::to_writer_pretty(out, &refs.into_iter().map(JsonRef::from).collect::<Vec<_>>())?
+ }
+ };
+ Ok(())
+ }
+
+ #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
+ pub enum JsonRef {
+ Peeled {
+ path: String,
+ tag: String,
+ object: String,
+ },
+ Direct {
+ path: String,
+ object: String,
+ },
+ Symbolic {
+ path: String,
+ target: String,
+ object: String,
+ },
+ }
+
+ impl From<fetch::Ref> for JsonRef {
+ fn from(value: fetch::Ref) -> Self {
+ match value {
+ fetch::Ref::Direct { path, object } => JsonRef::Direct {
+ path: path.to_string(),
+ object: object.to_string(),
+ },
+ fetch::Ref::Symbolic { path, target, object } => JsonRef::Symbolic {
+ path: path.to_string(),
+ target: target.to_string(),
+ object: object.to_string(),
+ },
+ fetch::Ref::Peeled { path, tag, object } => JsonRef::Peeled {
+ path: path.to_string(),
+ tag: tag.to_string(),
+ object: object.to_string(),
+ },
+ }
+ }
+ }
+
+ pub(crate) fn print(mut out: impl std::io::Write, refs: &[fetch::Ref]) -> std::io::Result<()> {
+ for r in refs {
+ match r {
+ fetch::Ref::Direct { path, object } => writeln!(&mut out, "{} {}", object.to_hex(), path),
+ fetch::Ref::Peeled { path, object, tag } => {
+ writeln!(&mut out, "{} {} tag:{}", object.to_hex(), path, tag)
+ }
+ fetch::Ref::Symbolic { path, target, object } => {
+ writeln!(&mut out, "{} {} symref-target:{}", object.to_hex(), path, target)
+ }
+ }?;
+ }
+ Ok(())
}
}
#[cfg(any(feature = "blocking-client", feature = "async-client"))]
diff --git a/main.rs b/main.rs
index 13ea6d7..1635c4e 100644
--- a/main.rs
+++ b/main.rs
@@ -98,23 +98,29 @@ pub fn main() -> Result<()> {
#[cfg(feature = "gitoxide-core-blocking-client")]
{
prepare_and_run(
- "config-list",
+ "remote-refs",
verbose,
progress,
progress_keep_open,
None,
move |progress, out, _err| {
- core::repository::remote::refs(repository(Mode::Lenient)?, &name, format, progress, out)
+ core::repository::remote::refs(
+ repository(Mode::Lenient)?,
+ name.as_deref(),
+ format,
+ progress,
+ out,
+ )
},
)
}
#[cfg(feature = "gitoxide-core-async-client")]
{
let (_handle, progress) =
- async_util::prepare(verbose, "remote-ref-list", Some(core::remote::refs::PROGRESS_RANGE));
+ async_util::prepare(verbose, "remote-refs", Some(core::remote::refs::PROGRESS_RANGE));
futures_lite::future::block_on(core::repository::remote::refs(
repository(Mode::Lenient)?,
- &name,
+ name.as_deref(),
format,
progress,
std::io::stdout(),
diff --git a/options.rs b/options.rs
index f65fef4..d911158 100644
--- a/options.rs
+++ b/options.rs
@@ -100,8 +100,10 @@ pub mod remote {
#[derive(Debug, clap::Parser)]
pub struct Platform {
/// The name of the remote to connect to.
- #[clap(long, short = 'n', default_value = "origin")]
- pub name: String,
+ ///
+ /// If unset, the current branch will determine the remote.
+ #[clap(long, short = 'n')]
+ pub name: Option<String>,
/// Subcommands
#[clap(subcommand)]
|
|
refactor(mysql): reuse alchemy rules
|
d5fd2153ee16a253ee1d8c061d861c4200c89b56
|
refactor
|
https://github.com/ibis-project/ibis/commit/d5fd2153ee16a253ee1d8c061d861c4200c89b56
|
reuse alchemy rules
|
diff --git a/registry.py b/registry.py
index 1234c89..be85671 100644
--- a/registry.py
+++ b/registry.py
@@ -9,11 +9,9 @@ import ibis.expr.types as ir
from ibis.backends.base.sql.alchemy import (
fixed_arity,
infix_op,
- reduction,
sqlalchemy_operation_registry,
sqlalchemy_window_functions_registry,
unary,
- variance_reduction,
)
operation_registry = sqlalchemy_operation_registry.copy()
@@ -262,11 +260,6 @@ operation_registry.update(
ops.ExtractSecond: _extract('second'),
ops.ExtractMillisecond: _extract('millisecond'),
# reductions
- ops.BitAnd: reduction(sa.func.bit_and),
- ops.BitOr: reduction(sa.func.bit_or),
- ops.BitXor: reduction(sa.func.bit_xor),
- ops.Variance: variance_reduction('var'),
- ops.StandardDev: variance_reduction('stddev'),
ops.IdenticalTo: _identical_to,
ops.TimestampNow: fixed_arity(sa.func.now, 0),
# others
|
|
test: coverage
|
01d9e581bdef38c9020563dfd4411080a8cd8a23
|
test
|
https://github.com/mikro-orm/mikro-orm/commit/01d9e581bdef38c9020563dfd4411080a8cd8a23
|
coverage
|
diff --git a/MariaDbQueryBuilder.ts b/MariaDbQueryBuilder.ts
index 8945a0d..bf82d4c 100644
--- a/MariaDbQueryBuilder.ts
+++ b/MariaDbQueryBuilder.ts
@@ -61,6 +61,7 @@ export class MariaDbQueryBuilder<T extends object = AnyEntity> extends QueryBuil
subQuery.finalized = true;
const knexQuery = subQuery.as(this.mainAlias.aliasName).clearSelect().select(pks);
+ /* istanbul ignore next */
if (addToSelect.length > 0) {
addToSelect.forEach(prop => {
const field = this._fields!.find(field => {
@@ -113,6 +114,7 @@ export class MariaDbQueryBuilder<T extends object = AnyEntity> extends QueryBuil
for (const [key, join] of Object.entries(this._joins)) {
const path = join.path?.replace(/\\[populate]|\\[pivot]|:ref/g, '').replace(new RegExp(`^${meta.className}.`), '');
+ /* istanbul ignore next */
if (!populate.has(path ?? '') && !orderByAliases.includes(join.alias)) {
delete this._joins[key];
}
diff --git a/GHx6.mariadb.test.ts b/GHx6.mariadb.test.ts
index ae02a06..e2ef2c9 100644
--- a/GHx6.mariadb.test.ts
+++ b/GHx6.mariadb.test.ts
@@ -0,0 +1,167 @@
+import {
+ Collection,
+ Entity,
+ ManyToMany,
+ ManyToOne,
+ MikroORM,
+ PrimaryKey,
+ Property,
+ QueryOrder,
+ raw,
+ RawQueryFragment,
+} from '@mikro-orm/mariadb';
+import { mockLogger } from '../../helpers';
+
+@Entity()
+class Job {
+
+ @PrimaryKey()
+ id!: number;
+
+ @Property({ fieldName: 'DateCompleted', nullable: true })
+ dateCompleted?: Date | null;
+
+}
+
+@Entity()
+class Tag {
+
+ @PrimaryKey()
+ id!: number;
+
+ @Property()
+ name!: string;
+
+ @Property({ nullable: true })
+ created?: Date | null;
+
+ @ManyToOne(() => Job, { name: 'custom_name' })
+ job!: Job;
+
+ @ManyToMany(() => Job)
+ jobs = new Collection<Job>(this);
+
+}
+
+let orm: MikroORM;
+
+beforeAll(async () => {
+ orm = MikroORM.initSync({
+ entities: [Job, Tag],
+ dbName: `raw-queries`,
+ port: 3309,
+ });
+
+ await orm.schema.refreshDatabase();
+});
+
+afterAll(async () => {
+ await orm.close(true);
+});
+
+test('raw fragments with findAndCount', async () => {
+ await orm.em.findAndCount(Job, {
+ dateCompleted: { $ne: null },
+ [raw(alias => `${alias}.DateCompleted`)]: '2023-07-24',
+ });
+ expect(RawQueryFragment.checkCacheSize()).toBe(0);
+});
+
+test('raw fragments with orderBy', async () => {
+ const mock = mockLogger(orm);
+ await orm.em.findAll(Job, {
+ orderBy: {
+ [raw(alias => `${alias}.DateCompleted`)]: 'desc',
+ },
+ });
+ expect(mock.mock.calls[0][0]).toMatch('select `j0`.* from `job` as `j0` order by j0.DateCompleted desc');
+ expect(RawQueryFragment.checkCacheSize()).toBe(0);
+});
+
+test('raw fragments with orderBy on relation', async () => {
+ const mock = mockLogger(orm);
+ await orm.em.findAll(Tag, {
+ populate: ['job'],
+ orderBy: {
+ job: {
+ [raw(alias => `${alias}.DateCompleted`)]: 'desc',
+ },
+ },
+ });
+ expect(mock.mock.calls[0][0]).toMatch('select `t0`.*, `j1`.`id` as `j1__id`, `j1`.`DateCompleted` as `j1__DateCompleted` ' +
+ 'from `tag` as `t0` ' +
+ 'left join `job` as `j1` on `t0`.`custom_name` = `j1`.`id` ' +
+ 'order by j1.DateCompleted desc');
+ expect(RawQueryFragment.checkCacheSize()).toBe(0);
+});
+
+test('raw fragments with populateOrderBy on relation', async () => {
+ const mock = mockLogger(orm);
+ await orm.em.findAll(Tag, {
+ populate: ['job'],
+ populateOrderBy: {
+ [raw(alias => `${alias}.created`)]: 'desc',
+ job: {
+ [raw(alias => `${alias}.DateCompleted`)]: 'desc',
+ },
+ },
+ });
+ expect(mock.mock.calls[0][0]).toMatch('select `t0`.*, `j1`.`id` as `j1__id`, `j1`.`DateCompleted` as `j1__DateCompleted` ' +
+ 'from `tag` as `t0` ' +
+ 'left join `job` as `j1` on `t0`.`custom_name` = `j1`.`id` ' +
+ 'order by t0.created desc, j1.DateCompleted desc');
+ expect(RawQueryFragment.checkCacheSize()).toBe(0);
+});
+
+test('raw fragments with multiple items in filter', async () => {
+ const mock = mockLogger(orm);
+ await orm.em.findAll(Tag, {
+ where: {
+ [raw('id')]: { $gte: 10, $lte: 50 },
+ },
+ });
+ expect(mock.mock.calls[0][0]).toMatch('select `t0`.* from `tag` as `t0` where id >= 10 and id <= 50');
+ expect(RawQueryFragment.checkCacheSize()).toBe(0);
+});
+
+test('qb.joinAndSelect', async () => {
+ const query = orm.em.qb(Tag, 'u')
+ .select('*')
+ .leftJoinAndSelect('jobs', 'a')
+ .where({
+ [raw('coalesce(`u`.`name`, ?)', ['abc'])]: { $gte: 0.3 },
+ })
+ .orderBy({
+ [raw('coalesce(`u`.`name`, ?)', ['def'])]: QueryOrder.DESC,
+ })
+ .limit(100)
+ .offset(0);
+ expect(query.getKnexQuery().toSQL().sql).toMatch('select `u`.*, `a`.`id` as `a__id`, `a`.`DateCompleted` as `a__DateCompleted` ' +
+ 'from `tag` as `u` ' +
+ 'left join `tag_jobs` as `t1` on `u`.`id` = `t1`.`tag_id` ' +
+ 'left join `job` as `a` on `t1`.`job_id` = `a`.`id` ' +
+ 'where (json_contains((select json_arrayagg(`u`.`id`) from (select `u`.`id` from `tag` as `u` left join `tag_jobs` as `t1` on `u`.`id` = `t1`.`tag_id` left join `job` as `a` on `t1`.`job_id` = `a`.`id` where coalesce(`u`.`name`, \\'abc\\') >= 0.3 group by `u`.`id` order by coalesce(`u`.`name`, \\'def\\') desc limit 100) as `u`), `u`.`id`)) ' +
+ 'order by coalesce(`u`.`name`, \\'def\\') desc');
+ await query;
+ expect(RawQueryFragment.checkCacheSize()).toBe(0);
+});
+
+test('em.findByCursor', async () => {
+ const mock = mockLogger(orm);
+ await orm.em.findByCursor(Tag, {}, {
+ populate: ['job'],
+ first: 3,
+ orderBy: {
+ [raw(alias => `${alias}.created`)]: 'desc',
+ job: {
+ [raw(alias => `${alias}.DateCompleted`)]: 'desc',
+ },
+ },
+ });
+ const queries = mock.mock.calls.flat().sort();
+ expect(queries[0]).toMatch('select `t0`.*, `j1`.`id` as `j1__id`, `j1`.`DateCompleted` as `j1__DateCompleted` ' +
+ 'from `tag` as `t0` ' +
+ 'left join `job` as `j1` on `t0`.`custom_name` = `j1`.`id` ' +
+ 'order by t0.created desc, j1.DateCompleted desc');
+ expect(RawQueryFragment.checkCacheSize()).toBe(0);
+});
|
|
chore: test links (#9583)
|
64bb07c700a1722ead004cd0b8525e51905bd563
|
chore
|
https://github.com/ibis-project/ibis/commit/64bb07c700a1722ead004cd0b8525e51905bd563
|
test links (#9583)
|
diff --git a/docs-preview.yml b/docs-preview.yml
index 4b72ec2..4525422 100644
--- a/docs-preview.yml
+++ b/docs-preview.yml
@@ -44,23 +44,11 @@ jobs:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}
- - name: build docs
- run: nix develop --ignore-environment --keep HOME -c just docs-build-all
-
- - name: install netlify cli
- run: npm install -g netlify-cli
-
- name: generate url alias
id: get_alias
run: |
echo "id=pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }}" >> "$GITHUB_OUTPUT"
- - name: build and push quarto docs to preview url
- run: netlify deploy --dir=docs/_output --alias="${{ steps.get_alias.outputs.id }}"
- env:
- NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
- NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-
- name: Get all changed qmd files
id: changed-qmd-files
uses: tj-actions/changed-files@v44
@@ -70,17 +58,30 @@ jobs:
**.qmd
- name: get preview links
+ id: get-preview-links
env:
ALL_CHANGED_FILES: ${{ steps.changed-qmd-files.outputs.all_changed_files }}
PREVIEW_URL: "https://${{ steps.get_alias.outputs.id }}--ibis-quarto.netlify.app"
run: |
- links="$({
+ links="$(
for file in ${ALL_CHANGED_FILES}; do
link="${file#docs/}"
echo "- [${file}](${PREVIEW_URL}/${link%.qmd})"
done
- })"
- echo "preview_links=$links" >> "$GITHUB_ENV"
+ )"
+ echo "links=$links" | tee -a "$GITHUB_OUTPUT"
+
+ - name: build docs
+ run: nix develop --ignore-environment --keep HOME -c just docs-build-all
+
+ - name: install netlify cli
+ run: npm install -g netlify-cli
+
+ - name: build and push quarto docs to preview url
+ run: netlify deploy --dir=docs/_output --alias="${{ steps.get_alias.outputs.id }}"
+ env:
+ NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+ NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
- name: create preview link comment
if: success()
@@ -90,4 +91,4 @@ jobs:
issue-number: ${{ github.event.pull_request.number }}
body: |
Docs preview: https://${{ steps.get_alias.outputs.id }}--ibis-quarto.netlify.app
- ${{ env.preview_links }}
+ ${{ steps.get-preview-links.outputs.links }}
|
|
chore(dev-deps): relock
|
0128d5548d01d3d6a548af763bad866bdd34607c
|
chore
|
https://github.com/ibis-project/ibis/commit/0128d5548d01d3d6a548af763bad866bdd34607c
|
relock
|
diff --git a/poetry.lock b/poetry.lock
index 9e2f385..5295cd1 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2822,19 +2822,6 @@ clickhouse-cityhash = [
{file = "clickhouse_cityhash-1.0.2.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:aa1bae67f262046e2c362c3bdd39747bc3fd77e75b663501687a70827bf7201f"},
{file = "clickhouse_cityhash-1.0.2.3-cp310-cp310-win32.whl", hash = "sha256:14d1646e25595c63de3e228ead0a129e2a0b7959d159406321a217752c16dd49"},
{file = "clickhouse_cityhash-1.0.2.3-cp310-cp310-win_amd64.whl", hash = "sha256:b5a9f092d1a0d3c6b90699f94202b4bf8c3e5a51ce8cfd163ba686081152d506"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:67d0b09fbf8f1de1afcf6aac0347feb384ae76a2cef8a51c5a740046c319793f"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ddf17e633cc2b28e5f597b6a63aed5e2c33917ae02b1b851ecd74cdfaba7913b"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:853408fa07bdc891c07794445a3cd401c3aed049698597e3a75d722e38aa099d"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:03e59cd528329a044f254b071134c957d4ea23bbdb8c45e758adc5f1b9034c6f"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:18673ea9338969a33ce78c1300171d12bde07f4e9b882bd49adfadcc5f3692a7"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f1dba048334908db83eaab73c3dd66dfaf2e61efd728afec6326fbb1f1d8c48"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:897891a4f7504e8238a4341abfad88bf0ca12ac0559833d6b135186101d87d0f"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:02433adbf620af0fa906bc47e3472eda19af7da87a84e069cd6fbe970968f069"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:0a6bb39c3124fdd5374507a036b0730ccba6535d18d53012c702efd5a9617e3e"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:6701779e2ea422579d48df4467bbf7d6c2743b4a422e86ee5932f858a99539db"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3879e029e7db87598c7e49319597d0af404baac85ab16f0ed29396f0019a974a"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-win32.whl", hash = "sha256:f0c22f97d55665478c530ff035703bbcadf1aed21ed711da3762b53f7ca76d23"},
- {file = "clickhouse_cityhash-1.0.2.3-cp311-cp311-win_amd64.whl", hash = "sha256:e960e510157bc657f632f3b6c58db0a632ff33024ffe54d5115240a81f757d20"},
{file = "clickhouse_cityhash-1.0.2.3-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:94cb7234d6b27fb2a3d1042d8bf22c6b37ed0f4c22d496b255918f13e0db3515"},
{file = "clickhouse_cityhash-1.0.2.3-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:23db430b9c3bd2f800d78efc19429586edf4b33fc25c88682de22bd9fd1be20e"},
{file = "clickhouse_cityhash-1.0.2.3-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:d556ff29cb66e73fdadf75831761912d660634635c4e915a865da51c79a4aa87"},
@@ -3829,8 +3816,6 @@ psutil = [
psycopg2 = [
{file = "psycopg2-2.9.5-cp310-cp310-win32.whl", hash = "sha256:d3ef67e630b0de0779c42912fe2cbae3805ebaba30cda27fea2a3de650a9414f"},
{file = "psycopg2-2.9.5-cp310-cp310-win_amd64.whl", hash = "sha256:4cb9936316d88bfab614666eb9e32995e794ed0f8f6b3b718666c22819c1d7ee"},
- {file = "psycopg2-2.9.5-cp311-cp311-win32.whl", hash = "sha256:093e3894d2d3c592ab0945d9eba9d139c139664dcf83a1c440b8a7aa9bb21955"},
- {file = "psycopg2-2.9.5-cp311-cp311-win_amd64.whl", hash = "sha256:920bf418000dd17669d2904472efeab2b20546efd0548139618f8fa305d1d7ad"},
{file = "psycopg2-2.9.5-cp36-cp36m-win32.whl", hash = "sha256:b9ac1b0d8ecc49e05e4e182694f418d27f3aedcfca854ebd6c05bb1cffa10d6d"},
{file = "psycopg2-2.9.5-cp36-cp36m-win_amd64.whl", hash = "sha256:fc04dd5189b90d825509caa510f20d1d504761e78b8dfb95a0ede180f71d50e5"},
{file = "psycopg2-2.9.5-cp37-cp37m-win32.whl", hash = "sha256:922cc5f0b98a5f2b1ff481f5551b95cd04580fd6f0c72d9b22e6c0145a4840e0"},
diff --git a/requirements.txt b/requirements.txt
index 2aa7cd8..2a9d9a4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -69,7 +69,7 @@ mkdocs-jupyter==0.22.0 ; python_version >= "3.8" and python_version < "4"
mkdocs-literate-nav==0.5.0 ; python_version >= "3.8" and python_version < "4.0"
mkdocs-macros-plugin==0.7.0 ; python_version >= "3.8" and python_version < "4.0"
mkdocs-material-extensions==1.1 ; python_version >= "3.8" and python_version < "4.0"
-mkdocs-material==8.5.9 ; python_version >= "3.8" and python_version < "4.0"
+mkdocs-material==8.5.10 ; python_version >= "3.8" and python_version < "4.0"
mkdocs-table-reader-plugin==1.1.1 ; python_version >= "3.8" and python_version < "4.0"
mkdocs==1.4.0 ; python_version >= "3.8" and python_version < "4.0"
mkdocstrings==0.17.0 ; python_version >= "3.8" and python_version < "4.0"
|
|
refactor(bigquery): port to sqlglot
|
bcfd7e7e8469172c98911f8610c8ff452375f71b
|
refactor
|
https://github.com/ibis-project/ibis/commit/bcfd7e7e8469172c98911f8610c8ff452375f71b
|
port to sqlglot
|
diff --git a/ibis-backends-cloud.yml b/ibis-backends-cloud.yml
index a5d5c2c..e4ff16d 100644
--- a/ibis-backends-cloud.yml
+++ b/ibis-backends-cloud.yml
@@ -46,8 +46,8 @@ jobs:
- "3.9"
- "3.11"
backend:
- # - name: bigquery
- # title: BigQuery
+ - name: bigquery
+ title: BigQuery
- name: snowflake
title: Snowflake
steps:
diff --git a/compiler.py b/compiler.py
index 97462d7..39be8c0 100644
--- a/compiler.py
+++ b/compiler.py
@@ -3,145 +3,825 @@
from __future__ import annotations
import re
-from functools import partial
+from functools import singledispatchmethod
import sqlglot as sg
-import toolz
+import sqlglot.expressions as sge
-import ibis.common.graph as lin
+import ibis.common.exceptions as com
+import ibis.expr.datatypes as dt
import ibis.expr.operations as ops
-import ibis.expr.types as ir
-from ibis.backends.base.sql import compiler as sql_compiler
-from ibis.backends.bigquery import operations, registry, rewrites
-
-
-class BigQueryUDFDefinition(sql_compiler.DDL):
- """Represents definition of a temporary UDF."""
-
- def __init__(self, expr, context):
- self.expr = expr
- self.context = context
-
- def compile(self):
- """Generate UDF string from definition."""
- op = expr.op() if isinstance(expr := self.expr, ir.Expr) else expr
- return op.sql
-
-
-class BigQueryUnion(sql_compiler.Union):
- """Union of tables."""
-
- @classmethod
- def keyword(cls, distinct):
- """Use distinct UNION if distinct is True."""
- return "UNION DISTINCT" if distinct else "UNION ALL"
-
-
-class BigQueryIntersection(sql_compiler.Intersection):
- """Intersection of tables."""
-
- @classmethod
- def keyword(cls, distinct):
- return "INTERSECT DISTINCT" if distinct else "INTERSECT ALL"
-
-
-class BigQueryDifference(sql_compiler.Difference):
- """Difference of tables."""
-
- @classmethod
- def keyword(cls, distinct):
- return "EXCEPT DISTINCT" if distinct else "EXCEPT ALL"
-
-
-def find_bigquery_udf(op):
- """Filter which includes only UDFs from expression tree."""
- if type(op) in BigQueryExprTranslator._rewrites:
- op = BigQueryExprTranslator._rewrites[type(op)](op)
- if isinstance(op, operations.BigQueryUDFNode):
- result = op
- else:
- result = None
- return lin.proceed, result
-
+from ibis import util
+from ibis.backends.base.sqlglot.compiler import NULL, STAR, SQLGlotCompiler, paren
+from ibis.backends.base.sqlglot.datatypes import BigQueryType, BigQueryUDFType
+from ibis.backends.base.sqlglot.rewrites import (
+ exclude_unsupported_window_frame_from_ops,
+ exclude_unsupported_window_frame_from_row_number,
+ rewrite_first_to_first_value,
+ rewrite_last_to_last_value,
+)
+from ibis.common.patterns import replace
+from ibis.common.temporal import DateUnit, IntervalUnit, TimestampUnit, TimeUnit
+from ibis.expr.rewrites import p, rewrite_sample, y
_NAME_REGEX = re.compile(r'[^!"$()*,./;?@[\\\\\\]^`{}~\\n]+')
-class BigQueryExprTranslator(sql_compiler.ExprTranslator):
- """Translate expressions to strings."""
-
- _registry = registry.OPERATION_REGISTRY
- _rewrites = rewrites.REWRITES
-
- _forbids_frame_clause = (
- *sql_compiler.ExprTranslator._forbids_frame_clause,
- ops.Lag,
- ops.Lead,
+@replace(p.WindowFunction(p.MinRank | p.DenseRank, y @ p.WindowFrame(start=None)))
+def exclude_unsupported_window_frame_from_rank(_, y):
+ return ops.Subtract(
+ _.copy(frame=y.copy(start=None, end=0, order_by=y.order_by or (ops.NULL,))), 1
)
- _unsupported_reductions = (ops.ApproxMedian, ops.ApproxCountDistinct)
- _dialect_name = "bigquery"
-
- @staticmethod
- def _gen_valid_name(name: str) -> str:
- name = "_".join(_NAME_REGEX.findall(name)) or "tmp"
- return f"`{name}`"
-
- def name(self, translated: str, name: str):
- # replace invalid characters in automatically generated names
- valid_name = self._gen_valid_name(name)
- if translated == valid_name:
- return translated
- return f"{translated} AS {valid_name}"
-
- @classmethod
- def compiles(cls, klass):
- def decorator(f):
- cls._registry[klass] = f
- return f
-
- return decorator
-
- def _trans_param(self, op):
- if op not in self.context.params:
- raise KeyError(op)
- return f"@{op.name}"
+class BigQueryCompiler(SQLGlotCompiler):
+ dialect = "bigquery"
+ type_mapper = BigQueryType
+ udf_type_mapper = BigQueryUDFType
+ rewrites = (
+ rewrite_sample,
+ rewrite_first_to_first_value,
+ rewrite_last_to_last_value,
+ exclude_unsupported_window_frame_from_ops,
+ exclude_unsupported_window_frame_from_row_number,
+ exclude_unsupported_window_frame_from_rank,
+ *SQLGlotCompiler.rewrites,
+ )
-compiles = BigQueryExprTranslator.compiles
-
+ NAN = sge.Cast(
+ this=sge.convert("NaN"), to=sge.DataType(this=sge.DataType.Type.DOUBLE)
+ )
+ POS_INF = sge.Cast(
+ this=sge.convert("Infinity"), to=sge.DataType(this=sge.DataType.Type.DOUBLE)
+ )
+ NEG_INF = sge.Cast(
+ this=sge.convert("-Infinity"), to=sge.DataType(this=sge.DataType.Type.DOUBLE)
+ )
-class BigQueryTableSetFormatter(sql_compiler.TableSetFormatter):
- def _quote_identifier(self, name):
- return sg.to_identifier(name).sql("bigquery")
+ def _aggregate(self, funcname: str, *args, where):
+ func = self.f[funcname]
+ if where is not None:
+ args = tuple(self.if_(where, arg, NULL) for arg in args)
-class BigQueryCompiler(sql_compiler.Compiler):
- translator_class = BigQueryExprTranslator
- table_set_formatter_class = BigQueryTableSetFormatter
- union_class = BigQueryUnion
- intersect_class = BigQueryIntersection
- difference_class = BigQueryDifference
+ return func(*args, dialect=self.dialect)
- support_values_syntax_in_select = False
- null_limit = None
- cheap_in_memory_tables = True
+ @staticmethod
+ def _minimize_spec(start, end, spec):
+ if (
+ start is None
+ and isinstance(getattr(end, "value", None), ops.Literal)
+ and end.value.value == 0
+ and end.following
+ ):
+ return None
+ return spec
+
+ @singledispatchmethod
+ def visit_node(self, op, **kw):
+ return super().visit_node(op, **kw)
+
+ @visit_node.register(ops.GeoXMax)
+ @visit_node.register(ops.GeoXMin)
+ @visit_node.register(ops.GeoYMax)
+ @visit_node.register(ops.GeoYMin)
+ def visit_BoundingBox(self, op, *, arg):
+ name = type(op).__name__[len("Geo") :].lower()
+ return sge.Dot(
+ this=self.f.st_boundingbox(arg), expression=sg.to_identifier(name)
+ )
+
+ @visit_node.register(ops.GeoSimplify)
+ def visit_GeoSimplify(self, op, *, arg, tolerance, preserve_collapsed):
+ if (
+ not isinstance(op.preserve_collapsed, ops.Literal)
+ or op.preserve_collapsed.value
+ ):
+ raise com.UnsupportedOperationError(
+ "BigQuery simplify does not support preserving collapsed geometries, "
+ "pass preserve_collapsed=False"
+ )
+ return self.f.st_simplify(arg, tolerance)
+
+ @visit_node.register(ops.ApproxMedian)
+ def visit_ApproxMedian(self, op, *, arg, where):
+ return self.agg.approx_quantiles(arg, 2, where=where)[self.f.offset(1)]
+
+ @visit_node.register(ops.Pi)
+ def visit_Pi(self, op):
+ return self.f.acos(-1)
+
+ @visit_node.register(ops.E)
+ def visit_E(self, op):
+ return self.f.exp(1)
+
+ @visit_node.register(ops.TimeDelta)
+ def visit_TimeDelta(self, op, *, left, right, part):
+ return self.f.time_diff(left, right, part, dialect=self.dialect)
+
+ @visit_node.register(ops.DateDelta)
+ def visit_DateDelta(self, op, *, left, right, part):
+ return self.f.date_diff(left, right, part, dialect=self.dialect)
+
+ @visit_node.register(ops.TimestampDelta)
+ def visit_TimestampDelta(self, op, *, left, right, part):
+ left_tz = op.left.dtype.timezone
+ right_tz = op.right.dtype.timezone
+
+ if left_tz is None and right_tz is None:
+ return self.f.datetime_diff(left, right, part)
+ elif left_tz is not None and right_tz is not None:
+ return self.f.timestamp_diff(left, right, part)
+
+ raise com.UnsupportedOperationError(
+ "timestamp difference with mixed timezone/timezoneless values is not implemented"
+ )
+
+ @visit_node.register(ops.GroupConcat)
+ def visit_GroupConcat(self, op, *, arg, sep, where):
+ if where is not None:
+ arg = self.if_(where, arg, NULL)
+ return self.f.string_agg(arg, sep)
+
+ @visit_node.register(ops.FloorDivide)
+ def visit_FloorDivide(self, op, *, left, right):
+ return self.cast(self.f.floor(self.f.ieee_divide(left, right)), op.dtype)
+
+ @visit_node.register(ops.Log2)
+ def visit_Log2(self, op, *, arg):
+ return self.f.log(arg, 2, dialect=self.dialect)
+
+ @visit_node.register(ops.Log)
+ def visit_Log(self, op, *, arg, base):
+ if base is None:
+ return self.f.ln(arg)
+ return self.f.log(arg, base, dialect=self.dialect)
+
+ @visit_node.register(ops.ArrayRepeat)
+ def visit_ArrayRepeat(self, op, *, arg, times):
+ start = step = 1
+ array_length = self.f.array_length(arg)
+ stop = self.f.greatest(times, 0) * array_length
+ i = sg.to_identifier("i")
+ idx = self.f.coalesce(
+ self.f.nullif(self.f.mod(i, array_length), 0), array_length
+ )
+ series = self.f.generate_array(start, stop, step)
+ return self.f.array(
+ sg.select(arg[self.f.safe_ordinal(idx)]).from_(self._unnest(series, as_=i))
+ )
+
+ @visit_node.register(ops.Capitalize)
+ def visit_Capitalize(self, op, *, arg):
+ return self.f.concat(
+ self.f.upper(self.f.substr(arg, 1, 1)), self.f.lower(self.f.substr(arg, 2))
+ )
+
+ @visit_node.register(ops.NthValue)
+ def visit_NthValue(self, op, *, arg, nth):
+ if not isinstance(op.nth, ops.Literal):
+ raise com.UnsupportedOperationError(
+ f"BigQuery `nth` must be a literal; got {type(op.nth)}"
+ )
+ return self.f.nth_value(arg, nth)
+
+ @visit_node.register(ops.StrRight)
+ def visit_StrRight(self, op, *, arg, nchars):
+ return self.f.substr(arg, -self.f.least(self.f.length(arg), nchars))
+
+ @visit_node.register(ops.StringJoin)
+ def visit_StringJoin(self, op, *, arg, sep):
+ return self.f.array_to_string(self.f.array(*arg), sep)
+
+ @visit_node.register(ops.DayOfWeekIndex)
+ def visit_DayOfWeekIndex(self, op, *, arg):
+ return self.f.mod(self.f.extract(self.v.dayofweek, arg) + 5, 7)
+
+ @visit_node.register(ops.DayOfWeekName)
+ def visit_DayOfWeekName(self, op, *, arg):
+ return self.f.initcap(sge.Cast(this=arg, to="STRING FORMAT 'DAY'"))
+
+ @visit_node.register(ops.StringToTimestamp)
+ def visit_StringToTimestamp(self, op, *, arg, format_str):
+ if (timezone := op.dtype.timezone) is not None:
+ return self.f.parse_timestamp(format_str, arg, timezone)
+ return self.f.parse_datetime(format_str, arg)
+
+ @visit_node.register(ops.Floor)
+ def visit_Floor(self, op, *, arg):
+ return self.cast(self.f.floor(arg), op.dtype)
+
+ @visit_node.register(ops.ArrayCollect)
+ def visit_ArrayCollect(self, op, *, arg, where):
+ if where is not None:
+ arg = self.if_(where, arg, NULL)
+ return self.f.array_agg(sge.IgnoreNulls(this=arg))
+
+ def _neg_idx_to_pos(self, arg, idx):
+ return self.if_(idx < 0, self.f.array_length(arg) + idx, idx)
+
+ @visit_node.register(ops.ArraySlice)
+ def visit_ArraySlice(self, op, *, arg, start, stop):
+ index = sg.to_identifier("bq_arr_slice")
+ cond = [index >= self._neg_idx_to_pos(arg, start)]
+
+ if stop is not None:
+ cond.append(index < self._neg_idx_to_pos(arg, stop))
+
+ el = sg.to_identifier("el")
+ return self.f.array(
+ sg.select(el).from_(self._unnest(arg, as_=el, offset=index)).where(*cond)
+ )
+
+ @visit_node.register(ops.ArrayIndex)
+ def visit_ArrayIndex(self, op, *, arg, index):
+ return arg[self.f.safe_offset(index)]
+
+ @visit_node.register(ops.ArrayContains)
+ def visit_ArrayContains(self, op, *, arg, other):
+ name = sg.to_identifier(util.gen_name("bq_arr_contains"))
+ return sge.Exists(
+ this=sg.select(sge.convert(1))
+ .from_(self._unnest(arg, as_=name))
+ .where(name.eq(other))
+ )
+
+ @visit_node.register(ops.StringContains)
+ def visit_StringContains(self, op, *, haystack, needle):
+ return self.f.strpos(haystack, needle) > 0
+
+ @visit_node.register(ops.StringFind)
+ def visti_StringFind(self, op, *, arg, substr, start, end):
+ if start is not None:
+ raise NotImplementedError(
+ "`start` not implemented for BigQuery string find"
+ )
+ if end is not None:
+ raise NotImplementedError("`end` not implemented for BigQuery string find")
+ return self.f.strpos(arg, substr)
+
+ def visit_NonNullLiteral(self, op, *, value, dtype):
+ if dtype.is_string():
+ return sge.convert(
+ str(value)
+ # Escape \\ first so we don't double escape other characters.
+ .replace("\\\\", "\\\\\\\\")
+ # ASCII escape sequences that are recognized in Python:
+ # https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals
+ .replace("\\a", "\\\\a") # Bell
+ .replace("\\b", "\\\\b") # Backspace
+ .replace("\\f", "\\\\f") # Formfeed
+ .replace("\\n", "\\\\n") # Newline / Linefeed
+ .replace("\\r", "\\\\r") # Carriage return
+ .replace("\\t", "\\\\t") # Tab
+ .replace("\\v", "\\\\v") # Vertical tab
+ )
+ elif dtype.is_inet() or dtype.is_macaddr():
+ return sge.convert(str(value))
+ elif dtype.is_timestamp():
+ funcname = "datetime" if dtype.timezone is None else "timestamp"
+ return self.f[funcname](value.isoformat())
+ elif dtype.is_date():
+ return self.f.datefromparts(value.year, value.month, value.day)
+ elif dtype.is_time():
+ return self.f.time(value.hour, value.minute, value.second)
+ elif dtype.is_binary():
+ return sge.Cast(
+ this=sge.convert(value.hex()),
+ to=sge.DataType(this=sge.DataType.Type.BINARY),
+ format=sge.convert("HEX"),
+ )
+ elif dtype.is_interval():
+ if dtype.unit == IntervalUnit.NANOSECOND:
+ raise com.UnsupportedOperationError(
+ "BigQuery does not support nanosecond intervals"
+ )
+ elif dtype.is_uuid():
+ return sge.convert(str(value))
+ return None
+
+ @visit_node.register(ops.IntervalFromInteger)
+ def visit_IntervalFromInteger(self, op, *, arg, unit):
+ if unit == IntervalUnit.NANOSECOND:
+ raise com.UnsupportedOperationError(
+ "BigQuery does not support nanosecond intervals"
+ )
+ return sge.Interval(this=arg, unit=self.v[unit.singular])
+
+ @visit_node.register(ops.Strftime)
+ def visit_Strftime(self, op, *, arg, format_str):
+ arg_dtype = op.arg.dtype
+ if arg_dtype.is_timestamp():
+ if (timezone := arg_dtype.timezone) is None:
+ return self.f.format_datetime(format_str, arg)
+ else:
+ return self.f.format_timestamp(format_str, arg, timezone)
+ elif arg_dtype.is_date():
+ return self.f.format_date(format_str, arg)
+ else:
+ assert arg_dtype.is_time(), arg_dtype
+ return self.f.format_time(format_str, arg)
+
+ @visit_node.register(ops.IntervalMultiply)
+ def visit_IntervalMultiply(self, op, *, left, right):
+ unit = self.v[op.left.dtype.resolution.upper()]
+ return sge.Interval(this=self.f.extract(unit, left) * right, unit=unit)
+
+ @visit_node.register(ops.TimestampFromUNIX)
+ def visit_TimestampFromUNIX(self, op, *, arg, unit):
+ unit = op.unit
+ if unit == TimestampUnit.SECOND:
+ return self.f.timestamp_seconds(arg)
+ elif unit == TimestampUnit.MILLISECOND:
+ return self.f.timestamp_millis(arg)
+ elif unit == TimestampUnit.MICROSECOND:
+ return self.f.timestamp_micros(arg)
+ elif unit == TimestampUnit.NANOSECOND:
+ return self.f.timestamp_micros(
+ self.cast(self.f.round(arg / 1_000), dt.int64)
+ )
+ else:
+ raise com.UnsupportedOperationError(f"Unit not supported: {unit}")
+
+ @visit_node.register(ops.Cast)
+ def visit_Cast(self, op, *, arg, to):
+ from_ = op.arg.dtype
+ if from_.is_timestamp() and to.is_integer():
+ return self.f.unix_micros(arg)
+ elif from_.is_integer() and to.is_timestamp():
+ return self.f.timestamp_seconds(arg)
+ elif from_.is_interval() and to.is_integer():
+ if from_.unit in {
+ IntervalUnit.WEEK,
+ IntervalUnit.QUARTER,
+ IntervalUnit.NANOSECOND,
+ }:
+ raise com.UnsupportedOperationError(
+ f"BigQuery does not allow extracting date part `{from_.unit}` from intervals"
+ )
+ return self.f.extract(self.v[to.resolution.upper()], arg)
+ elif from_.is_integer() and to.is_interval():
+ return sge.Interval(this=arg, unit=self.v[to.unit.singular])
+ elif from_.is_floating() and to.is_integer():
+ return self.cast(self.f.trunc(arg), dt.int64)
+ return super().visit_Cast(op, arg=arg, to=to)
+
+ @visit_node.register(ops.JSONGetItem)
+ def visit_JSONGetItem(self, op, *, arg, index):
+ return arg[index]
+
+ @visit_node.register(ops.ExtractEpochSeconds)
+ def visit_ExtractEpochSeconds(self, op, *, arg):
+ return self.f.unix_seconds(arg)
+
+ @visit_node.register(ops.ExtractWeekOfYear)
+ def visit_ExtractWeekOfYear(self, op, *, arg):
+ return self.f.extract(self.v.isoweek, arg)
+
+ @visit_node.register(ops.ExtractYear)
+ @visit_node.register(ops.ExtractQuarter)
+ @visit_node.register(ops.ExtractMonth)
+ @visit_node.register(ops.ExtractDay)
+ @visit_node.register(ops.ExtractDayOfYear)
+ @visit_node.register(ops.ExtractHour)
+ @visit_node.register(ops.ExtractMinute)
+ @visit_node.register(ops.ExtractSecond)
+ @visit_node.register(ops.ExtractMicrosecond)
+ @visit_node.register(ops.ExtractMillisecond)
+ def visit_ExtractDateField(self, op, *, arg):
+ name = type(op).__name__[len("Extract") :].upper()
+ return self.f.extract(self.v[name], arg)
+
+ @visit_node.register(ops.TimestampTruncate)
+ def visit_Timestamp(self, op, *, arg, unit):
+ if unit == IntervalUnit.NANOSECOND:
+ raise com.UnsupportedOperationError(
+ f"BigQuery does not support truncating {op.arg.dtype} values to unit {unit!r}"
+ )
+ elif unit == IntervalUnit.WEEK:
+ unit = "WEEK(MONDAY)"
+ else:
+ unit = unit.name
+ return self.f.timestamp_trunc(arg, self.v[unit], dialect=self.dialect)
+
+ @visit_node.register(ops.DateTruncate)
+ def visit_DateTruncate(self, op, *, arg, unit):
+ if unit == DateUnit.WEEK:
+ unit = "WEEK(MONDAY)"
+ else:
+ unit = unit.name
+ return self.f.date_trunc(arg, self.v[unit], dialect=self.dialect)
+
+ @visit_node.register(ops.TimeTruncate)
+ def visit_TimeTruncate(self, op, *, arg, unit):
+ if unit == TimeUnit.NANOSECOND:
+ raise com.UnsupportedOperationError(
+ f"BigQuery does not support truncating {op.arg.dtype} values to unit {unit!r}"
+ )
+ else:
+ unit = unit.name
+ return self.f.time_trunc(arg, self.v[unit], dialect=self.dialect)
+
+ def _nullifzero(self, step, zero, step_dtype):
+ if step_dtype.is_interval():
+ return self.if_(step.eq(zero), NULL, step)
+ return self.f.nullif(step, zero)
+
+ def _zero(self, dtype):
+ if dtype.is_interval():
+ return self.f.make_interval()
+ return sge.convert(0)
+
+ def _sign(self, value, dtype):
+ if dtype.is_interval():
+ zero = self._zero(dtype)
+ return sge.Case(
+ ifs=[
+ self.if_(value < zero, -1),
+ self.if_(value.eq(zero), 0),
+ self.if_(value > zero, 1),
+ ],
+ default=NULL,
+ )
+ return self.f.sign(value)
+
+ def _make_range(self, func, start, stop, step, step_dtype):
+ step_sign = self._sign(step, step_dtype)
+ delta_sign = self._sign(stop - start, step_dtype)
+ zero = self._zero(step_dtype)
+ nullifzero = self._nullifzero(step, zero, step_dtype)
+ condition = sg.and_(sg.not_(nullifzero.is_(NULL)), step_sign.eq(delta_sign))
+ gen_array = func(start, stop, step)
+ name = sg.to_identifier(util.gen_name("bq_arr_range"))
+ inner = (
+ sg.select(name)
+ .from_(self._unnest(gen_array, as_=name))
+ .where(name.neq(stop))
+ )
+ return self.if_(condition, self.f.array(inner), self.f.array())
+
+ @visit_node.register(ops.IntegerRange)
+ def visit_IntegerRange(self, op, *, start, stop, step):
+ return self._make_range(self.f.generate_array, start, stop, step, op.step.dtype)
+
+ @visit_node.register(ops.TimestampRange)
+ def visit_TimestampRange(self, op, *, start, stop, step):
+ if op.start.dtype.timezone is None or op.stop.dtype.timezone is None:
+ raise com.IbisTypeError(
+ "Timestamps without timezone values are not supported when generating timestamp ranges"
+ )
+ return self._make_range(
+ self.f.generate_timestamp_array, start, stop, step, op.step.dtype
+ )
+
+ @visit_node.register(ops.First)
+ def visit_First(self, op, *, arg, where):
+ if where is not None:
+ arg = self.if_(where, arg, NULL)
+ array = self.f.array_agg(
+ sge.Limit(this=sge.IgnoreNulls(this=arg), expression=sge.convert(1)),
+ )
+ return array[self.f.safe_offset(0)]
+
+ @visit_node.register(ops.Last)
+ def visit_Last(self, op, *, arg, where):
+ if where is not None:
+ arg = self.if_(where, arg, NULL)
+ array = self.f.array_reverse(self.f.array_agg(sge.IgnoreNulls(this=arg)))
+ return array[self.f.safe_offset(0)]
+
+ @visit_node.register(ops.Arbitrary)
+ def _arbitrary(self, op, *, arg, how, where):
+ if how != "first":
+ raise com.UnsupportedOperationError(
+ f"{how!r} value not supported for arbitrary in BigQuery"
+ )
+
+ return self.agg.any_value(arg, where=where)
+
+ @visit_node.register(ops.ArrayFilter)
+ def visit_ArrayFilter(self, op, *, arg, body, param):
+ return self.f.array(
+ sg.select(param).from_(self._unnest(arg, as_=param)).where(body)
+ )
+
+ @visit_node.register(ops.ArrayMap)
+ def visit_ArrayMap(self, op, *, arg, body, param):
+ return self.f.array(sg.select(body).from_(self._unnest(arg, as_=param)))
+
+ @visit_node.register(ops.ArrayZip)
+ def visit_ArrayZip(self, op, *, arg):
+ lengths = [self.f.array_length(arr) - 1 for arr in arg]
+ idx = sg.to_identifier(util.gen_name("bq_arr_idx"))
+ indices = self._unnest(
+ self.f.generate_array(0, self.f.greatest(*lengths)), as_=idx
+ )
+ struct_fields = [
+ arr[self.f.safe_offset(idx)].as_(name)
+ for name, arr in zip(op.dtype.value_type.names, arg)
+ ]
+ return self.f.array(
+ sge.Select(kind="STRUCT", expressions=struct_fields).from_(indices)
+ )
+
+ @visit_node.register(ops.ArrayPosition)
+ def visit_ArrayPosition(self, op, *, arg, other):
+ name = sg.to_identifier(util.gen_name("bq_arr"))
+ idx = sg.to_identifier(util.gen_name("bq_arr_idx"))
+ unnest = self._unnest(arg, as_=name, offset=idx)
+ return self.f.coalesce(
+ sg.select(idx + 1).from_(unnest).where(name.eq(other)).limit(1).subquery(),
+ 0,
+ )
+
+ def _unnest(self, expression, *, as_, offset=None):
+ alias = sge.TableAlias(columns=[sg.to_identifier(as_)])
+ return sge.Unnest(expressions=[expression], alias=alias, offset=offset)
+
+ @visit_node.register(ops.ArrayRemove)
+ def visit_ArrayRemove(self, op, *, arg, other):
+ name = sg.to_identifier(util.gen_name("bq_arr"))
+ unnest = self._unnest(arg, as_=name)
+ return self.f.array(sg.select(name).from_(unnest).where(name.neq(other)))
+
+ @visit_node.register(ops.ArrayDistinct)
+ def visit_ArrayDistinct(self, op, *, arg):
+ name = util.gen_name("bq_arr")
+ return self.f.array(
+ sg.select(name).distinct().from_(self._unnest(arg, as_=name))
+ )
+
+ @visit_node.register(ops.ArraySort)
+ def visit_ArraySort(self, op, *, arg):
+ name = util.gen_name("bq_arr")
+ return self.f.array(
+ sg.select(name).from_(self._unnest(arg, as_=name)).order_by(name)
+ )
+
+ @visit_node.register(ops.ArrayUnion)
+ def visit_ArrayUnion(self, op, *, left, right):
+ lname = util.gen_name("bq_arr_left")
+ rname = util.gen_name("bq_arr_right")
+ lhs = sg.select(lname).from_(self._unnest(left, as_=lname))
+ rhs = sg.select(rname).from_(self._unnest(right, as_=rname))
+ return self.f.array(sg.union(lhs, rhs, distinct=True))
+
+ @visit_node.register(ops.ArrayIntersect)
+ def visit_ArrayIntersect(self, op, *, left, right):
+ lname = util.gen_name("bq_arr_left")
+ rname = util.gen_name("bq_arr_right")
+ lhs = sg.select(lname).from_(self._unnest(left, as_=lname))
+ rhs = sg.select(rname).from_(self._unnest(right, as_=rname))
+ return self.f.array(sg.intersect(lhs, rhs, distinct=True))
+
+ @visit_node.register(ops.Substring)
+ def visit_Substring(self, op, *, arg, start, length):
+ if isinstance(op.length, ops.Literal) and (value := op.length.value) < 0:
+ raise com.IbisInputError(
+ f"Length parameter must be a non-negative value; got {value}"
+ )
+ suffix = (length,) * (length is not None)
+ if_pos = self.f.substr(arg, start + 1, *suffix)
+ if_neg = self.f.substr(arg, self.f.length(arg) + start + 1, *suffix)
+ return self.if_(start >= 0, if_pos, if_neg)
+
+ @visit_node.register(ops.RegexExtract)
+ def visit_RegexExtract(self, op, *, arg, pattern, index):
+ matches = self.f.regexp_contains(arg, pattern)
+ nonzero_index_replace = self.f.regexp_replace(
+ arg,
+ self.f.concat(".*?", pattern, ".*"),
+ self.f.concat("\\\\\\\\", self.cast(index, dt.string)),
+ )
+ zero_index_replace = self.f.regexp_replace(
+ arg, self.f.concat(".*?", self.f.concat("(", pattern, ")"), ".*"), "\\\\\\\\1"
+ )
+ extract = self.if_(index.eq(0), zero_index_replace, nonzero_index_replace)
+ return self.if_(matches, extract, NULL)
+
+ @visit_node.register(ops.TimestampAdd)
+ @visit_node.register(ops.TimestampSub)
+ def visit_TimestampAddSub(self, op, *, left, right):
+ if not isinstance(right, sge.Interval):
+ raise com.OperationNotDefinedError(
+ "BigQuery does not support non-literals on the right side of timestamp add/subtract"
+ )
+ if (unit := op.right.dtype.unit) == IntervalUnit.NANOSECOND:
+ raise com.UnsupportedOperationError(
+ f"BigQuery does not allow binary operation {type(op).__name__} with "
+ f"INTERVAL offset {unit}"
+ )
+
+ opname = type(op).__name__[len("Timestamp") :]
+ funcname = f"TIMESTAMP_{opname.upper()}"
+ return self.f.anon[funcname](left, right)
+
+ @visit_node.register(ops.DateAdd)
+ @visit_node.register(ops.DateSub)
+ def visit_DateAddSub(self, op, *, left, right):
+ if not isinstance(right, sge.Interval):
+ raise com.OperationNotDefinedError(
+ "BigQuery does not support non-literals on the right side of date add/subtract"
+ )
+ if not (unit := op.right.dtype.unit).is_date():
+ raise com.UnsupportedOperationError(
+ f"BigQuery does not allow binary operation {type(op).__name__} with "
+ f"INTERVAL offset {unit}"
+ )
+ opname = type(op).__name__[len("Date") :]
+ funcname = f"DATE_{opname.upper()}"
+ return self.f.anon[funcname](left, right)
+
+ @visit_node.register(ops.Covariance)
+ def visit_Covariance(self, op, *, left, right, how, where):
+ if where is not None:
+ left = self.if_(where, left, NULL)
+ right = self.if_(where, right, NULL)
+
+ if op.left.dtype.is_boolean():
+ left = self.cast(left, dt.int64)
+
+ if op.right.dtype.is_boolean():
+ right = self.cast(right, dt.int64)
+
+ how = op.how[:4].upper()
+ assert how in ("POP", "SAMP"), 'how not in ("POP", "SAMP")'
+ return self.agg[f"COVAR_{how}"](left, right, where=where)
+
+ @visit_node.register(ops.Correlation)
+ def visit_Correlation(self, op, *, left, right, how, where):
+ if how == "sample":
+ raise ValueError(f"Correlation with how={how!r} is not supported.")
+
+ if where is not None:
+ left = self.if_(where, left, NULL)
+ right = self.if_(where, right, NULL)
+
+ if op.left.dtype.is_boolean():
+ left = self.cast(left, dt.int64)
+
+ if op.right.dtype.is_boolean():
+ right = self.cast(right, dt.int64)
+
+ return self.agg.corr(left, right, where=where)
+
+ @visit_node.register(ops.TypeOf)
+ def visit_TypeOf(self, op, *, arg):
+ name = sg.to_identifier(util.gen_name("bq_typeof"))
+ from_ = self._unnest(self.f.array(self.f.format("%T", arg)), as_=name)
+ ifs = [
+ self.if_(
+ self.f.regexp_contains(name, '^[A-Z]+ "'),
+ self.f.regexp_extract(name, '^([A-Z]+) "'),
+ ),
+ self.if_(self.f.regexp_contains(name, "^-?[0-9]*$"), "INT64"),
+ self.if_(
+ self.f.regexp_contains(
+ name, r'^(-?[0-9]+[.e].*|CAST\\\\("([^"]*)" AS FLOAT64\\\\))$'
+ ),
+ "FLOAT64",
+ ),
+ self.if_(name.isin(sge.convert("true"), sge.convert("false")), "BOOL"),
+ self.if_(
+ sg.or_(self.f.starts_with(name, '"'), self.f.starts_with(name, "'")),
+ "STRING",
+ ),
+ self.if_(self.f.starts_with(name, 'b"'), "BYTES"),
+ self.if_(self.f.starts_with(name, "["), "ARRAY"),
+ self.if_(self.f.regexp_contains(name, r"^(STRUCT)?\\\\("), "STRUCT"),
+ self.if_(self.f.starts_with(name, "ST_"), "GEOGRAPHY"),
+ self.if_(name.eq(sge.convert("NULL")), "NULL"),
+ ]
+ case = sge.Case(ifs=ifs, default=sge.convert("UNKNOWN"))
+ return sg.select(case).from_(from_).subquery()
+
+ @visit_node.register(ops.Xor)
+ def visit_Xor(self, op, *, left, right):
+ return sg.or_(sg.and_(left, sg.not_(right)), sg.and_(sg.not_(left), right))
+
+ @visit_node.register(ops.HashBytes)
+ def visit_HashBytes(self, op, *, arg, how):
+ if how not in ("md5", "sha1", "sha256", "sha512"):
+ raise NotImplementedError(how)
+ return self.f[how](arg)
@staticmethod
- def _generate_setup_queries(expr, context):
- """Generate DDL for temporary resources."""
- nodes = lin.traverse(find_bigquery_udf, expr)
- queries = map(partial(BigQueryUDFDefinition, context=context), nodes)
+ def _gen_valid_name(name: str) -> str:
+ return "_".join(_NAME_REGEX.findall(name)) or "tmp"
+
+ @visit_node.register(ops.CountStar)
+ def visit_CountStar(self, op, *, arg, where):
+ if where is not None:
+ return self.f.countif(where)
+ return self.f.count(STAR)
+
+ @visit_node.register(ops.Degrees)
+ def visit_Degrees(self, op, *, arg):
+ return paren(180 * arg / self.f.acos(-1))
+
+ @visit_node.register(ops.Radians)
+ def visit_Radians(self, op, *, arg):
+ return paren(self.f.acos(-1) * arg / 180)
+
+ @visit_node.register(ops.CountDistinct)
+ def visit_CountDistinct(self, op, *, arg, where):
+ if where is not None:
+ arg = self.if_(where, arg, NULL)
+ return self.f.count(sge.Distinct(expressions=[arg]))
+
+ @visit_node.register(ops.CountDistinctStar)
+ @visit_node.register(ops.DateDiff)
+ @visit_node.register(ops.ExtractAuthority)
+ @visit_node.register(ops.ExtractFile)
+ @visit_node.register(ops.ExtractFragment)
+ @visit_node.register(ops.ExtractHost)
+ @visit_node.register(ops.ExtractPath)
+ @visit_node.register(ops.ExtractProtocol)
+ @visit_node.register(ops.ExtractQuery)
+ @visit_node.register(ops.ExtractUserInfo)
+ @visit_node.register(ops.FindInSet)
+ @visit_node.register(ops.Median)
+ @visit_node.register(ops.Quantile)
+ @visit_node.register(ops.MultiQuantile)
+ @visit_node.register(ops.RegexSplit)
+ @visit_node.register(ops.RowID)
+ @visit_node.register(ops.TimestampBucket)
+ @visit_node.register(ops.TimestampDiff)
+ def visit_Undefined(self, op, **_):
+ raise com.OperationNotDefinedError(type(op).__name__)
+
+
+_SIMPLE_OPS = {
+ ops.StringAscii: "ascii",
+ ops.BitAnd: "bit_and",
+ ops.BitOr: "bit_or",
+ ops.BitXor: "bit_xor",
+ ops.DateFromYMD: "date",
+ ops.Divide: "ieee_divide",
+ ops.EndsWith: "ends_with",
+ ops.GeoArea: "st_area",
+ ops.GeoAsBinary: "st_asbinary",
+ ops.GeoAsText: "st_astext",
+ ops.GeoAzimuth: "st_azimuth",
+ ops.GeoBuffer: "st_buffer",
+ ops.GeoCentroid: "st_centroid",
+ ops.GeoContains: "st_contains",
+ ops.GeoCoveredBy: "st_coveredby",
+ ops.GeoCovers: "st_covers",
+ ops.GeoDWithin: "st_dwithin",
+ ops.GeoDifference: "st_difference",
+ ops.GeoDisjoint: "st_disjoint",
+ ops.GeoDistance: "st_distance",
+ ops.GeoEndPoint: "st_endpoint",
+ ops.GeoEquals: "st_equals",
+ ops.GeoGeometryType: "st_geometrytype",
+ ops.GeoIntersection: "st_intersection",
+ ops.GeoIntersects: "st_intersects",
+ ops.GeoLength: "st_length",
+ ops.GeoMaxDistance: "st_maxdistance",
+ ops.GeoNPoints: "st_numpoints",
+ ops.GeoPerimeter: "st_perimeter",
+ ops.GeoPoint: "st_geogpoint",
+ ops.GeoPointN: "st_pointn",
+ ops.GeoStartPoint: "st_startpoint",
+ ops.GeoTouches: "st_touches",
+ ops.GeoUnaryUnion: "st_union_agg",
+ ops.GeoUnion: "st_union",
+ ops.GeoWithin: "st_within",
+ ops.GeoX: "st_x",
+ ops.GeoY: "st_y",
+ ops.Hash: "farm_fingerprint",
+ ops.IsInf: "is_inf",
+ ops.IsNan: "is_nan",
+ ops.Log10: "log10",
+ ops.LPad: "lpad",
+ ops.RPad: "rpad",
+ ops.Levenshtein: "edit_distance",
+ ops.Modulus: "mod",
+ ops.RandomScalar: "rand",
+ ops.RegexReplace: "regexp_replace",
+ ops.RegexSearch: "regexp_contains",
+ ops.Time: "time",
+ ops.TimeFromHMS: "time",
+ ops.TimestampFromYMDHMS: "datetime",
+ ops.TimestampNow: "current_timestamp",
+}
+
+
+for _op, _name in _SIMPLE_OPS.items():
+ assert isinstance(type(_op), type), type(_op)
+ if issubclass(_op, ops.Reduction):
+
+ @BigQueryCompiler.visit_node.register(_op)
+ def _fmt(self, op, *, _name: str = _name, where, **kw):
+ return self.agg[_name](*kw.values(), where=where)
- # UDFs are uniquely identified by the name of the Node subclass we
- # generate.
- def key(x):
- expr = x.expr
- op = expr.op() if isinstance(expr, ir.Expr) else expr
- return op.__class__.__name__
+ else:
- return list(toolz.unique(queries, key=key))
+ @BigQueryCompiler.visit_node.register(_op)
+ def _fmt(self, op, *, _name: str = _name, **kw):
+ return self.f[_name](*kw.values())
+ setattr(BigQueryCompiler, f"visit_{_op.__name__}", _fmt)
-# Register custom UDFs
-import ibis.backends.bigquery.custom_udfs # noqa: F401, E402
+del _op, _name, _fmt
diff --git a/datatypes.py b/datatypes.py
index 1e8b457..b98afa1 100644
--- a/datatypes.py
+++ b/datatypes.py
@@ -1,126 +1,14 @@
from __future__ import annotations
import google.cloud.bigquery as bq
-import sqlglot.expressions as sge
import ibis
import ibis.expr.datatypes as dt
import ibis.expr.schema as sch
-from ibis.backends.base.sqlglot.datatypes import SqlglotType
+from ibis.backends.base.sqlglot.datatypes import BigQueryType
from ibis.formats import SchemaMapper
-class BigQueryType(SqlglotType):
- dialect = "bigquery"
-
- default_decimal_precision = 38
- default_decimal_scale = 9
-
- @classmethod
- def _from_sqlglot_NUMERIC(cls) -> dt.Decimal:
- return dt.Decimal(
- cls.default_decimal_precision,
- cls.default_decimal_scale,
- nullable=cls.default_nullable,
- )
-
- @classmethod
- def _from_sqlglot_BIGNUMERIC(cls) -> dt.Decimal:
- return dt.Decimal(76, 38, nullable=cls.default_nullable)
-
- @classmethod
- def _from_sqlglot_DATETIME(cls) -> dt.Decimal:
- return dt.Timestamp(timezone=None, nullable=cls.default_nullable)
-
- @classmethod
- def _from_sqlglot_TIMESTAMP(cls) -> dt.Decimal:
- return dt.Timestamp(timezone="UTC", nullable=cls.default_nullable)
-
- @classmethod
- def _from_sqlglot_GEOGRAPHY(cls) -> dt.Decimal:
- return dt.GeoSpatial(
- geotype="geography", srid=4326, nullable=cls.default_nullable
- )
-
- @classmethod
- def _from_sqlglot_TINYINT(cls) -> dt.Int64:
- return dt.Int64(nullable=cls.default_nullable)
-
- _from_sqlglot_UINT = (
- _from_sqlglot_USMALLINT
- ) = (
- _from_sqlglot_UTINYINT
- ) = _from_sqlglot_INT = _from_sqlglot_SMALLINT = _from_sqlglot_TINYINT
-
- @classmethod
- def _from_sqlglot_UBIGINT(cls) -> dt.Int64:
- raise TypeError("Unsigned BIGINT isn't representable in BigQuery INT64")
-
- @classmethod
- def _from_sqlglot_FLOAT(cls) -> dt.Double:
- return dt.Float64(nullable=cls.default_nullable)
-
- @classmethod
- def _from_sqlglot_MAP(cls) -> dt.Map:
- raise NotImplementedError(
- "Cannot convert sqlglot Map type to ibis type: maps are not supported in BigQuery"
- )
-
- @classmethod
- def _from_ibis_Map(cls, dtype: dt.Map) -> sge.DataType:
- raise NotImplementedError(
- "Cannot convert Ibis Map type to BigQuery type: maps are not supported in BigQuery"
- )
-
- @classmethod
- def _from_ibis_Timestamp(cls, dtype: dt.Timestamp) -> sge.DataType:
- if dtype.timezone is None:
- return sge.DataType(this=sge.DataType.Type.DATETIME)
- elif dtype.timezone == "UTC":
- return sge.DataType(this=sge.DataType.Type.TIMESTAMPTZ)
- else:
- raise TypeError(
- "BigQuery does not support timestamps with timezones other than 'UTC'"
- )
-
- @classmethod
- def _from_ibis_Decimal(cls, dtype: dt.Decimal) -> sge.DataType:
- precision = dtype.precision
- scale = dtype.scale
- if (precision, scale) == (76, 38):
- return sge.DataType(this=sge.DataType.Type.BIGDECIMAL)
- elif (precision, scale) in ((38, 9), (None, None)):
- return sge.DataType(this=sge.DataType.Type.DECIMAL)
- else:
- raise TypeError(
- "BigQuery only supports decimal types with precision of 38 and "
- f"scale of 9 (NUMERIC) or precision of 76 and scale of 38 (BIGNUMERIC). "
- f"Current precision: {dtype.precision}. Current scale: {dtype.scale}"
- )
-
- @classmethod
- def _from_ibis_UInt64(cls, dtype: dt.UInt64) -> sge.DataType:
- raise TypeError(
- f"Conversion from {dtype} to BigQuery integer type (Int64) is lossy"
- )
-
- @classmethod
- def _from_ibis_UInt32(cls, dtype: dt.UInt32) -> sge.DataType:
- return sge.DataType(this=sge.DataType.Type.BIGINT)
-
- _from_ibis_UInt8 = _from_ibis_UInt16 = _from_ibis_UInt32
-
- @classmethod
- def _from_ibis_GeoSpatial(cls, dtype: dt.GeoSpatial) -> sge.DataType:
- if (dtype.geotype, dtype.srid) == ("geography", 4326):
- return sge.DataType(this=sge.DataType.Type.GEOGRAPHY)
- else:
- raise TypeError(
- "BigQuery geography uses points on WGS84 reference ellipsoid."
- f"Current geotype: {dtype.geotype}, Current srid: {dtype.srid}"
- )
-
-
class BigQuerySchema(SchemaMapper):
@classmethod
def from_ibis(cls, schema: sch.Schema) -> list[bq.SchemaField]:
diff --git a/__init__.py b/__init__.py
index 5295bd1..a0df878 100644
--- a/__init__.py
+++ b/__init__.py
@@ -433,7 +433,7 @@ class Backend(SQLGlotBackend):
type_mapper = self.compiler.type_mapper
argnames = udf_node.argnames
return dict(
- name=udf_node.__func_name__,
+ name=type(udf_node).__name__,
ident=self.compiler.__sql_name__(udf_node),
signature=", ".join(
f"{argname} {type_mapper.to_string(arg.dtype)}"
diff --git a/client.py b/client.py
index b332025..8a0d052 100644
--- a/client.py
+++ b/client.py
@@ -24,7 +24,7 @@ def schema_from_bigquery_table(table):
partition_field = partition_info.field or NATIVE_PARTITION_COL
# Only add a new column if it's not already a column in the schema
if partition_field not in schema:
- schema |= {partition_field: dt.timestamp}
+ schema |= {partition_field: dt.Timestamp(timezone="UTC")}
return schema
diff --git a/converter.py b/converter.py
index 9e858b9..dd6d638 100644
--- a/converter.py
+++ b/converter.py
@@ -0,0 +1,20 @@
+from __future__ import annotations
+
+from ibis.formats.pandas import PandasData
+
+
+class BigQueryPandasData(PandasData):
+ @classmethod
+ def convert_GeoSpatial(cls, s, dtype, pandas_type):
+ import geopandas as gpd
+ import shapely as shp
+
+ return gpd.GeoSeries(shp.from_wkt(s))
+
+ convert_Point = (
+ convert_LineString
+ ) = (
+ convert_Polygon
+ ) = (
+ convert_MultiLineString
+ ) = convert_MultiPoint = convert_MultiPolygon = convert_GeoSpatial
diff --git a/custom_udfs.py b/custom_udfs.py
index e3fa313..1a5a5f8 100644
--- a/custom_udfs.py
+++ b/custom_udfs.py
@@ -1,41 +0,0 @@
-from __future__ import annotations
-
-import ibis.expr.datatypes as dt
-import ibis.expr.operations as ops
-from ibis.backends.bigquery.compiler import BigQueryExprTranslator
-from ibis.backends.bigquery.udf import udf
-
-# Based on:
-# https://github.com/GoogleCloudPlatform/bigquery-utils/blob/45e1ac51367ab6209f68e04b1660d5b00258c131/udfs/community/typeof.sqlx#L1
-typeof_ = udf.sql(
- name="typeof",
- params={"input": "ANY TYPE"},
- output_type=dt.str,
- sql_expression=r"""
- (
- SELECT
- CASE
- -- Process NUMERIC, DATE, DATETIME, TIME, TIMESTAMP,
- WHEN REGEXP_CONTAINS(literal, r'^[A-Z]+ "') THEN REGEXP_EXTRACT(literal, r'^([A-Z]+) "')
- WHEN REGEXP_CONTAINS(literal, r'^-?[0-9]*$') THEN 'INT64'
- WHEN
- REGEXP_CONTAINS(literal, r'^(-?[0-9]+[.e].*|CAST\\("([^"]*)" AS FLOAT64\\))$')
- THEN
- 'FLOAT64'
- WHEN literal IN ('true', 'false') THEN 'BOOL'
- WHEN literal LIKE '"%' OR literal LIKE "'%" THEN 'STRING'
- WHEN literal LIKE 'b"%' THEN 'BYTES'
- WHEN literal LIKE '[%' THEN 'ARRAY'
- WHEN REGEXP_CONTAINS(literal, r'^(STRUCT)?\\(') THEN 'STRUCT'
- WHEN literal LIKE 'ST_%' THEN 'GEOGRAPHY'
- WHEN literal = 'NULL' THEN 'NULL'
- ELSE
- 'UNKNOWN'
- END
- FROM
- UNNEST([FORMAT('%T', input)]) AS literal
- )
- """,
-)
-
-BigQueryExprTranslator.rewrites(ops.TypeOf)(lambda op: typeof_(op.arg).op())
diff --git a/operations.py b/operations.py
index d7f781f..41640ba 100644
--- a/operations.py
+++ b/operations.py
@@ -1,9 +0,0 @@
-"""Ibis operations specific to BigQuery."""
-
-from __future__ import annotations
-
-import ibis.expr.operations as ops
-
-
-class BigQueryUDFNode(ops.ValueOp):
- """Represents use of a UDF."""
diff --git a/registry.py b/registry.py
index 75f9713..c29a9bd 100644
--- a/registry.py
+++ b/registry.py
@@ -1,1020 +0,0 @@
-"""Module to convert from Ibis expression to SQL string."""
-
-from __future__ import annotations
-
-import contextlib
-from typing import TYPE_CHECKING, Literal
-
-import numpy as np
-import sqlglot as sg
-from multipledispatch import Dispatcher
-
-import ibis
-import ibis.common.exceptions as com
-import ibis.expr.datatypes as dt
-import ibis.expr.operations as ops
-from ibis import util
-from ibis.backends.base.sql.registry import (
- fixed_arity,
- helpers,
- operation_registry,
- reduction,
- unary,
-)
-from ibis.backends.base.sql.registry.literal import _string_literal_format
-from ibis.backends.base.sql.registry.main import table_array_view
-from ibis.backends.bigquery.datatypes import BigQueryType
-from ibis.common.temporal import DateUnit, IntervalUnit, TimeUnit
-
-if TYPE_CHECKING:
- from ibis.backends.base.sql import compiler
-
-
-def _extract_field(sql_attr):
- def extract_field_formatter(translator, op):
- arg = translator.translate(op.args[0])
- if sql_attr == "epochseconds":
- return f"UNIX_SECONDS({arg})"
- else:
- return f"EXTRACT({sql_attr} from {arg})"
-
- return extract_field_formatter
-
-
-bigquery_cast = Dispatcher("bigquery_cast")
-
-
-@bigquery_cast.register(str, dt.Timestamp, dt.Integer)
-def bigquery_cast_timestamp_to_integer(compiled_arg, from_, to):
- """Convert TIMESTAMP to INT64 (seconds since Unix epoch)."""
- return f"UNIX_MICROS({compiled_arg})"
-
-
-@bigquery_cast.register(str, dt.Integer, dt.Timestamp)
-def bigquery_cast_integer_to_timestamp(compiled_arg, from_, to):
- """Convert INT64 (seconds since Unix epoch) to Timestamp."""
- return f"TIMESTAMP_SECONDS({compiled_arg})"
-
-
-@bigquery_cast.register(str, dt.Interval, dt.Integer)
-def bigquery_cast_interval_to_integer(compiled_arg, from_, to):
- if from_.unit in {IntervalUnit.WEEK, IntervalUnit.QUARTER, IntervalUnit.NANOSECOND}:
- raise com.UnsupportedOperationError(
- f"BigQuery does not allow extracting date part `{from_.unit}` from intervals"
- )
-
- return f"EXTRACT({from_.resolution.upper()} from {compiled_arg})"
-
-
-@bigquery_cast.register(str, dt.Floating, dt.Integer)
-def bigquery_cast_floating_to_integer(compiled_arg, from_, to):
- """Convert FLOAT64 to INT64 without rounding."""
- return f"CAST(TRUNC({compiled_arg}) AS INT64)"
-
-
-@bigquery_cast.register(str, dt.DataType, dt.DataType)
-def bigquery_cast_generate(compiled_arg, from_, to):
- """Cast to desired type."""
- sql_type = BigQueryType.to_string(to)
- return f"CAST({compiled_arg} AS {sql_type})"
-
-
-@bigquery_cast.register(str, dt.DataType)
-def bigquery_cast_generate_simple(compiled_arg, to):
- return bigquery_cast(compiled_arg, to, to)
-
-
-def _cast(translator, op):
- arg, target_type = op.args
- arg_formatted = translator.translate(arg)
- input_dtype = arg.dtype
- return bigquery_cast(arg_formatted, input_dtype, target_type)
-
-
-def integer_to_timestamp(translator: compiler.ExprTranslator, op) -> str:
- """Interprets an integer as a timestamp."""
- arg = translator.translate(op.arg)
- unit = op.unit.short
-
- if unit == "s":
- return f"TIMESTAMP_SECONDS({arg})"
- elif unit == "ms":
- return f"TIMESTAMP_MILLIS({arg})"
- elif unit == "us":
- return f"TIMESTAMP_MICROS({arg})"
- elif unit == "ns":
- # Timestamps are represented internally as elapsed microseconds, so some
- # rounding is required if an integer represents nanoseconds.
- # https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types#timestamp_type
- return f"TIMESTAMP_MICROS(CAST(ROUND({arg} / 1000) AS INT64))"
-
- raise NotImplementedError(f"cannot cast unit {op.unit}")
-
-
-def _struct_field(translator, op):
- arg = translator.translate(op.arg)
- return f"{arg}.`{op.field}`"
-
-
-def _struct_column(translator, op):
- cols = (
- f"{translator.translate(value)} AS {name}"
- for name, value in zip(op.names, op.values)
- )
- return "STRUCT({})".format(", ".join(cols))
-
-
-def _array_concat(translator, op):
- return "ARRAY_CONCAT({})".format(", ".join(map(translator.translate, op.arg)))
-
-
-def _array_column(translator, op):
- return "[{}]".format(", ".join(map(translator.translate, op.exprs)))
-
-
-def _array_index(translator, op):
- # SAFE_OFFSET returns NULL if out of bounds
- arg = translator.translate(op.arg)
- index = translator.translate(op.index)
- return f"{arg}[SAFE_OFFSET({index})]"
-
-
-def _array_contains(translator, op):
- arg = translator.translate(op.arg)
- other = translator.translate(op.other)
- name = util.gen_name("bq_arr")
- return f"(SELECT LOGICAL_OR({name} = {other}) FROM UNNEST({arg}) {name})"
-
-
-def _array_position(translator, op):
- arg = translator.translate(op.arg)
- other = translator.translate(op.other)
- name = util.gen_name("bq_arr")
- idx = util.gen_name("bq_arr_idx")
- unnest = f"UNNEST({arg}) {name} WITH OFFSET AS {idx}"
- return f"COALESCE((SELECT {idx} FROM {unnest} WHERE {name} = {other} LIMIT 1), -1)"
-
-
-def _array_remove(translator, op):
- arg = translator.translate(op.arg)
- other = translator.translate(op.other)
- name = util.gen_name("bq_arr")
- return f"ARRAY(SELECT {name} FROM UNNEST({arg}) {name} WHERE {name} <> {other})"
-
-
-def _array_distinct(translator, op):
- arg = translator.translate(op.arg)
- name = util.gen_name("bq_arr")
- return f"ARRAY(SELECT DISTINCT {name} FROM UNNEST({arg}) {name})"
-
-
-def _array_sort(translator, op):
- arg = translator.translate(op.arg)
- name = util.gen_name("bq_arr")
- return f"ARRAY(SELECT {name} FROM UNNEST({arg}) {name} ORDER BY {name})"
-
-
-def _array_union(translator, op):
- left = translator.translate(op.left)
- right = translator.translate(op.right)
-
- lname = util.gen_name("bq_arr_left")
- rname = util.gen_name("bq_arr_right")
-
- left_expr = f"SELECT {lname} FROM UNNEST({left}) {lname}"
- right_expr = f"SELECT {rname} FROM UNNEST({right}) {rname}"
-
- return f"ARRAY({left_expr} UNION DISTINCT {right_expr})"
-
-
-def _array_intersect(translator, op):
- left = translator.translate(op.left)
- right = translator.translate(op.right)
-
- lname = util.gen_name("bq_arr_left")
- rname = util.gen_name("bq_arr_right")
-
- left_expr = f"SELECT {lname} FROM UNNEST({left}) {lname}"
- right_expr = f"SELECT {rname} FROM UNNEST({right}) {rname}"
-
- return f"ARRAY({left_expr} INTERSECT DISTINCT {right_expr})"
-
-
-def _array_zip(translator, op):
- arg = list(map(translator.translate, op.arg))
- lengths = ", ".join(map("ARRAY_LENGTH({}) - 1".format, arg))
- indices = f"UNNEST(GENERATE_ARRAY(0, GREATEST({lengths})))"
- idx = util.gen_name("bq_arr_idx")
- struct_fields = ", ".join(
- f"{arr}[SAFE_OFFSET({idx})] AS {name}"
- for name, arr in zip(op.dtype.value_type.names, arg)
- )
- return f"ARRAY(SELECT AS STRUCT {struct_fields} FROM {indices} {idx})"
-
-
-def _array_map(translator, op):
- arg = translator.translate(op.arg)
- result = translator.translate(op.body)
- param = op.param
- return f"ARRAY(SELECT {result} FROM UNNEST({arg}) {param})"
-
-
-def _array_filter(translator, op):
- arg = translator.translate(op.arg)
- result = translator.translate(op.body)
- param = op.param
- return f"ARRAY(SELECT {param} FROM UNNEST({arg}) {param} WHERE {result})"
-
-
-def _hash(translator, op):
- arg_formatted = translator.translate(op.arg)
- return f"farm_fingerprint({arg_formatted})"
-
-
-def _string_find(translator, op):
- haystack, needle, start, end = op.args
-
- if start is not None:
- raise NotImplementedError("start not implemented for string find")
- if end is not None:
- raise NotImplementedError("end not implemented for string find")
-
- return "STRPOS({}, {}) - 1".format(
- translator.translate(haystack), translator.translate(needle)
- )
-
-
-def _regex_search(translator, op):
- arg = translator.translate(op.arg)
- regex = translator.translate(op.pattern)
- return f"REGEXP_CONTAINS({arg}, {regex})"
-
-
-def _regex_extract(translator, op):
- arg = translator.translate(op.arg)
- regex = translator.translate(op.pattern)
- index = translator.translate(op.index)
- matches = f"REGEXP_CONTAINS({arg}, {regex})"
- # non-greedily match the regex's prefix so the regex can match as much as possible
- nonzero_index_replace = rf"REGEXP_REPLACE({arg}, CONCAT('.*?', {regex}, '.*'), CONCAT('\\\\', CAST({index} AS STRING)))"
- # zero index replacement means capture everything matched by the regex, so
- # we wrap the regex in an outer group
- zero_index_replace = (
- rf"REGEXP_REPLACE({arg}, CONCAT('.*?', CONCAT('(', {regex}, ')'), '.*'), '\\\\1')"
- )
- extract = f"IF({index} = 0, {zero_index_replace}, {nonzero_index_replace})"
- return f"IF({matches}, {extract}, NULL)"
-
-
-def _regex_replace(translator, op):
- arg = translator.translate(op.arg)
- regex = translator.translate(op.pattern)
- replacement = translator.translate(op.replacement)
- return f"REGEXP_REPLACE({arg}, {regex}, {replacement})"
-
-
-def _string_concat(translator, op):
- args = ", ".join(map(translator.translate, op.arg))
- return f"CONCAT({args})"
-
-
-def _string_join(translator, op):
- sep, args = op.args
- return "ARRAY_TO_STRING([{}], {})".format(
- ", ".join(map(translator.translate, args)), translator.translate(sep)
- )
-
-
-def _string_ascii(translator, op):
- arg = translator.translate(op.arg)
- return f"TO_CODE_POINTS({arg})[SAFE_OFFSET(0)]"
-
-
-def _string_right(translator, op):
- arg, nchars = map(translator.translate, op.args)
- return f"SUBSTR({arg}, -LEAST(LENGTH({arg}), {nchars}))"
-
-
-def _string_substring(translator, op):
- length = op.length
- if (length := getattr(length, "value", None)) is not None and length < 0:
- raise ValueError("Length parameter must be a non-negative value.")
-
- arg = translator.translate(op.arg)
- start = translator.translate(op.start)
-
- arg_length = f"LENGTH({arg})"
- if op.length is not None:
- suffix = f", {translator.translate(op.length)}"
- else:
- suffix = ""
-
- if_pos = f"SUBSTR({arg}, {start} + 1{suffix})"
- if_neg = f"SUBSTR({arg}, {arg_length} + {start} + 1{suffix})"
- return f"IF({start} >= 0, {if_pos}, {if_neg})"
-
-
-def _log(translator, op):
- arg, base = op.args
- arg_formatted = translator.translate(arg)
-
- if base is None:
- return f"ln({arg_formatted})"
-
- base_formatted = translator.translate(base)
- return f"log({arg_formatted}, {base_formatted})"
-
-
-def _sg_literal(val) -> str:
- return sg.exp.Literal(this=str(val), is_string=isinstance(val, str)).sql(
- dialect="bigquery"
- )
-
-
-def _literal(t, op):
- dtype = op.dtype
- value = op.value
-
- if value is None:
- if not dtype.is_null():
- return f"CAST(NULL AS {BigQueryType.to_string(dtype)})"
- return "NULL"
- elif dtype.is_boolean():
- return str(value).upper()
- elif dtype.is_string() or dtype.is_inet() or dtype.is_macaddr():
- return _string_literal_format(t, op)
- elif dtype.is_decimal():
- if value.is_nan():
- return "CAST('NaN' AS FLOAT64)"
- elif value.is_infinite():
- prefix = "-" * value.is_signed()
- return f"CAST('{prefix}inf' AS FLOAT64)"
- else:
- return f"{BigQueryType.to_string(dtype)} '{value}'"
- elif dtype.is_uuid():
- return _sg_literal(str(value))
- elif dtype.is_numeric():
- if not np.isfinite(value):
- return f"CAST({str(value)!r} AS FLOAT64)"
- return _sg_literal(value)
- elif dtype.is_date():
- with contextlib.suppress(AttributeError):
- value = value.date()
- return f"DATE {_sg_literal(str(value))}"
- elif dtype.is_timestamp():
- typename = "DATETIME" if dtype.timezone is None else "TIMESTAMP"
- return f"{typename} {_sg_literal(str(value))}"
- elif dtype.is_time():
- # TODO: define extractors on TimeValue expressions
- return f"TIME {_sg_literal(str(value))}"
- elif dtype.is_binary():
- return repr(value)
- elif dtype.is_struct():
- cols = ", ".join(
- f"{t.translate(ops.Literal(value[name], dtype=typ))} AS `{name}`"
- for name, typ in dtype.items()
- )
- return f"STRUCT({cols})"
- elif dtype.is_array():
- val_type = dtype.value_type
- values = ", ".join(
- t.translate(ops.Literal(element, dtype=val_type)) for element in value
- )
- return f"[{values}]"
- elif dtype.is_interval():
- return f"INTERVAL {value} {dtype.resolution.upper()}"
- else:
- raise NotImplementedError(f"Unsupported type for BigQuery literal: {dtype}")
-
-
-def _arbitrary(translator, op):
- arg, how, where = op.args
-
- if where is not None:
- arg = ops.IfElse(where, arg, ibis.NA)
-
- if how != "first":
- raise com.UnsupportedOperationError(
- f"{how!r} value not supported for arbitrary in BigQuery"
- )
-
- return f"ANY_VALUE({translator.translate(arg)})"
-
-
-def _first(translator, op):
- arg = op.arg
- where = op.where
-
- if where is not None:
- arg = ops.IfElse(where, arg, ibis.NA)
-
- arg = translator.translate(arg)
- return f"ARRAY_AGG({arg} IGNORE NULLS)[SAFE_OFFSET(0)]"
-
-
-def _last(translator, op):
- arg = op.arg
- where = op.where
-
- if where is not None:
- arg = ops.IfElse(where, arg, ibis.NA)
-
- arg = translator.translate(arg)
- return f"ARRAY_REVERSE(ARRAY_AGG({arg} IGNORE NULLS))[SAFE_OFFSET(0)]"
-
-
-def _truncate(kind, units):
- def truncator(translator, op):
- arg, unit = op.args
- trans_arg = translator.translate(arg)
- if unit not in units:
- raise com.UnsupportedOperationError(
- f"BigQuery does not support truncating {arg.dtype} values to unit {unit!r}"
- )
- if unit.name == "WEEK":
- unit = "WEEK(MONDAY)"
- else:
- unit = unit.name
- return f"{kind}_TRUNC({trans_arg}, {unit})"
-
- return truncator
-
-
-# BigQuery doesn't support nanosecond intervals
-_date_truncate = _truncate("DATE", DateUnit)
-_time_truncate = _truncate("TIME", set(TimeUnit) - {TimeUnit.NANOSECOND})
-_timestamp_truncate = _truncate(
- "TIMESTAMP", set(IntervalUnit) - {IntervalUnit.NANOSECOND}
-)
-
-
-def _date_binary(func):
- def _formatter(translator, op):
- arg, offset = op.left, op.right
-
- unit = offset.dtype.unit
- if not unit.is_date():
- raise com.UnsupportedOperationError(
- f"BigQuery does not allow binary operation {func} with INTERVAL offset {unit}"
- )
-
- formatted_arg = translator.translate(arg)
- formatted_offset = translator.translate(offset)
- return f"{func}({formatted_arg}, {formatted_offset})"
-
- return _formatter
-
-
-def _timestamp_binary(func):
- def _formatter(translator, op):
- arg, offset = op.left, op.right
-
- unit = offset.dtype.unit
- if unit == IntervalUnit.NANOSECOND:
- raise com.UnsupportedOperationError(
- f"BigQuery does not allow binary operation {func} with INTERVAL offset {unit}"
- )
-
- if unit.is_date():
- try:
- offset = offset.to_expr().to_unit("h").op()
- except ValueError:
- raise com.UnsupportedOperationError(
- f"BigQuery does not allow binary operation {func} with INTERVAL offset {unit}"
- )
-
- formatted_arg = translator.translate(arg)
- formatted_offset = translator.translate(offset)
- return f"{func}({formatted_arg}, {formatted_offset})"
-
- return _formatter
-
-
-def _geo_boundingbox(dimension_name):
- def _formatter(translator, op):
- geog = op.args[0]
- geog_formatted = translator.translate(geog)
- return f"ST_BOUNDINGBOX({geog_formatted}).{dimension_name}"
-
- return _formatter
-
-
-def _geo_simplify(translator, op):
- geog, tolerance, preserve_collapsed = op.args
- if preserve_collapsed.value:
- raise com.UnsupportedOperationError(
- "BigQuery simplify does not support preserving collapsed geometries, "
- "must pass preserve_collapsed=False"
- )
- geog, tolerance = map(translator.translate, (geog, tolerance))
- return f"ST_SIMPLIFY({geog}, {tolerance})"
-
-
-STRFTIME_FORMAT_FUNCTIONS = {
- dt.date: "DATE",
- dt.time: "TIME",
- dt.Timestamp(timezone=None): "DATETIME",
- dt.Timestamp(timezone="UTC"): "TIMESTAMP",
-}
-
-
-def bigquery_day_of_week_index(t, op):
- """Convert timestamp to day-of-week integer."""
- arg = op.args[0]
- arg_formatted = t.translate(arg)
- return f"MOD(EXTRACT(DAYOFWEEK FROM {arg_formatted}) + 5, 7)"
-
-
-def bigquery_day_of_week_name(t, op):
- """Convert timestamp to day-of-week name."""
- return f"INITCAP(CAST({t.translate(op.arg)} AS STRING FORMAT 'DAY'))"
-
-
-def bigquery_compiles_divide(t, op):
- """Floating point division."""
- return f"IEEE_DIVIDE({t.translate(op.left)}, {t.translate(op.right)})"
-
-
-def compiles_strftime(translator, op):
- """Timestamp formatting."""
- arg = op.arg
- format_str = op.format_str
- arg_type = arg.dtype
- strftime_format_func_name = STRFTIME_FORMAT_FUNCTIONS[arg_type]
- fmt_string = translator.translate(format_str)
- arg_formatted = translator.translate(arg)
- if isinstance(arg_type, dt.Timestamp) and arg_type.timezone is None:
- return f"FORMAT_{strftime_format_func_name}({fmt_string}, {arg_formatted})"
- elif isinstance(arg_type, dt.Timestamp):
- return "FORMAT_{}({}, {}, {!r})".format(
- strftime_format_func_name,
- fmt_string,
- arg_formatted,
- arg_type.timezone,
- )
- else:
- return f"FORMAT_{strftime_format_func_name}({fmt_string}, {arg_formatted})"
-
-
-def compiles_string_to_timestamp(translator, op):
- """Timestamp parsing."""
- fmt_string = translator.translate(op.format_str)
- arg_formatted = translator.translate(op.arg)
- return f"PARSE_TIMESTAMP({fmt_string}, {arg_formatted})"
-
-
-def compiles_floor(t, op):
- bigquery_type = BigQueryType.to_string(op.dtype)
- arg = op.arg
- return f"CAST(FLOOR({t.translate(arg)}) AS {bigquery_type})"
-
-
-def compiles_approx(translator, op):
- arg = op.arg
- where = op.where
-
- if where is not None:
- arg = ops.IfElse(where, arg, ibis.NA)
-
- return f"APPROX_QUANTILES({translator.translate(arg)}, 2)[OFFSET(1)]"
-
-
-def compiles_covar_corr(func):
- def translate(translator, op):
- left = op.left
- right = op.right
-
- if (where := op.where) is not None:
- left = ops.IfElse(where, left, None)
- right = ops.IfElse(where, right, None)
-
- left = translator.translate(
- ops.Cast(left, dt.int64) if left.dtype.is_boolean() else left
- )
- right = translator.translate(
- ops.Cast(right, dt.int64) if right.dtype.is_boolean() else right
- )
- return f"{func}({left}, {right})"
-
- return translate
-
-
-def _covar(translator, op):
- how = op.how[:4].upper()
- assert how in ("POP", "SAMP"), 'how not in ("POP", "SAMP")'
- return compiles_covar_corr(f"COVAR_{how}")(translator, op)
-
-
-def _corr(translator, op):
- if (how := op.how) == "sample":
- raise ValueError(f"Correlation with how={how!r} is not supported.")
- return compiles_covar_corr("CORR")(translator, op)
-
-
-def _identical_to(t, op):
- left = t.translate(op.left)
- right = t.translate(op.right)
- return f"{left} IS NOT DISTINCT FROM {right}"
-
-
-def _floor_divide(t, op):
- left = t.translate(op.left)
- right = t.translate(op.right)
- return bigquery_cast(f"FLOOR(IEEE_DIVIDE({left}, {right}))", op.dtype)
-
-
-def _log2(t, op):
- return f"LOG({t.translate(op.arg)}, 2)"
-
-
-def _is_nan(t, op):
- return f"IS_NAN({t.translate(op.arg)})"
-
-
-def _is_inf(t, op):
- return f"IS_INF({t.translate(op.arg)})"
-
-
-def _array_agg(t, op):
- arg = op.arg
- if (where := op.where) is not None:
- arg = ops.IfElse(where, arg, ibis.NA)
- return f"ARRAY_AGG({t.translate(arg)} IGNORE NULLS)"
-
-
-def _arg_min_max(sort_dir: Literal["ASC", "DESC"]):
- def translate(t, op: ops.ArgMin | ops.ArgMax) -> str:
- arg = op.arg
- if (where := op.where) is not None:
- arg = ops.IfElse(where, arg, None)
- arg = t.translate(arg)
- key = t.translate(op.key)
- return f"ARRAY_AGG({arg} IGNORE NULLS ORDER BY {key} {sort_dir} LIMIT 1)[SAFE_OFFSET(0)]"
-
- return translate
-
-
-def _array_repeat(t, op):
- start = step = 1
- times = t.translate(op.times)
- arg = t.translate(op.arg)
- array_length = f"ARRAY_LENGTH({arg})"
- stop = f"GREATEST({times}, 0) * {array_length}"
- idx = f"COALESCE(NULLIF(MOD(i, {array_length}), 0), {array_length})"
- series = f"GENERATE_ARRAY({start}, {stop}, {step})"
- return f"ARRAY(SELECT {arg}[SAFE_ORDINAL({idx})] FROM UNNEST({series}) AS i)"
-
-
-def _neg_idx_to_pos(array, idx):
- return f"IF({idx} < 0, ARRAY_LENGTH({array}) + {idx}, {idx})"
-
-
-def _array_slice(t, op):
- arg = t.translate(op.arg)
- cond = [f"index >= {_neg_idx_to_pos(arg, t.translate(op.start))}"]
- if stop := op.stop:
- cond.append(f"index < {_neg_idx_to_pos(arg, t.translate(stop))}")
- return (
- f"ARRAY("
- f"SELECT el "
- f"FROM UNNEST({arg}) AS el WITH OFFSET index "
- f"WHERE {' AND '.join(cond)}"
- f")"
- )
-
-
-def _capitalize(t, op):
- arg = t.translate(op.arg)
- return f"CONCAT(UPPER(SUBSTR({arg}, 1, 1)), LOWER(SUBSTR({arg}, 2)))"
-
-
-def _nth_value(t, op):
- arg = t.translate(op.arg)
-
- if not isinstance(nth_op := op.nth, ops.Literal):
- raise TypeError(f"Bigquery nth must be a literal; got {type(op.nth)}")
-
- return f"NTH_VALUE({arg}, {nth_op.value + 1})"
-
-
-def _interval_multiply(t, op):
- if isinstance(op.left, ops.Literal) and isinstance(op.right, ops.Literal):
- value = op.left.value * op.right.value
- literal = ops.Literal(value, op.left.dtype)
- return t.translate(literal)
-
- left, right = t.translate(op.left), t.translate(op.right)
- unit = op.left.dtype.resolution.upper()
- return f"INTERVAL EXTRACT({unit} from {left}) * {right} {unit}"
-
-
-def table_column(translator, op):
- """Override column references to adjust names for BigQuery."""
- quoted_name = translator._gen_valid_name(
- helpers.quote_identifier(op.name, force=True)
- )
-
- ctx = translator.context
-
- # If the column does not originate from the table set in the current SELECT
- # context, we should format as a subquery
- if translator.permit_subquery and ctx.is_foreign_expr(op.table):
- # TODO(kszucs): avoid the expression roundtrip
- proj_expr = op.table.to_expr().select([op.name]).to_array().op()
- return table_array_view(translator, proj_expr)
-
- alias = ctx.get_ref(op.table, search_parents=True)
- if alias is not None:
- quoted_name = f"{alias}.{quoted_name}"
-
- return quoted_name
-
-
-def _count_distinct_star(t, op):
- raise com.UnsupportedOperationError(
- "BigQuery doesn't support COUNT(DISTINCT ...) with multiple columns"
- )
-
-
-def _time_delta(t, op):
- left = t.translate(op.left)
- right = t.translate(op.right)
- return f"TIME_DIFF({left}, {right}, {op.part.value.upper()})"
-
-
-def _date_delta(t, op):
- left = t.translate(op.left)
- right = t.translate(op.right)
- return f"DATE_DIFF({left}, {right}, {op.part.value.upper()})"
-
-
-def _timestamp_delta(t, op):
- left = t.translate(op.left)
- right = t.translate(op.right)
- left_tz = op.left.dtype.timezone
- right_tz = op.right.dtype.timezone
- args = f"{left}, {right}, {op.part.value.upper()}"
- if left_tz is None and right_tz is None:
- return f"DATETIME_DIFF({args})"
- elif left_tz is not None and right_tz is not None:
- return f"TIMESTAMP_DIFF({args})"
- else:
- raise NotImplementedError(
- "timestamp difference with mixed timezone/timezoneless values is not implemented"
- )
-
-
-def _group_concat(translator, op):
- arg = op.arg
- where = op.where
-
- if where is not None:
- arg = ops.IfElse(where, arg, ibis.NA)
-
- arg = translator.translate(arg)
- sep = translator.translate(op.sep)
- return f"STRING_AGG({arg}, {sep})"
-
-
-def _zero(dtype):
- if dtype.is_interval():
- return "MAKE_INTERVAL()"
- return "0"
-
-
-def _sign(value, dtype):
- if dtype.is_interval():
- zero = _zero(dtype)
- return f"""\\
-CASE
- WHEN {value} < {zero} THEN -1
- WHEN {value} = {zero} THEN 0
- WHEN {value} > {zero} THEN 1
- ELSE NULL
-END"""
- return f"SIGN({value})"
-
-
-def _nullifzero(step, zero, step_dtype):
- if step_dtype.is_interval():
- return f"IF({step} = {zero}, NULL, {step})"
- return f"NULLIF({step}, {zero})"
-
-
-def _make_range(func):
- def _range(translator, op):
- start = translator.translate(op.start)
- stop = translator.translate(op.stop)
- step = translator.translate(op.step)
-
- step_dtype = op.step.dtype
- step_sign = _sign(step, step_dtype)
- delta_sign = _sign(step, step_dtype)
- zero = _zero(step_dtype)
- nullifzero = _nullifzero(step, zero, step_dtype)
-
- condition = f"{nullifzero} IS NOT NULL AND {step_sign} = {delta_sign}"
- gen_array = f"{func}({start}, {stop}, {step})"
- inner = f"SELECT x FROM UNNEST({gen_array}) x WHERE x <> {stop}"
- return f"IF({condition}, ARRAY({inner}), [])"
-
- return _range
-
-
-def _timestamp_range(translator, op):
- start = op.start
- stop = op.stop
-
- if start.dtype.timezone is None or stop.dtype.timezone is None:
- raise com.IbisTypeError(
- "Timestamps without timezone values are not supported when generating timestamp ranges"
- )
-
- rule = _make_range("GENERATE_TIMESTAMP_ARRAY")
- return rule(translator, op)
-
-
-OPERATION_REGISTRY = {
- **operation_registry,
- # Literal
- ops.Literal: _literal,
- # Logical
- ops.Any: reduction("LOGICAL_OR"),
- ops.All: reduction("LOGICAL_AND"),
- ops.NullIf: fixed_arity("NULLIF", 2),
- # Reductions
- ops.ApproxMedian: compiles_approx,
- ops.Covariance: _covar,
- ops.Correlation: _corr,
- # Math
- ops.Divide: bigquery_compiles_divide,
- ops.Floor: compiles_floor,
- ops.Modulus: fixed_arity("MOD", 2),
- ops.Sign: unary("SIGN"),
- ops.BitwiseNot: lambda t, op: f"~ {t.translate(op.arg)}",
- ops.BitwiseXor: lambda t, op: f"{t.translate(op.left)} ^ {t.translate(op.right)}",
- ops.BitwiseOr: lambda t, op: f"{t.translate(op.left)} | {t.translate(op.right)}",
- ops.BitwiseAnd: lambda t, op: f"{t.translate(op.left)} & {t.translate(op.right)}",
- ops.BitwiseLeftShift: lambda t,
- op: f"{t.translate(op.left)} << {t.translate(op.right)}",
- ops.BitwiseRightShift: lambda t,
- op: f"{t.translate(op.left)} >> {t.translate(op.right)}",
- # Temporal functions
- ops.Date: unary("DATE"),
- ops.DateFromYMD: fixed_arity("DATE", 3),
- ops.DateAdd: _date_binary("DATE_ADD"),
- ops.DateSub: _date_binary("DATE_SUB"),
- ops.DateTruncate: _date_truncate,
- ops.DayOfWeekIndex: bigquery_day_of_week_index,
- ops.DayOfWeekName: bigquery_day_of_week_name,
- ops.ExtractEpochSeconds: _extract_field("epochseconds"),
- ops.ExtractYear: _extract_field("year"),
- ops.ExtractQuarter: _extract_field("quarter"),
- ops.ExtractMonth: _extract_field("month"),
- ops.ExtractWeekOfYear: _extract_field("isoweek"),
- ops.ExtractDay: _extract_field("day"),
- ops.ExtractDayOfYear: _extract_field("dayofyear"),
- ops.ExtractHour: _extract_field("hour"),
- ops.ExtractMinute: _extract_field("minute"),
- ops.ExtractSecond: _extract_field("second"),
- ops.ExtractMicrosecond: _extract_field("microsecond"),
- ops.ExtractMillisecond: _extract_field("millisecond"),
- ops.Strftime: compiles_strftime,
- ops.StringToTimestamp: compiles_string_to_timestamp,
- ops.Time: unary("TIME"),
- ops.TimeFromHMS: fixed_arity("TIME", 3),
- ops.TimeTruncate: _time_truncate,
- ops.TimestampAdd: _timestamp_binary("TIMESTAMP_ADD"),
- ops.TimestampFromUNIX: integer_to_timestamp,
- ops.TimestampFromYMDHMS: fixed_arity("DATETIME", 6),
- ops.TimestampNow: fixed_arity("CURRENT_TIMESTAMP", 0),
- ops.TimestampSub: _timestamp_binary("TIMESTAMP_SUB"),
- ops.TimestampTruncate: _timestamp_truncate,
- ops.IntervalMultiply: _interval_multiply,
- ops.Hash: _hash,
- ops.StringReplace: fixed_arity("REPLACE", 3),
- ops.StringSplit: fixed_arity("SPLIT", 2),
- ops.StringConcat: _string_concat,
- ops.StringJoin: _string_join,
- ops.StringAscii: _string_ascii,
- ops.StringFind: _string_find,
- ops.Substring: _string_substring,
- ops.StrRight: _string_right,
- ops.Capitalize: _capitalize,
- ops.Translate: fixed_arity("TRANSLATE", 3),
- ops.Repeat: fixed_arity("REPEAT", 2),
- ops.RegexSearch: _regex_search,
- ops.RegexExtract: _regex_extract,
- ops.RegexReplace: _regex_replace,
- ops.GroupConcat: _group_concat,
- ops.Cast: _cast,
- ops.StructField: _struct_field,
- ops.StructColumn: _struct_column,
- ops.ArrayCollect: _array_agg,
- ops.ArrayConcat: _array_concat,
- ops.Array: _array_column,
- ops.ArrayIndex: _array_index,
- ops.ArrayLength: unary("ARRAY_LENGTH"),
- ops.ArrayRepeat: _array_repeat,
- ops.ArraySlice: _array_slice,
- ops.ArrayContains: _array_contains,
- ops.ArrayPosition: _array_position,
- ops.ArrayRemove: _array_remove,
- ops.ArrayDistinct: _array_distinct,
- ops.ArraySort: _array_sort,
- ops.ArrayUnion: _array_union,
- ops.ArrayIntersect: _array_intersect,
- ops.ArrayZip: _array_zip,
- ops.ArrayMap: _array_map,
- ops.ArrayFilter: _array_filter,
- ops.Log: _log,
- ops.Log2: _log2,
- ops.Arbitrary: _arbitrary,
- ops.First: _first,
- ops.Last: _last,
- # Geospatial Columnar
- ops.GeoUnaryUnion: unary("ST_UNION_AGG"),
- # Geospatial
- ops.GeoArea: unary("ST_AREA"),
- ops.GeoAsBinary: unary("ST_ASBINARY"),
- ops.GeoAsText: unary("ST_ASTEXT"),
- ops.GeoAzimuth: fixed_arity("ST_AZIMUTH", 2),
- ops.GeoBuffer: fixed_arity("ST_BUFFER", 2),
- ops.GeoCentroid: unary("ST_CENTROID"),
- ops.GeoContains: fixed_arity("ST_CONTAINS", 2),
- ops.GeoCovers: fixed_arity("ST_COVERS", 2),
- ops.GeoCoveredBy: fixed_arity("ST_COVEREDBY", 2),
- ops.GeoDWithin: fixed_arity("ST_DWITHIN", 3),
- ops.GeoDifference: fixed_arity("ST_DIFFERENCE", 2),
- ops.GeoDisjoint: fixed_arity("ST_DISJOINT", 2),
- ops.GeoDistance: fixed_arity("ST_DISTANCE", 2),
- ops.GeoEndPoint: unary("ST_ENDPOINT"),
- ops.GeoEquals: fixed_arity("ST_EQUALS", 2),
- ops.GeoGeometryType: unary("ST_GEOMETRYTYPE"),
- ops.GeoIntersection: fixed_arity("ST_INTERSECTION", 2),
- ops.GeoIntersects: fixed_arity("ST_INTERSECTS", 2),
- ops.GeoLength: unary("ST_LENGTH"),
- ops.GeoMaxDistance: fixed_arity("ST_MAXDISTANCE", 2),
- ops.GeoNPoints: unary("ST_NUMPOINTS"),
- ops.GeoPerimeter: unary("ST_PERIMETER"),
- ops.GeoPoint: fixed_arity("ST_GEOGPOINT", 2),
- ops.GeoPointN: fixed_arity("ST_POINTN", 2),
- ops.GeoSimplify: _geo_simplify,
- ops.GeoStartPoint: unary("ST_STARTPOINT"),
- ops.GeoTouches: fixed_arity("ST_TOUCHES", 2),
- ops.GeoUnion: fixed_arity("ST_UNION", 2),
- ops.GeoWithin: fixed_arity("ST_WITHIN", 2),
- ops.GeoX: unary("ST_X"),
- ops.GeoXMax: _geo_boundingbox("xmax"),
- ops.GeoXMin: _geo_boundingbox("xmin"),
- ops.GeoY: unary("ST_Y"),
- ops.GeoYMax: _geo_boundingbox("ymax"),
- ops.GeoYMin: _geo_boundingbox("ymin"),
- ops.BitAnd: reduction("BIT_AND"),
- ops.BitOr: reduction("BIT_OR"),
- ops.BitXor: reduction("BIT_XOR"),
- ops.ApproxCountDistinct: reduction("APPROX_COUNT_DISTINCT"),
- ops.ApproxMedian: compiles_approx,
- ops.IdenticalTo: _identical_to,
- ops.FloorDivide: _floor_divide,
- ops.IsNan: _is_nan,
- ops.IsInf: _is_inf,
- ops.ArgMin: _arg_min_max("ASC"),
- ops.ArgMax: _arg_min_max("DESC"),
- ops.Pi: lambda *_: "ACOS(-1)",
- ops.E: lambda *_: "EXP(1)",
- ops.RandomScalar: fixed_arity("RAND", 0),
- ops.NthValue: _nth_value,
- ops.JSONGetItem: lambda t, op: f"{t.translate(op.arg)}[{t.translate(op.index)}]",
- ops.ArrayStringJoin: lambda t,
- op: f"ARRAY_TO_STRING({t.translate(op.arg)}, {t.translate(op.sep)})",
- ops.StartsWith: fixed_arity("STARTS_WITH", 2),
- ops.EndsWith: fixed_arity("ENDS_WITH", 2),
- ops.TableColumn: table_column,
- ops.CountDistinctStar: _count_distinct_star,
- ops.Argument: lambda _, op: op.param,
- ops.Unnest: unary("UNNEST"),
- ops.TimeDelta: _time_delta,
- ops.DateDelta: _date_delta,
- ops.TimestampDelta: _timestamp_delta,
- ops.IntegerRange: _make_range("GENERATE_ARRAY"),
- ops.TimestampRange: _timestamp_range,
-}
-
-_invalid_operations = {
- ops.FindInSet,
- ops.DateDiff,
- ops.TimestampDiff,
- ops.ExtractAuthority,
- ops.ExtractFile,
- ops.ExtractFragment,
- ops.ExtractHost,
- ops.ExtractPath,
- ops.ExtractProtocol,
- ops.ExtractQuery,
- ops.ExtractUserInfo,
-}
-
-OPERATION_REGISTRY = {
- k: v for k, v in OPERATION_REGISTRY.items() if k not in _invalid_operations
-}
diff --git a/rewrites.py b/rewrites.py
index b8087b3..e7e82aa 100644
--- a/rewrites.py
+++ b/rewrites.py
@@ -182,7 +182,7 @@ def window_merge_frames(_, frame):
group_by = tuple(toolz.unique(_.frame.group_by + frame.group_by))
order_by = {}
- for sort_key in _.frame.order_by + frame.order_by:
+ for sort_key in frame.order_by + _.frame.order_by:
order_by[sort_key.expr] = sort_key.ascending
order_by = tuple(ops.SortKey(k, v) for k, v in order_by.items())
diff --git a/out.sql b/out.sql
index 9ca730d..5b6da54 100644
--- a/out.sql
+++ b/out.sql
@@ -1,156 +1,138 @@
-WITH t0 AS (
- SELECT
- t7.`field_of_study`,
- IF(pos = pos_2, `__pivoted__`, NULL) AS `__pivoted__`
- FROM humanities AS t7
- CROSS JOIN UNNEST(GENERATE_ARRAY(
- 0,
- GREATEST(
- ARRAY_LENGTH(
- [STRUCT('1970-71' AS years, t7.`1970-71` AS degrees), STRUCT('1975-76' AS years, t7.`1975-76` AS degrees), STRUCT('1980-81' AS years, t7.`1980-81` AS degrees), STRUCT('1985-86' AS years, t7.`1985-86` AS degrees), STRUCT('1990-91' AS years, t7.`1990-91` AS degrees), STRUCT('1995-96' AS years, t7.`1995-96` AS degrees), STRUCT('2000-01' AS years, t7.`2000-01` AS degrees), STRUCT('2005-06' AS years, t7.`2005-06` AS degrees), STRUCT('2010-11' AS years, t7.`2010-11` AS degrees), STRUCT('2011-12' AS years, t7.`2011-12` AS degrees), STRUCT('2012-13' AS years, t7.`2012-13` AS degrees), STRUCT('2013-14' AS years, t7.`2013-14` AS degrees), STRUCT('2014-15' AS years, t7.`2014-15` AS degrees), STRUCT('2015-16' AS years, t7.`2015-16` AS degrees), STRUCT('2016-17' AS years, t7.`2016-17` AS degrees), STRUCT('2017-18' AS years, t7.`2017-18` AS degrees), STRUCT('2018-19' AS years, t7.`2018-19` AS degrees), STRUCT('2019-20' AS years, t7.`2019-20` AS degrees)]
- )
- ) - 1
- )) AS pos
- CROSS JOIN UNNEST([STRUCT('1970-71' AS years, t7.`1970-71` AS degrees), STRUCT('1975-76' AS years, t7.`1975-76` AS degrees), STRUCT('1980-81' AS years, t7.`1980-81` AS degrees), STRUCT('1985-86' AS years, t7.`1985-86` AS degrees), STRUCT('1990-91' AS years, t7.`1990-91` AS degrees), STRUCT('1995-96' AS years, t7.`1995-96` AS degrees), STRUCT('2000-01' AS years, t7.`2000-01` AS degrees), STRUCT('2005-06' AS years, t7.`2005-06` AS degrees), STRUCT('2010-11' AS years, t7.`2010-11` AS degrees), STRUCT('2011-12' AS years, t7.`2011-12` AS degrees), STRUCT('2012-13' AS years, t7.`2012-13` AS degrees), STRUCT('2013-14' AS years, t7.`2013-14` AS degrees), STRUCT('2014-15' AS years, t7.`2014-15` AS degrees), STRUCT('2015-16' AS years, t7.`2015-16` AS degrees), STRUCT('2016-17' AS years, t7.`2016-17` AS degrees), STRUCT('2017-18' AS years, t7.`2017-18` AS degrees), STRUCT('2018-19' AS years, t7.`2018-19` AS degrees), STRUCT('2019-20' AS years, t7.`2019-20` AS degrees)]) AS `__pivoted__` WITH OFFSET AS pos_2
- WHERE
- pos = pos_2
- OR (
- pos > (
- ARRAY_LENGTH(
- [STRUCT('1970-71' AS years, t7.`1970-71` AS degrees), STRUCT('1975-76' AS years, t7.`1975-76` AS degrees), STRUCT('1980-81' AS years, t7.`1980-81` AS degrees), STRUCT('1985-86' AS years, t7.`1985-86` AS degrees), STRUCT('1990-91' AS years, t7.`1990-91` AS degrees), STRUCT('1995-96' AS years, t7.`1995-96` AS degrees), STRUCT('2000-01' AS years, t7.`2000-01` AS degrees), STRUCT('2005-06' AS years, t7.`2005-06` AS degrees), STRUCT('2010-11' AS years, t7.`2010-11` AS degrees), STRUCT('2011-12' AS years, t7.`2011-12` AS degrees), STRUCT('2012-13' AS years, t7.`2012-13` AS degrees), STRUCT('2013-14' AS years, t7.`2013-14` AS degrees), STRUCT('2014-15' AS years, t7.`2014-15` AS degrees), STRUCT('2015-16' AS years, t7.`2015-16` AS degrees), STRUCT('2016-17' AS years, t7.`2016-17` AS degrees), STRUCT('2017-18' AS years, t7.`2017-18` AS degrees), STRUCT('2018-19' AS years, t7.`2018-19` AS degrees), STRUCT('2019-20' AS years, t7.`2019-20` AS degrees)]
- ) - 1
- )
- AND pos_2 = (
- ARRAY_LENGTH(
- [STRUCT('1970-71' AS years, t7.`1970-71` AS degrees), STRUCT('1975-76' AS years, t7.`1975-76` AS degrees), STRUCT('1980-81' AS years, t7.`1980-81` AS degrees), STRUCT('1985-86' AS years, t7.`1985-86` AS degrees), STRUCT('1990-91' AS years, t7.`1990-91` AS degrees), STRUCT('1995-96' AS years, t7.`1995-96` AS degrees), STRUCT('2000-01' AS years, t7.`2000-01` AS degrees), STRUCT('2005-06' AS years, t7.`2005-06` AS degrees), STRUCT('2010-11' AS years, t7.`2010-11` AS degrees), STRUCT('2011-12' AS years, t7.`2011-12` AS degrees), STRUCT('2012-13' AS years, t7.`2012-13` AS degrees), STRUCT('2013-14' AS years, t7.`2013-14` AS degrees), STRUCT('2014-15' AS years, t7.`2014-15` AS degrees), STRUCT('2015-16' AS years, t7.`2015-16` AS degrees), STRUCT('2016-17' AS years, t7.`2016-17` AS degrees), STRUCT('2017-18' AS years, t7.`2017-18` AS degrees), STRUCT('2018-19' AS years, t7.`2018-19` AS degrees), STRUCT('2019-20' AS years, t7.`2019-20` AS degrees)]
- ) - 1
- )
- )
-), t1 AS (
- SELECT
- t0.`field_of_study`,
- t0.`__pivoted__`.`years` AS `years`,
- t0.`__pivoted__`.`degrees` AS `degrees`
- FROM t0
-), t2 AS (
- SELECT
- t1.*,
- first_value(t1.`degrees`) OVER (PARTITION BY t1.`field_of_study` ORDER BY t1.`years` ASC) AS `earliest_degrees`,
- last_value(t1.`degrees`) OVER (PARTITION BY t1.`field_of_study` ORDER BY t1.`years` ASC) AS `latest_degrees`
- FROM t1
-), t3 AS (
- SELECT
- t2.*,
- t2.`latest_degrees` - t2.`earliest_degrees` AS `diff`
- FROM t2
-), t4 AS (
- SELECT
- t3.`field_of_study`,
- ANY_VALUE(t3.`diff`) AS `diff`
- FROM t3
- GROUP BY
- 1
-), t5 AS (
- SELECT
- t4.*
- FROM t4
- WHERE
- t4.`diff` < 0
-)
SELECT
- t6.`field_of_study`,
- t6.`diff`
+ t10.field_of_study,
+ t10.diff
FROM (
- WITH t0 AS (
- SELECT
- t7.`field_of_study`,
- IF(pos = pos_2, `__pivoted__`, NULL) AS `__pivoted__`
- FROM humanities AS t7
- CROSS JOIN UNNEST(GENERATE_ARRAY(
- 0,
- GREATEST(
- ARRAY_LENGTH(
- [STRUCT('1970-71' AS years, t7.`1970-71` AS degrees), STRUCT('1975-76' AS years, t7.`1975-76` AS degrees), STRUCT('1980-81' AS years, t7.`1980-81` AS degrees), STRUCT('1985-86' AS years, t7.`1985-86` AS degrees), STRUCT('1990-91' AS years, t7.`1990-91` AS degrees), STRUCT('1995-96' AS years, t7.`1995-96` AS degrees), STRUCT('2000-01' AS years, t7.`2000-01` AS degrees), STRUCT('2005-06' AS years, t7.`2005-06` AS degrees), STRUCT('2010-11' AS years, t7.`2010-11` AS degrees), STRUCT('2011-12' AS years, t7.`2011-12` AS degrees), STRUCT('2012-13' AS years, t7.`2012-13` AS degrees), STRUCT('2013-14' AS years, t7.`2013-14` AS degrees), STRUCT('2014-15' AS years, t7.`2014-15` AS degrees), STRUCT('2015-16' AS years, t7.`2015-16` AS degrees), STRUCT('2016-17' AS years, t7.`2016-17` AS degrees), STRUCT('2017-18' AS years, t7.`2017-18` AS degrees), STRUCT('2018-19' AS years, t7.`2018-19` AS degrees), STRUCT('2019-20' AS years, t7.`2019-20` AS degrees)]
- )
- ) - 1
- )) AS pos
- CROSS JOIN UNNEST([STRUCT('1970-71' AS years, t7.`1970-71` AS degrees), STRUCT('1975-76' AS years, t7.`1975-76` AS degrees), STRUCT('1980-81' AS years, t7.`1980-81` AS degrees), STRUCT('1985-86' AS years, t7.`1985-86` AS degrees), STRUCT('1990-91' AS years, t7.`1990-91` AS degrees), STRUCT('1995-96' AS years, t7.`1995-96` AS degrees), STRUCT('2000-01' AS years, t7.`2000-01` AS degrees), STRUCT('2005-06' AS years, t7.`2005-06` AS degrees), STRUCT('2010-11' AS years, t7.`2010-11` AS degrees), STRUCT('2011-12' AS years, t7.`2011-12` AS degrees), STRUCT('2012-13' AS years, t7.`2012-13` AS degrees), STRUCT('2013-14' AS years, t7.`2013-14` AS degrees), STRUCT('2014-15' AS years, t7.`2014-15` AS degrees), STRUCT('2015-16' AS years, t7.`2015-16` AS degrees), STRUCT('2016-17' AS years, t7.`2016-17` AS degrees), STRUCT('2017-18' AS years, t7.`2017-18` AS degrees), STRUCT('2018-19' AS years, t7.`2018-19` AS degrees), STRUCT('2019-20' AS years, t7.`2019-20` AS degrees)]) AS `__pivoted__` WITH OFFSET AS pos_2
- WHERE
- pos = pos_2
- OR (
- pos > (
- ARRAY_LENGTH(
- [STRUCT('1970-71' AS years, t7.`1970-71` AS degrees), STRUCT('1975-76' AS years, t7.`1975-76` AS degrees), STRUCT('1980-81' AS years, t7.`1980-81` AS degrees), STRUCT('1985-86' AS years, t7.`1985-86` AS degrees), STRUCT('1990-91' AS years, t7.`1990-91` AS degrees), STRUCT('1995-96' AS years, t7.`1995-96` AS degrees), STRUCT('2000-01' AS years, t7.`2000-01` AS degrees), STRUCT('2005-06' AS years, t7.`2005-06` AS degrees), STRUCT('2010-11' AS years, t7.`2010-11` AS degrees), STRUCT('2011-12' AS years, t7.`2011-12` AS degrees), STRUCT('2012-13' AS years, t7.`2012-13` AS degrees), STRUCT('2013-14' AS years, t7.`2013-14` AS degrees), STRUCT('2014-15' AS years, t7.`2014-15` AS degrees), STRUCT('2015-16' AS years, t7.`2015-16` AS degrees), STRUCT('2016-17' AS years, t7.`2016-17` AS degrees), STRUCT('2017-18' AS years, t7.`2017-18` AS degrees), STRUCT('2018-19' AS years, t7.`2018-19` AS degrees), STRUCT('2019-20' AS years, t7.`2019-20` AS degrees)]
- ) - 1
- )
- AND pos_2 = (
- ARRAY_LENGTH(
- [STRUCT('1970-71' AS years, t7.`1970-71` AS degrees), STRUCT('1975-76' AS years, t7.`1975-76` AS degrees), STRUCT('1980-81' AS years, t7.`1980-81` AS degrees), STRUCT('1985-86' AS years, t7.`1985-86` AS degrees), STRUCT('1990-91' AS years, t7.`1990-91` AS degrees), STRUCT('1995-96' AS years, t7.`1995-96` AS degrees), STRUCT('2000-01' AS years, t7.`2000-01` AS degrees), STRUCT('2005-06' AS years, t7.`2005-06` AS degrees), STRUCT('2010-11' AS years, t7.`2010-11` AS degrees), STRUCT('2011-12' AS years, t7.`2011-12` AS degrees), STRUCT('2012-13' AS years, t7.`2012-13` AS degrees), STRUCT('2013-14' AS years, t7.`2013-14` AS degrees), STRUCT('2014-15' AS years, t7.`2014-15` AS degrees), STRUCT('2015-16' AS years, t7.`2015-16` AS degrees), STRUCT('2016-17' AS years, t7.`2016-17` AS degrees), STRUCT('2017-18' AS years, t7.`2017-18` AS degrees), STRUCT('2018-19' AS years, t7.`2018-19` AS degrees), STRUCT('2019-20' AS years, t7.`2019-20` AS degrees)]
- ) - 1
- )
- )
- ), t1 AS (
- SELECT
- t0.`field_of_study`,
- t0.`__pivoted__`.`years` AS `years`,
- t0.`__pivoted__`.`degrees` AS `degrees`
- FROM t0
- ), t2 AS (
- SELECT
- t1.*,
- first_value(t1.`degrees`) OVER (PARTITION BY t1.`field_of_study` ORDER BY t1.`years` ASC) AS `earliest_degrees`,
- last_value(t1.`degrees`) OVER (PARTITION BY t1.`field_of_study` ORDER BY t1.`years` ASC) AS `latest_degrees`
- FROM t1
- ), t3 AS (
- SELECT
- t2.*,
- t2.`latest_degrees` - t2.`earliest_degrees` AS `diff`
- FROM t2
- ), t4 AS (
+ SELECT
+ t5.field_of_study,
+ t5.diff
+ FROM (
SELECT
- t3.`field_of_study`,
- ANY_VALUE(t3.`diff`) AS `diff`
- FROM t3
+ t4.field_of_study,
+ ANY_VALUE(t4.diff) AS diff
+ FROM (
+ SELECT
+ t3.field_of_study,
+ t3.years,
+ t3.degrees,
+ t3.earliest_degrees,
+ t3.latest_degrees,
+ t3.latest_degrees - t3.earliest_degrees AS diff
+ FROM (
+ SELECT
+ t2.field_of_study,
+ t2.years,
+ t2.degrees,
+ first_value(t2.degrees) OVER (PARTITION BY t2.field_of_study ORDER BY t2.years ASC ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS earliest_degrees,
+ last_value(t2.degrees) OVER (PARTITION BY t2.field_of_study ORDER BY t2.years ASC ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS latest_degrees
+ FROM (
+ SELECT
+ t1.field_of_study,
+ t1.__pivoted__.years AS years,
+ t1.__pivoted__.degrees AS degrees
+ FROM (
+ SELECT
+ t0.field_of_study,
+ IF(pos = pos_2, __pivoted__, NULL) AS __pivoted__
+ FROM humanities AS t0
+ CROSS JOIN UNNEST(GENERATE_ARRAY(
+ 0,
+ GREATEST(
+ ARRAY_LENGTH(
+ [STRUCT('1970-71' AS years, t0.`1970-71` AS degrees), STRUCT('1975-76' AS years, t0.`1975-76` AS degrees), STRUCT('1980-81' AS years, t0.`1980-81` AS degrees), STRUCT('1985-86' AS years, t0.`1985-86` AS degrees), STRUCT('1990-91' AS years, t0.`1990-91` AS degrees), STRUCT('1995-96' AS years, t0.`1995-96` AS degrees), STRUCT('2000-01' AS years, t0.`2000-01` AS degrees), STRUCT('2005-06' AS years, t0.`2005-06` AS degrees), STRUCT('2010-11' AS years, t0.`2010-11` AS degrees), STRUCT('2011-12' AS years, t0.`2011-12` AS degrees), STRUCT('2012-13' AS years, t0.`2012-13` AS degrees), STRUCT('2013-14' AS years, t0.`2013-14` AS degrees), STRUCT('2014-15' AS years, t0.`2014-15` AS degrees), STRUCT('2015-16' AS years, t0.`2015-16` AS degrees), STRUCT('2016-17' AS years, t0.`2016-17` AS degrees), STRUCT('2017-18' AS years, t0.`2017-18` AS degrees), STRUCT('2018-19' AS years, t0.`2018-19` AS degrees), STRUCT('2019-20' AS years, t0.`2019-20` AS degrees)]
+ )
+ ) - 1
+ )) AS pos
+ CROSS JOIN UNNEST([STRUCT('1970-71' AS years, t0.`1970-71` AS degrees), STRUCT('1975-76' AS years, t0.`1975-76` AS degrees), STRUCT('1980-81' AS years, t0.`1980-81` AS degrees), STRUCT('1985-86' AS years, t0.`1985-86` AS degrees), STRUCT('1990-91' AS years, t0.`1990-91` AS degrees), STRUCT('1995-96' AS years, t0.`1995-96` AS degrees), STRUCT('2000-01' AS years, t0.`2000-01` AS degrees), STRUCT('2005-06' AS years, t0.`2005-06` AS degrees), STRUCT('2010-11' AS years, t0.`2010-11` AS degrees), STRUCT('2011-12' AS years, t0.`2011-12` AS degrees), STRUCT('2012-13' AS years, t0.`2012-13` AS degrees), STRUCT('2013-14' AS years, t0.`2013-14` AS degrees), STRUCT('2014-15' AS years, t0.`2014-15` AS degrees), STRUCT('2015-16' AS years, t0.`2015-16` AS degrees), STRUCT('2016-17' AS years, t0.`2016-17` AS degrees), STRUCT('2017-18' AS years, t0.`2017-18` AS degrees), STRUCT('2018-19' AS years, t0.`2018-19` AS degrees), STRUCT('2019-20' AS years, t0.`2019-20` AS degrees)]) AS __pivoted__ WITH OFFSET AS pos_2
+ WHERE
+ pos = pos_2
+ OR (
+ pos > (
+ ARRAY_LENGTH(
+ [STRUCT('1970-71' AS years, t0.`1970-71` AS degrees), STRUCT('1975-76' AS years, t0.`1975-76` AS degrees), STRUCT('1980-81' AS years, t0.`1980-81` AS degrees), STRUCT('1985-86' AS years, t0.`1985-86` AS degrees), STRUCT('1990-91' AS years, t0.`1990-91` AS degrees), STRUCT('1995-96' AS years, t0.`1995-96` AS degrees), STRUCT('2000-01' AS years, t0.`2000-01` AS degrees), STRUCT('2005-06' AS years, t0.`2005-06` AS degrees), STRUCT('2010-11' AS years, t0.`2010-11` AS degrees), STRUCT('2011-12' AS years, t0.`2011-12` AS degrees), STRUCT('2012-13' AS years, t0.`2012-13` AS degrees), STRUCT('2013-14' AS years, t0.`2013-14` AS degrees), STRUCT('2014-15' AS years, t0.`2014-15` AS degrees), STRUCT('2015-16' AS years, t0.`2015-16` AS degrees), STRUCT('2016-17' AS years, t0.`2016-17` AS degrees), STRUCT('2017-18' AS years, t0.`2017-18` AS degrees), STRUCT('2018-19' AS years, t0.`2018-19` AS degrees), STRUCT('2019-20' AS years, t0.`2019-20` AS degrees)]
+ ) - 1
+ )
+ AND pos_2 = (
+ ARRAY_LENGTH(
+ [STRUCT('1970-71' AS years, t0.`1970-71` AS degrees), STRUCT('1975-76' AS years, t0.`1975-76` AS degrees), STRUCT('1980-81' AS years, t0.`1980-81` AS degrees), STRUCT('1985-86' AS years, t0.`1985-86` AS degrees), STRUCT('1990-91' AS years, t0.`1990-91` AS degrees), STRUCT('1995-96' AS years, t0.`1995-96` AS degrees), STRUCT('2000-01' AS years, t0.`2000-01` AS degrees), STRUCT('2005-06' AS years, t0.`2005-06` AS degrees), STRUCT('2010-11' AS years, t0.`2010-11` AS degrees), STRUCT('2011-12' AS years, t0.`2011-12` AS degrees), STRUCT('2012-13' AS years, t0.`2012-13` AS degrees), STRUCT('2013-14' AS years, t0.`2013-14` AS degrees), STRUCT('2014-15' AS years, t0.`2014-15` AS degrees), STRUCT('2015-16' AS years, t0.`2015-16` AS degrees), STRUCT('2016-17' AS years, t0.`2016-17` AS degrees), STRUCT('2017-18' AS years, t0.`2017-18` AS degrees), STRUCT('2018-19' AS years, t0.`2018-19` AS degrees), STRUCT('2019-20' AS years, t0.`2019-20` AS degrees)]
+ ) - 1
+ )
+ )
+ ) AS t1
+ ) AS t2
+ ) AS t3
+ ) AS t4
GROUP BY
1
- ), t5 AS (
- SELECT
- t4.*
- FROM t4
- WHERE
- t4.`diff` < 0
- ), t7 AS (
- SELECT
- t5.*
- FROM t5
- ORDER BY
- t5.`diff` ASC
- ), t8 AS (
- SELECT
- t4.*
- FROM t4
- ORDER BY
- t4.`diff` DESC
- ), t9 AS (
- SELECT
- t5.*
- FROM t5
- ORDER BY
- t5.`diff` ASC
- LIMIT 10
- ), t10 AS (
- SELECT
- t4.*
- FROM t4
- ORDER BY
- t4.`diff` DESC
- LIMIT 10
- )
- SELECT
- *
- FROM t10
+ ) AS t5
+ ORDER BY
+ t5.diff DESC
+ LIMIT 10
UNION ALL
SELECT
- *
- FROM t9
-) AS t6
\\ No newline at end of file
+ t5.field_of_study,
+ t5.diff
+ FROM (
+ SELECT
+ t4.field_of_study,
+ ANY_VALUE(t4.diff) AS diff
+ FROM (
+ SELECT
+ t3.field_of_study,
+ t3.years,
+ t3.degrees,
+ t3.earliest_degrees,
+ t3.latest_degrees,
+ t3.latest_degrees - t3.earliest_degrees AS diff
+ FROM (
+ SELECT
+ t2.field_of_study,
+ t2.years,
+ t2.degrees,
+ first_value(t2.degrees) OVER (PARTITION BY t2.field_of_study ORDER BY t2.years ASC ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS earliest_degrees,
+ last_value(t2.degrees) OVER (PARTITION BY t2.field_of_study ORDER BY t2.years ASC ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS latest_degrees
+ FROM (
+ SELECT
+ t1.field_of_study,
+ t1.__pivoted__.years AS years,
+ t1.__pivoted__.degrees AS degrees
+ FROM (
+ SELECT
+ t0.field_of_study,
+ IF(pos = pos_2, __pivoted__, NULL) AS __pivoted__
+ FROM humanities AS t0
+ CROSS JOIN UNNEST(GENERATE_ARRAY(
+ 0,
+ GREATEST(
+ ARRAY_LENGTH(
+ [STRUCT('1970-71' AS years, t0.`1970-71` AS degrees), STRUCT('1975-76' AS years, t0.`1975-76` AS degrees), STRUCT('1980-81' AS years, t0.`1980-81` AS degrees), STRUCT('1985-86' AS years, t0.`1985-86` AS degrees), STRUCT('1990-91' AS years, t0.`1990-91` AS degrees), STRUCT('1995-96' AS years, t0.`1995-96` AS degrees), STRUCT('2000-01' AS years, t0.`2000-01` AS degrees), STRUCT('2005-06' AS years, t0.`2005-06` AS degrees), STRUCT('2010-11' AS years, t0.`2010-11` AS degrees), STRUCT('2011-12' AS years, t0.`2011-12` AS degrees), STRUCT('2012-13' AS years, t0.`2012-13` AS degrees), STRUCT('2013-14' AS years, t0.`2013-14` AS degrees), STRUCT('2014-15' AS years, t0.`2014-15` AS degrees), STRUCT('2015-16' AS years, t0.`2015-16` AS degrees), STRUCT('2016-17' AS years, t0.`2016-17` AS degrees), STRUCT('2017-18' AS years, t0.`2017-18` AS degrees), STRUCT('2018-19' AS years, t0.`2018-19` AS degrees), STRUCT('2019-20' AS years, t0.`2019-20` AS degrees)]
+ )
+ ) - 1
+ )) AS pos
+ CROSS JOIN UNNEST([STRUCT('1970-71' AS years, t0.`1970-71` AS degrees), STRUCT('1975-76' AS years, t0.`1975-76` AS degrees), STRUCT('1980-81' AS years, t0.`1980-81` AS degrees), STRUCT('1985-86' AS years, t0.`1985-86` AS degrees), STRUCT('1990-91' AS years, t0.`1990-91` AS degrees), STRUCT('1995-96' AS years, t0.`1995-96` AS degrees), STRUCT('2000-01' AS years, t0.`2000-01` AS degrees), STRUCT('2005-06' AS years, t0.`2005-06` AS degrees), STRUCT('2010-11' AS years, t0.`2010-11` AS degrees), STRUCT('2011-12' AS years, t0.`2011-12` AS degrees), STRUCT('2012-13' AS years, t0.`2012-13` AS degrees), STRUCT('2013-14' AS years, t0.`2013-14` AS degrees), STRUCT('2014-15' AS years, t0.`2014-15` AS degrees), STRUCT('2015-16' AS years, t0.`2015-16` AS degrees), STRUCT('2016-17' AS years, t0.`2016-17` AS degrees), STRUCT('2017-18' AS years, t0.`2017-18` AS degrees), STRUCT('2018-19' AS years, t0.`2018-19` AS degrees), STRUCT('2019-20' AS years, t0.`2019-20` AS degrees)]) AS __pivoted__ WITH OFFSET AS pos_2
+ WHERE
+ pos = pos_2
+ OR (
+ pos > (
+ ARRAY_LENGTH(
+ [STRUCT('1970-71' AS years, t0.`1970-71` AS degrees), STRUCT('1975-76' AS years, t0.`1975-76` AS degrees), STRUCT('1980-81' AS years, t0.`1980-81` AS degrees), STRUCT('1985-86' AS years, t0.`1985-86` AS degrees), STRUCT('1990-91' AS years, t0.`1990-91` AS degrees), STRUCT('1995-96' AS years, t0.`1995-96` AS degrees), STRUCT('2000-01' AS years, t0.`2000-01` AS degrees), STRUCT('2005-06' AS years, t0.`2005-06` AS degrees), STRUCT('2010-11' AS years, t0.`2010-11` AS degrees), STRUCT('2011-12' AS years, t0.`2011-12` AS degrees), STRUCT('2012-13' AS years, t0.`2012-13` AS degrees), STRUCT('2013-14' AS years, t0.`2013-14` AS degrees), STRUCT('2014-15' AS years, t0.`2014-15` AS degrees), STRUCT('2015-16' AS years, t0.`2015-16` AS degrees), STRUCT('2016-17' AS years, t0.`2016-17` AS degrees), STRUCT('2017-18' AS years, t0.`2017-18` AS degrees), STRUCT('2018-19' AS years, t0.`2018-19` AS degrees), STRUCT('2019-20' AS years, t0.`2019-20` AS degrees)]
+ ) - 1
+ )
+ AND pos_2 = (
+ ARRAY_LENGTH(
+ [STRUCT('1970-71' AS years, t0.`1970-71` AS degrees), STRUCT('1975-76' AS years, t0.`1975-76` AS degrees), STRUCT('1980-81' AS years, t0.`1980-81` AS degrees), STRUCT('1985-86' AS years, t0.`1985-86` AS degrees), STRUCT('1990-91' AS years, t0.`1990-91` AS degrees), STRUCT('1995-96' AS years, t0.`1995-96` AS degrees), STRUCT('2000-01' AS years, t0.`2000-01` AS degrees), STRUCT('2005-06' AS years, t0.`2005-06` AS degrees), STRUCT('2010-11' AS years, t0.`2010-11` AS degrees), STRUCT('2011-12' AS years, t0.`2011-12` AS degrees), STRUCT('2012-13' AS years, t0.`2012-13` AS degrees), STRUCT('2013-14' AS years, t0.`2013-14` AS degrees), STRUCT('2014-15' AS years, t0.`2014-15` AS degrees), STRUCT('2015-16' AS years, t0.`2015-16` AS degrees), STRUCT('2016-17' AS years, t0.`2016-17` AS degrees), STRUCT('2017-18' AS years, t0.`2017-18` AS degrees), STRUCT('2018-19' AS years, t0.`2018-19` AS degrees), STRUCT('2019-20' AS years, t0.`2019-20` AS degrees)]
+ ) - 1
+ )
+ )
+ ) AS t1
+ ) AS t2
+ ) AS t3
+ ) AS t4
+ GROUP BY
+ 1
+ ) AS t5
+ WHERE
+ t5.diff < 0
+ ORDER BY
+ t5.diff ASC NULLS LAST
+ LIMIT 10
+) AS t10
\\ No newline at end of file
diff --git a/test_client.py b/test_client.py
index 6efe9d7..6a2f4b9 100644
--- a/test_client.py
+++ b/test_client.py
@@ -190,13 +190,13 @@ def test_raw_sql(con):
def test_parted_column_rename(parted_alltypes):
assert "PARTITIONTIME" in parted_alltypes.columns
- assert "_PARTITIONTIME" in parted_alltypes.op().table.schema.names
+ assert "_PARTITIONTIME" in parted_alltypes.op().parent.schema.names
def test_scalar_param_partition_time(parted_alltypes):
assert "PARTITIONTIME" in parted_alltypes.columns
assert "PARTITIONTIME" in parted_alltypes.schema()
- param = ibis.param("timestamp").name("time_param")
+ param = ibis.param("timestamp('UTC')")
expr = parted_alltypes[param > parted_alltypes.PARTITIONTIME]
df = expr.execute(params={param: "2017-01-01"})
assert df.empty
diff --git a/test_udf_execute.py b/test_udf_execute.py
index 8c20171..6a07a57 100644
--- a/test_udf_execute.py
+++ b/test_udf_execute.py
@@ -9,7 +9,7 @@ from pytest import param
import ibis
import ibis.expr.datatypes as dt
-from ibis.backends.bigquery import udf
+from ibis import udf
PROJECT_ID = os.environ.get("GOOGLE_BIGQUERY_PROJECT_ID", "ibis-gbq")
DATASET_ID = "testing"
@@ -28,12 +28,8 @@ def df(alltypes):
def test_udf(alltypes, df):
- @udf(
- input_type=[dt.double, dt.double],
- output_type=dt.double,
- determinism=True,
- )
- def my_add(a, b):
+ @udf.scalar.python(determinism=True)
+ def my_add(a: float, b: float) -> float:
return a + b
expr = my_add(alltypes.double_col, alltypes.double_col)
@@ -49,13 +45,10 @@ def test_udf(alltypes, df):
def test_udf_with_struct(alltypes, df, snapshot):
- @udf(
- input_type=[dt.double, dt.double],
- output_type=dt.Struct.from_tuples(
- [("width", dt.double), ("height", dt.double)]
- ),
- )
- def my_struct_thing(a, b):
+ @udf.scalar.python
+ def my_struct_thing(a: float, b: float) -> dt.Struct(
+ {"width": float, "height": float}
+ ):
class Rectangle:
def __init__(self, width, height):
self.width = width
@@ -63,9 +56,6 @@ def test_udf_with_struct(alltypes, df, snapshot):
return Rectangle(a, b)
- result = my_struct_thing.sql
- snapshot.assert_match(result, "out.sql")
-
expr = my_struct_thing(alltypes.double_col, alltypes.double_col)
result = expr.execute()
assert not result.empty
@@ -75,12 +65,12 @@ def test_udf_with_struct(alltypes, df, snapshot):
def test_udf_compose(alltypes, df):
- @udf([dt.double], dt.double)
- def add_one(x):
+ @udf.scalar.python
+ def add_one(x: float) -> float:
return x + 1.0
- @udf([dt.double], dt.double)
- def times_two(x):
+ @udf.scalar.python
+ def times_two(x: float) -> float:
return x * 2.0
t = alltypes
@@ -91,8 +81,8 @@ def test_udf_compose(alltypes, df):
def test_udf_scalar(con):
- @udf([dt.double, dt.double], dt.double)
- def my_add(x, y):
+ @udf.scalar.python
+ def my_add(x: float, y: float) -> float:
return x + y
expr = my_add(1, 2)
@@ -101,29 +91,23 @@ def test_udf_scalar(con):
def test_multiple_calls_has_one_definition(con):
- @udf([dt.string], dt.double)
- def my_str_len(s):
+ @udf.scalar.python
+ def my_str_len(s: str) -> float:
return s.length
s = ibis.literal("abcd")
expr = my_str_len(s) + my_str_len(s)
- add = expr.op()
-
- # generated javascript is identical
- assert add.left.sql == add.right.sql
assert con.execute(expr) == 8.0
def test_udf_libraries(con):
- @udf(
- [dt.Array(dt.string)],
- dt.double,
+ @udf.scalar.python(
# whatever symbols are exported in the library are visible inside the
# UDF, in this case lodash defines _ and we use that here
- libraries=["gs://ibis-testing-libraries/lodash.min.js"],
+ libraries=("gs://ibis-testing-libraries/lodash.min.js",),
)
- def string_length(strings):
+ def string_length(strings: list[str]) -> float:
return _.sum(_.map(strings, lambda x: x.length)) # noqa: F821
raw_data = ["aaa", "bb", "c"]
@@ -135,45 +119,18 @@ def test_udf_libraries(con):
def test_udf_with_len(con):
- @udf([dt.string], dt.double)
- def my_str_len(x):
+ @udf.scalar.python
+ def my_str_len(x: str) -> float:
return len(x)
- @udf([dt.Array(dt.string)], dt.double)
- def my_array_len(x):
+ @udf.scalar.python
+ def my_array_len(x: list[str]) -> float:
return len(x)
assert con.execute(my_str_len("aaa")) == 3
assert con.execute(my_array_len(["aaa", "bb"])) == 2
[email protected](
- ("argument_type",),
- [
- param(
- dt.string,
- id="string",
- ),
- param(
- "ANY TYPE",
- id="string",
- ),
- ],
-)
-def test_udf_sql(con, argument_type):
- format_t = udf.sql(
- "format_t",
- params={"input": argument_type},
- output_type=dt.string,
- sql_expression="FORMAT('%T', input)",
- )
-
- s = ibis.literal("abcd")
- expr = format_t(s)
-
- con.execute(expr)
-
-
@pytest.mark.parametrize(
("value", "expected"),
[
diff --git a/index.sql b/index.sql
index e338353..7fab1e1 100644
--- a/index.sql
+++ b/index.sql
@@ -1,2 +1,2 @@
SELECT
- MOD(EXTRACT(DAYOFWEEK FROM CAST('2017-01-01' AS DATE)) + 5, 7) AS `DayOfWeekIndex_datetime_date_2017_ 1_ 1`
\\ No newline at end of file
+ mod(EXTRACT(dayofweek FROM DATE(2017, 1, 1)) + 5, 7) AS `DayOfWeekIndex_datetime_date_2017_ 1_ 1`
\\ No newline at end of file
diff --git a/name.sql b/name.sql
index b0fa531..3551de6 100644
--- a/name.sql
+++ b/name.sql
@@ -1,2 +1,2 @@
SELECT
- INITCAP(CAST(CAST('2017-01-01' AS DATE) AS STRING FORMAT 'DAY')) AS `DayOfWeekName_datetime_date_2017_ 1_ 1`
\\ No newline at end of file
+ INITCAP(CAST(DATE(2017, 1, 1) AS STRING FORMAT 'DAY')) AS `DayOfWeekName_datetime_date_2017_ 1_ 1`
\\ No newline at end of file
diff --git a/out_one_unnest.sql b/out_one_unnest.sql
index 48386fc..2f5c71f 100644
--- a/out_one_unnest.sql
+++ b/out_one_unnest.sql
@@ -1,16 +1,16 @@
SELECT
- t0.`rowindex`,
- IF(pos = pos_2, `repeated_struct_col`, NULL) AS `repeated_struct_col`
+ t0.rowindex,
+ IF(pos = pos_2, repeated_struct_col, NULL) AS repeated_struct_col
FROM array_test AS t0
-CROSS JOIN UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t0.`repeated_struct_col`)) - 1)) AS pos
-CROSS JOIN UNNEST(t0.`repeated_struct_col`) AS `repeated_struct_col` WITH OFFSET AS pos_2
+CROSS JOIN UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t0.repeated_struct_col)) - 1)) AS pos
+CROSS JOIN UNNEST(t0.repeated_struct_col) AS repeated_struct_col WITH OFFSET AS pos_2
WHERE
pos = pos_2
OR (
pos > (
- ARRAY_LENGTH(t0.`repeated_struct_col`) - 1
+ ARRAY_LENGTH(t0.repeated_struct_col) - 1
)
AND pos_2 = (
- ARRAY_LENGTH(t0.`repeated_struct_col`) - 1
+ ARRAY_LENGTH(t0.repeated_struct_col) - 1
)
)
\\ No newline at end of file
diff --git a/out_two_unnests.sql b/out_two_unnests.sql
index 4dcbfb9..76781af 100644
--- a/out_two_unnests.sql
+++ b/out_two_unnests.sql
@@ -1,32 +1,32 @@
SELECT
- IF(pos = pos_2, `level_two`, NULL) AS `level_two`
+ IF(pos = pos_2, level_two, NULL) AS level_two
FROM (
SELECT
- t1.`rowindex`,
- IF(pos = pos_2, `level_one`, NULL).`nested_struct_col` AS `level_one`
- FROM array_test AS t1
- CROSS JOIN UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t1.`repeated_struct_col`)) - 1)) AS pos
- CROSS JOIN UNNEST(t1.`repeated_struct_col`) AS `level_one` WITH OFFSET AS pos_2
+ t0.rowindex,
+ IF(pos = pos_2, level_one, NULL).nested_struct_col AS level_one
+ FROM array_test AS t0
+ CROSS JOIN UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t0.repeated_struct_col)) - 1)) AS pos
+ CROSS JOIN UNNEST(t0.repeated_struct_col) AS level_one WITH OFFSET AS pos_2
WHERE
pos = pos_2
OR (
pos > (
- ARRAY_LENGTH(t1.`repeated_struct_col`) - 1
+ ARRAY_LENGTH(t0.repeated_struct_col) - 1
)
AND pos_2 = (
- ARRAY_LENGTH(t1.`repeated_struct_col`) - 1
+ ARRAY_LENGTH(t0.repeated_struct_col) - 1
)
)
-) AS t0
-CROSS JOIN UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t0.`level_one`)) - 1)) AS pos
-CROSS JOIN UNNEST(t0.`level_one`) AS `level_two` WITH OFFSET AS pos_2
+) AS t1
+CROSS JOIN UNNEST(GENERATE_ARRAY(0, GREATEST(ARRAY_LENGTH(t1.level_one)) - 1)) AS pos
+CROSS JOIN UNNEST(t1.level_one) AS level_two WITH OFFSET AS pos_2
WHERE
pos = pos_2
OR (
pos > (
- ARRAY_LENGTH(t0.`level_one`) - 1
+ ARRAY_LENGTH(t1.level_one) - 1
)
AND pos_2 = (
- ARRAY_LENGTH(t0.`level_one`) - 1
+ ARRAY_LENGTH(t1.level_one) - 1
)
)
\\ No newline at end of file
diff --git a/test_compiler.py b/test_compiler.py
index 94f0081..774e1e3 100644
--- a/test_compiler.py
+++ b/test_compiler.py
@@ -1,7 +1,6 @@
from __future__ import annotations
import datetime
-import re
import time
from operator import floordiv, methodcaller, truediv
@@ -10,6 +9,7 @@ import pytest
from pytest import param
import ibis
+import ibis.common.exceptions as com
import ibis.expr.datatypes as dt
import ibis.expr.operations as ops
from ibis import _
@@ -233,7 +233,7 @@ def test_substring_neg_length():
t = ibis.table([("value", "string")], name="t")
expr = t["value"].substr(3, -1).name("tmp")
with pytest.raises(
- Exception, match=r"Length parameter must be a non-negative value\\."
+ Exception, match=r"Length parameter must be a non-negative value; got -1"
):
to_sql(expr)
@@ -387,10 +387,10 @@ def test_geospatial_simplify(snapshot):
def test_geospatial_simplify_error():
t = ibis.table([("geog", "geography")], name="t")
expr = t.geog.simplify(5.2, preserve_collapsed=True).name("tmp")
- with pytest.raises(Exception) as exception_info:
+ with pytest.raises(
+ Exception, match="simplify does not support preserving collapsed geometries"
+ ):
to_sql(expr)
- expected = "BigQuery simplify does not support preserving collapsed geometries, must pass preserve_collapsed=False"
- assert str(exception_info.value) == expected
def test_timestamp_accepts_date_literals(alltypes):
@@ -399,7 +399,7 @@ def test_timestamp_accepts_date_literals(alltypes):
expr = alltypes.mutate(param=p)
params = {p: date_string}
result = to_sql(expr, params=params)
- assert re.search(r"@param_\\d+ AS `param`", result) is not None
+ assert "2009-03-01T00:00:00" in result
@pytest.mark.parametrize("distinct", [True, False])
@@ -483,14 +483,18 @@ def test_range_window_function(alltypes, window, snapshot):
"preceding",
[
param(5, id="five"),
- param(ibis.interval(nanoseconds=1), id="nanos", marks=pytest.mark.xfail),
+ param(
+ ibis.interval(nanoseconds=1),
+ id="nanos",
+ marks=pytest.mark.xfail(raises=com.UnsupportedOperationError),
+ ),
param(ibis.interval(microseconds=1), id="micros"),
param(ibis.interval(seconds=1), id="seconds"),
param(ibis.interval(minutes=1), id="minutes"),
param(ibis.interval(hours=1), id="hours"),
param(ibis.interval(days=1), id="days"),
param(2 * ibis.interval(days=1), id="two_days"),
- param(ibis.interval(weeks=1), id="week", marks=pytest.mark.xfail),
+ param(ibis.interval(weeks=1), id="week"),
],
)
def test_trailing_range_window(alltypes, preceding, snapshot):
@@ -584,7 +588,7 @@ def test_scalar_param_scope(alltypes):
t = alltypes
param = ibis.param("timestamp")
result = to_sql(t.mutate(param=param), params={param: "2017-01-01"})
- assert re.search(r"@param_\\d+ AS `param`", result) is not None
+ assert "2017-01-01T00:00:00" in result
def test_cast_float_to_int(alltypes, snapshot):
diff --git a/test_builtin.py b/test_builtin.py
index ad30cf8..e040478 100644
--- a/test_builtin.py
+++ b/test_builtin.py
@@ -10,7 +10,7 @@ def farm_fingerprint(value: bytes) -> int:
...
[email protected](schema="bqutil.fn")
[email protected](schema="fn", database="bqutil")
def from_hex(value: str) -> int:
"""Community function to convert from hex string to integer.
diff --git a/test_usage.py b/test_usage.py
index e8166e4..601217b 100644
--- a/test_usage.py
+++ b/test_usage.py
@@ -1,120 +1,74 @@
from __future__ import annotations
+import re
+
import pytest
-from pytest import param
import ibis
+import ibis.common.exceptions as com
import ibis.expr.datatypes as dt
-from ibis.backends.bigquery import udf
-from ibis.backends.bigquery.udf import _udf_name_cache
-
+from ibis import udf
-def test_multiple_calls_redefinition(snapshot):
- _udf_name_cache.clear()
- @udf.python([dt.string], dt.double)
- def my_len(s):
+def test_multiple_calls_redefinition():
+ @udf.scalar.python
+ def my_len(s: str) -> float:
return s.length
s = ibis.literal("abcd")
expr = my_len(s) + my_len(s)
- @udf.python([dt.string], dt.double)
- def my_len(s):
+ @udf.scalar.python
+ def my_len(s: str) -> float:
return s.length + 1
expr = expr + my_len(s)
sql = ibis.bigquery.compile(expr)
- snapshot.assert_match(sql, "out.sql")
+ assert len(set(re.findall(r"my_len_(\\d+)", sql))) == 2
[email protected](
- ("determinism",),
- [
- param(True),
- param(False),
- param(None),
- ],
-)
-def test_udf_determinism(snapshot, determinism):
- _udf_name_cache.clear()
-
- @udf.python([dt.string], dt.double, determinism=determinism)
- def my_len(s):
[email protected]("determinism", [True, False, None])
+def test_udf_determinism(determinism):
+ @udf.scalar.python(determinism=determinism)
+ def my_len(s: str) -> float:
return s.length
s = ibis.literal("abcd")
expr = my_len(s)
sql = ibis.bigquery.compile(expr)
- snapshot.assert_match(sql, "out.sql")
-
-def test_udf_sql(snapshot):
- _udf_name_cache.clear()
-
- format_t = udf.sql(
- "format_t",
- params={"input": dt.string},
- output_type=dt.double,
- sql_expression="FORMAT('%T', input)",
- )
-
- s = ibis.literal("abcd")
- expr = format_t(s)
-
- sql = ibis.bigquery.compile(expr)
- snapshot.assert_match(sql, "out.sql")
+ if not determinism:
+ assert "NOT DETERMINISTIC" in sql
+ else:
+ assert "DETERMINISTIC" in sql and "NOT DETERMINISTIC" not in sql
@pytest.mark.parametrize(
("argument_type", "return_type"),
[
- param(
- dt.int64,
- dt.float64,
- marks=pytest.mark.xfail(raises=TypeError),
- id="int_float",
- ),
- param(
- dt.float64,
- dt.int64,
- marks=pytest.mark.xfail(raises=TypeError),
- id="float_int",
- ),
+ # invalid input type
+ (dt.int64, dt.float64),
+ # invalid return type
+ (dt.float64, dt.int64),
# complex argument type, valid return type
- param(
- dt.Array(dt.int64),
- dt.float64,
- marks=pytest.mark.xfail(raises=TypeError),
- id="array_int_float",
- ),
+ (dt.Array(dt.int64), dt.float64),
# valid argument type, complex invalid return type
- param(
- dt.float64,
- dt.Array(dt.int64),
- marks=pytest.mark.xfail(raises=TypeError),
- id="float_array_int",
- ),
+ (dt.float64, dt.Array(dt.int64)),
# both invalid
- param(
- dt.Array(dt.Array(dt.int64)),
- dt.int64,
- marks=pytest.mark.xfail(raises=TypeError),
- id="array_array_int_int",
- ),
+ (dt.Array(dt.Array(dt.int64)), dt.int64),
# struct type with nested integer, valid return type
- param(
- dt.Struct.from_tuples([("x", dt.Array(dt.int64))]),
- dt.float64,
- marks=pytest.mark.xfail(raises=TypeError),
- id="struct",
- ),
+ (dt.Struct({"x": dt.Array(dt.int64)}), dt.float64),
],
+ ids=str,
)
def test_udf_int64(argument_type, return_type):
# invalid argument type, valid return type
- @udf.python([argument_type], return_type)
- def my_int64_add(x):
- return 1.0
+ @udf.scalar.python(signature=((argument_type,), return_type))
+ def my_func(x):
+ return 1
+
+ expr = my_func(None)
+ with pytest.raises(com.UnsupportedBackendType):
+ ibis.bigquery.compile(expr)
diff --git a/core.py b/core.py
index be31c52..e96bc6d 100644
--- a/core.py
+++ b/core.py
@@ -10,7 +10,6 @@ import textwrap
from collections import ChainMap
from typing import Callable
-import ibis.expr.datatypes as dt
from ibis.backends.bigquery.udf.find import find_names
from ibis.backends.bigquery.udf.rewrite import rewrite
@@ -514,14 +513,11 @@ class PythonToJavaScriptTranslator:
if __name__ == "__main__":
- from ibis.backends.bigquery.udf import udf
+ import ibis
+ from ibis import udf
- @udf(
- input_type=[dt.double, dt.double, dt.int64],
- output_type=dt.Array(dt.double),
- strict=False,
- )
- def my_func(a, b, n):
+ @udf.scalar.python(strict=False)
+ def my_func(a: float, b: float, n: float) -> list[float]:
class Rectangle:
def __init__(self, width, height):
self.width = width
@@ -598,4 +594,4 @@ if __name__ == "__main__":
nnn = len(values)
return [sum(values) - a + b * y**-x, z, foo.width, nnn]
- print(my_func.sql) # noqa: T201
+ print(ibis.bigquery.compile(my_func(42.7, 13.2, 1))) # noqa: T201
diff --git a/test_aggregation.py b/test_aggregation.py
index 590965f..d0407d8 100644
--- a/test_aggregation.py
+++ b/test_aggregation.py
@@ -1374,7 +1374,9 @@ def test_group_concat(
.reset_index()
)
- backend.assert_frame_equal(result.fillna(pd.NA), expected.fillna(pd.NA))
+ backend.assert_frame_equal(
+ result.replace(np.nan, None), expected.replace(np.nan, None)
+ )
@pytest.mark.broken(
diff --git a/test_asof_join.py b/test_asof_join.py
index bb73178..3ba8d3c 100644
--- a/test_asof_join.py
+++ b/test_asof_join.py
@@ -90,6 +90,7 @@ def time_keyed_right(time_keyed_df2):
"pyspark",
"druid",
"impala",
+ "bigquery",
]
)
def test_asof_join(con, time_left, time_right, time_df1, time_df2, direction, op):
@@ -125,6 +126,7 @@ def test_asof_join(con, time_left, time_right, time_df1, time_df2, direction, op
"pyspark",
"druid",
"impala",
+ "bigquery",
]
)
def test_keyed_asof_join_with_tolerance(
diff --git a/test_generic.py b/test_generic.py
index 4fc2032..be5c214 100644
--- a/test_generic.py
+++ b/test_generic.py
@@ -1347,7 +1347,6 @@ def test_hexdigest(backend, alltypes):
[
"pandas",
"dask",
- "bigquery",
"mssql",
"oracle",
"risingwave",
@@ -1369,6 +1368,7 @@ def test_hexdigest(backend, alltypes):
1672531200,
marks=[
pytest.mark.notyet(["duckdb", "impala"], reason="casts to NULL"),
+ pytest.mark.notyet(["bigquery"], raises=GoogleBadRequest),
pytest.mark.notyet(["trino"], raises=TrinoUserError),
pytest.mark.broken(
["druid"], reason="casts to 1672531200000 (millisecond)"
@@ -1393,7 +1393,6 @@ def test_try_cast(con, from_val, to_type, expected):
@pytest.mark.notimpl(
[
- "bigquery",
"dask",
"datafusion",
"druid",
@@ -1419,6 +1418,7 @@ def test_try_cast(con, from_val, to_type, expected):
pytest.mark.never(
["clickhouse", "pyspark"], reason="casts to 1672531200"
),
+ pytest.mark.notyet(["bigquery"], raises=GoogleBadRequest),
pytest.mark.notyet(["trino"], raises=TrinoUserError),
pytest.mark.broken(["polars"], reason="casts to 1672531200000000000"),
],
@@ -1434,7 +1434,6 @@ def test_try_cast_null(con, from_val, to_type):
[
"pandas",
"dask",
- "bigquery",
"datafusion",
"druid",
"mssql",
@@ -1464,7 +1463,6 @@ def test_try_cast_table(backend, con):
[
"pandas",
"dask",
- "bigquery",
"datafusion",
"mssql",
"mysql",
@@ -1490,6 +1488,7 @@ def test_try_cast_table(backend, con):
["clickhouse", "polars", "flink", "pyspark"],
reason="casts this to to a number",
),
+ pytest.mark.notyet(["bigquery"], raises=GoogleBadRequest),
pytest.mark.notyet(["trino"], raises=TrinoUserError),
],
id="datetime-to-float",
@@ -1797,7 +1796,6 @@ def test_dynamic_table_slice_with_computed_offset(backend):
@pytest.mark.notimpl(
[
- "bigquery",
"druid",
"flink",
"polars",
@@ -1827,7 +1825,6 @@ def test_sample(backend):
@pytest.mark.notimpl(
[
- "bigquery",
"druid",
"flink",
"polars",
diff --git a/test_numeric.py b/test_numeric.py
index 54ca961..b0d53d9 100644
--- a/test_numeric.py
+++ b/test_numeric.py
@@ -395,7 +395,6 @@ def test_numeric_literal(con, backend, expr, expected_types):
ibis.literal(decimal.Decimal("Infinity"), type=dt.decimal),
# TODO(krzysztof-kwitt): Should we unify it?
{
- "bigquery": float("inf"),
"sqlite": float("inf"),
"risingwave": float("nan"),
"postgres": decimal.Decimal("Infinity"),
@@ -406,7 +405,6 @@ def test_numeric_literal(con, backend, expr, expected_types):
"duckdb": float("inf"),
},
{
- "bigquery": "FLOAT64",
"sqlite": "real",
"postgres": "numeric",
"risingwave": "numeric",
@@ -465,6 +463,7 @@ def test_numeric_literal(con, backend, expr, expected_types):
"infinity is not allowed as a decimal value",
raises=SnowflakeProgrammingError,
),
+ pytest.mark.notyet(["bigquery"], raises=GoogleBadRequest),
],
id="decimal-infinity+",
),
@@ -472,7 +471,6 @@ def test_numeric_literal(con, backend, expr, expected_types):
ibis.literal(decimal.Decimal("-Infinity"), type=dt.decimal),
# TODO(krzysztof-kwitt): Should we unify it?
{
- "bigquery": float("-inf"),
"sqlite": float("-inf"),
"risingwave": float("nan"),
"postgres": decimal.Decimal("-Infinity"),
@@ -483,7 +481,6 @@ def test_numeric_literal(con, backend, expr, expected_types):
"duckdb": float("-inf"),
},
{
- "bigquery": "FLOAT64",
"sqlite": "real",
"postgres": "numeric",
"risingwave": "numeric",
@@ -542,6 +539,7 @@ def test_numeric_literal(con, backend, expr, expected_types):
raises=TrinoUserError,
reason="can't cast infinity to decimal",
),
+ pytest.mark.notyet(["bigquery"], raises=GoogleBadRequest),
],
id="decimal-infinity-",
),
@@ -629,6 +627,7 @@ def test_numeric_literal(con, backend, expr, expected_types):
raises=TrinoUserError,
reason="can't cast nan to decimal",
),
+ pytest.mark.notyet(["bigquery"], raises=GoogleBadRequest),
],
id="decimal-NaN",
),
diff --git a/test_param.py b/test_param.py
index 61c3746..e7ae254 100644
--- a/test_param.py
+++ b/test_param.py
@@ -12,7 +12,7 @@ from pytest import param
import ibis
import ibis.expr.datatypes as dt
from ibis import _
-from ibis.backends.tests.errors import GoogleBadRequest, Py4JJavaError
+from ibis.backends.tests.errors import Py4JJavaError
@pytest.mark.parametrize(
@@ -144,42 +144,21 @@ def test_scalar_param_map(con):
"timestamp",
"timestamp_col",
id="string_timestamp",
- marks=[
- pytest.mark.notimpl(["druid"]),
- pytest.mark.broken(
- ["bigquery"],
- raises=GoogleBadRequest,
- reason="No matching for operator = for argument types: DATETIME, TIMESTAMP",
- ),
- ],
+ marks=[pytest.mark.notimpl(["druid"])],
),
param(
datetime.date(2009, 1, 20),
"timestamp",
"timestamp_col",
id="date_timestamp",
- marks=[
- pytest.mark.notimpl(["druid"]),
- pytest.mark.broken(
- ["bigquery"],
- raises=GoogleBadRequest,
- reason="No matching for operator = for argument types: DATETIME, TIMESTAMP",
- ),
- ],
+ marks=[pytest.mark.notimpl(["druid"])],
),
param(
datetime.datetime(2009, 1, 20, 1, 2, 3),
"timestamp",
"timestamp_col",
id="datetime_timestamp",
- marks=[
- pytest.mark.notimpl(["druid"]),
- pytest.mark.broken(
- ["bigquery"],
- raises=GoogleBadRequest,
- reason="No matching for operator = for argument types: DATETIME, TIMESTAMP",
- ),
- ],
+ marks=[pytest.mark.notimpl(["druid"])],
),
],
)
diff --git a/test_sql.py b/test_sql.py
index 04fd680..e2b6d4b 100644
--- a/test_sql.py
+++ b/test_sql.py
@@ -61,7 +61,7 @@ def test_literal(backend, expr):
assert ibis.to_sql(expr, dialect=backend.name())
[email protected](["pandas", "dask", "polars", "pyspark"], reason="not SQL")
[email protected](["pandas", "dask", "polars"], reason="not SQL")
@pytest.mark.xfail_version(
mssql=["sqlalchemy>=2"], reason="sqlalchemy 2 prefixes literals with `N`"
)
@@ -103,7 +103,7 @@ def test_cte_refs_in_topo_order(backend, snapshot):
snapshot.assert_match(sql, "out.sql")
[email protected](["pandas", "dask", "polars", "pyspark"], reason="not SQL")
[email protected](["pandas", "dask", "polars"], reason="not SQL")
def test_isin_bug(con, snapshot):
t = ibis.table(dict(x="int"), name="t")
good = t[t.x > 2].x
diff --git a/test_string.py b/test_string.py
index 04d45ad..fcae4d9 100644
--- a/test_string.py
+++ b/test_string.py
@@ -1000,7 +1000,6 @@ def test_multiple_subs(con):
@pytest.mark.notimpl(
[
- "bigquery",
"clickhouse",
"dask",
"datafusion",
diff --git a/test_temporal.py b/test_temporal.py
index de80b63..51b33be 100644
--- a/test_temporal.py
+++ b/test_temporal.py
@@ -606,11 +606,6 @@ def test_date_truncate(backend, alltypes, df, unit):
pd.offsets.DateOffset,
# TODO - DateOffset - #2553
marks=[
- pytest.mark.notimpl(
- ["bigquery"],
- raises=com.UnsupportedOperationError,
- reason="BigQuery does not allow binary operation TIMESTAMP_ADD with INTERVAL offset D",
- ),
pytest.mark.notimpl(
["polars"],
raises=TypeError,
@@ -634,11 +629,6 @@ def test_date_truncate(backend, alltypes, df, unit):
pd.offsets.DateOffset,
# TODO - DateOffset - #2553
marks=[
- pytest.mark.notimpl(
- ["bigquery"],
- raises=com.UnsupportedOperationError,
- reason="BigQuery does not allow binary operation TIMESTAMP_ADD with INTERVAL offset M",
- ),
pytest.mark.notimpl(
["dask"],
raises=ValueError,
@@ -661,11 +651,6 @@ def test_date_truncate(backend, alltypes, df, unit):
pd.offsets.DateOffset,
# TODO - DateOffset - #2553
marks=[
- pytest.mark.notimpl(
- ["bigquery"],
- raises=com.UnsupportedOperationError,
- reason="BigQuery does not allow extracting date part `IntervalUnit.WEEK` from intervals",
- ),
pytest.mark.notimpl(
["dask"],
raises=ValueError,
diff --git a/test_udf.py b/test_udf.py
index 61d4579..6c28f93 100644
--- a/test_udf.py
+++ b/test_udf.py
@@ -37,7 +37,7 @@ def test_udf(batting):
batting = batting.limit(100)
nvowels = num_vowels(batting.playerID)
assert nvowels.op().__module__ == __name__
- assert type(nvowels.op()).__qualname__ == "num_vowels"
+ assert type(nvowels.op()).__qualname__.startswith("num_vowels")
expr = batting.group_by(id_len=nvowels).agg(n=_.count())
result = expr.execute()
diff --git a/test_window.py b/test_window.py
index 2d8e590..b024ce9 100644
--- a/test_window.py
+++ b/test_window.py
@@ -719,7 +719,7 @@ def test_simple_ungrouped_window_with_scalar_order_by(alltypes):
reason="Window operations are unsupported in the dask backend",
),
pytest.mark.broken(
- ["bigquery", "flink", "impala"],
+ ["flink", "impala"],
reason="default window semantics are different",
raises=AssertionError,
),
@@ -1306,17 +1306,12 @@ def test_rank_followed_by_over_call_merge_frames(backend, alltypes, df):
)
@pytest.mark.notimpl(["polars"], raises=com.OperationNotDefinedError)
@pytest.mark.notyet(["flink"], raises=com.UnsupportedOperationError)
[email protected](
- ["pandas"],
- raises=TypeError,
- reason="pandas rank impl cannot handle compound sort keys with null",
-)
@pytest.mark.notimpl(
["risingwave"],
raises=sa.exc.InternalError,
reason="Feature is not yet implemented: Window function with empty PARTITION BY is not supported yet",
)
-def test_ordering_order(con):
+def test_windowed_order_by_sequence_is_preserved(con):
table = ibis.memtable({"bool_col": [True, False, False, None, True]})
window = ibis.window(
order_by=[
diff --git a/udf.py b/udf.py
index 9c4214b..a947ca1 100644
--- a/udf.py
+++ b/udf.py
@@ -1,9 +1,11 @@
from __future__ import annotations
import abc
+import collections
import enum
import functools
import inspect
+import itertools
import typing
from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar, overload
@@ -20,12 +22,24 @@ from ibis.common.collections import FrozenDict
from ibis.common.deferred import deferrable
if TYPE_CHECKING:
+ from collections.abc import Iterable, MutableMapping
+
import ibis.expr.types as ir
EMPTY = inspect.Parameter.empty
+_udf_name_cache: MutableMapping[
+ type[ops.Node], Iterable[int]
+] = collections.defaultdict(itertools.count)
+
+
+def _make_udf_name(name: str) -> str:
+ definition = next(_udf_name_cache[name])
+ return f"{name}_{definition:d}"
+
+
@enum.unique
class InputType(enum.Enum):
BUILTIN = enum.auto()
@@ -88,6 +102,7 @@ class _UDF(abc.ABC):
input_type: InputType,
name: str | None = None,
schema: str | None = None,
+ database: str | None = None,
signature: tuple[tuple, Any] | None = None,
**kwargs,
) -> type[S]:
@@ -124,13 +139,13 @@ class _UDF(abc.ABC):
# method
"__func__": property(fget=lambda _, fn=fn: fn),
"__config__": FrozenDict(kwargs),
- "__udf_namespace__": schema,
+ "__udf_namespace__": ops.Namespace(schema=schema, database=database),
"__module__": fn.__module__,
"__func_name__": func_name,
}
)
- return type(fn.__name__, (cls._base,), fields)
+ return type(_make_udf_name(fn.__name__), (cls._base,), fields)
@classmethod
def _make_wrapper(
@@ -168,6 +183,7 @@ class scalar(_UDF):
*,
name: str | None = None,
schema: str | None = None,
+ database: str | None = None,
signature: tuple[tuple[Any, ...], Any] | None = None,
**kwargs: Any,
) -> Callable[[Callable], Callable[..., ir.Value]]:
@@ -175,7 +191,9 @@ class scalar(_UDF):
@util.experimental
@classmethod
- def builtin(cls, fn=None, *, name=None, schema=None, signature=None, **kwargs):
+ def builtin(
+ cls, fn=None, *, name=None, schema=None, database=None, signature=None, **kwargs
+ ):
"""Construct a scalar user-defined function that is built-in to the backend.
Parameters
@@ -186,6 +204,8 @@ class scalar(_UDF):
The name of the UDF in the backend if different from the function name.
schema
The schema in which the builtin function resides.
+ database
+ The database in which the builtin function resides.
signature
If present, a tuple of the form `((arg0type, arg1type, ...), returntype)`.
For example, a function taking an int and a float and returning a
@@ -215,6 +235,7 @@ class scalar(_UDF):
fn,
name=name,
schema=schema,
+ database=database,
signature=signature,
**kwargs,
)
@@ -231,6 +252,7 @@ class scalar(_UDF):
*,
name: str | None = None,
schema: str | None = None,
+ database: str | None = None,
signature: tuple[tuple[Any, ...], Any] | None = None,
**kwargs: Any,
) -> Callable[[Callable], Callable[..., ir.Value]]:
@@ -238,7 +260,9 @@ class scalar(_UDF):
@util.experimental
@classmethod
- def python(cls, fn=None, *, name=None, schema=None, signature=None, **kwargs):
+ def python(
+ cls, fn=None, *, name=None, schema=None, database=None, signature=None, **kwargs
+ ):
"""Construct a **non-vectorized** scalar user-defined function that accepts Python scalar values as inputs.
::: {.callout-warning collapse="true"}
@@ -262,6 +286,8 @@ class scalar(_UDF):
The name of the UDF in the backend if different from the function name.
schema
The schema in which to create the UDF.
+ database
+ The database in which to create the UDF.
signature
If present, a tuple of the form `((arg0type, arg1type, ...), returntype)`.
For example, a function taking an int and a float and returning a
@@ -292,6 +318,7 @@ class scalar(_UDF):
fn,
name=name,
schema=schema,
+ database=database,
signature=signature,
**kwargs,
)
@@ -308,6 +335,7 @@ class scalar(_UDF):
*,
name: str | None = None,
schema: str | None = None,
+ database: str | None = None,
signature: tuple[tuple[Any, ...], Any] | None = None,
**kwargs: Any,
) -> Callable[[Callable], Callable[..., ir.Value]]:
@@ -315,7 +343,9 @@ class scalar(_UDF):
@util.experimental
@classmethod
- def pandas(cls, fn=None, *, name=None, schema=None, signature=None, **kwargs):
+ def pandas(
+ cls, fn=None, *, name=None, schema=None, database=None, signature=None, **kwargs
+ ):
"""Construct a **vectorized** scalar user-defined function that accepts pandas Series' as inputs.
Parameters
@@ -326,6 +356,8 @@ class scalar(_UDF):
The name of the UDF in the backend if different from the function name.
schema
The schema in which to create the UDF.
+ database
+ The database in which to create the UDF.
signature
If present, a tuple of the form `((arg0type, arg1type, ...), returntype)`.
For example, a function taking an int and a float and returning a
@@ -358,6 +390,7 @@ class scalar(_UDF):
fn,
name=name,
schema=schema,
+ database=database,
signature=signature,
**kwargs,
)
@@ -374,6 +407,7 @@ class scalar(_UDF):
*,
name: str | None = None,
schema: str | None = None,
+ database: str | None = None,
signature: tuple[tuple[Any, ...], Any] | None = None,
**kwargs: Any,
) -> Callable[[Callable], Callable[..., ir.Value]]:
@@ -381,7 +415,9 @@ class scalar(_UDF):
@util.experimental
@classmethod
- def pyarrow(cls, fn=None, *, name=None, schema=None, signature=None, **kwargs):
+ def pyarrow(
+ cls, fn=None, *, name=None, schema=None, database=None, signature=None, **kwargs
+ ):
"""Construct a **vectorized** scalar user-defined function that accepts PyArrow Arrays as input.
Parameters
@@ -392,6 +428,8 @@ class scalar(_UDF):
The name of the UDF in the backend if different from the function name.
schema
The schema in which to create the UDF.
+ database
+ The database in which to create the UDF.
signature
If present, a tuple of the form `((arg0type, arg1type, ...), returntype)`.
For example, a function taking an int and a float and returning a
@@ -423,6 +461,7 @@ class scalar(_UDF):
fn,
name=name,
schema=schema,
+ database=database,
signature=signature,
**kwargs,
)
@@ -446,6 +485,7 @@ class agg(_UDF):
*,
name: str | None = None,
schema: str | None = None,
+ database: str | None = None,
signature: tuple[tuple[Any, ...], Any] | None = None,
**kwargs: Any,
) -> Callable[[Callable], Callable[..., ir.Value]]:
@@ -453,7 +493,9 @@ class agg(_UDF):
@util.experimental
@classmethod
- def builtin(cls, fn=None, *, name=None, schema=None, signature=None, **kwargs):
+ def builtin(
+ cls, fn=None, *, name=None, schema=None, database=None, signature=None, **kwargs
+ ):
"""Construct an aggregate user-defined function that is built-in to the backend.
Parameters
@@ -464,6 +506,8 @@ class agg(_UDF):
The name of the UDF in the backend if different from the function name.
schema
The schema in which the builtin function resides.
+ database
+ The database in which the builtin function resides.
signature
If present, a tuple of the form `((arg0type, arg1type, ...), returntype)`.
For example, a function taking an int and a float and returning a
@@ -490,6 +534,7 @@ class agg(_UDF):
fn,
name=name,
schema=schema,
+ database=database,
signature=signature,
**kwargs,
)
|
|
feat(api): add `relocate` table expression API for moving columns around based on selectors
|
ee8a86f86e436cb33107e20bb8376b924a419bb3
|
feat
|
https://github.com/rohankumardubey/ibis/commit/ee8a86f86e436cb33107e20bb8376b924a419bb3
|
add `relocate` table expression API for moving columns around based on selectors
|
diff --git a/relations.py b/relations.py
index 5b03bfd..1a16807 100644
--- a/relations.py
+++ b/relations.py
@@ -3609,6 +3609,189 @@ class Table(Expr, _FixedTextJupyterMixin):
return self.group_by(id_cols).aggregate(**aggs)
+ def relocate(
+ self,
+ *columns: str | s.Selector,
+ before: str | s.Selector | None = None,
+ after: str | s.Selector | None = None,
+ **kwargs: str,
+ ) -> Table:
+ """Relocate `columns` before or after other specified columns.
+
+ Parameters
+ ----------
+ columns
+ Columns to relocate. Selectors are accepted.
+ before
+ A column name or selector to insert the new columns before.
+ after
+ A column name or selector. Columns in `columns` are relocated after the last
+ column selected in `after`.
+ kwargs
+ Additional column names to relocate, renaming argument values to
+ keyword argument names.
+
+ Returns
+ -------
+ Table
+ A table with the columns relocated.
+
+ Examples
+ --------
+ >>> import ibis
+ >>> ibis.options.interactive = True
+ >>> import ibis.selectors as s
+ >>> t = ibis.memtable(dict(a=[1], b=[1], c=[1], d=["a"], e=["a"], f=["a"]))
+ >>> t
+ ┏━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━┳━━━━━━━━┓
+ ┃ a ┃ b ┃ c ┃ d ┃ e ┃ f ┃
+ ┡━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━╇━━━━━━━━┩
+ │ int64 │ int64 │ int64 │ string │ string │ string │
+ ├───────┼───────┼───────┼────────┼────────┼────────┤
+ │ 1 │ 1 │ 1 │ a │ a │ a │
+ └───────┴───────┴───────┴────────┴────────┴────────┘
+ >>> t.relocate("f")
+ ┏━━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━┓
+ ┃ f ┃ a ┃ b ┃ c ┃ d ┃ e ┃
+ ┡━━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━┩
+ │ string │ int64 │ int64 │ int64 │ string │ string │
+ ├────────┼───────┼───────┼───────┼────────┼────────┤
+ │ a │ 1 │ 1 │ 1 │ a │ a │
+ └────────┴───────┴───────┴───────┴────────┴────────┘
+ >>> t.relocate("a", after="c")
+ ┏━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━┳━━━━━━━━┓
+ ┃ b ┃ c ┃ a ┃ d ┃ e ┃ f ┃
+ ┡━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━╇━━━━━━━━┩
+ │ int64 │ int64 │ int64 │ string │ string │ string │
+ ├───────┼───────┼───────┼────────┼────────┼────────┤
+ │ 1 │ 1 │ 1 │ a │ a │ a │
+ └───────┴───────┴───────┴────────┴────────┴────────┘
+ >>> t.relocate("f", before="b")
+ ┏━━━━━━━┳━━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━┓
+ ┃ a ┃ f ┃ b ┃ c ┃ d ┃ e ┃
+ ┡━━━━━━━╇━━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━┩
+ │ int64 │ string │ int64 │ int64 │ string │ string │
+ ├───────┼────────┼───────┼───────┼────────┼────────┤
+ │ 1 │ a │ 1 │ 1 │ a │ a │
+ └───────┴────────┴───────┴───────┴────────┴────────┘
+ >>> t.relocate("a", after=s.last())
+ ┏━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━┳━━━━━━━━┳━━━━━━━┓
+ ┃ b ┃ c ┃ d ┃ e ┃ f ┃ a ┃
+ ┡━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━╇━━━━━━━━╇━━━━━━━┩
+ │ int64 │ int64 │ string │ string │ string │ int64 │
+ ├───────┼───────┼────────┼────────┼────────┼───────┤
+ │ 1 │ 1 │ a │ a │ a │ 1 │
+ └───────┴───────┴────────┴────────┴────────┴───────┘
+
+ Relocate allows renaming
+
+ >>> t.relocate(ff="f")
+ ┏━━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━┓
+ ┃ ff ┃ a ┃ b ┃ c ┃ d ┃ e ┃
+ ┡━━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━┩
+ │ string │ int64 │ int64 │ int64 │ string │ string │
+ ├────────┼───────┼───────┼───────┼────────┼────────┤
+ │ a │ 1 │ 1 │ 1 │ a │ a │
+ └────────┴───────┴───────┴───────┴────────┴────────┘
+
+ You can relocate based on any predicate selector, such as
+ [`of_type`][ibis.selectors.of_type]
+
+ >>> t.relocate(s.of_type("string"))
+ ┏━━━━━━━━┳━━━━━━━━┳━━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━┓
+ ┃ d ┃ e ┃ f ┃ a ┃ b ┃ c ┃
+ ┡━━━━━━━━╇━━━━━━━━╇━━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━┩
+ │ string │ string │ string │ int64 │ int64 │ int64 │
+ ├────────┼────────┼────────┼───────┼───────┼───────┤
+ │ a │ a │ a │ 1 │ 1 │ 1 │
+ └────────┴────────┴────────┴───────┴───────┴───────┘
+ >>> t.relocate(s.numeric(), after=s.last())
+ ┏━━━━━━━━┳━━━━━━━━┳━━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━┓
+ ┃ d ┃ e ┃ f ┃ a ┃ b ┃ c ┃
+ ┡━━━━━━━━╇━━━━━━━━╇━━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━┩
+ │ string │ string │ string │ int64 │ int64 │ int64 │
+ ├────────┼────────┼────────┼───────┼───────┼───────┤
+ │ a │ a │ a │ 1 │ 1 │ 1 │
+ └────────┴────────┴────────┴───────┴───────┴───────┘
+ >>> t.relocate(s.any_of(s.c(*"ae")))
+ ┏━━━━━━━┳━━━━━━━━┳━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━┓
+ ┃ a ┃ e ┃ b ┃ c ┃ d ┃ f ┃
+ ┡━━━━━━━╇━━━━━━━━╇━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━┩
+ │ int64 │ string │ int64 │ int64 │ string │ string │
+ ├───────┼────────┼───────┼───────┼────────┼────────┤
+ │ 1 │ a │ 1 │ 1 │ a │ a │
+ └───────┴────────┴───────┴───────┴────────┴────────┘
+
+ When multiple columns are selected with `before` or `after`, those
+ selected columns are moved before and after the `selectors` input
+
+ >>> t = ibis.memtable(dict(a=[1], b=["a"], c=[1], d=["a"]))
+ >>> t.relocate(s.numeric(), after=s.of_type("string"))
+ ┏━━━━━━━━┳━━━━━━━━┳━━━━━━━┳━━━━━━━┓
+ ┃ b ┃ d ┃ a ┃ c ┃
+ ┡━━━━━━━━╇━━━━━━━━╇━━━━━━━╇━━━━━━━┩
+ │ string │ string │ int64 │ int64 │
+ ├────────┼────────┼───────┼───────┤
+ │ a │ a │ 1 │ 1 │
+ └────────┴────────┴───────┴───────┘
+ >>> t.relocate(s.numeric(), before=s.of_type("string"))
+ ┏━━━━━━━┳━━━━━━━┳━━━━━━━━┳━━━━━━━━┓
+ ┃ a ┃ c ┃ b ┃ d ┃
+ ┡━━━━━━━╇━━━━━━━╇━━━━━━━━╇━━━━━━━━┩
+ │ int64 │ int64 │ string │ string │
+ ├───────┼───────┼────────┼────────┤
+ │ 1 │ 1 │ a │ a │
+ └───────┴───────┴────────┴────────┘
+ """
+ import ibis.selectors as s
+
+ if not columns and before is None and after is None and not kwargs:
+ raise com.IbisInputError(
+ "At least one selector or `before` or `after` must be provided"
+ )
+
+ if before is not None and after is not None:
+ raise com.IbisInputError("Cannot specify both `before` and `after`")
+
+ sels = {}
+ table_columns = self.columns
+
+ for name, sel in itertools.chain(
+ zip(itertools.repeat(None), map(s._to_selector, columns)),
+ zip(kwargs.keys(), map(s._to_selector, kwargs.values())),
+ ):
+ for pos in sel.positions(self):
+ if pos in sels:
+ # make sure the last duplicate column wins by reinserting
+ # the position if it already exists
+ del sels[pos]
+ sels[pos] = name if name is not None else table_columns[pos]
+
+ ncols = len(table_columns)
+
+ if before is not None:
+ where = min(s._to_selector(before).positions(self), default=0)
+ elif after is not None:
+ where = max(s._to_selector(after).positions(self), default=ncols - 1) + 1
+ else:
+ assert before is None and after is None
+ where = 0
+
+ # all columns that should come BEFORE the matched selectors
+ front = [left for left in range(where) if left not in sels]
+
+ # all columns that should come AFTER the matched selectors
+ back = [right for right in range(where, ncols) if right not in sels]
+
+ # selected columns
+ middle = [self[i].name(name) for i, name in sels.items()]
+
+ relocated = self.select(*front, *middle, *back)
+
+ assert len(relocated.columns) == ncols
+
+ return relocated
+
@public
class CachedTable(Table):
diff --git a/selectors.py b/selectors.py
index d634066..49d7269 100644
--- a/selectors.py
+++ b/selectors.py
@@ -73,7 +73,7 @@ class Selector(Concrete):
@abc.abstractmethod
def expand(self, table: ir.Table) -> Sequence[ir.Value]:
- """Expand `table` into a sequence of value expressions.
+ """Expand `table` into value expressions that match the selector.
Parameters
----------
@@ -83,9 +83,26 @@ class Selector(Concrete):
Returns
-------
Sequence[Value]
- A sequence of value expressions
+ A sequence of value expressions that match the selector
"""
+ def positions(self, table: ir.Table) -> Sequence[int]:
+ """Expand `table` into column indices that match the selector.
+
+ Parameters
+ ----------
+ table
+ An ibis table expression
+
+ Returns
+ -------
+ Sequence[int]
+ A sequence of column indices where the selector matches
+ """
+ raise NotImplementedError(
+ f"`positions` doesn't make sense for {self.__class__.__name__} selector"
+ )
+
class Predicate(Selector):
predicate: Callable[[ir.Value], bool]
@@ -100,6 +117,11 @@ class Predicate(Selector):
"""
return [col for column in table.columns if self.predicate(col := table[column])]
+ def positions(self, table: ir.Table) -> Sequence[int]:
+ return [
+ i for i, column in enumerate(table.columns) if self.predicate(table[column])
+ ]
+
def __and__(self, other: Selector) -> Predicate:
"""Compute the conjunction of two `Selector`s.
diff --git a/test_relocate.py b/test_relocate.py
index c5b8909..e7a84df 100644
--- a/test_relocate.py
+++ b/test_relocate.py
@@ -0,0 +1,88 @@
+from __future__ import annotations
+
+import pytest
+
+import ibis
+import ibis.common.exceptions as exc
+import ibis.selectors as s
+
+
+def test_individual_columns():
+ t = ibis.table(dict(x="int", y="int"))
+ assert t.relocate("x", after="y").columns == list("yx")
+ assert t.relocate("y", before="x").columns == list("yx")
+
+
+def test_move_blocks():
+ t = ibis.table(dict(x="int", a="string", y="int", b="string"))
+ assert t.relocate(s.of_type("string")).columns == list("abxy")
+ assert t.relocate(s.of_type("string"), after=s.numeric()).columns == list("xyab")
+
+
+def test_keep_non_contiguous_variables():
+ t = ibis.table(dict.fromkeys("abcde", "int"))
+ assert t.relocate("b", after=s.c("a", "c", "e")).columns == list("acdeb")
+ assert t.relocate("e", before=s.c("b", "d")).columns == list("aebcd")
+
+
+def test_before_after_does_not_move_to_front():
+ t = ibis.table(dict(x="int", y="int"))
+ assert t.relocate("y").columns == list("yx")
+
+
+def test_only_one_of_before_and_after():
+ t = ibis.table(dict(x="int", y="int", z="int"))
+
+ with pytest.raises(exc.IbisInputError, match="Cannot specify both"):
+ t.relocate("z", before="x", after="y")
+
+
+def test_respects_order():
+ t = ibis.table(dict.fromkeys("axbzy", "int"))
+ assert t.relocate("x", "y", "z", before="x").columns == list("axyzb")
+ assert t.relocate("x", "y", "z", before=s.last()).columns == list("abxyz")
+ assert t.relocate("x", "a", "z").columns == list("xazby")
+
+
+def test_relocate_can_rename():
+ t = ibis.table(dict(a="int", b="int", c="int", d="string", e="string", f=r"string"))
+ assert t.relocate(ffff="f").columns == ["ffff", *"abcde"]
+ assert t.relocate(ffff="f", before="c").columns == [*"ab", "ffff", *"cde"]
+ assert t.relocate(ffff="f", after="c").columns == [*"abc", "ffff", *"de"]
+
+
+def test_retains_last_duplicate_when_renaming_and_moving():
+ t = ibis.table(dict(x="int"))
+ assert t.relocate(a="x", b="x").columns == ["b"]
+
+ # TODO: test against .rename once that's implemented
+
+ t = ibis.table(dict(x="int", y="int"))
+ assert t.relocate(a="x", b="y", c="x").columns == list("bc")
+
+
+def test_everything():
+ t = ibis.table(dict(w="int", x="int", y="int", z="int"))
+ assert t.relocate("y", "z", before=s.all()).columns == list("yzwx")
+ assert t.relocate("y", "z", after=s.all()).columns == list("wxyz")
+
+
+def test_moves_to_front_with_no_before_and_no_after():
+ t = ibis.table(dict(x="int", y="int", z="int"))
+ assert t.relocate("z", "y").columns == list("zyx")
+
+
+def test_empty_before_moves_to_front():
+ t = ibis.table(dict(x="int", y="int", z="int"))
+ assert t.relocate("y", before=s.of_type("string")).columns == list("yxz")
+
+
+def test_empty_after_moves_to_end():
+ t = ibis.table(dict(x="int", y="int", z="int"))
+ assert t.relocate("y", after=s.of_type("string")).columns == list("xzy")
+
+
+def test_no_arguments():
+ t = ibis.table(dict(x="int", y="int", z="int"))
+ with pytest.raises(exc.IbisInputError, match="At least one selector"):
+ assert t.relocate()
|
|
feat: added setLogger and getLogger functions, this will prevent console.log mistakenly left
build: refactoring image drawer
|
38de76ceecc1305f416e23fdc9da223adbb8a6c1
|
feat
|
https://github.com/tsparticles/tsparticles/commit/38de76ceecc1305f416e23fdc9da223adbb8a6c1
|
added setLogger and getLogger functions, this will prevent console.log mistakenly left
build: refactoring image drawer
|
diff --git a/Canvas.ts b/Canvas.ts
index 8e2966f..da65790 100644
--- a/Canvas.ts
+++ b/Canvas.ts
@@ -1,5 +1,5 @@
import { clear, drawParticle, drawParticlePlugin, drawPlugin, paintBase, paintImage } from "../Utils/CanvasUtils";
-import { deepExtend, isSsr } from "../Utils/Utils";
+import { deepExtend, getLogger, isSsr } from "../Utils/Utils";
import { getStyleFromHsl, getStyleFromRgb, rangeColorToHsl, rangeColorToRgb } from "../Utils/ColorUtils";
import type { Container } from "./Container";
import type { IContainerPlugin } from "./Interfaces/IContainerPlugin";
@@ -253,7 +253,7 @@ export class Canvas {
try {
await this._initTrail();
} catch (e) {
- console.error(e);
+ getLogger().error(e);
}
this.initBackground();
diff --git a/Particles.ts b/Particles.ts
index 607b95b..e98361c 100644
--- a/Particles.ts
+++ b/Particles.ts
@@ -1,3 +1,4 @@
+import { getLogger, getPosition } from "../Utils/Utils";
import type { ClickMode } from "../Enums/Modes/ClickMode";
import type { Container } from "./Container";
import type { Engine } from "../engine";
@@ -15,7 +16,6 @@ import { QuadTree } from "./Utils/QuadTree";
import { Rectangle } from "./Utils/Rectangle";
import type { RecursivePartial } from "../Types/RecursivePartial";
import { errorPrefix } from "./Utils/Constants";
-import { getPosition } from "../Utils/Utils";
const qTreeCapacity = 4;
@@ -447,7 +447,7 @@ export class Particles {
return particle;
} catch (e) {
- console.warn(`${errorPrefix} adding particle: ${e}`);
+ getLogger().warning(`${errorPrefix} adding particle: ${e}`);
return;
}
diff --git a/FrameManager.ts b/FrameManager.ts
index 612f4e0..76a72a8 100644
--- a/FrameManager.ts
+++ b/FrameManager.ts
@@ -1,6 +1,7 @@
import type { Container } from "../Container";
import type { IDelta } from "../Interfaces/IDelta";
import { errorPrefix } from "./Constants";
+import { getLogger } from "../../Utils/Utils";
/**
* @param value -
@@ -63,7 +64,7 @@ export class FrameManager {
container.draw(false);
}
} catch (e) {
- console.error(`${errorPrefix} in animation loop`, e);
+ getLogger().error(`${errorPrefix} in animation loop`, e);
}
}
}
diff --git a/Utils.ts b/Utils.ts
index 415036e..4d03808 100644
--- a/Utils.ts
+++ b/Utils.ts
@@ -1,7 +1,6 @@
-import { type IHsl, type Particle, errorPrefix, getStyleFromHsl } from "tsparticles-engine";
+import { type IHsl, type Particle, errorPrefix, getLogger, getStyleFromHsl } from "tsparticles-engine";
import { decodeGIF, getGIFLoopAmount } from "./GifUtils/Utils";
-import type { GIF } from "./GifUtils/GIF";
-import type { GIFProgressCallbackFunction } from "./GifUtils/GIFProgressCallbackFunction";
+import type { GIF } from "./GifUtils/Types/GIF";
import type { IImageShape } from "./IImageShape";
/**
@@ -107,7 +106,7 @@ export async function loadImage(image: IImage): Promise<void> {
image.error = true;
image.loading = false;
- console.error(`${errorPrefix} loading image: ${image.source}`);
+ getLogger().error(`${errorPrefix} loading image: ${image.source}`);
resolve();
});
@@ -129,12 +128,8 @@ export async function loadGifImage(image: IImage): Promise<void> {
image.loading = true;
- const cb: GIFProgressCallbackFunction = (/*percentageRead, frameCount, lastFrame, framePos, gifSize*/) => {
- //do nothing
- };
-
try {
- image.gifData = await decodeGIF(image.source, cb);
+ image.gifData = await decodeGIF(image.source);
image.gifLoopCount = getGIFLoopAmount(image.gifData) ?? 0;
@@ -164,7 +159,7 @@ export async function downloadSvgImage(image: IImage): Promise<void> {
const response = await fetch(image.source);
if (!response.ok) {
- console.error(`${errorPrefix} Image not found`);
+ getLogger().error(`${errorPrefix} Image not found`);
image.error = true;
} else {
diff --git a/engine.ts b/engine.ts
index c39e5b9..a030241 100644
--- a/engine.ts
+++ b/engine.ts
@@ -9,7 +9,7 @@ import type {
ShapeDrawerInitFunction,
} from "./Types/ShapeDrawerFunctions";
import { errorPrefix, generatedAttribute } from "./Core/Utils/Constants";
-import { isBoolean, isFunction, isNumber, isString, itemFromSingleOrMultiple } from "./Utils/Utils";
+import { getLogger, isBoolean, isFunction, isNumber, isString, itemFromSingleOrMultiple } from "./Utils/Utils";
import { Container } from "./Core/Container";
import type { CustomEventArgs } from "./Types/CustomEventArgs";
import type { CustomEventListener } from "./Types/CustomEventListener";
@@ -58,7 +58,7 @@ async function getDataFromUrl(
return response.json();
}
- console.error(`${errorPrefix} ${response.status} while retrieving config file`);
+ getLogger().error(`${errorPrefix} ${response.status} while retrieving config file`);
}
/**
diff --git a/package.json b/package.json
index b0d3542..477a906 100644
--- a/package.json
+++ b/package.json
@@ -21,11 +21,9 @@
"prettier": "@tsparticles/prettier-config",
"devDependencies": {
"@babel/core": "^7.22.5",
- "@commitlint/cli": "^17.6.5",
- "@commitlint/config-conventional": "^17.6.5",
- "@nrwl/devkit": "^16.3.2",
- "@nrwl/workspace": "^16.3.2",
- "@skypack/package-check": "^0.2.2",
+ "@commitlint/cli": "^17.6.6",
+ "@commitlint/config-conventional": "^17.6.6",
+ "@nrwl/workspace": "^16.4.0",
"@tsparticles/cli": "^1.6.5",
"@tsparticles/eslint-config": "^1.13.3",
"@tsparticles/prettier-config": "^1.10.0",
@@ -36,31 +34,26 @@
"@types/mocha": "^10.0.1",
"@types/node": "^20.3.1",
"@types/webpack-env": "^1.18.1",
- "@typescript-eslint/eslint-plugin": "^5.59.11",
- "@typescript-eslint/parser": "^5.59.11",
+ "@typescript-eslint/eslint-plugin": "^5.60.1",
+ "@typescript-eslint/parser": "^5.60.1",
"babel-loader": "^9.1.2",
"browserslist": "^4.21.9",
"canvas": "^2.11.2",
"chai": "^4.3.7",
- "compare-versions": "^6.0.0-rc.1",
"copyfiles": "^2.4.1",
"eslint": "^8.43.0",
"eslint-config-prettier": "^8.8.0",
- "eslint-plugin-jsdoc": "^46.2.6",
+ "eslint-plugin-jsdoc": "^46.3.0",
"eslint-plugin-tsdoc": "^0.2.17",
- "fs-extra": "^11.1.1",
"husky": "^8.0.3",
- "ini": "^4.1.1",
- "install": "^0.13.0",
"jsdom": "^22.1.0",
"jsdom-global": "^3.0.2",
- "lerna": "^7.0.2",
+ "lerna": "^7.1.0",
"mocha": "^10.2.0",
- "nx": "^16.3.2",
+ "nx": "^16.4.0",
"nx-cloud": "^16.0.5",
"nyc": "^15.1.0",
"prettier": "^2.8.8",
- "reflect-metadata": "^0.1.13",
"rimraf": "^5.0.1",
"source-map-support": "^0.5.21",
"terser-webpack-plugin": "^5.3.9",
@@ -73,10 +66,9 @@
"typedoc-plugin-keywords": "^1.4.1",
"typedoc-plugin-missing-exports": "^2.0.0",
"typescript": "^5.1.3",
- "typescript-json-schema": "^0.58.0",
- "webpack": "^5.87.0",
+ "typescript-json-schema": "^0.58.1",
+ "webpack": "^5.88.0",
"webpack-bundle-analyzer": "^4.9.0",
- "webpack-cli": "^5.1.4",
- "yorkie": "^2.0.0"
+ "webpack-cli": "^5.1.4"
}
}
diff --git a/SoundsInstance.ts b/SoundsInstance.ts
index 3fbc2c1..20c4c0c 100644
--- a/SoundsInstance.ts
+++ b/SoundsInstance.ts
@@ -4,6 +4,7 @@ import {
type IContainerPlugin,
clamp,
executeOnSingleOrMultiple,
+ getLogger,
isNumber,
itemFromArray,
itemFromSingleOrMultiple,
@@ -454,7 +455,7 @@ export class SoundsInstance implements IContainerPlugin {
await this._playFrequency(freq, note.duration);
} catch (e) {
- console.error(e);
+ getLogger().error(e);
}
};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cc7cabe..b4e2264 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,20 +12,14 @@ importers:
specifier: ^7.22.5
version: 7.22.5
'@commitlint/cli':
- specifier: ^17.6.5
- version: 17.6.5
+ specifier: ^17.6.6
+ version: 17.6.6
'@commitlint/config-conventional':
- specifier: ^17.6.5
- version: 17.6.5
- '@nrwl/devkit':
- specifier: ^16.3.2
- version: 16.3.2([email protected])
+ specifier: ^17.6.6
+ version: 17.6.6
'@nrwl/workspace':
- specifier: ^16.3.2
- version: 16.3.2
- '@skypack/package-check':
- specifier: ^0.2.2
- version: 0.2.2
+ specifier: ^16.4.0
+ version: 16.4.0
'@tsparticles/cli':
specifier: ^1.6.5
version: 1.6.5([email protected])
@@ -57,14 +51,14 @@ importers:
specifier: ^1.18.1
version: 1.18.1
'@typescript-eslint/eslint-plugin':
- specifier: ^5.59.11
- version: 5.59.11(@typescript-eslint/[email protected])([email protected])([email protected])
+ specifier: ^5.60.1
+ version: 5.60.1(@typescript-eslint/[email protected])([email protected])([email protected])
'@typescript-eslint/parser':
- specifier: ^5.59.11
- version: 5.59.11([email protected])([email protected])
+ specifier: ^5.60.1
+ version: 5.60.1([email protected])([email protected])
babel-loader:
specifier: ^9.1.2
- version: 9.1.2(@babel/[email protected])([email protected])
+ version: 9.1.2(@babel/[email protected])([email protected])
browserslist:
specifier: ^4.21.9
version: 4.21.9
@@ -74,9 +68,6 @@ importers:
chai:
specifier: ^4.3.7
version: 4.3.7
- compare-versions:
- specifier: ^6.0.0-rc.1
- version: 6.0.0-rc.1
copyfiles:
specifier: ^2.4.1
version: 2.4.1
@@ -87,23 +78,14 @@ importers:
specifier: ^8.8.0
version: 8.8.0([email protected])
eslint-plugin-jsdoc:
- specifier: ^46.2.6
- version: 46.2.6([email protected])
+ specifier: ^46.3.0
+ version: 46.3.0([email protected])
eslint-plugin-tsdoc:
specifier: ^0.2.17
version: 0.2.17
- fs-extra:
- specifier: ^11.1.1
- version: 11.1.1
husky:
specifier: ^8.0.3
version: 8.0.3
- ini:
- specifier: ^4.1.1
- version: 4.1.1
- install:
- specifier: ^0.13.0
- version: 0.13.0
jsdom:
specifier: ^22.1.0
version: 22.1.0([email protected])
@@ -111,14 +93,14 @@ importers:
specifier: ^3.0.2
version: 3.0.2([email protected])
lerna:
- specifier: ^7.0.2
- version: 7.0.2
+ specifier: ^7.1.0
+ version: 7.1.0
mocha:
specifier: ^10.2.0
version: 10.2.0
nx:
- specifier: ^16.3.2
- version: 16.3.2
+ specifier: ^16.4.0
+ version: 16.4.0
nx-cloud:
specifier: ^16.0.5
version: 16.0.5
@@ -128,9 +110,6 @@ importers:
prettier:
specifier: ^2.8.8
version: 2.8.8
- reflect-metadata:
- specifier: ^0.1.13
- version: 0.1.13
rimraf:
specifier: ^5.0.1
version: 5.0.1
@@ -139,7 +118,7 @@ importers:
version: 0.5.21
terser-webpack-plugin:
specifier: ^5.3.9
- version: 5.3.9([email protected])
+ version: 5.3.9([email protected])
ts-json-schema-generator:
specifier: ^1.2.0
version: 1.2.0
@@ -168,20 +147,17 @@ importers:
specifier: ^5.1.3
version: 5.1.3
typescript-json-schema:
- specifier: ^0.58.0
- version: 0.58.0
+ specifier: ^0.58.1
+ version: 0.58.1
webpack:
- specifier: ^5.87.0
- version: 5.87.0([email protected])
+ specifier: ^5.88.0
+ version: 5.88.0([email protected])
webpack-bundle-analyzer:
specifier: ^4.9.0
version: 4.9.0
webpack-cli:
specifier: ^5.1.4
- version: 5.1.4([email protected])([email protected])
- yorkie:
- specifier: ^2.0.0
- version: 2.0.0
+ version: 5.1.4([email protected])([email protected])
bundles/confetti:
dependencies:
@@ -3972,13 +3948,13 @@ packages:
'@babel/helper-validator-identifier': 7.22.5
to-fast-properties: 2.0.0
- /@commitlint/[email protected]:
- resolution: {integrity: sha512-3PQrWr/uo6lzF5k7n5QuosCYnzaxP9qGBp3jhWP0Vmsa7XA6wrl9ccPqfQyXpSbQE3zBROVO3TDqgPKe4tfmLQ==}
+ /@commitlint/[email protected]:
+ resolution: {integrity: sha512-sTKpr2i/Fjs9OmhU+beBxjPavpnLSqZaO6CzwKVq2Tc4UYVTMFgpKOslDhUBVlfAUBfjVO8ParxC/MXkIOevEA==}
engines: {node: '>=v14'}
hasBin: true
dependencies:
'@commitlint/format': 17.4.4
- '@commitlint/lint': 17.6.5
+ '@commitlint/lint': 17.6.6
'@commitlint/load': 17.5.0
'@commitlint/read': 17.5.1
'@commitlint/types': 17.4.4
@@ -3992,8 +3968,8 @@ packages:
- '@swc/wasm'
dev: true
- /@commitlint/[email protected]:
- resolution: {integrity: sha512-Xl9H9KLl86NZm5CYNTNF9dcz1xelE/EbvhWIWcYxG/rn3UWYWdWmmnX2q6ZduNdLFSGbOxzUpIx61j5zxbeXxg==}
+ /@commitlint/[email protected]:
+ resolution: {integrity: sha512-phqPz3BDhfj49FUYuuZIuDiw+7T6gNAEy7Yew1IBHqSohVUCWOK2FXMSAExzS2/9X+ET93g0Uz83KjiHDOOFag==}
engines: {node: '>=v14'}
dependencies:
conventional-changelog-conventionalcommits: 5.0.0
@@ -4032,19 +4008,19 @@ packages:
chalk: 4.1.2
dev: true
- /@commitlint/[email protected]:
- resolution: {integrity: sha512-CQvAPt9gX7cuUbMrIaIMKczfWJqqr6m8IlJs0F2zYwyyMTQ87QMHIj5jJ5HhOaOkaj6dvTMVGx8Dd1I4xgUuoQ==}
+ /@commitlint/[email protected]:
+ resolution: {integrity: sha512-4Fw875faAKO+2nILC04yW/2Vy/wlV3BOYCSQ4CEFzriPEprc1Td2LILmqmft6PDEK5Sr14dT9tEzeaZj0V56Gg==}
engines: {node: '>=v14'}
dependencies:
'@commitlint/types': 17.4.4
- semver: 7.5.0
+ semver: 7.5.2
dev: true
- /@commitlint/[email protected]:
- resolution: {integrity: sha512-BSJMwkE4LWXrOsiP9KoHG+/heSDfvOL/Nd16+ojTS/DX8HZr8dNl8l3TfVr/d/9maWD8fSegRGtBtsyGuugFrw==}
+ /@commitlint/[email protected]:
+ resolution: {integrity: sha512-5bN+dnHcRLkTvwCHYMS7Xpbr+9uNi0Kq5NR3v4+oPNx6pYXt8ACuw9luhM/yMgHYwW0ajIR20wkPAFkZLEMGmg==}
engines: {node: '>=v14'}
dependencies:
- '@commitlint/is-ignored': 17.6.5
+ '@commitlint/is-ignored': 17.6.6
'@commitlint/parse': 17.6.5
'@commitlint/rules': 17.6.5
'@commitlint/types': 17.4.4
@@ -4060,8 +4036,8 @@ packages:
'@commitlint/types': 17.4.4
'@types/node': 20.3.1
chalk: 4.1.2
- cosmiconfig: 8.1.3
- cosmiconfig-typescript-loader: 4.3.0(@types/[email protected])([email protected])([email protected])([email protected])
+ cosmiconfig: 8.2.0
+ cosmiconfig-typescript-loader: 4.3.0(@types/[email protected])([email protected])([email protected])([email protected])
lodash.isplainobject: 4.0.6
lodash.merge: 4.6.2
lodash.uniq: 4.5.0
@@ -4360,8 +4336,8 @@ packages:
'@jridgewell/sourcemap-codec': 1.4.15
dev: true
- /@lerna/[email protected]:
- resolution: {integrity: sha512-15lMrNBL/pvREMJPSfIPieaBtyyapDco/TNjALLEL53JGzO9g8rj5PipfE9h5ILx8aq/GaP17XCh209aVCun/w==}
+ /@lerna/[email protected]:
+ resolution: {integrity: sha512-NmpwxygdVW2xprCNNgZ9d6P/pRlaXX2vfUynYNS+jsv7Q2uDZSdW86kjwEgbWyjSu7quZsmpQLqpl6PnfFl82g==}
engines: {node: ^14.17.0 || >=16.0.0}
dependencies:
chalk: 4.1.2
@@ -4369,11 +4345,11 @@ packages:
strong-log-transformer: 2.1.0
dev: true
- /@lerna/[email protected]:
- resolution: {integrity: sha512-1arGpEpWbWmci1MyaGKvP2SqCAPFWpLqZp0swckianX1kx1mso9B16BWFvcHhU57zCD0Co/z+jX+02UEzZGP7Q==}
+ /@lerna/[email protected]:
+ resolution: {integrity: sha512-qmj1c9J9AmMdiZW7akK7PVhUK3rwHnOgOBrz7TL0eoHsCE9kda+5VWiKFKSyDqq2zSai+a5OZU/pfkaPm8FygA==}
engines: {node: ^14.17.0 || >=16.0.0}
dependencies:
- '@lerna/child-process': 7.0.2
+ '@lerna/child-process': 7.1.0
dedent: 0.7.0
fs-extra: 11.1.1
init-package-json: 5.0.0
@@ -4381,7 +4357,7 @@ packages:
p-reduce: 2.1.0
pacote: 15.2.0
pify: 5.0.0
- semver: 7.5.1
+ semver: 7.5.3
slash: 3.0.0
validate-npm-package-license: 3.0.4
validate-npm-package-name: 5.0.0
@@ -4442,14 +4418,14 @@ packages:
engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
dependencies:
'@gar/promisify': 1.1.3
- semver: 7.5.1
+ semver: 7.5.3
dev: true
/@npmcli/[email protected]:
resolution: {integrity: sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==}
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
dependencies:
- semver: 7.5.1
+ semver: 7.5.3
dev: true
/@npmcli/[email protected]:
@@ -4462,7 +4438,7 @@ packages:
proc-log: 3.0.0
promise-inflight: 1.0.1
promise-retry: 2.0.1
- semver: 7.5.1
+ semver: 7.5.3
which: 3.0.1
transitivePeerDependencies:
- bluebird
@@ -4512,10 +4488,18 @@ packages:
- supports-color
dev: true
- /@nrwl/[email protected]([email protected]):
+ /@nrwl/[email protected]([email protected]):
resolution: {integrity: sha512-EiDwVIvh6AcClXv22Q7auQh7Iy/ONISEFWzTswy/J6ZmVGCQesbiwg4cGV0MKiScr+awdVzqyNey+wD6IR5Lkw==}
dependencies:
- '@nx/devkit': 16.3.2([email protected])
+ '@nx/devkit': 16.3.2([email protected])
+ transitivePeerDependencies:
+ - nx
+ dev: true
+
+ /@nrwl/[email protected]([email protected]):
+ resolution: {integrity: sha512-KUu9oNrMB8DP78BAO8XWJC5HOSS6dO6ocMWj2DtuNVgMgABviy+ih/TmrGKxQQBH0Ib4cxTeMIQVRdAak5c1UA==}
+ dependencies:
+ '@nx/devkit': 16.4.0([email protected])
transitivePeerDependencies:
- nx
dev: true
@@ -4528,43 +4512,57 @@ packages:
- debug
dev: true
- /@nrwl/[email protected]:
- resolution: {integrity: sha512-2Kg7dtv6JcQagCZPSq+okceI81NqmXGGgbKWqS7sOfdmp1otxS9uiUFNXw+Pdtnw38mdRviMtSOXScntu4sUKg==}
+ /@nrwl/[email protected]:
+ resolution: {integrity: sha512-6n4chOOv6jqact07NvIDRQfsnaiYYhi+mrqSuJKs6fL+c5kx/VCryndTP0MDTBbazfL6H7vwiQUkTja2sQDuwA==}
hasBin: true
dependencies:
- nx: 16.3.2
+ nx: 16.4.0
transitivePeerDependencies:
- '@swc-node/register'
- '@swc/core'
- debug
dev: true
- /@nrwl/[email protected]:
- resolution: {integrity: sha512-ORVzEEJIMOFYEOtOQHLU7N4vT4mYZ/JzKiwHZrHkCaVhgkiGBLoX3tOwVZjafKaa/24cGISv0J7WRtnfRKl2cA==}
+ /@nrwl/[email protected]:
+ resolution: {integrity: sha512-iu2GgzoEQYn7IzJe2m69YqftajFJpce5jcE5d6OV2Idgq228Lb0j7aCw4W4fK7bsCeqZGhVGpiBjE+Cyw1GxGw==}
dependencies:
- '@nx/workspace': 16.3.2
+ '@nx/workspace': 16.4.0
transitivePeerDependencies:
- '@swc-node/register'
- '@swc/core'
- debug
dev: true
- /@nx/[email protected]([email protected]):
+ /@nx/[email protected]([email protected]):
resolution: {integrity: sha512-1ev3EDm2Sx/ibziZroL1SheqxDR7UgC49tkBgJz1GrQLQnfdhBYroCPSyBSWGPMLHjIuHb3+hyGSV1Bz+BIYOA==}
peerDependencies:
nx: '>= 15 <= 17'
dependencies:
- '@nrwl/devkit': 16.3.2([email protected])
+ '@nrwl/devkit': 16.3.2([email protected])
ejs: 3.1.9
ignore: 5.2.4
- nx: 16.3.2
+ nx: 16.4.0
semver: 7.3.4
tmp: 0.2.1
tslib: 2.5.1
dev: true
- /@nx/[email protected]:
- resolution: {integrity: sha512-YfYVNfsJBzBcBnJUU4AcA6A4QMkgnVlETfp4KGL36Otq542mRY1ISGHdox63ocI5AKh5gay5AaGcR4wR9PU9Vg==}
+ /@nx/[email protected]([email protected]):
+ resolution: {integrity: sha512-/Y+tC2IBxVEf3EKB80G9mF27ZBAFEBBmDMn1MPzfGX9AB2GGNCqgvSkSHT5DlkyxJOMqbE7DpMyHxubALyenEA==}
+ peerDependencies:
+ nx: '>= 15 <= 17'
+ dependencies:
+ '@nrwl/devkit': 16.4.0([email protected])
+ ejs: 3.1.9
+ ignore: 5.2.4
+ nx: 16.4.0
+ semver: 7.5.3
+ tmp: 0.2.1
+ tslib: 2.5.1
+ dev: true
+
+ /@nx/[email protected]:
+ resolution: {integrity: sha512-/ZXuF8M3u8DSNmjYstQKorzo7uIETNhnFinwWlO8mzz+SyR+Xs5G6penJ4+cB1ju3Hf3lZkXd5U6pEiW4OAAkA==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [darwin]
@@ -4572,8 +4570,8 @@ packages:
dev: true
optional: true
- /@nx/[email protected]:
- resolution: {integrity: sha512-bJtpozz0zSRVRrcQ76GrlT3TWEGTymLYWrVG51bH5KZ46t6/a4EQBI3uL3vubMmOZ0jR4ywybOcPBBhxmBJ68w==}
+ /@nx/[email protected]:
+ resolution: {integrity: sha512-0Fo58qZzHgRs4SRVaAOBipdJQNew57YQbpFaLHKhCTyKc0Pe6THEYaaT/x9QVkcFO0x4AzNr9T7iJTrneNwcKg==}
engines: {node: '>= 10'}
cpu: [x64]
os: [darwin]
@@ -4581,8 +4579,8 @@ packages:
dev: true
optional: true
- /@nx/[email protected]:
- resolution: {integrity: sha512-ZvufI0bWqT67nLbBo6ejrIGxypdoedRQTP/tudWbs/4isvxLe1uVku1BfKCTQUsJG367SqNOU1H5kzI/MRr3ow==}
+ /@nx/[email protected]:
+ resolution: {integrity: sha512-Qoes/NifE4zb5Gb6ZdC32HvxZBzO0xo74j7EozUV5rZEm3bCtKbKqThPV9Uuu+8S4j718r5vlob/IMXqRcWK4g==}
engines: {node: '>= 10'}
cpu: [x64]
os: [freebsd]
@@ -4590,8 +4588,8 @@ packages:
dev: true
optional: true
- /@nx/[email protected]:
- resolution: {integrity: sha512-IQL4kxdiZLvifar7+SIum3glRuVsxtE0dL8RvteSDXrxDQnaTUrjILC+VGhalRmk7ngBbGKNrhWOeeL7390CzQ==}
+ /@nx/[email protected]:
+ resolution: {integrity: sha512-m8uklbettj8RnLtasjQPiYxqJotDSfO3LO1II8Bds53C7OT8TDnTkW68MEx+CxuSCQFy2Aa0Oih3jSvDzfnZzA==}
engines: {node: '>= 10'}
cpu: [arm]
os: [linux]
@@ -4599,8 +4597,8 @@ packages:
dev: true
optional: true
- /@nx/[email protected]:
- resolution: {integrity: sha512-f6AWgPVu3mfUEoOBa0rY2/7QY0Or9eR0KtLFpcPh7RUpxPw2EXzIbjD/0RGipdpspSrgiMKbZpsUjo6mXBFsQA==}
+ /@nx/[email protected]:
+ resolution: {integrity: sha512-bAs2T/zZQDTCzzhciE8kCrkwgXbeX3K83cGRacB7PDZZl/O4jr5TRO4zYHi6doytyLONjqhvWNLbIo4cEEcfZA==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
@@ -4608,8 +4606,8 @@ packages:
dev: true
optional: true
- /@nx/[email protected]:
- resolution: {integrity: sha512-AvrWcYz7021E3b5P9/0i26p60XMZfw86Epks51L6AhlflarlOH4AcEChc7APMtb1ELAIbDWx2S6oIDRbQ7rtVA==}
+ /@nx/[email protected]:
+ resolution: {integrity: sha512-K1D8j4lRZDBVuW8iomeJjCznFz7rfP3qaB3RHjKZU5qrZBq1uYohhdfT7dzwWFNWEvt6WytfhGCl2S9PsQ37Wg==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
@@ -4617,8 +4615,8 @@ packages:
dev: true
optional: true
- /@nx/[email protected]:
- resolution: {integrity: sha512-K2pWGAcbCNm6b7UZI9cc8z4Rb540QcuepBXD7akjPjWerzXriT6VCn4i9mVKsCg2mwSfknTJJVJ1PZwJSmTl/Q==}
+ /@nx/[email protected]:
+ resolution: {integrity: sha512-v1NJ3ESaw5bdSeuh5Xslq1dXGWztf0mSLwZP510Rt9+ulr5LQ/X1Rri8zefU0gZNLcmJL0G2Qq7UTnppYGRTEg==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
@@ -4626,8 +4624,8 @@ packages:
dev: true
optional: true
- /@nx/[email protected]:
- resolution: {integrity: sha512-sY1QDuQlqyYiRPJZanrtV07tU0DOXiCrWb0pDsGiO0qHuUSmW5Vw17GWEY4z3rt0/5U8fJ+/9WQrneviOmsOKg==}
+ /@nx/[email protected]:
+ resolution: {integrity: sha512-+8YLVWZFq+k6YJ2ZDwR5sGaRnZhUVYtR8aPbGyonMnJ8VEQJNEqsm1KT6nt0gd3JJdxyphm3VsMQWBMo42jM+w==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
@@ -4635,8 +4633,8 @@ packages:
dev: true
optional: true
- /@nx/[email protected]:
- resolution: {integrity: sha512-wBfohT2hjrLKn9WFHvG0MFVk7uYhgYNiptnTLdTouziHgFyZ08vyl7XYBq55BwHPMQ5iswVoEfjn/5ZBfCPscg==}
+ /@nx/[email protected]:
+ resolution: {integrity: sha512-HwE6AxlrfWvODT49vVX6NGMYc3zdMVXETCdZb0jZ/oz28XXTAPvVb/8DJgKSyCs0DPirEeCHiPwbdcJA1Bqw8A==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [win32]
@@ -4644,8 +4642,8 @@ packages:
dev: true
optional: true
- /@nx/[email protected]:
- resolution: {integrity: sha512-QC0sWrfQm0/WdvvM//7UAgm+otbak6bznZ0zawTeqmLBh1hLjNeweyzSVKQEtZtlzDMKpzCVuuwkJq+VKBLvmw==}
+ /@nx/[email protected]:
+ resolution: {integrity: sha512-ISL3c6i/v+JOsUHEbngDHaobmbgu6oSY0htKas1RjLWGkWXDLgEXMRjQ/xDbNVYH00Mto7mmq+nrjkNNbqOrfQ==}
engines: {node: '>= 10'}
cpu: [x64]
os: [win32]
@@ -4653,11 +4651,11 @@ packages:
dev: true
optional: true
- /@nx/[email protected]:
- resolution: {integrity: sha512-gFrJEv3+Jn2leu3RKFTakPHY8okI8hjOg8RO4OWA2ZemFXRyh9oIm/xsCsOyqYlGt06eqV2mD3GUun/05z1nhg==}
+ /@nx/[email protected]:
+ resolution: {integrity: sha512-nuFlhrl9FI6Tb2RvSNRGTVl/X3Cvf/vV2DO1MiyMjZWasZLhAr9rjtLYgTrJW4uQLJOn6MXJzP97w/Boa4pfRQ==}
dependencies:
- '@nrwl/workspace': 16.3.2
- '@nx/devkit': 16.3.2([email protected])
+ '@nrwl/workspace': 16.4.0
+ '@nx/devkit': 16.4.0([email protected])
'@parcel/watcher': 2.0.4
chalk: 4.1.2
chokidar: 3.5.3
@@ -4669,7 +4667,7 @@ packages:
ignore: 5.2.4
minimatch: 3.0.5
npm-run-path: 4.0.1
- nx: 16.3.2
+ nx: 16.4.0
open: 8.4.2
rxjs: 7.8.1
tmp: 0.2.1
@@ -4847,14 +4845,6 @@ packages:
engines: {node: '>=10'}
dev: true
- /@skypack/[email protected]:
- resolution: {integrity: sha512-T4Wyi9lUuz0a1C2OHuzqZ0aFOCI0AmaGTb2LP9sHgWdoHXlB3JU02gfBpa0Y081G/gFsJYpQ/R0iCJRzF/nknw==}
- hasBin: true
- dependencies:
- kleur: 4.1.5
- yargs-parser: 20.2.9
- dev: true
-
/@sphinxxxx/[email protected]:
resolution: {integrity: sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw==}
dev: true
@@ -4894,12 +4884,12 @@ packages:
'@tsparticles/prettier-config': 1.10.0
'@tsparticles/tsconfig': 1.13.0
'@tsparticles/webpack-plugin': 1.15.5
- '@typescript-eslint/eslint-plugin': 5.60.0(@typescript-eslint/[email protected])([email protected])([email protected])
- '@typescript-eslint/parser': 5.60.0([email protected])([email protected])
+ '@typescript-eslint/eslint-plugin': 5.60.1(@typescript-eslint/[email protected])([email protected])([email protected])
+ '@typescript-eslint/parser': 5.60.1([email protected])([email protected])
commander: 11.0.0
eslint: 8.43.0
eslint-config-prettier: 8.8.0([email protected])
- eslint-plugin-jsdoc: 46.2.6([email protected])
+ eslint-plugin-jsdoc: 46.3.0([email protected])
eslint-plugin-tsdoc: 0.2.17
fs-extra: 11.1.1
klaw: 4.1.0
@@ -4908,7 +4898,7 @@ packages:
prompts: 2.4.2
rimraf: 5.0.1
typescript: 5.1.3
- webpack: 5.87.0([email protected])
+ webpack: 5.88.0([email protected])
transitivePeerDependencies:
- '@swc/core'
- '@webpack-cli/generators'
@@ -4943,11 +4933,11 @@ packages:
resolution: {integrity: sha512-Cp/j8NwuZIWprPp4E5QQGGoJyH8fcFAUbCNoJpWFWjiVPo3ZZW7GdhkaHj4MwKoPUeI52VMNDellmpR8hF+ukA==}
dependencies:
'@tsparticles/prettier-config': 1.10.0
- '@typescript-eslint/eslint-plugin': 5.60.0(@typescript-eslint/[email protected])([email protected])([email protected])
- '@typescript-eslint/parser': 5.60.0([email protected])([email protected])
+ '@typescript-eslint/eslint-plugin': 5.60.1(@typescript-eslint/[email protected])([email protected])([email protected])
+ '@typescript-eslint/parser': 5.60.1([email protected])([email protected])
eslint: 8.43.0
- eslint-plugin-import: 2.27.5(@typescript-eslint/[email protected])([email protected])
- eslint-plugin-jsdoc: 46.2.6([email protected])
+ eslint-plugin-import: 2.27.5(@typescript-eslint/[email protected])([email protected])
+ eslint-plugin-jsdoc: 46.3.0([email protected])
eslint-plugin-tsdoc: 0.2.17
prettier: 2.8.8
typescript: 5.1.3
@@ -5026,22 +5016,22 @@ packages:
'@types/node': 20.3.1
'@types/webpack-bundle-analyzer': 4.6.0([email protected])
'@types/webpack-env': 1.18.1
- '@typescript-eslint/eslint-plugin': 5.60.0(@typescript-eslint/[email protected])([email protected])([email protected])
- '@typescript-eslint/parser': 5.60.0([email protected])([email protected])
- babel-loader: 9.1.2(@babel/[email protected])([email protected])
+ '@typescript-eslint/eslint-plugin': 5.60.1(@typescript-eslint/[email protected])([email protected])([email protected])
+ '@typescript-eslint/parser': 5.60.1([email protected])([email protected])
+ babel-loader: 9.1.2(@babel/[email protected])([email protected])
browserslist: 4.21.9
copyfiles: 2.4.1
eslint: 8.43.0
eslint-config-prettier: 8.8.0([email protected])
- eslint-plugin-jsdoc: 46.2.6([email protected])
+ eslint-plugin-jsdoc: 46.3.0([email protected])
eslint-plugin-tsdoc: 0.2.17
prettier: 2.8.8
rimraf: 5.0.1
- terser-webpack-plugin: 5.3.9([email protected])
+ terser-webpack-plugin: 5.3.9([email protected])
typescript: 5.1.3
- webpack: 5.87.0([email protected])
+ webpack: 5.88.0([email protected])
webpack-bundle-analyzer: 4.9.0
- webpack-cli: 5.1.4([email protected])([email protected])
+ webpack-cli: 5.1.4([email protected])([email protected])
transitivePeerDependencies:
- '@swc/core'
- '@webpack-cli/generators'
@@ -5289,7 +5279,7 @@ packages:
dependencies:
'@types/node': 20.3.1
tapable: 2.2.1
- webpack: 5.87.0([email protected])
+ webpack: 5.88.0([email protected])
transitivePeerDependencies:
- '@swc/core'
- esbuild
@@ -5302,7 +5292,7 @@ packages:
dependencies:
'@types/node': 20.3.1
tapable: 2.2.1
- webpack: 5.87.0([email protected])
+ webpack: 5.88.0([email protected])
transitivePeerDependencies:
- '@swc/core'
- esbuild
@@ -5332,34 +5322,6 @@ packages:
dev: true
optional: true
- /@typescript-eslint/[email protected](@typescript-eslint/[email protected])([email protected])([email protected]):
- resolution: {integrity: sha512-XxuOfTkCUiOSyBWIvHlUraLw/JT/6Io1365RO6ZuI88STKMavJZPNMU0lFcUTeQXEhHiv64CbxYxBNoDVSmghg==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- peerDependencies:
- '@typescript-eslint/parser': ^5.0.0
- eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
- typescript: '*'
- peerDependenciesMeta:
- typescript:
- optional: true
- dependencies:
- '@eslint-community/regexpp': 4.5.1
- '@typescript-eslint/parser': 5.59.11([email protected])([email protected])
- '@typescript-eslint/scope-manager': 5.59.11
- '@typescript-eslint/type-utils': 5.59.11([email protected])([email protected])
- '@typescript-eslint/utils': 5.59.11([email protected])([email protected])
- debug: 4.3.4([email protected])
- eslint: 8.43.0
- grapheme-splitter: 1.0.4
- ignore: 5.2.4
- natural-compare-lite: 1.4.0
- semver: 7.5.1
- tsutils: 3.21.0([email protected])
- typescript: 5.1.3
- transitivePeerDependencies:
- - supports-color
- dev: true
-
/@typescript-eslint/[email protected](@typescript-eslint/[email protected])([email protected])([email protected]):
resolution: {integrity: sha512-sXtOgJNEuRU5RLwPUb1jxtToZbgvq3M6FPpY4QENxoOggK+UpTxUBpj6tD8+Qh2g46Pi9We87E+eHnUw8YcGsw==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5388,8 +5350,8 @@ packages:
- supports-color
dev: false
- /@typescript-eslint/[email protected](@typescript-eslint/[email protected])([email protected])([email protected]):
- resolution: {integrity: sha512-78B+anHLF1TI8Jn/cD0Q00TBYdMgjdOn980JfAVa9yw5sop8nyTfVOQAv6LWywkOGLclDBtv5z3oxN4w7jxyNg==}
+ /@typescript-eslint/[email protected](@typescript-eslint/[email protected])([email protected])([email protected]):
+ resolution: {integrity: sha512-KSWsVvsJsLJv3c4e73y/Bzt7OpqMCADUO846bHcuWYSYM19bldbAeDv7dYyV0jwkbMfJ2XdlzwjhXtuD7OY6bw==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
'@typescript-eslint/parser': ^5.0.0
@@ -5400,10 +5362,10 @@ packages:
optional: true
dependencies:
'@eslint-community/regexpp': 4.5.1
- '@typescript-eslint/parser': 5.60.0([email protected])([email protected])
- '@typescript-eslint/scope-manager': 5.60.0
- '@typescript-eslint/type-utils': 5.60.0([email protected])([email protected])
- '@typescript-eslint/utils': 5.60.0([email protected])([email protected])
+ '@typescript-eslint/parser': 5.60.1([email protected])([email protected])
+ '@typescript-eslint/scope-manager': 5.60.1
+ '@typescript-eslint/type-utils': 5.60.1([email protected])([email protected])
+ '@typescript-eslint/utils': 5.60.1([email protected])([email protected])
debug: 4.3.4([email protected])
eslint: 8.43.0
grapheme-splitter: 1.0.4
@@ -5416,26 +5378,6 @@ packages:
- supports-color
dev: true
- /@typescript-eslint/[email protected]([email protected])([email protected]):
- resolution: {integrity: sha512-s9ZF3M+Nym6CAZEkJJeO2TFHHDsKAM3ecNkLuH4i4s8/RCPnF5JRip2GyviYkeEAcwGMJxkqG9h2dAsnA1nZpA==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- peerDependencies:
- eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
- typescript: '*'
- peerDependenciesMeta:
- typescript:
- optional: true
- dependencies:
- '@typescript-eslint/scope-manager': 5.59.11
- '@typescript-eslint/types': 5.59.11
- '@typescript-eslint/typescript-estree': 5.59.11([email protected])
- debug: 4.3.4([email protected])
- eslint: 8.43.0
- typescript: 5.1.3
- transitivePeerDependencies:
- - supports-color
- dev: true
-
/@typescript-eslint/[email protected]([email protected])([email protected]):
resolution: {integrity: sha512-7pCa6al03Pv1yf/dUg/s1pXz/yGMUBAw5EeWqNTFiSueKvRNonze3hma3lhdsOrQcaOXhbk5gKu2Fludiho9VA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5456,8 +5398,8 @@ packages:
- supports-color
dev: false
- /@typescript-eslint/[email protected]([email protected])([email protected]):
- resolution: {integrity: sha512-jBONcBsDJ9UoTWrARkRRCgDz6wUggmH5RpQVlt7BimSwaTkTjwypGzKORXbR4/2Hqjk9hgwlon2rVQAjWNpkyQ==}
+ /@typescript-eslint/[email protected]([email protected])([email protected]):
+ resolution: {integrity: sha512-pHWlc3alg2oSMGwsU/Is8hbm3XFbcrb6P5wIxcQW9NsYBfnrubl/GhVVD/Jm/t8HXhA2WncoIRfBtnCgRGV96Q==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -5466,9 +5408,9 @@ packages:
typescript:
optional: true
dependencies:
- '@typescript-eslint/scope-manager': 5.60.0
- '@typescript-eslint/types': 5.60.0
- '@typescript-eslint/typescript-estree': 5.60.0([email protected])
+ '@typescript-eslint/scope-manager': 5.60.1
+ '@typescript-eslint/types': 5.60.1
+ '@typescript-eslint/typescript-estree': 5.60.1([email protected])
debug: 4.3.4([email protected])
eslint: 8.43.0
typescript: 5.1.3
@@ -5476,14 +5418,6 @@ packages:
- supports-color
dev: true
- /@typescript-eslint/[email protected]:
- resolution: {integrity: sha512-dHFOsxoLFtrIcSj5h0QoBT/89hxQONwmn3FOQ0GOQcLOOXm+MIrS8zEAhs4tWl5MraxCY3ZJpaXQQdFMc2Tu+Q==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- dependencies:
- '@typescript-eslint/types': 5.59.11
- '@typescript-eslint/visitor-keys': 5.59.11
- dev: true
-
/@typescript-eslint/[email protected]:
resolution: {integrity: sha512-gLbY3Le9Dxcb8KdpF0+SJr6EQ+hFGYFl6tVY8VxLPFDfUZC7BHFw+Vq7bM5lE9DwWPfx4vMWWTLGXgpc0mAYyQ==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5492,32 +5426,12 @@ packages:
'@typescript-eslint/visitor-keys': 5.59.6
dev: false
- /@typescript-eslint/[email protected]:
- resolution: {integrity: sha512-hakuzcxPwXi2ihf9WQu1BbRj1e/Pd8ZZwVTG9kfbxAMZstKz8/9OoexIwnmLzShtsdap5U/CoQGRCWlSuPbYxQ==}
+ /@typescript-eslint/[email protected]:
+ resolution: {integrity: sha512-Dn/LnN7fEoRD+KspEOV0xDMynEmR3iSHdgNsarlXNLGGtcUok8L4N71dxUgt3YvlO8si7E+BJ5Fe3wb5yUw7DQ==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
dependencies:
- '@typescript-eslint/types': 5.60.0
- '@typescript-eslint/visitor-keys': 5.60.0
- dev: true
-
- /@typescript-eslint/[email protected]([email protected])([email protected]):
- resolution: {integrity: sha512-LZqVY8hMiVRF2a7/swmkStMYSoXMFlzL6sXV6U/2gL5cwnLWQgLEG8tjWPpaE4rMIdZ6VKWwcffPlo1jPfk43g==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- peerDependencies:
- eslint: '*'
- typescript: '*'
- peerDependenciesMeta:
- typescript:
- optional: true
- dependencies:
- '@typescript-eslint/typescript-estree': 5.59.11([email protected])
- '@typescript-eslint/utils': 5.59.11([email protected])([email protected])
- debug: 4.3.4([email protected])
- eslint: 8.43.0
- tsutils: 3.21.0([email protected])
- typescript: 5.1.3
- transitivePeerDependencies:
- - supports-color
+ '@typescript-eslint/types': 5.60.1
+ '@typescript-eslint/visitor-keys': 5.60.1
dev: true
/@typescript-eslint/[email protected]([email protected])([email protected]):
@@ -5540,8 +5454,8 @@ packages:
- supports-color
dev: false
- /@typescript-eslint/[email protected]([email protected])([email protected]):
- resolution: {integrity: sha512-X7NsRQddORMYRFH7FWo6sA9Y/zbJ8s1x1RIAtnlj6YprbToTiQnM6vxcMu7iYhdunmoC0rUWlca13D5DVHkK2g==}
+ /@typescript-eslint/[email protected]([email protected])([email protected]):
+ resolution: {integrity: sha512-vN6UztYqIu05nu7JqwQGzQKUJctzs3/Hg7E2Yx8rz9J+4LgtIDFWjjl1gm3pycH0P3mHAcEUBd23LVgfrsTR8A==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
eslint: '*'
@@ -5550,8 +5464,8 @@ packages:
typescript:
optional: true
dependencies:
- '@typescript-eslint/typescript-estree': 5.60.0([email protected])
- '@typescript-eslint/utils': 5.60.0([email protected])([email protected])
+ '@typescript-eslint/typescript-estree': 5.60.1([email protected])
+ '@typescript-eslint/utils': 5.60.1([email protected])([email protected])
debug: 4.3.4([email protected])
eslint: 8.43.0
tsutils: 3.21.0([email protected])
@@ -5560,42 +5474,16 @@ packages:
- supports-color
dev: true
- /@typescript-eslint/[email protected]:
- resolution: {integrity: sha512-epoN6R6tkvBYSc+cllrz+c2sOFWkbisJZWkOE+y3xHtvYaOE6Wk6B8e114McRJwFRjGvYdJwLXQH5c9osME/AA==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- dev: true
-
/@typescript-eslint/[email protected]:
resolution: {integrity: sha512-tH5lBXZI7T2MOUgOWFdVNUILsI02shyQvfzG9EJkoONWugCG77NDDa1EeDGw7oJ5IvsTAAGVV8I3Tk2PNu9QfA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
dev: false
- /@typescript-eslint/[email protected]:
- resolution: {integrity: sha512-ascOuoCpNZBccFVNJRSC6rPq4EmJ2NkuoKnd6LDNyAQmdDnziAtxbCGWCbefG1CNzmDvd05zO36AmB7H8RzKPA==}
+ /@typescript-eslint/[email protected]:
+ resolution: {integrity: sha512-zDcDx5fccU8BA0IDZc71bAtYIcG9PowaOwaD8rjYbqwK7dpe/UMQl3inJ4UtUK42nOCT41jTSCwg76E62JpMcg==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
dev: true
- /@typescript-eslint/[email protected]([email protected]):
- resolution: {integrity: sha512-YupOpot5hJO0maupJXixi6l5ETdrITxeo5eBOeuV7RSKgYdU3G5cxO49/9WRnJq9EMrB7AuTSLH/bqOsXi7wPA==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- peerDependencies:
- typescript: '*'
- peerDependenciesMeta:
- typescript:
- optional: true
- dependencies:
- '@typescript-eslint/types': 5.59.11
- '@typescript-eslint/visitor-keys': 5.59.11
- debug: 4.3.4([email protected])
- globby: 11.1.0
- is-glob: 4.0.3
- semver: 7.5.1
- tsutils: 3.21.0([email protected])
- typescript: 5.1.3
- transitivePeerDependencies:
- - supports-color
- dev: true
-
/@typescript-eslint/[email protected]([email protected]):
resolution: {integrity: sha512-vW6JP3lMAs/Tq4KjdI/RiHaaJSO7IUsbkz17it/Rl9Q+WkQ77EOuOnlbaU8kKfVIOJxMhnRiBG+olE7f3M16DA==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5617,8 +5505,8 @@ packages:
- supports-color
dev: false
- /@typescript-eslint/[email protected]([email protected]):
- resolution: {integrity: sha512-R43thAuwarC99SnvrBmh26tc7F6sPa2B3evkXp/8q954kYL6Ro56AwASYWtEEi+4j09GbiNAHqYwNNZuNlARGQ==}
+ /@typescript-eslint/[email protected]([email protected]):
+ resolution: {integrity: sha512-hkX70J9+2M2ZT6fhti5Q2FoU9zb+GeZK2SLP1WZlvUDqdMbEKhexZODD1WodNRyO8eS+4nScvT0dts8IdaBzfw==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
typescript: '*'
@@ -5626,38 +5514,18 @@ packages:
typescript:
optional: true
dependencies:
- '@typescript-eslint/types': 5.60.0
- '@typescript-eslint/visitor-keys': 5.60.0
+ '@typescript-eslint/types': 5.60.1
+ '@typescript-eslint/visitor-keys': 5.60.1
debug: 4.3.4([email protected])
globby: 11.1.0
is-glob: 4.0.3
- semver: 7.5.1
+ semver: 7.5.3
tsutils: 3.21.0([email protected])
typescript: 5.1.3
transitivePeerDependencies:
- supports-color
dev: true
- /@typescript-eslint/[email protected]([email protected])([email protected]):
- resolution: {integrity: sha512-didu2rHSOMUdJThLk4aZ1Or8IcO3HzCw/ZvEjTTIfjIrcdd5cvSIwwDy2AOlE7htSNp7QIZ10fLMyRCveesMLg==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- peerDependencies:
- eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
- dependencies:
- '@eslint-community/eslint-utils': 4.4.0([email protected])
- '@types/json-schema': 7.0.11
- '@types/semver': 7.5.0
- '@typescript-eslint/scope-manager': 5.59.11
- '@typescript-eslint/types': 5.59.11
- '@typescript-eslint/typescript-estree': 5.59.11([email protected])
- eslint: 8.43.0
- eslint-scope: 5.1.1
- semver: 7.5.1
- transitivePeerDependencies:
- - supports-color
- - typescript
- dev: true
-
/@typescript-eslint/[email protected]([email protected])([email protected]):
resolution: {integrity: sha512-vzaaD6EXbTS29cVH0JjXBdzMt6VBlv+hE31XktDRMX1j3462wZCJa7VzO2AxXEXcIl8GQqZPcOPuW/Z1tZVogg==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5678,8 +5546,8 @@ packages:
- typescript
dev: false
- /@typescript-eslint/[email protected]([email protected])([email protected]):
- resolution: {integrity: sha512-ba51uMqDtfLQ5+xHtwlO84vkdjrqNzOnqrnwbMHMRY8Tqeme8C2Q8Fc7LajfGR+e3/4LoYiWXUM6BpIIbHJ4hQ==}
+ /@typescript-eslint/[email protected]([email protected])([email protected]):
+ resolution: {integrity: sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
peerDependencies:
eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -5687,25 +5555,17 @@ packages:
'@eslint-community/eslint-utils': 4.4.0([email protected])
'@types/json-schema': 7.0.11
'@types/semver': 7.5.0
- '@typescript-eslint/scope-manager': 5.60.0
- '@typescript-eslint/types': 5.60.0
- '@typescript-eslint/typescript-estree': 5.60.0([email protected])
+ '@typescript-eslint/scope-manager': 5.60.1
+ '@typescript-eslint/types': 5.60.1
+ '@typescript-eslint/typescript-estree': 5.60.1([email protected])
eslint: 8.43.0
eslint-scope: 5.1.1
- semver: 7.5.1
+ semver: 7.5.3
transitivePeerDependencies:
- supports-color
- typescript
dev: true
- /@typescript-eslint/[email protected]:
- resolution: {integrity: sha512-KGYniTGG3AMTuKF9QBD7EIrvufkB6O6uX3knP73xbKLMpH+QRPcgnCxjWXSHjMRuOxFLovljqQgQpR0c7GvjoA==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- dependencies:
- '@typescript-eslint/types': 5.59.11
- eslint-visitor-keys: 3.4.1
- dev: true
-
/@typescript-eslint/[email protected]:
resolution: {integrity: sha512-zEfbFLzB9ETcEJ4HZEEsCR9HHeNku5/Qw1jSS5McYJv5BR+ftYXwFFAH5Al+xkGaZEqowMwl7uoJjQb1YSPF8Q==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5714,11 +5574,11 @@ packages:
eslint-visitor-keys: 3.4.1
dev: false
- /@typescript-eslint/[email protected]:
- resolution: {integrity: sha512-wm9Uz71SbCyhUKgcaPRauBdTegUyY/ZWl8gLwD/i/ybJqscrrdVSFImpvUz16BLPChIeKBK5Fa9s6KDQjsjyWw==}
+ /@typescript-eslint/[email protected]:
+ resolution: {integrity: sha512-xEYIxKcultP6E/RMKqube11pGjXH1DCo60mQoWhVYyKfLkwbIVVjYxmOenNMxILx0TjCujPTjjnTIVzm09TXIw==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
dependencies:
- '@typescript-eslint/types': 5.60.0
+ '@typescript-eslint/types': 5.60.1
eslint-visitor-keys: 3.4.1
dev: true
@@ -5824,15 +5684,15 @@ packages:
webpack-cli: 5.1.1([email protected])([email protected])
dev: false
- /@webpack-cli/[email protected]([email protected])([email protected]):
+ /@webpack-cli/[email protected]([email protected])([email protected]):
resolution: {integrity: sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==}
engines: {node: '>=14.15.0'}
peerDependencies:
webpack: 5.x.x
webpack-cli: 5.x.x
dependencies:
- webpack: 5.87.0([email protected])
- webpack-cli: 5.1.4([email protected])([email protected])
+ webpack: 5.88.0([email protected])
+ webpack-cli: 5.1.4([email protected])([email protected])
/@webpack-cli/[email protected]([email protected])([email protected]):
resolution: {integrity: sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==}
@@ -5845,15 +5705,15 @@ packages:
webpack-cli: 5.1.1([email protected])([email protected])
dev: false
- /@webpack-cli/[email protected]([email protected])([email protected]):
+ /@webpack-cli/[email protected]([email protected])([email protected]):
resolution: {integrity: sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==}
engines: {node: '>=14.15.0'}
peerDependencies:
webpack: 5.x.x
webpack-cli: 5.x.x
dependencies:
- webpack: 5.87.0([email protected])
- webpack-cli: 5.1.4([email protected])([email protected])
+ webpack: 5.88.0([email protected])
+ webpack-cli: 5.1.4([email protected])([email protected])
/@webpack-cli/[email protected]([email protected])([email protected]):
resolution: {integrity: sha512-0xRgjgDLdz6G7+vvDLlaRpFatJaJ69uTalZLRSMX5B3VUrDmXcrVA3+6fXXQgmYz7bY9AAgs348XQdmtLsK41A==}
@@ -5870,7 +5730,7 @@ packages:
webpack-cli: 5.1.1([email protected])([email protected])
dev: false
- /@webpack-cli/[email protected]([email protected])([email protected]):
+ /@webpack-cli/[email protected]([email protected])([email protected]):
resolution: {integrity: sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==}
engines: {node: '>=14.15.0'}
peerDependencies:
@@ -5881,8 +5741,8 @@ packages:
webpack-dev-server:
optional: true
dependencies:
- webpack: 5.87.0([email protected])
- webpack-cli: 5.1.4([email protected])([email protected])
+ webpack: 5.88.0([email protected])
+ webpack-cli: 5.1.4([email protected])([email protected])
/@xtuc/[email protected]:
resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
@@ -6299,7 +6159,7 @@ packages:
webpack: 5.83.1([email protected])
dev: false
- /[email protected](@babel/[email protected])([email protected]):
+ /[email protected](@babel/[email protected])([email protected]):
resolution: {integrity: sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==}
engines: {node: '>= 14.15.0'}
peerDependencies:
@@ -6309,7 +6169,7 @@ packages:
'@babel/core': 7.22.5
find-cache-dir: 3.3.2
schema-utils: 4.0.1
- webpack: 5.87.0([email protected])
+ webpack: 5.88.0([email protected])
dev: true
/[email protected](@babel/[email protected]):
@@ -6537,7 +6397,7 @@ packages:
/[email protected]:
resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==}
dependencies:
- semver: 7.5.1
+ semver: 7.5.3
dev: true
/[email protected]:
@@ -6775,10 +6635,6 @@ packages:
resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
engines: {node: '>=6.0'}
- /[email protected]:
- resolution: {integrity: sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==}
engines: {node: '>=8'}
@@ -6954,10 +6810,6 @@ packages:
dot-prop: 5.3.0
dev: true
- /[email protected]:
- resolution: {integrity: sha512-cFhkjbGY1jLFWIV7KegECbfuyYPxSGvgGkdkfM+ibboQDoPwg2FRHm5BSNTOApiauRBzJIQH7qvOJs2sW5ueKQ==}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
@@ -7166,7 +7018,7 @@ packages:
/[email protected]:
resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
- /[email protected](@types/[email protected])([email protected])([email protected])([email protected]):
+ /[email protected](@types/[email protected])([email protected])([email protected])([email protected]):
resolution: {integrity: sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==}
engines: {node: '>=12', npm: '>=6'}
peerDependencies:
@@ -7176,21 +7028,11 @@ packages:
typescript: '>=3'
dependencies:
'@types/node': 20.3.1
- cosmiconfig: 8.1.3
+ cosmiconfig: 8.2.0
ts-node: 10.9.1(@types/[email protected])([email protected])
typescript: 5.1.3
dev: true
- /[email protected]:
- resolution: {integrity: sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==}
- engines: {node: '>=14'}
- dependencies:
- import-fresh: 3.3.0
- js-yaml: 4.1.0
- parse-json: 5.2.0
- path-type: 4.0.0
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==}
engines: {node: '>=14'}
@@ -7205,14 +7047,6 @@ packages:
resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
dev: true
- /[email protected]:
- resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
- dependencies:
- lru-cache: 4.1.5
- shebang-command: 1.2.0
- which: 1.3.1
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
engines: {node: '>= 8'}
@@ -7692,7 +7526,7 @@ packages:
- supports-color
dev: true
- /[email protected](@typescript-eslint/[email protected])([email protected])([email protected]):
+ /[email protected](@typescript-eslint/[email protected])([email protected])([email protected]):
resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
engines: {node: '>=4'}
peerDependencies:
@@ -7713,7 +7547,7 @@ packages:
eslint-import-resolver-webpack:
optional: true
dependencies:
- '@typescript-eslint/parser': 5.60.0([email protected])([email protected])
+ '@typescript-eslint/parser': 5.60.1([email protected])([email protected])
debug: 3.2.7([email protected])
eslint: 8.43.0
eslint-import-resolver-node: 0.3.7
@@ -7721,7 +7555,7 @@ packages:
- supports-color
dev: true
- /[email protected](@typescript-eslint/[email protected])([email protected]):
+ /[email protected](@typescript-eslint/[email protected])([email protected]):
resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==}
engines: {node: '>=4'}
peerDependencies:
@@ -7731,7 +7565,7 @@ packages:
'@typescript-eslint/parser':
optional: true
dependencies:
- '@typescript-eslint/parser': 5.60.0([email protected])([email protected])
+ '@typescript-eslint/parser': 5.60.1([email protected])([email protected])
array-includes: 3.1.6
array.prototype.flat: 1.3.1
array.prototype.flatmap: 1.3.1
@@ -7739,7 +7573,7 @@ packages:
doctrine: 2.1.0
eslint: 8.43.0
eslint-import-resolver-node: 0.3.7
- eslint-module-utils: 2.8.0(@typescript-eslint/[email protected])([email protected])([email protected])
+ eslint-module-utils: 2.8.0(@typescript-eslint/[email protected])([email protected])([email protected])
has: 1.0.3
is-core-module: 2.12.1
is-glob: 4.0.3
@@ -7773,8 +7607,8 @@ packages:
- supports-color
dev: false
- /[email protected]([email protected]):
- resolution: {integrity: sha512-zIaK3zbSrKuH12bP+SPybPgcHSM6MFzh3HFeaODzmsF1N8C1l8dzJ22cW1aq4g0+nayU1VMjmNf7hg0dpShLrA==}
+ /[email protected]([email protected]):
+ resolution: {integrity: sha512-nfSvsR8YJRZyKrWwcXPSQyQC8jllfdEjcRhTXFr7RxfB5Wyl7AxrfjCUz72WwalkXMF4u+R6F/oDoW46ah69HQ==}
engines: {node: '>=16'}
peerDependencies:
eslint: ^7.0.0 || ^8.0.0
@@ -7965,19 +7799,6 @@ packages:
resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
engines: {node: '>=0.8.x'}
- /[email protected]:
- resolution: {integrity: sha512-zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA==}
- engines: {node: '>=4'}
- dependencies:
- cross-spawn: 5.1.0
- get-stream: 3.0.0
- is-stream: 1.1.0
- npm-run-path: 2.0.2
- p-finally: 1.0.0
- signal-exit: 3.0.7
- strip-eof: 1.0.0
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==}
engines: {node: '>=10'}
@@ -8401,11 +8222,6 @@ packages:
engines: {node: '>=8'}
dev: true
- /[email protected]:
- resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==}
- engines: {node: '>=4'}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
engines: {node: '>=8'}
@@ -8577,7 +8393,7 @@ packages:
es6-error: 4.1.1
matcher: 3.0.0
roarr: 2.15.4
- semver: 7.5.1
+ semver: 7.5.3
serialize-error: 7.0.1
dev: true
optional: true
@@ -8935,11 +8751,6 @@ packages:
resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
dev: true
- /[email protected]:
- resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}
- engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-kBhlSheBfYmq3e0L1ii+VKe3zBTLL5lDCDWR+f9dLmEGSB3MqLlMlsolubSsyI88Bg6EA+BIMlomAnQ1SwgQBw==}
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -8948,7 +8759,7 @@ packages:
promzard: 1.0.0
read: 2.1.0
read-package-json: 6.0.4
- semver: 7.5.1
+ semver: 7.5.3
validate-npm-package-license: 3.0.4
validate-npm-package-name: 5.0.0
dev: true
@@ -8974,11 +8785,6 @@ packages:
wrap-ansi: 7.0.0
dev: true
- /[email protected]:
- resolution: {integrity: sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA==}
- engines: {node: '>= 0.10'}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==}
engines: {node: '>= 0.4'}
@@ -9050,13 +8856,6 @@ packages:
engines: {node: '>= 0.4'}
dev: true
- /[email protected]:
- resolution: {integrity: sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==}
- hasBin: true
- dependencies:
- ci-info: 1.6.0
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
hasBin: true
@@ -9192,11 +8991,6 @@ packages:
protocols: 2.0.1
dev: true
- /[email protected]:
- resolution: {integrity: sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==}
- engines: {node: '>=0.10.0'}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==}
engines: {node: '>=8'}
@@ -9644,25 +9438,20 @@ packages:
engines: {node: '>=6'}
dev: true
- /[email protected]:
- resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
- engines: {node: '>=6'}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-RE2g0b5VGZsOCFOCgP7omTRYFqydmZkBwl5oNnQ1lDYC57uyO9KqNnNVxT7COSHTxrRCWVcAVOcbjk+tvh/rgQ==}
engines: {node: '>=0.10.0'}
dev: true
- /[email protected]:
- resolution: {integrity: sha512-omFpf1pTiaObC2YOC7K+euaDwhQA9CyKN1kXxmlSwaSkh8b8QTs4SC8jp3oNeXfcHpVS1ttuuz98AvQvJD46wA==}
+ /[email protected]:
+ resolution: {integrity: sha512-fY1EctsuP21eR7F9zmnqcdtBRkzvsoAOVYzjrtQQXYt9hlyA14RvjQJIF7R54t+T60As7kFYNgw2PHsC3orV2w==}
engines: {node: ^14.17.0 || >=16.0.0}
hasBin: true
dependencies:
- '@lerna/child-process': 7.0.2
- '@lerna/create': 7.0.2
+ '@lerna/child-process': 7.1.0
+ '@lerna/create': 7.1.0
'@npmcli/run-script': 6.0.2
- '@nx/devkit': 16.3.2([email protected])
+ '@nx/devkit': 16.3.2([email protected])
'@octokit/plugin-enterprise-rest': 6.0.1
'@octokit/rest': 19.0.11
byte-size: 8.1.1
@@ -9704,7 +9493,7 @@ packages:
npm-packlist: 5.1.1
npm-registry-fetch: 14.0.5
npmlog: 6.0.2
- nx: 16.3.2
+ nx: 16.4.0
p-map: 4.0.0
p-map-series: 2.1.0
p-pipe: 3.1.0
@@ -9768,7 +9557,7 @@ packages:
npm-package-arg: 10.1.0
npm-registry-fetch: 14.0.5
proc-log: 3.0.0
- semver: 7.5.1
+ semver: 7.5.3
sigstore: 1.5.2
ssri: 10.0.4
transitivePeerDependencies:
@@ -9936,13 +9725,6 @@ packages:
engines: {node: '>=8'}
dev: true
- /[email protected]:
- resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==}
- dependencies:
- pseudomap: 1.0.2
- yallist: 2.1.2
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
dependencies:
@@ -10453,7 +10235,7 @@ packages:
nopt: 6.0.0
npmlog: 6.0.2
rimraf: 3.0.2
- semver: 7.5.1
+ semver: 7.5.3
tar: 6.1.15
which: 2.0.2
transitivePeerDependencies:
@@ -10535,7 +10317,7 @@ packages:
dependencies:
hosted-git-info: 4.1.0
is-core-module: 2.12.1
- semver: 7.5.1
+ semver: 7.5.3
validate-npm-package-license: 3.0.4
dev: true
@@ -10545,15 +10327,10 @@ packages:
dependencies:
hosted-git-info: 6.1.1
is-core-module: 2.12.1
- semver: 7.5.1
+ semver: 7.5.3
validate-npm-package-license: 3.0.4
dev: true
- /[email protected]:
- resolution: {integrity: sha512-7WyT0w8jhpDStXRq5836AMmihQwq2nrUVQrgjvUo/p/NZf9uy/MeJ246lBJVmWuYXMlJuG9BNZHF0hWjfTbQUA==}
- engines: {node: '>=0.10.0'}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
engines: {node: '>=0.10.0'}
@@ -10581,7 +10358,7 @@ packages:
resolution: {integrity: sha512-dH3GmQL4vsPtld59cOn8uY0iOqRmqKvV+DLGwNXV/Q7MDgD2QfOADWd/mFXcIE5LVhYYGjA3baz6W9JneqnuCw==}
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
dependencies:
- semver: 7.5.1
+ semver: 7.5.3
dev: true
/[email protected]:
@@ -10599,7 +10376,7 @@ packages:
dependencies:
hosted-git-info: 6.1.1
proc-log: 3.0.0
- semver: 7.5.1
+ semver: 7.5.3
validate-npm-package-name: 5.0.0
dev: true
@@ -10608,7 +10385,7 @@ packages:
engines: {node: '>=10'}
dependencies:
hosted-git-info: 3.0.8
- semver: 7.5.1
+ semver: 7.5.3
validate-npm-package-name: 3.0.0
dev: true
@@ -10637,7 +10414,7 @@ packages:
npm-install-checks: 6.1.1
npm-normalize-package-bin: 3.0.1
npm-package-arg: 10.1.0
- semver: 7.5.1
+ semver: 7.5.3
dev: true
/[email protected]:
@@ -10655,13 +10432,6 @@ packages:
- supports-color
dev: true
- /[email protected]:
- resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}
- engines: {node: '>=4'}
- dependencies:
- path-key: 2.0.1
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
engines: {node: '>=8'}
@@ -10708,8 +10478,8 @@ packages:
- debug
dev: true
- /[email protected]:
- resolution: {integrity: sha512-fOzCVL7qoCJAcYTJwvJ9j+PSaL791ro4AICWuLxaphZsp2jcLoav4Ev7ONPks2Wlkt8FS9bee3nqQ3w1ya36Og==}
+ /[email protected]:
+ resolution: {integrity: sha512-HhJnOAm2wlaIVMmxK1HcdcKfX5DlnQc1RAHFf+QostvQQ/SmUg9f7LoStxpNm01JhQTehb01tH9zAsXKcKzO4A==}
hasBin: true
requiresBuild: true
peerDependencies:
@@ -10721,7 +10491,7 @@ packages:
'@swc/core':
optional: true
dependencies:
- '@nrwl/tao': 16.3.2
+ '@nrwl/tao': 16.4.0
'@parcel/watcher': 2.0.4
'@yarnpkg/lockfile': 1.1.0
'@yarnpkg/parsers': 3.0.0-rc.44
@@ -10745,7 +10515,7 @@ packages:
minimatch: 3.0.5
npm-run-path: 4.0.1
open: 8.4.2
- semver: 7.3.4
+ semver: 7.5.3
string-width: 4.2.3
strong-log-transformer: 2.1.0
tar-stream: 2.2.0
@@ -10756,16 +10526,16 @@ packages:
yargs: 17.7.2
yargs-parser: 21.1.1
optionalDependencies:
- '@nx/nx-darwin-arm64': 16.3.2
- '@nx/nx-darwin-x64': 16.3.2
- '@nx/nx-freebsd-x64': 16.3.2
- '@nx/nx-linux-arm-gnueabihf': 16.3.2
- '@nx/nx-linux-arm64-gnu': 16.3.2
- '@nx/nx-linux-arm64-musl': 16.3.2
- '@nx/nx-linux-x64-gnu': 16.3.2
- '@nx/nx-linux-x64-musl': 16.3.2
- '@nx/nx-win32-arm64-msvc': 16.3.2
- '@nx/nx-win32-x64-msvc': 16.3.2
+ '@nx/nx-darwin-arm64': 16.4.0
+ '@nx/nx-darwin-x64': 16.4.0
+ '@nx/nx-freebsd-x64': 16.4.0
+ '@nx/nx-linux-arm-gnueabihf': 16.4.0
+ '@nx/nx-linux-arm64-gnu': 16.4.0
+ '@nx/nx-linux-arm64-musl': 16.4.0
+ '@nx/nx-linux-x64-gnu': 16.4.0
+ '@nx/nx-linux-x64-musl': 16.4.0
+ '@nx/nx-win32-arm64-msvc': 16.4.0
+ '@nx/nx-win32-x64-msvc': 16.4.0
transitivePeerDependencies:
- debug
dev: true
@@ -11147,11 +10917,6 @@ packages:
resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
engines: {node: '>=0.10.0'}
- /[email protected]:
- resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
- engines: {node: '>=4'}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
engines: {node: '>=8'}
@@ -11318,10 +11083,6 @@ packages:
resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
dev: true
- /[email protected]:
- resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
@@ -11708,10 +11469,6 @@ packages:
strip-indent: 3.0.0
dev: true
- /[email protected]:
- resolution: {integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==}
engines: {node: '>=4'}
@@ -12007,20 +11764,28 @@ packages:
lru-cache: 6.0.0
dev: true
- /[email protected]:
- resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==}
+ /[email protected]:
+ resolution: {integrity: sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==}
+ engines: {node: '>=10'}
+ hasBin: true
+ dependencies:
+ lru-cache: 6.0.0
+
+ /[email protected]:
+ resolution: {integrity: sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==}
engines: {node: '>=10'}
hasBin: true
dependencies:
lru-cache: 6.0.0
dev: true
- /[email protected]:
- resolution: {integrity: sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==}
+ /[email protected]:
+ resolution: {integrity: sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==}
engines: {node: '>=10'}
hasBin: true
dependencies:
lru-cache: 6.0.0
+ dev: true
/[email protected]:
resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
@@ -12087,24 +11852,12 @@ packages:
dependencies:
kind-of: 6.0.3
- /[email protected]:
- resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
- engines: {node: '>=0.10.0'}
- dependencies:
- shebang-regex: 1.0.0
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
engines: {node: '>=8'}
dependencies:
shebang-regex: 3.0.0
- /[email protected]:
- resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
- engines: {node: '>=0.10.0'}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
engines: {node: '>=8'}
@@ -12408,21 +12161,11 @@ packages:
engines: {node: '>=8'}
dev: true
- /[email protected]:
- resolution: {integrity: sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==}
- engines: {node: '>=0.10.0'}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
engines: {node: '>=6'}
dev: true
- /[email protected]:
- resolution: {integrity: sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA==}
- engines: {node: '>=4'}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
engines: {node: '>=8'}
@@ -12563,7 +12306,7 @@ packages:
webpack: 5.83.1([email protected])
dev: false
- /[email protected]([email protected]):
+ /[email protected]([email protected]):
resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==}
engines: {node: '>= 10.13.0'}
peerDependencies:
@@ -12584,7 +12327,7 @@ packages:
schema-utils: 3.1.2
serialize-javascript: 6.0.1
terser: 5.17.4
- webpack: 5.87.0([email protected])
+ webpack: 5.88.0([email protected])
/[email protected]:
resolution: {integrity: sha512-jcEKZw6UPrgugz/0Tuk/PVyLAPfMBJf5clnGueo45wTweoV8yh7Q7PEkhkJ5uuUbC7zAxEcG3tqNr1bstkQ8nw==}
@@ -12982,8 +12725,8 @@ packages:
typescript: 5.1.3
dev: true
- /[email protected]:
- resolution: {integrity: sha512-KQTtfHnuRVfW55U5pjQGBJlvhrgWL2VwJ7WVo4HUTz74BlOk26Ca3Ngzk84BdJ9MvpFZ/fH+3OJYfSqJYJNZIw==}
+ /[email protected]:
+ resolution: {integrity: sha512-EcmquhfGEmEJOAezLZC6CzY0rPNzfXuky+Z3zoXULEEncW8e13aAjmC2r8ppT1bvvDekJj1TJ4xVhOdkjYtkUA==}
hasBin: true
dependencies:
'@types/json-schema': 7.0.11
@@ -13339,7 +13082,7 @@ packages:
webpack-merge: 5.8.0
dev: false
- /[email protected]([email protected])([email protected]):
+ /[email protected]([email protected])([email protected]):
resolution: {integrity: sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==}
engines: {node: '>=14.15.0'}
hasBin: true
@@ -13357,9 +13100,9 @@ packages:
optional: true
dependencies:
'@discoveryjs/json-ext': 0.5.7
- '@webpack-cli/configtest': 2.1.1([email protected])([email protected])
- '@webpack-cli/info': 2.0.2([email protected])([email protected])
- '@webpack-cli/serve': 2.0.5([email protected])([email protected])
+ '@webpack-cli/configtest': 2.1.1([email protected])([email protected])
+ '@webpack-cli/info': 2.0.2([email protected])([email protected])
+ '@webpack-cli/serve': 2.0.5([email protected])([email protected])
colorette: 2.0.20
commander: 10.0.1
cross-spawn: 7.0.3
@@ -13368,7 +13111,7 @@ packages:
import-local: 3.1.0
interpret: 3.1.1
rechoir: 0.8.0
- webpack: 5.87.0([email protected])
+ webpack: 5.88.0([email protected])
webpack-bundle-analyzer: 4.9.0
webpack-merge: 5.8.0
@@ -13424,8 +13167,8 @@ packages:
- uglify-js
dev: false
- /[email protected]([email protected]):
- resolution: {integrity: sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==}
+ /[email protected]([email protected]):
+ resolution: {integrity: sha512-O3jDhG5e44qIBSi/P6KpcCcH7HD+nYIHVBhdWFxcLOcIGN8zGo5nqF3BjyNCxIh4p1vFdNnreZv2h2KkoAw3lw==}
engines: {node: '>=10.13.0'}
hasBin: true
peerDependencies:
@@ -13455,7 +13198,7 @@ packages:
neo-async: 2.6.2
schema-utils: 3.3.0
tapable: 2.2.1
- terser-webpack-plugin: 5.3.9([email protected])
+ terser-webpack-plugin: 5.3.9([email protected])
watchpack: 2.4.0
webpack-cli: 5.1.1([email protected])([email protected])
webpack-sources: 3.2.3
@@ -13465,8 +13208,8 @@ packages:
- uglify-js
dev: false
- /[email protected]([email protected]):
- resolution: {integrity: sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==}
+ /[email protected]([email protected]):
+ resolution: {integrity: sha512-O3jDhG5e44qIBSi/P6KpcCcH7HD+nYIHVBhdWFxcLOcIGN8zGo5nqF3BjyNCxIh4p1vFdNnreZv2h2KkoAw3lw==}
engines: {node: '>=10.13.0'}
hasBin: true
peerDependencies:
@@ -13496,9 +13239,9 @@ packages:
neo-async: 2.6.2
schema-utils: 3.3.0
tapable: 2.2.1
- terser-webpack-plugin: 5.3.9([email protected])
+ terser-webpack-plugin: 5.3.9([email protected])
watchpack: 2.4.0
- webpack-cli: 5.1.4([email protected])([email protected])
+ webpack-cli: 5.1.4([email protected])([email protected])
webpack-sources: 3.2.3
transitivePeerDependencies:
- '@swc/core'
@@ -13554,13 +13297,6 @@ packages:
is-typed-array: 1.1.10
dev: true
- /[email protected]:
- resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
- hasBin: true
- dependencies:
- isexe: 2.0.0
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
engines: {node: '>= 8'}
@@ -13740,10 +13476,6 @@ packages:
resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
engines: {node: '>=10'}
- /[email protected]:
- resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==}
- dev: true
-
/[email protected]:
resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
@@ -13853,14 +13585,3 @@ packages:
resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
engines: {node: '>=12.20'}
dev: true
-
- /[email protected]:
- resolution: {integrity: sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==}
- engines: {node: '>=4'}
- requiresBuild: true
- dependencies:
- execa: 0.8.0
- is-ci: 1.2.1
- normalize-path: 1.0.0
- strip-indent: 2.0.0
- dev: true
diff --git a/ByteStream.ts b/ByteStream.ts
index 13e77da..5e05f1d 100644
--- a/ByteStream.ts
+++ b/ByteStream.ts
@@ -20,13 +20,11 @@ export class ByteStream {
* @returns the string
*/
getString(count: number): string {
- let s = "";
+ const slice = this.data.slice(this.pos, this.pos + count);
- for (; --count >= 0; s += String.fromCharCode(this.data[this.pos++])) {
- // do nothing
- }
+ this.pos += slice.length;
- return s;
+ return slice.reduce((acc, curr) => acc + String.fromCharCode(curr), "");
}
/**
diff --git a/DisposalMethod.ts b/DisposalMethod.ts
index 53d9adb..6a279bc 100644
--- a/DisposalMethod.ts
+++ b/DisposalMethod.ts
diff --git a/ApplicationExtension.ts b/ApplicationExtension.ts
index cd079c6..e640837 100644
--- a/ApplicationExtension.ts
+++ b/ApplicationExtension.ts
diff --git a/Frame.ts b/Frame.ts
index 0a8c39f..d96bda8 100644
--- a/Frame.ts
+++ b/Frame.ts
@@ -1,4 +1,5 @@
-import type { DisposalMethod } from "./DisposalMethod";
+import type { DisposalMethod } from "../Enums/DisposalMethod";
+import type { IRgb } from "tsparticles-engine";
import type { PlainTextData } from "./PlainTextData";
export interface Frame {
@@ -40,7 +41,7 @@ export interface Frame {
/**
* the local color table for this frame
*/
- localColorTable: [number, number, number][];
+ localColorTable: IRgb[];
/**
* the text that will be displayed on screen with this frame (if not null)
diff --git a/GIF.ts b/GIF.ts
index d28dcd3..5d59f98 100644
--- a/GIF.ts
+++ b/GIF.ts
@@ -1,5 +1,6 @@
import type { ApplicationExtension } from "./ApplicationExtension";
import type { Frame } from "./Frame";
+import type { IRgb } from "tsparticles-engine";
export interface GIF {
/**
@@ -30,7 +31,7 @@ export interface GIF {
/**
* the global color table for the GIF
*/
- globalColorTable: [number, number, number][];
+ globalColorTable: IRgb[];
/**
* the height of the image in pixels (locical screen size)
diff --git a/GIFDataHeaders.ts b/GIFDataHeaders.ts
index 3ff41bb..f5cbcde 100644
--- a/GIFDataHeaders.ts
+++ b/GIFDataHeaders.ts
diff --git a/GIFProgressCallbackFunction.ts b/GIFProgressCallbackFunction.ts
index 2b0ad48..d1a5279 100644
--- a/GIFProgressCallbackFunction.ts
+++ b/GIFProgressCallbackFunction.ts
diff --git a/PlainTextData.ts b/PlainTextData.ts
index f1f5901..a2c6ab8 100644
--- a/PlainTextData.ts
+++ b/PlainTextData.ts
@@ -1,3 +1,5 @@
+import type { IDimension } from "tsparticles-engine";
+
export interface PlainTextData {
/**
* the index into the global color table for the background color of the text
@@ -5,14 +7,9 @@ export interface PlainTextData {
backgroundColor: number;
/**
- * the height (in pixels) of each cell (character) in text grid
- */
- charHeight: number;
-
- /**
- * the width (in pixels) of each cell (character) in text grid
+ * the size (in pixels) of each cell (character) in text grid
*/
- charWidth: number;
+ charSize: IDimension;
/**
* the index into the global color table for the foreground color of the text
diff --git a/ImageDrawer.ts b/ImageDrawer.ts
index 94452de..59d8553 100644
--- a/ImageDrawer.ts
+++ b/ImageDrawer.ts
@@ -1,7 +1,7 @@
import { type Container, type IDelta, type IShapeDrawer, errorPrefix } from "tsparticles-engine";
import type { IImage, IParticleImage, ImageParticle } from "./Utils";
import type { ImageContainer, ImageEngine } from "./types";
-import { DisposalMethod } from "./GifUtils/DisposalMethod";
+import { DisposalMethod } from "./GifUtils/Enums/DisposalMethod";
import type { IImageShape } from "./IImageShape";
import { replaceImageColor } from "./Utils";
|
|
refactor: remove psql_path from postgres data loading (#3071)
|
f9429987eea8a83b8126c450e5ff07c57312f59b
|
refactor
|
https://github.com/rohankumardubey/ibis/commit/f9429987eea8a83b8126c450e5ff07c57312f59b
|
remove psql_path from postgres data loading (#3071)
|
diff --git a/datamgr.py b/datamgr.py
index de2e255..82b22fd 100644
--- a/datamgr.py
+++ b/datamgr.py
@@ -8,7 +8,6 @@ from pathlib import Path
import click
import pandas as pd
import sqlalchemy as sa
-from plumbum import local
from toolz import dissoc
SCRIPT_DIR = Path(__file__).parent.absolute()
@@ -242,20 +241,12 @@ def parquet(tables, data_directory, ignore_missing_dependency, **params):
path_type=Path,
),
)
[email protected](
- '-l',
- '--psql-path',
- type=click.Path(exists=True),
- required=os.name == 'nt',
- default=None if os.name == 'nt' else '/usr/bin/psql',
-)
@click.option(
'--plpython/--no-plpython',
help='Create PL/Python extension in database',
default=True,
)
-def postgres(schema, tables, data_directory, psql_path, plpython, **params):
- psql = local[psql_path]
+def postgres(schema, tables, data_directory, plpython, **params):
logger.info('Initializing PostgreSQL...')
engine = init_database(
'postgresql', params, schema, isolation_level='AUTOCOMMIT'
@@ -270,8 +261,6 @@ def postgres(schema, tables, data_directory, psql_path, plpython, **params):
if plpython:
engine.execute("CREATE EXTENSION IF NOT EXISTS PLPYTHONU")
- query = "COPY {} FROM STDIN WITH (FORMAT CSV, HEADER TRUE, DELIMITER ',')"
- database = params['database']
for table in tables:
src = data_directory / f'{table}.csv'
@@ -298,23 +287,21 @@ def postgres(schema, tables, data_directory, psql_path, plpython, **params):
"geo_multipolygon": Geometry("MULTIPOLYGON", srid=srid),
},
)
- continue
-
- load = psql[
- '--host',
- params['host'],
- '--port',
- params['port'],
- '--username',
- params['user'],
- '--dbname',
- database,
- '--command',
- query.format(table),
- ]
- with local.env(PGPASSWORD=params['password']):
- with src.open('r') as f:
- load(stdin=f)
+ else:
+ # Here we insert rows using COPY table FROM STDIN, by way of
+ # psycopg2's `copy_expert` API.
+ #
+ # We could use DataFrame.to_sql(method=callable), but that incurs
+ # an unnecessary round trip and requires more code: the `data_iter`
+ # argument would have to be turned back into a CSV before being
+ # passed to `copy_expert`.
+ sql = (
+ f"COPY {table} FROM STDIN "
+ "WITH (FORMAT CSV, HEADER TRUE, DELIMITER ',')"
+ )
+ with src.open('r') as file:
+ with engine.begin() as con, con.connection.cursor() as cur:
+ cur.copy_expert(sql=sql, file=file)
engine.execute('VACUUM FULL ANALYZE')
|
|
chore(deps): lock numpy to latest version
|
afa7c61dcd5041bcff6fcb30bc24475743af67b8
|
chore
|
https://github.com/ibis-project/ibis/commit/afa7c61dcd5041bcff6fcb30bc24475743af67b8
|
lock numpy to latest version
|
diff --git a/poetry.lock b/poetry.lock
index 023342a..abf2c6f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1370,7 +1370,7 @@ python-versions = ">=3.5"
[[package]]
name = "numpy"
-version = "1.22.4"
+version = "1.23.1"
description = "NumPy is the fundamental package for array computing with Python."
category = "main"
optional = false
@@ -3372,28 +3372,28 @@ nest-asyncio = [
{file = "nest_asyncio-1.5.5.tar.gz", hash = "sha256:e442291cd942698be619823a17a86a5759eabe1f8613084790de189fe9e16d65"},
]
numpy = [
- {file = "numpy-1.22.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:ba9ead61dfb5d971d77b6c131a9dbee62294a932bf6a356e48c75ae684e635b3"},
- {file = "numpy-1.22.4-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:1ce7ab2053e36c0a71e7a13a7475bd3b1f54750b4b433adc96313e127b870887"},
- {file = "numpy-1.22.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7228ad13744f63575b3a972d7ee4fd61815b2879998e70930d4ccf9ec721dce0"},
- {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43a8ca7391b626b4c4fe20aefe79fec683279e31e7c79716863b4b25021e0e74"},
- {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a911e317e8c826ea632205e63ed8507e0dc877dcdc49744584dfc363df9ca08c"},
- {file = "numpy-1.22.4-cp310-cp310-win32.whl", hash = "sha256:9ce7df0abeabe7fbd8ccbf343dc0db72f68549856b863ae3dd580255d009648e"},
- {file = "numpy-1.22.4-cp310-cp310-win_amd64.whl", hash = "sha256:3e1ffa4748168e1cc8d3cde93f006fe92b5421396221a02f2274aab6ac83b077"},
- {file = "numpy-1.22.4-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:59d55e634968b8f77d3fd674a3cf0b96e85147cd6556ec64ade018f27e9479e1"},
- {file = "numpy-1.22.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c1d937820db6e43bec43e8d016b9b3165dcb42892ea9f106c70fb13d430ffe72"},
- {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4c5d5eb2ec8da0b4f50c9a843393971f31f1d60be87e0fb0917a49133d257d6"},
- {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64f56fc53a2d18b1924abd15745e30d82a5782b2cab3429aceecc6875bd5add0"},
- {file = "numpy-1.22.4-cp38-cp38-win32.whl", hash = "sha256:fb7a980c81dd932381f8228a426df8aeb70d59bbcda2af075b627bbc50207cba"},
- {file = "numpy-1.22.4-cp38-cp38-win_amd64.whl", hash = "sha256:e96d7f3096a36c8754207ab89d4b3282ba7b49ea140e4973591852c77d09eb76"},
- {file = "numpy-1.22.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:4c6036521f11a731ce0648f10c18ae66d7143865f19f7299943c985cdc95afb5"},
- {file = "numpy-1.22.4-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b89bf9b94b3d624e7bb480344e91f68c1c6c75f026ed6755955117de00917a7c"},
- {file = "numpy-1.22.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d487e06ecbf1dc2f18e7efce82ded4f705f4bd0cd02677ffccfb39e5c284c7e"},
- {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3eb268dbd5cfaffd9448113539e44e2dd1c5ca9ce25576f7c04a5453edc26fa"},
- {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37431a77ceb9307c28382c9773da9f306435135fae6b80b62a11c53cfedd8802"},
- {file = "numpy-1.22.4-cp39-cp39-win32.whl", hash = "sha256:cc7f00008eb7d3f2489fca6f334ec19ca63e31371be28fd5dad955b16ec285bd"},
- {file = "numpy-1.22.4-cp39-cp39-win_amd64.whl", hash = "sha256:f0725df166cf4785c0bc4cbfb320203182b1ecd30fee6e541c8752a92df6aa32"},
- {file = "numpy-1.22.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0791fbd1e43bf74b3502133207e378901272f3c156c4df4954cad833b1380207"},
- {file = "numpy-1.22.4.zip", hash = "sha256:425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af"},
+ {file = "numpy-1.23.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b15c3f1ed08df4980e02cc79ee058b788a3d0bef2fb3c9ca90bb8cbd5b8a3a04"},
+ {file = "numpy-1.23.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9ce242162015b7e88092dccd0e854548c0926b75c7924a3495e02c6067aba1f5"},
+ {file = "numpy-1.23.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e0d7447679ae9a7124385ccf0ea990bb85bb869cef217e2ea6c844b6a6855073"},
+ {file = "numpy-1.23.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3119daed207e9410eaf57dcf9591fdc68045f60483d94956bee0bfdcba790953"},
+ {file = "numpy-1.23.1-cp310-cp310-win32.whl", hash = "sha256:3ab67966c8d45d55a2bdf40701536af6443763907086c0a6d1232688e27e5447"},
+ {file = "numpy-1.23.1-cp310-cp310-win_amd64.whl", hash = "sha256:1865fdf51446839ca3fffaab172461f2b781163f6f395f1aed256b1ddc253622"},
+ {file = "numpy-1.23.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:aeba539285dcf0a1ba755945865ec61240ede5432df41d6e29fab305f4384db2"},
+ {file = "numpy-1.23.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7e8229f3687cdadba2c4faef39204feb51ef7c1a9b669247d49a24f3e2e1617c"},
+ {file = "numpy-1.23.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68b69f52e6545af010b76516f5daaef6173e73353e3295c5cb9f96c35d755641"},
+ {file = "numpy-1.23.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1408c3527a74a0209c781ac82bde2182b0f0bf54dea6e6a363fe0cc4488a7ce7"},
+ {file = "numpy-1.23.1-cp38-cp38-win32.whl", hash = "sha256:47f10ab202fe4d8495ff484b5561c65dd59177949ca07975663f4494f7269e3e"},
+ {file = "numpy-1.23.1-cp38-cp38-win_amd64.whl", hash = "sha256:37e5ebebb0eb54c5b4a9b04e6f3018e16b8ef257d26c8945925ba8105008e645"},
+ {file = "numpy-1.23.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:173f28921b15d341afadf6c3898a34f20a0569e4ad5435297ba262ee8941e77b"},
+ {file = "numpy-1.23.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:876f60de09734fbcb4e27a97c9a286b51284df1326b1ac5f1bf0ad3678236b22"},
+ {file = "numpy-1.23.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:35590b9c33c0f1c9732b3231bb6a72d1e4f77872390c47d50a615686ae7ed3fd"},
+ {file = "numpy-1.23.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a35c4e64dfca659fe4d0f1421fc0f05b8ed1ca8c46fb73d9e5a7f175f85696bb"},
+ {file = "numpy-1.23.1-cp39-cp39-win32.whl", hash = "sha256:c2f91f88230042a130ceb1b496932aa717dcbd665350beb821534c5c7e15881c"},
+ {file = "numpy-1.23.1-cp39-cp39-win_amd64.whl", hash = "sha256:37ece2bd095e9781a7156852e43d18044fd0d742934833335599c583618181b9"},
+ {file = "numpy-1.23.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:8002574a6b46ac3b5739a003b5233376aeac5163e5dcd43dd7ad062f3e186129"},
+ {file = "numpy-1.23.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d732d17b8a9061540a10fda5bfeabca5785700ab5469a5e9b93aca5e2d3a5fb"},
+ {file = "numpy-1.23.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:55df0f7483b822855af67e38fb3a526e787adf189383b4934305565d71c4b148"},
+ {file = "numpy-1.23.1.tar.gz", hash = "sha256:d748ef349bfef2e1194b59da37ed5a29c19ea8d7e6342019921ba2ba4fd8b624"},
]
packaging = [
{file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
diff --git a/requirements.txt b/requirements.txt
index 94a71b1..9ec1c30 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -102,7 +102,7 @@ nbclient==0.6.6; python_full_version >= "3.7.1" and python_version < "4" and pyt
nbconvert==6.5.0; python_full_version >= "3.7.1" and python_version < "4" and python_version >= "3.7"
nbformat==5.4.0; python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.7.1"
nest-asyncio==1.5.5; python_full_version >= "3.7.1" and python_version < "4" and python_version >= "3.7"
-numpy==1.22.4; python_version >= "3.8"
+numpy==1.23.1; python_version >= "3.8"
packaging==21.3; python_version >= "3.6"
pandas==1.4.3; python_version >= "3.8"
pandocfilters==1.5.0; python_full_version >= "3.7.1" and python_version < "4" and python_version >= "3.7"
|
|
feat: Add `Time` type. (#427)
It was originally from the `git-actor` crate.
|
cfb6a726ddb763f7c22688f8ef309e719c2dfce4
|
feat
|
https://github.com/Byron/gitoxide/commit/cfb6a726ddb763f7c22688f8ef309e719c2dfce4
|
Add `Time` type. (#427)
It was originally from the `git-actor` crate.
|
diff --git a/Cargo.lock b/Cargo.lock
index 80edbe9..b054b01 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -970,6 +970,13 @@ dependencies = [
[[package]]
name = "git-date"
version = "0.0.0"
+dependencies = [
+ "bstr",
+ "document-features",
+ "git-testtools",
+ "itoa 1.0.2",
+ "serde",
+]
[[package]]
name = "git-diff"
diff --git a/Makefile b/Makefile
index 67ada91..1860d14 100644
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,7 @@ check: ## Build all code in suitable configurations
cd git-mailmap && cargo check --features serde1
cd git-worktree && cargo check --features serde1
cd git-actor && cargo check --features serde1
+ cd git-date && cargo check --features serde1
cd git-pack && cargo check --features serde1 \\
&& cargo check --features pack-cache-lru-static \\
&& cargo check --features pack-cache-lru-dynamic \\
diff --git a/README.md b/README.md
index e5e8f7f..21e0a1e 100644
--- a/README.md
+++ b/README.md
@@ -125,12 +125,12 @@ Crates that seem feature complete and need to see some more use before they can
* [git-index](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-index)
* [git-worktree](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-worktree)
* [git-bitmap](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-bitmap)
- * [git-revision](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-revision)
* [git-attributes](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-attributes)
+ * [git-revision](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-revision)
+ * [git-date](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-date)
* **idea**
* [git-note](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-note)
* [git-filter](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-filter)
- * [git-date](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-date)
* [git-lfs](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-lfs)
* [git-rebase](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-rebase)
* [git-sequencer](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-sequencer)
diff --git a/crate-status.md b/crate-status.md
index 97e2965..668c036 100644
--- a/crate-status.md
+++ b/crate-status.md
@@ -252,6 +252,7 @@ A mechanism to associate metadata with any object, and keep revisions of it usin
### git-date
* [ ] parse git dates
+* [ ] serialize `Time`
### git-credentials
* [x] launch git credentials helpers with a given action
diff --git a/Cargo.toml b/Cargo.toml
index f8c0a4c..45a889d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,4 +12,20 @@ doctest = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+## Data structures implement `serde::Serialize` and `serde::Deserialize`.
+serde1 = ["serde"]
+
[dependencies]
+serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
+itoa = "1.0.1"
+
+document-features = { version = "0.2.0", optional = true }
+
+[dev-dependencies]
+git-testtools = { path = "../tests/tools"}
+bstr = { version = "0.2.13", default-features = false, features = ["std", "unicode"]}
+
+[package.metadata.docs.rs]
+features = ["document-features"]
+all-features = true
diff --git a/lib.rs b/lib.rs
index ade1d34..e8a6a5f 100644
--- a/lib.rs
+++ b/lib.rs
@@ -1 +1,25 @@
-#![forbid(unsafe_code, rust_2018_idioms)]
+//! Date and time parsing similar to what git can do.
+//!
+//! Note that this is not a general purpose time library.
+//! ## Feature Flags
+#![cfg_attr(
+ feature = "document-features",
+ cfg_attr(doc, doc = ::document_features::document_features!())
+)]
+#![forbid(unsafe_code)]
+#![deny(missing_docs, rust_2018_idioms)]
+
+///
+pub mod time;
+
+/// A timestamp with timezone.
+#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
+#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
+pub struct Time {
+ /// time in seconds since epoch.
+ pub seconds_since_unix_epoch: u32,
+ /// time offset in seconds, may be negative to match the `sign` field.
+ pub offset_in_seconds: i32,
+ /// the sign of `offset`, used to encode `-0000` which would otherwise loose sign information.
+ pub sign: time::Sign,
+}
diff --git a/time.rs b/time.rs
index c7f078a..ae48808 100644
--- a/time.rs
+++ b/time.rs
@@ -0,0 +1,103 @@
+use std::io;
+
+use crate::Time;
+
+/// Indicates if a number is positive or negative for use in [`Time`].
+#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy)]
+#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
+#[allow(missing_docs)]
+pub enum Sign {
+ Plus,
+ Minus,
+}
+
+impl From<i32> for Sign {
+ fn from(v: i32) -> Self {
+ if v < 0 {
+ Sign::Minus
+ } else {
+ Sign::Plus
+ }
+ }
+}
+
+impl Default for Time {
+ fn default() -> Self {
+ Time {
+ seconds_since_unix_epoch: 0,
+ offset_in_seconds: 0,
+ sign: Sign::Plus,
+ }
+ }
+}
+
+impl Time {
+ /// Create a new instance from seconds and offset.
+ pub fn new(seconds_since_unix_epoch: u32, offset_in_seconds: i32) -> Self {
+ Time {
+ seconds_since_unix_epoch,
+ offset_in_seconds,
+ sign: offset_in_seconds.into(),
+ }
+ }
+
+ /// Return the passed seconds since epoch since this signature was made.
+ pub fn seconds(&self) -> u32 {
+ self.seconds_since_unix_epoch
+ }
+
+ /// Serialize this instance to `out` in a format suitable for use in header fields of serialized git commits or tags.
+ pub fn write_to(&self, mut out: impl io::Write) -> io::Result<()> {
+ let mut itoa = itoa::Buffer::new();
+ out.write_all(itoa.format(self.seconds_since_unix_epoch).as_bytes())?;
+ out.write_all(b" ")?;
+ out.write_all(match self.sign {
+ Sign::Plus => b"+",
+ Sign::Minus => b"-",
+ })?;
+
+ const ZERO: &[u8; 1] = b"0";
+
+ const SECONDS_PER_HOUR: i32 = 60 * 60;
+ let offset = self.offset_in_seconds.abs();
+ let hours = offset / SECONDS_PER_HOUR;
+ assert!(hours < 25, "offset is more than a day: {}", hours);
+ let minutes = (offset - (hours * SECONDS_PER_HOUR)) / 60;
+
+ if hours < 10 {
+ out.write_all(ZERO)?;
+ }
+ out.write_all(itoa.format(hours).as_bytes())?;
+
+ if minutes < 10 {
+ out.write_all(ZERO)?;
+ }
+ out.write_all(itoa.format(minutes).as_bytes()).map(|_| ())
+ }
+ /// Computes the number of bytes necessary to render this time
+ pub fn size(&self) -> usize {
+ // TODO: this is not year 2038 safe…but we also can't parse larger numbers (or represent them) anyway. It's a trap nonetheless
+ // that can be fixed by increasing the size to usize.
+ (if self.seconds_since_unix_epoch >= 1_000_000_000 {
+ 10
+ } else if self.seconds_since_unix_epoch >= 100_000_000 {
+ 9
+ } else if self.seconds_since_unix_epoch >= 10_000_000 {
+ 8
+ } else if self.seconds_since_unix_epoch >= 1_000_000 {
+ 7
+ } else if self.seconds_since_unix_epoch >= 100_000 {
+ 6
+ } else if self.seconds_since_unix_epoch >= 10_000 {
+ 5
+ } else if self.seconds_since_unix_epoch >= 1_000 {
+ 4
+ } else if self.seconds_since_unix_epoch >= 100 {
+ 3
+ } else if self.seconds_since_unix_epoch >= 10 {
+ 2
+ } else {
+ 1
+ }) + 2 /*space + sign*/ + 2 /*hours*/ + 2 /*minutes*/
+ }
+}
diff --git a/date.rs b/date.rs
index c497f4b..7926e86 100644
--- a/date.rs
+++ b/date.rs
@@ -0,0 +1,3 @@
+pub use git_testtools::hex_to_id;
+
+mod time;
diff --git a/mod.rs b/mod.rs
index 8048e13..30825dd 100644
--- a/mod.rs
+++ b/mod.rs
@@ -0,0 +1,37 @@
+use bstr::ByteSlice;
+use git_date::{time::Sign, Time};
+
+#[test]
+fn write_to() -> Result<(), Box<dyn std::error::Error>> {
+ for (time, expected) in &[
+ (
+ Time {
+ seconds_since_unix_epoch: 500,
+ offset_in_seconds: 9000,
+ sign: Sign::Plus,
+ },
+ "500 +0230",
+ ),
+ (
+ Time {
+ seconds_since_unix_epoch: 189009009,
+ offset_in_seconds: 36000,
+ sign: Sign::Minus,
+ },
+ "189009009 -1000",
+ ),
+ (
+ Time {
+ seconds_since_unix_epoch: 0,
+ offset_in_seconds: 0,
+ sign: Sign::Minus,
+ },
+ "0 -0000",
+ ),
+ ] {
+ let mut output = Vec::new();
+ time.write_to(&mut output)?;
+ assert_eq!(output.as_bstr(), expected);
+ }
+ Ok(())
+}
|
|
build(docker): simplify risingwave docker setup (#8126)
Remove risingwave-specific minio service in favor of existing minio
service.
|
f2ff173c1467c5921edfb0ac9790ff8b0340bfc9
|
build
|
https://github.com/ibis-project/ibis/commit/f2ff173c1467c5921edfb0ac9790ff8b0340bfc9
|
simplify risingwave docker setup (#8126)
Remove risingwave-specific minio service in favor of existing minio
service.
|
diff --git a/compose.yaml b/compose.yaml
index 4eb4f6e..bba50d9 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -104,9 +104,10 @@ services:
retries: 20
test:
- CMD-SHELL
- - mc ready data && mc mb --ignore-existing data/trino
+ - mc ready data && mc mb --ignore-existing data/trino data/risingwave
networks:
- trino
+ - risingwave
volumes:
- $PWD/docker/minio/config.json:/.mc/config.json:ro
@@ -537,74 +538,26 @@ services:
networks:
- impala
- risingwave-minio:
- image: "quay.io/minio/minio:latest"
- command:
- - server
- - "--address"
- - "0.0.0.0:9301"
- - "--console-address"
- - "0.0.0.0:9400"
- - /data
- expose:
- - "9301"
- - "9400"
- ports:
- - "9301:9301"
- - "9400:9400"
- depends_on: []
- volumes:
- - "risingwave-minio:/data"
- entrypoint: /bin/sh -c "set -e; mkdir -p \\"/data/hummock001\\"; /usr/bin/docker-entrypoint.sh \\"$$0\\" \\"$$@\\" "
- environment:
- MINIO_CI_CD: "1"
- MINIO_ROOT_PASSWORD: hummockadmin
- MINIO_ROOT_USER: hummockadmin
- MINIO_DOMAIN: "risingwave-minio"
- container_name: risingwave-minio
- healthcheck:
- test:
- - CMD-SHELL
- - bash -c 'printf \\"GET / HTTP/1.1\\n\\n\\" > /dev/tcp/127.0.0.1/9301; exit $$?;'
- interval: 5s
- timeout: 5s
- retries: 20
- restart: always
- networks:
- - risingwave
-
risingwave:
image: ghcr.io/risingwavelabs/risingwave:nightly-20240122
command: "standalone --meta-opts=\\" \\
--advertise-addr 0.0.0.0:5690 \\
--backend mem \\
- --state-store hummock+minio://hummockadmin:hummockadmin@risingwave-minio:9301/hummock001 \\
- --data-directory hummock_001 \\
- --config-path /risingwave.toml\\" \\
- --compute-opts=\\" \\
- --config-path /risingwave.toml \\
- --advertise-addr 0.0.0.0:5688 \\
- --role both \\" \\
- --frontend-opts=\\" \\
- --config-path /risingwave.toml \\
- --listen-addr 0.0.0.0:4566 \\
- --advertise-addr 0.0.0.0:4566 \\" \\
- --compactor-opts=\\" \\
- --advertise-addr 0.0.0.0:6660 \\""
- expose:
- - "4566"
+ --state-store hummock+minio://accesskey:secretkey@minio:9000/risingwave \\
+ --data-directory hummock_001\\" \\
+ --compute-opts=\\"--advertise-addr 0.0.0.0:5688 --role both\\" \\
+ --frontend-opts=\\"--listen-addr 0.0.0.0:4566 --advertise-addr 0.0.0.0:4566\\" \\
+ --compactor-opts=\\"--advertise-addr 0.0.0.0:6660\\""
ports:
- - "4566:4566"
+ - 4566:4566
depends_on:
- - risingwave-minio
+ minio:
+ condition: service_healthy
volumes:
- - "./docker/risingwave/risingwave.toml:/risingwave.toml"
- risingwave:/data
environment:
RUST_BACKTRACE: "1"
- # If ENABLE_TELEMETRY is not set, telemetry will start by default
- ENABLE_TELEMETRY: ${ENABLE_TELEMETRY:-true}
- container_name: risingwave
+ ENABLE_TELEMETRY: "false"
healthcheck:
test:
- CMD-SHELL
@@ -612,10 +565,9 @@ services:
- bash -c 'printf \\"GET / HTTP/1.1\\n\\n\\" > /dev/tcp/127.0.0.1/5688; exit $$?;'
- bash -c 'printf \\"GET / HTTP/1.1\\n\\n\\" > /dev/tcp/127.0.0.1/4566; exit $$?;'
- bash -c 'printf \\"GET / HTTP/1.1\\n\\n\\" > /dev/tcp/127.0.0.1/5690; exit $$?;'
- interval: 5s
- timeout: 5s
+ interval: 1s
retries: 20
- restart: always
+ restart: on-failure
networks:
- risingwave
@@ -646,5 +598,4 @@ volumes:
postgres:
exasol:
impala:
- risingwave-minio:
risingwave:
diff --git a/risingwave.toml b/risingwave.toml
index d0c4ec0..9569fea 100644
--- a/risingwave.toml
+++ b/risingwave.toml
@@ -1,2 +0,0 @@
-# RisingWave config file to be mounted into the Docker containers.
-# See https://github.com/risingwavelabs/risingwave/blob/main/src/config/example.toml for example
diff --git a/test_json.py b/test_json.py
index 901d7a4..99c69e1 100644
--- a/test_json.py
+++ b/test_json.py
@@ -41,8 +41,7 @@ pytestmark = [
reason="https://github.com/ibis-project/ibis/pull/6920#discussion_r1373212503",
)
@pytest.mark.broken(
- ["risingwave"],
- reason="TODO(Kexiang): order mismatch in array",
+ ["risingwave"], reason="TODO(Kexiang): order mismatch in array", strict=False
)
def test_json_getitem(json_t, expr_fn, expected):
expr = expr_fn(json_t)
|
|
fix(setup.py): set the correct version number for 2.1.0
|
f3d267b96b9f14d3616c17b8f7bdeb8d0a6fc2cf
|
fix
|
https://github.com/ibis-project/ibis/commit/f3d267b96b9f14d3616c17b8f7bdeb8d0a6fc2cf
|
set the correct version number for 2.1.0
|
diff --git a/setup.py b/setup.py
index 4c771fd..949186c 100644
--- a/setup.py
+++ b/setup.py
@@ -129,7 +129,7 @@ entry_points = {
setup_kwargs = {
"name": "ibis-framework",
- "version": "2.0.0",
+ "version": "2.1.0",
"description": "Productivity-centric Python Big Data Framework",
"long_description": "# Ibis: Python data analysis framework for Hadoop and SQL engines\\n\\n|Service|Status|\\n| -------------: | :---- |\\n| Documentation | [](http://ibis-project.org) |\\n| Conda packages | [](https://anaconda.org/conda-forge/ibis-framework) |\\n| PyPI | [](https://pypi.org/project/ibis-framework) |\\n| Ibis CI | [](https://github.com/ibis-project/ibis/actions/workflows/ibis-main.yml?query=branch%3Amaster) |\\n| Backend CI | [](https://github.com/ibis-project/ibis/actions/workflows/ibis-backends.yml?query=branch%3Amaster) |\\n| Coverage | [](https://codecov.io/gh/ibis-project/ibis) |\\n\\n\\nIbis is a toolbox to bridge the gap between local Python environments, remote\\nstorage, execution systems like Hadoop components (HDFS, Impala, Hive, Spark)\\nand SQL databases. Its goal is to simplify analytical workflows and make you\\nmore productive.\\n\\nInstall Ibis from PyPI with:\\n\\n```sh\\npip install ibis-framework\\n```\\n\\nor from conda-forge with\\n\\n```sh\\nconda install ibis-framework -c conda-forge\\n```\\n\\nIbis currently provides tools for interacting with the following systems:\\n\\n- [Apache Impala](https://impala.apache.org/)\\n- [Apache Kudu](https://kudu.apache.org/)\\n- [Hadoop Distributed File System (HDFS)](https://hadoop.apache.org/)\\n- [PostgreSQL](https://www.postgresql.org/)\\n- [MySQL](https://www.mysql.com/)\\n- [SQLite](https://www.sqlite.org/)\\n- [Pandas](https://pandas.pydata.org/) [DataFrames](http://pandas.pydata.org/pandas-docs/stable/dsintro.html#dataframe)\\n- [Clickhouse](https://clickhouse.yandex)\\n- [BigQuery](https://cloud.google.com/bigquery)\\n- [OmniSciDB](https://www.omnisci.com)\\n- [PySpark](https://spark.apache.org)\\n- [Dask](https://dask.org/) (Experimental)\\n\\nLearn more about using the library at http://ibis-project.org.\\n",
"author": "Ibis Contributors",
|
|
refactor(clickhouse): clean up parsing rules
|
673177267ee23dc344da62235fb3252eed8b4650
|
refactor
|
https://github.com/rohankumardubey/ibis/commit/673177267ee23dc344da62235fb3252eed8b4650
|
clean up parsing rules
|
diff --git a/datatypes.py b/datatypes.py
index c616e83..8440586 100644
--- a/datatypes.py
+++ b/datatypes.py
@@ -13,6 +13,7 @@ from ibis.common.parsing import (
LPAREN,
NUMBER,
PRECISION,
+ RAW_NUMBER,
RAW_STRING,
RPAREN,
SCALE,
@@ -26,8 +27,6 @@ def _bool_type():
def parse(text: str) -> dt.DataType:
- parened_string = LPAREN.then(RAW_STRING).skip(RPAREN)
-
datetime64_args = LPAREN.then(
parsy.seq(
scale=parsy.decimal_digit.map(int).optional(),
@@ -42,9 +41,9 @@ def parse(text: str) -> dt.DataType:
)
datetime = spaceless_string("datetime").then(
- parsy.seq(timezone=parened_string.optional()).combine_dict(
- partial(dt.Timestamp, nullable=False)
- )
+ parsy.seq(
+ timezone=LPAREN.then(RAW_STRING).skip(RPAREN).optional()
+ ).combine_dict(partial(dt.Timestamp, nullable=False))
)
primitive = (
@@ -84,116 +83,97 @@ def parse(text: str) -> dt.DataType:
).result(dt.String(nullable=False))
)
- @parsy.generate
- def nullable():
- yield spaceless_string("nullable")
- yield LPAREN
- parsed_ty = yield ty
- yield RPAREN
- return parsed_ty(nullable=True)
-
- @parsy.generate
- def fixed_string():
- yield spaceless_string("fixedstring")
- yield LPAREN
- yield NUMBER
- yield RPAREN
- return dt.String(nullable=False)
-
- @parsy.generate
- def decimal():
- yield spaceless_string("decimal", "numeric")
- precision, scale = yield LPAREN.then(
- parsy.seq(PRECISION.skip(COMMA), SCALE)
- ).skip(RPAREN)
- return dt.Decimal(precision, scale, nullable=False)
-
- @parsy.generate
- def paren_type():
- yield LPAREN
- value_type = yield ty
- yield RPAREN
- return value_type
-
- @parsy.generate
- def array():
- yield spaceless_string("array")
- value_type = yield paren_type
- return dt.Array(value_type, nullable=False)
-
- @parsy.generate
- def map():
- yield spaceless_string("map")
- yield LPAREN
- key_type = yield ty
- yield COMMA
- value_type = yield ty
- yield RPAREN
- return dt.Map(key_type, value_type, nullable=False)
+ ty = parsy.forward_declaration()
- at_least_one_space = parsy.regex(r"\\s+")
+ nullable = (
+ spaceless_string("nullable")
+ .then(LPAREN)
+ .then(ty.map(lambda ty: ty.copy(nullable=True)))
+ .skip(RPAREN)
+ )
+
+ fixed_string = (
+ spaceless_string("fixedstring")
+ .then(LPAREN)
+ .then(NUMBER)
+ .then(RPAREN)
+ .result(dt.String(nullable=False))
+ )
- @parsy.generate
- def nested():
- yield spaceless_string("nested")
- yield LPAREN
+ decimal = (
+ spaceless_string("decimal", "numeric")
+ .then(LPAREN)
+ .then(
+ parsy.seq(precision=PRECISION.skip(COMMA), scale=SCALE).combine_dict(
+ partial(dt.Decimal(nullable=False))
+ )
+ )
+ .skip(RPAREN)
+ )
- field_names_types = yield (
+ array = spaceless_string("array").then(
+ LPAREN.then(ty.map(partial(dt.Array, nullable=False))).skip(RPAREN)
+ )
+
+ map = (
+ spaceless_string("map")
+ .then(LPAREN)
+ .then(parsy.seq(ty, COMMA.then(ty)).combine(partial(dt.Map, nullable=False)))
+ .skip(RPAREN)
+ )
+
+ at_least_one_space = parsy.regex(r"\\s+")
+
+ nested = (
+ spaceless_string("nested")
+ .then(LPAREN)
+ .then(
parsy.seq(SPACES.then(FIELD.skip(at_least_one_space)), ty)
.combine(lambda field, ty: (field, dt.Array(ty, nullable=False)))
.sep_by(COMMA)
+ .map(partial(dt.Struct.from_tuples, nullable=False))
)
- yield RPAREN
- return dt.Struct.from_tuples(field_names_types, nullable=False)
-
- @parsy.generate
- def struct():
- yield spaceless_string("tuple")
- yield LPAREN
- field_names_types = yield (
+ .skip(RPAREN)
+ )
+
+ struct = (
+ spaceless_string("tuple")
+ .then(LPAREN)
+ .then(
parsy.seq(
SPACES.then(FIELD.skip(at_least_one_space).optional()),
ty,
)
- .combine(lambda field, ty: (field, ty))
.sep_by(COMMA)
+ .map(
+ lambda field_names_types: dt.Struct.from_tuples(
+ [
+ (field_name if field_name is not None else f"f{i:d}", typ)
+ for i, (field_name, typ) in enumerate(field_names_types)
+ ],
+ nullable=False,
+ )
+ )
)
- yield RPAREN
- return dt.Struct.from_tuples(
- [
- (field_name if field_name is not None else f"f{i:d}", typ)
- for i, (field_name, typ) in enumerate(field_names_types)
- ],
- nullable=False,
- )
+ .skip(RPAREN)
+ )
+
+ enum_value = SPACES.then(RAW_STRING).skip(spaceless_string("=")).then(RAW_NUMBER)
+
+ lowcardinality = (
+ spaceless_string("lowcardinality").then(LPAREN).then(ty).skip(RPAREN)
+ )
+
+ enum = (
+ spaceless_string('enum')
+ .then(RAW_NUMBER)
+ .then(LPAREN)
+ .then(enum_value.sep_by(COMMA))
+ .skip(RPAREN)
+ .result(dt.String(nullable=False))
+ )
- @parsy.generate
- def enum_value():
- yield SPACES
- key = yield RAW_STRING
- yield spaceless_string('=')
- value = yield parsy.digit.at_least(1).concat()
- return (key, int(value))
-
- @parsy.generate
- def lowcardinality():
- yield spaceless_string('LowCardinality')
- yield LPAREN
- r = yield ty
- yield RPAREN
- return r
-
- @parsy.generate
- def enum():
- yield spaceless_string('enum')
- enumsz = yield parsy.digit.at_least(1).concat()
- enumsz = int(enumsz)
- yield LPAREN
- yield enum_value.sep_by(COMMA).map(dict) # ignore values
- yield RPAREN
- return dt.String(nullable=False)
-
- ty = (
+ ty.become(
nullable
| nested
| primitive
@@ -204,9 +184,8 @@ def parse(text: str) -> dt.DataType:
| struct
| enum
| lowcardinality
- | spaceless_string("IPv4", "IPv6").result(dt.inet(nullable=False))
- | spaceless_string("Object('json')").result(dt.json(nullable=False))
- | spaceless_string("JSON").result(dt.json(nullable=False))
+ | spaceless_string("IPv4", "IPv6").result(dt.INET(nullable=False))
+ | spaceless_string("Object('json')", "JSON").result(dt.JSON(nullable=False))
)
return ty.parse(text)
|
|
fix: improve error message when no default route provided
|
04c3b6ac2fd151379d57e95bde085e2a098d1b76
|
fix
|
https://github.com/Hardeepex/crawlee/commit/04c3b6ac2fd151379d57e95bde085e2a098d1b76
|
improve error message when no default route provided
|
diff --git a/router.ts b/router.ts
index 5e27627..715a2f4 100644
--- a/router.ts
+++ b/router.ts
@@ -88,7 +88,8 @@ export class Router<Context extends CrawlingContext> {
}
if (!label) {
- throw new MissingRouteError(`No default route set up!`);
+ // eslint-disable-next-line max-len
+ throw new MissingRouteError(`No default route set up. Please specify 'requestHandler' option or provide default route via 'crawler.router.addDefaultRoute()'.`);
}
throw new MissingRouteError(`Route not found for label '${String(label)}' and no default route set up!`);
diff --git a/cheerio_crawler.test.ts b/cheerio_crawler.test.ts
index a3b5ac1..3efb293 100644
--- a/cheerio_crawler.test.ts
+++ b/cheerio_crawler.test.ts
@@ -268,6 +268,19 @@ describe('CheerioCrawler', () => {
});
});
+ test('should throw when no requestHandler nor default route provided', async () => {
+ const requestList = await getRequestListForMirror(port);
+
+ const cheerioCrawler = new CheerioCrawler({
+ requestList,
+ minConcurrency: 2,
+ maxConcurrency: 2,
+ });
+
+ // eslint-disable-next-line max-len
+ await expect(cheerioCrawler.run()).rejects.toThrow(`No default route set up. Please specify 'requestHandler' option or provide default route via 'crawler.router.addDefaultRoute()'.`);
+ });
+
test('should ignore ssl by default', async () => {
const sources = [
{ url: 'http://example.com/?q=1' },
|
|
chore: fix phrasing of clickhouse intro
|
897129cfa32d32f09d41014506cf98b593069af3
|
chore
|
https://github.com/rohankumardubey/ibis/commit/897129cfa32d32f09d41014506cf98b593069af3
|
fix phrasing of clickhouse intro
|
diff --git a/clickhouse.qmd b/clickhouse.qmd
index 1405eca..6c26175 100644
--- a/clickhouse.qmd
+++ b/clickhouse.qmd
@@ -6,7 +6,7 @@ title: ClickHouse
[ClickHouse](https://clickhouse.com/) as a backend.
In this example we'll demonstrate using Ibis to connect to a ClickHouse server,
-and executing a few queries.
+and to execute a few queries.
```{python}
from ibis.interactive import *
|
|
chore: move infer impl for Mapping to datatypes module
|
3c51ba1cabe4268dc1637f9eb373c82966e58346
|
chore
|
https://github.com/ibis-project/ibis/commit/3c51ba1cabe4268dc1637f9eb373c82966e58346
|
move infer impl for Mapping to datatypes module
|
diff --git a/client.py b/client.py
index 8bfd201..26ab775 100644
--- a/client.py
+++ b/client.py
@@ -7,7 +7,6 @@ import pandas as pd
import toolz
from pandas.api.types import CategoricalDtype, DatetimeTZDtype
-import ibis.common.exceptions as com
import ibis.expr.datatypes as dt
import ibis.expr.operations as ops
import ibis.expr.schema as sch
@@ -142,16 +141,9 @@ def _infer_pandas_series_contents(s: pd.Series) -> dt.DataType:
if inferred_dtype == 'mixed':
# We need to inspect an element to determine the Ibis dtype
value = s.iloc[0]
- if isinstance(value, (np.ndarray, pd.Series, Sequence)):
+ if isinstance(value, (np.ndarray, pd.Series, Sequence, Mapping)):
# Defer to individual `infer` functions for these
return dt.infer(value)
- elif isinstance(value, Mapping):
- try:
- return dt.infer(value)
- except com.IbisTypeError:
- return dt.Struct.from_tuples(
- (k, dt.infer(v)) for k, v in value.items()
- )
else:
return dt.dtype('binary')
else:
diff --git a/core.py b/core.py
index a0cfabe..f378ca9 100644
--- a/core.py
+++ b/core.py
@@ -23,6 +23,7 @@ from typing import (
import numpy as np
import pandas as pd
import parsy as p
+import toolz
from multipledispatch import Dispatcher
from public import public
@@ -1267,10 +1268,15 @@ def infer_map(value: Mapping[typing.Any, typing.Any]) -> Map:
"""Infer the [`Map`][ibis.expr.datatypes.Map] type of `value`."""
if not value:
return Map(null, null)
- return Map(
- highest_precedence(map(infer, value.keys())),
- highest_precedence(map(infer, value.values())),
- )
+ try:
+ return Map(
+ highest_precedence(map(infer, value.keys())),
+ highest_precedence(map(infer, value.values())),
+ )
+ except IbisTypeError:
+ return Struct.from_dict(
+ toolz.valmap(infer, value, factory=type(value))
+ )
@infer.register((list, tuple))
|
|
refactor: make "transition.key" always exist
This lets us avoid ternary operators more
|
043b93656414c3cc8423bb2a4b233e1fd29a8852
|
refactor
|
https://github.com/pmndrs/react-spring/commit/043b93656414c3cc8423bb2a4b233e1fd29a8852
|
make "transition.key" always exist
This lets us avoid ternary operators more
|
diff --git a/useTransition.tsx b/useTransition.tsx
index 38bc30d..3703393 100644
--- a/useTransition.tsx
+++ b/useTransition.tsx
@@ -26,8 +26,8 @@ export function useTransition<T>(
const items = toArray(data)
const transitions: Transition[] = []
- // Explicit keys are used to associate transitions with immutable items.
- const keys = is.und(key) ? key : is.fun(key) ? items.map(key) : toArray(key)
+ // Keys help with reusing transitions between renders.
+ const keys = is.und(key) ? items : is.fun(key) ? items.map(key) : toArray(key)
// The "onRest" callbacks need a ref to the latest transitions.
const usedTransitions = useRef<Transition[] | null>(null)
@@ -46,7 +46,7 @@ export function useTransition<T>(
if (prevTransitions && !reset)
each(prevTransitions, t => {
if (is.und(t.expiresBy)) {
- prevKeys.push(keys ? t.key : t.item)
+ prevKeys.push(t.key)
transitions.push(t)
} else {
clearTimeout(t.expirationId)
@@ -55,8 +55,8 @@ export function useTransition<T>(
// Append new transitions for new items.
each(items, (item, i) => {
- const key = keys && keys[i]
- if (prevKeys.indexOf(keys ? key : item) < 0) {
+ const key = keys[i]
+ if (prevKeys.indexOf(key) < 0) {
const spring = new Controller()
transitions.push({ id: spring.id, key, item, phase: MOUNT, spring })
}
@@ -88,7 +88,7 @@ export function useTransition<T>(
from = props.from
}
} else {
- const isDeleted = (keys || items).indexOf(keys ? t.key : t.item) < 0
+ const isDeleted = keys.indexOf(t.key) < 0
if (t.phase < LEAVE) {
if (isDeleted) {
to = props.leave
@@ -192,7 +192,7 @@ interface Change {
interface Transition<T = any> {
id: number
- key?: keyof any
+ key: any
item: T
phase: Phase
spring: Controller
|
|
fix(duckdb): free memtables based on operation lifetime (#10042)
|
a121ab35ece43d8cf2724dca86f1bbbbd8e047a5
|
fix
|
https://github.com/ibis-project/ibis/commit/a121ab35ece43d8cf2724dca86f1bbbbd8e047a5
|
free memtables based on operation lifetime (#10042)
|
diff --git a/__init__.py b/__init__.py
index e623741..de1326e 100644
--- a/__init__.py
+++ b/__init__.py
@@ -7,6 +7,7 @@ import contextlib
import os
import urllib
import warnings
+import weakref
from operator import itemgetter
from pathlib import Path
from typing import TYPE_CHECKING, Any
@@ -1605,6 +1606,12 @@ class Backend(SQLBackend, CanCreateDatabase, CanCreateSchema, UrlFromPath):
# only register if we haven't already done so
self.con.register(name, op.data.to_pyarrow(op.schema))
+ # if we don't aggressively unregister tables duckdb will keep a
+ # reference to every memtable ever registered, even if there's no
+ # way for a user to access the operation anymore, resulting in a
+ # memory leak
+ weakref.finalize(op, self.con.unregister, name)
+
def _register_udfs(self, expr: ir.Expr) -> None:
con = self.con
diff --git a/test_client.py b/test_client.py
index 3e2fdb7..1542503 100644
--- a/test_client.py
+++ b/test_client.py
@@ -417,3 +417,12 @@ lat,lon,geom
path.write_bytes(data)
t = con.read_csv(path, all_varchar=all_varchar, **input)
assert t.schema()["geom"].is_geospatial()
+
+
+def test_memtable_doesnt_leak(con, monkeypatch):
+ monkeypatch.setattr(ibis.options, "default_backend", con)
+ name = "memtable_doesnt_leak"
+ assert name not in con.list_tables()
+ df = ibis.memtable({"a": [1, 2, 3]}, name=name).execute()
+ assert name not in con.list_tables()
+ assert len(df) == 3
|
|
fix(core): return managed entity from `em.refresh()`
This method was previously returning unmanaged entity which was only used internally
to get the new data.
|
0bf5363ef8fff4b3b965d744d18d51af55eb45cf
|
fix
|
https://github.com/mikro-orm/mikro-orm/commit/0bf5363ef8fff4b3b965d744d18d51af55eb45cf
|
return managed entity from `em.refresh()`
This method was previously returning unmanaged entity which was only used internally
to get the new data.
|
diff --git a/upgrading-v5-to-v6.md b/upgrading-v5-to-v6.md
index f380570..2197b3c 100644
--- a/upgrading-v5-to-v6.md
+++ b/upgrading-v5-to-v6.md
@@ -477,7 +477,7 @@ class User {
}
```
-This does not apply to virtual properties:
+This does not apply to [virtual properties](./defining-entities.md#virtual-properties):
```ts
@Entity()
@@ -489,7 +489,7 @@ class User {
@ManyToOne(() => User, { name: 'parent_id' })
parent!: User;
- @Property({ name: 'parent_id', })
+ @Property({ name: 'parent_id', persist: false })
parentId!: number;
}
|
|
feat: Simple serialization for `Instruction` and `RefSpecRef` type. (#450)
It's also a way to normalize input strings as there is only one way
to serialize instructions, which themselves are already normalized
towards what's possible.
|
abdf83f494e2a9fba4a8d9fcb776f2c84baebd3e
|
feat
|
https://github.com/Byron/gitoxide/commit/abdf83f494e2a9fba4a8d9fcb776f2c84baebd3e
|
Simple serialization for `Instruction` and `RefSpecRef` type. (#450)
It's also a way to normalize input strings as there is only one way
to serialize instructions, which themselves are already normalized
towards what's possible.
|
diff --git a/lib.rs b/lib.rs
index cbe9978..a778d87 100644
--- a/lib.rs
+++ b/lib.rs
@@ -29,6 +29,8 @@ pub struct RefSpec {
mod spec;
+mod write;
+
///
pub mod matcher;
diff --git a/write.rs b/write.rs
index 69c10db..926dbcc 100644
--- a/write.rs
+++ b/write.rs
@@ -0,0 +1,71 @@
+use crate::instruction::{Fetch, Push};
+use crate::{Instruction, RefSpecRef};
+use bstr::BString;
+
+impl RefSpecRef<'_> {
+ /// Reproduce ourselves in parseable form.
+ pub fn to_bstring(&self) -> BString {
+ let mut buf = Vec::with_capacity(128);
+ self.write_to(&mut buf).expect("no io error");
+ buf.into()
+ }
+
+ /// Serialize ourselves in a parseable format to `out`.
+ pub fn write_to(&self, out: impl std::io::Write) -> std::io::Result<()> {
+ self.instruction().write_to(out)
+ }
+}
+
+impl Instruction<'_> {
+ /// Reproduce ourselves in parseable form.
+ pub fn to_bstring(&self) -> BString {
+ let mut buf = Vec::with_capacity(128);
+ self.write_to(&mut buf).expect("no io error");
+ buf.into()
+ }
+
+ /// Serialize ourselves in a parseable format to `out`.
+ pub fn write_to(&self, mut out: impl std::io::Write) -> std::io::Result<()> {
+ match self {
+ Instruction::Push(Push::Matching {
+ src,
+ dst,
+ allow_non_fast_forward,
+ }) => {
+ if *allow_non_fast_forward {
+ out.write_all(&[b'+'])?;
+ }
+ out.write_all(src)?;
+ out.write_all(&[b':'])?;
+ out.write_all(dst)
+ }
+ Instruction::Push(Push::AllMatchingBranches { allow_non_fast_forward }) => {
+ if *allow_non_fast_forward {
+ out.write_all(&[b'+'])?;
+ }
+ out.write_all(&[b':'])
+ }
+ Instruction::Push(Push::Delete { ref_or_pattern }) => {
+ out.write_all(&[b':'])?;
+ out.write_all(ref_or_pattern)
+ }
+ Instruction::Fetch(Fetch::Only { src }) => out.write_all(src),
+ Instruction::Fetch(Fetch::Exclude { src }) => {
+ out.write_all(&[b'^'])?;
+ out.write_all(src)
+ }
+ Instruction::Fetch(Fetch::AndUpdate {
+ src,
+ dst,
+ allow_non_fast_forward,
+ }) => {
+ if *allow_non_fast_forward {
+ out.write_all(&[b'+'])?;
+ }
+ out.write_all(src)?;
+ out.write_all(&[b':'])?;
+ out.write_all(dst)
+ }
+ }
+ }
+}
diff --git a/refspec.rs b/refspec.rs
index 111fe4f..a281c1a 100644
--- a/refspec.rs
+++ b/refspec.rs
@@ -6,3 +6,4 @@ mod impls;
mod matcher;
mod matching;
mod parse;
+mod write;
diff --git a/mod.rs b/mod.rs
index 735e72e..f2ee611 100644
--- a/mod.rs
+++ b/mod.rs
@@ -0,0 +1,98 @@
+mod push {
+ use git_refspec::{instruction, Instruction};
+
+ #[test]
+ fn all_matching_branches() {
+ assert_eq!(
+ Instruction::Push(instruction::Push::AllMatchingBranches {
+ allow_non_fast_forward: false
+ })
+ .to_bstring(),
+ ":"
+ );
+ assert_eq!(
+ Instruction::Push(instruction::Push::AllMatchingBranches {
+ allow_non_fast_forward: true
+ })
+ .to_bstring(),
+ "+:"
+ );
+ }
+
+ #[test]
+ fn delete() {
+ assert_eq!(
+ Instruction::Push(instruction::Push::Delete {
+ ref_or_pattern: "for-deletion".into(),
+ })
+ .to_bstring(),
+ ":for-deletion"
+ );
+ }
+
+ #[test]
+ fn matching() {
+ assert_eq!(
+ Instruction::Push(instruction::Push::Matching {
+ src: "from".into(),
+ dst: "to".into(),
+ allow_non_fast_forward: false
+ })
+ .to_bstring(),
+ "from:to"
+ );
+ assert_eq!(
+ Instruction::Push(instruction::Push::Matching {
+ src: "from".into(),
+ dst: "to".into(),
+ allow_non_fast_forward: true
+ })
+ .to_bstring(),
+ "+from:to"
+ );
+ }
+}
+
+mod fetch {
+ use git_refspec::{instruction, Instruction};
+ #[test]
+ fn only() {
+ assert_eq!(
+ Instruction::Fetch(instruction::Fetch::Only {
+ src: "refs/heads/main".into(),
+ })
+ .to_bstring(),
+ "refs/heads/main"
+ );
+ }
+
+ #[test]
+ fn exclude() {
+ assert_eq!(
+ Instruction::Fetch(instruction::Fetch::Exclude { src: "excluded".into() }).to_bstring(),
+ "^excluded"
+ );
+ }
+
+ #[test]
+ fn and_update() {
+ assert_eq!(
+ Instruction::Fetch(instruction::Fetch::AndUpdate {
+ src: "from".into(),
+ dst: "to".into(),
+ allow_non_fast_forward: false
+ })
+ .to_bstring(),
+ "from:to"
+ );
+ assert_eq!(
+ Instruction::Fetch(instruction::Fetch::AndUpdate {
+ src: "from".into(),
+ dst: "to".into(),
+ allow_non_fast_forward: true
+ })
+ .to_bstring(),
+ "+from:to"
+ );
+ }
+}
|
|
chore: add `ModuleGraph::display`
|
2f924527f03d3ad6593e57b75bd0d1137159cf2c
|
chore
|
https://github.com/erg-lang/erg/commit/2f924527f03d3ad6593e57b75bd0d1137159cf2c
|
add `ModuleGraph::display`
|
diff --git a/build_package.rs b/build_package.rs
index e96629b..2c07087 100644
--- a/build_package.rs
+++ b/build_package.rs
@@ -336,6 +336,7 @@ impl<ASTBuilder: ASTBuildable, HIRBuilder: Buildable>
log!(info "Start dependency resolution process");
let _ = self.resolve(&mut ast, &cfg);
log!(info "Dependency resolution process completed");
+ log!("graph:\\n{}", self.shared.graph.display());
if self.parse_errors.errors.is_empty() {
self.shared.warns.extend(self.parse_errors.warns.flush());
} else {
diff --git a/graph.rs b/graph.rs
index aee5c06..d7be3ed 100644
--- a/graph.rs
+++ b/graph.rs
@@ -160,6 +160,42 @@ impl ModuleGraph {
pub fn initialize(&mut self) {
self.0.clear();
}
+
+ pub fn display_parents(
+ &self,
+ lev: usize,
+ id: &NormalizedPathBuf,
+ appeared: &mut Set<NormalizedPathBuf>,
+ ) -> String {
+ let mut s = String::new();
+ let Some(parents) = self.parents(id) else {
+ return s;
+ };
+ for parent in parents.iter() {
+ s.push_str(&format!("{}-> {}\\n", " ".repeat(lev), parent.display()));
+ if appeared.contains(parent) {
+ continue;
+ }
+ s.push_str(&self.display_parents(lev + 1, parent, appeared));
+ appeared.insert(parent.clone());
+ }
+ s
+ }
+
+ pub fn display(&self) -> String {
+ let mut s = String::new();
+ let mut appeared = set! {};
+ for node in self.0.iter() {
+ let children = self.children(&node.id);
+ if !children.is_empty() || appeared.contains(&node.id) {
+ continue;
+ }
+ s.push_str(&format!("{}\\n", node.id.display()));
+ s.push_str(&self.display_parents(1, &node.id, &mut appeared));
+ appeared.insert(node.id.clone());
+ }
+ s
+ }
}
#[derive(Debug, Clone, Default)]
@@ -248,4 +284,8 @@ impl SharedModuleGraph {
pub fn clone_inner(&self) -> ModuleGraph {
self.0.borrow().clone()
}
+
+ pub fn display(&self) -> String {
+ self.0.borrow().display()
+ }
}
|
|
refactor (#287)
Re-use the index::integrity::Options for multi_index options as it's
exactly the same.
This opportunty was missed the previous we simplified these signatures.
|
6c066597f310b1bd5eb5611c1147b48846bc0ac0
|
refactor
|
https://github.com/Byron/gitoxide/commit/6c066597f310b1bd5eb5611c1147b48846bc0ac0
|
:integrity::Options for multi_index options as it's
exactly the same.
This opportunty was missed the previous we simplified these signatures.
|
diff --git a/mod.rs b/mod.rs
index ff298a0..fad4727 100644
--- a/mod.rs
+++ b/mod.rs
@@ -26,6 +26,11 @@ pub use file::{decode_entry, verify, ResolvedBase};
///
pub mod header;
+///
+pub mod init {
+ pub use super::header::decode::Error;
+}
+
///
pub mod entry;
diff --git a/verify.rs b/verify.rs
index 7334ae5..0032e7e 100644
--- a/verify.rs
+++ b/verify.rs
@@ -1,6 +1,7 @@
use std::time::Instant;
use std::{cmp::Ordering, sync::atomic::AtomicBool};
+use crate::index;
use git_features::progress::Progress;
use crate::multi_index::File;
@@ -48,29 +49,6 @@ pub mod integrity {
/// The provided progress instance.
pub progress: P,
}
-
- /// Additional options to define how the integrity should be verified.
- pub struct Options<F> {
- /// The thoroughness of the verification
- pub verify_mode: crate::index::verify::Mode,
- /// The way to traverse packs
- pub traversal: crate::index::traverse::Algorithm,
- /// The amount of theads to use of `Some(N)`, with `None|Some(0)` using all available cores are used.
- pub thread_limit: Option<usize>,
- /// A function to create a pack cache
- pub make_pack_lookup_cache: F,
- }
-
- impl Default for Options<fn() -> crate::cache::Never> {
- fn default() -> Self {
- Options {
- verify_mode: Default::default(),
- traversal: Default::default(),
- thread_limit: None,
- make_pack_lookup_cache: || crate::cache::Never,
- }
- }
- }
}
///
@@ -108,12 +86,17 @@ impl File {
where
P: Progress,
{
- self.verify_integrity_inner(progress, should_interrupt, false, integrity::Options::default())
- .map_err(|err| match err {
- crate::index::traverse::Error::Processor(err) => err,
- _ => unreachable!("BUG: no other error type is possible"),
- })
- .map(|o| (o.actual_index_checksum, o.progress))
+ self.verify_integrity_inner(
+ progress,
+ should_interrupt,
+ false,
+ index::verify::integrity::Options::default(),
+ )
+ .map_err(|err| match err {
+ index::traverse::Error::Processor(err) => err,
+ _ => unreachable!("BUG: no other error type is possible"),
+ })
+ .map(|o| (o.actual_index_checksum, o.progress))
}
/// Similar to [`crate::Bundle::verify_integrity()`] but checks all contained indices and their packs.
@@ -123,8 +106,8 @@ impl File {
&self,
progress: P,
should_interrupt: &AtomicBool,
- options: integrity::Options<F>,
- ) -> Result<integrity::Outcome<P>, crate::index::traverse::Error<integrity::Error>>
+ options: index::verify::integrity::Options<F>,
+ ) -> Result<integrity::Outcome<P>, index::traverse::Error<integrity::Error>>
where
P: Progress,
C: crate::cache::DecodeEntry,
@@ -138,13 +121,8 @@ impl File {
mut progress: P,
should_interrupt: &AtomicBool,
deep_check: bool,
- integrity::Options {
- verify_mode,
- traversal,
- thread_limit,
- make_pack_lookup_cache,
- }: integrity::Options<F>,
- ) -> Result<integrity::Outcome<P>, crate::index::traverse::Error<integrity::Error>>
+ options: index::verify::integrity::Options<F>,
+ ) -> Result<integrity::Outcome<P>, index::traverse::Error<integrity::Error>>
where
P: Progress,
C: crate::cache::DecodeEntry,
@@ -158,16 +136,16 @@ impl File {
should_interrupt,
)
.map_err(integrity::Error::from)
- .map_err(crate::index::traverse::Error::Processor)?;
+ .map_err(index::traverse::Error::Processor)?;
if let Some(first_invalid) = crate::verify::fan(&self.fan) {
- return Err(crate::index::traverse::Error::Processor(integrity::Error::Fan {
+ return Err(index::traverse::Error::Processor(integrity::Error::Fan {
index: first_invalid,
}));
}
if self.num_objects == 0 {
- return Err(crate::index::traverse::Error::Processor(integrity::Error::Empty));
+ return Err(index::traverse::Error::Processor(integrity::Error::Empty));
}
let mut pack_traverse_statistics = Vec::new();
@@ -188,7 +166,7 @@ impl File {
let rhs = self.oid_at_index(entry_index + 1);
if rhs.cmp(lhs) != Ordering::Greater {
- return Err(crate::index::traverse::Error::Processor(integrity::Error::OutOfOrder {
+ return Err(index::traverse::Error::Processor(integrity::Error::OutOfOrder {
index: entry_index,
}));
}
@@ -230,14 +208,14 @@ impl File {
let index = if deep_check {
bundle = crate::Bundle::at(index_path, self.object_hash)
.map_err(integrity::Error::from)
- .map_err(crate::index::traverse::Error::Processor)?
+ .map_err(index::traverse::Error::Processor)?
.into();
bundle.as_ref().map(|b| &b.index).expect("just set")
} else {
index = Some(
- crate::index::File::at(index_path, self.object_hash)
+ index::File::at(index_path, self.object_hash)
.map_err(|err| integrity::Error::BundleInit(crate::bundle::init::Error::Index(err)))
- .map_err(crate::index::traverse::Error::Processor)?,
+ .map_err(index::traverse::Error::Processor)?,
);
index.as_ref().expect("just set")
};
@@ -251,11 +229,11 @@ impl File {
let oid = self.oid_at_index(entry_id);
let (_, expected_pack_offset) = self.pack_id_and_pack_offset_at_index(entry_id);
let entry_in_bundle_index = index.lookup(oid).ok_or_else(|| {
- crate::index::traverse::Error::Processor(integrity::Error::OidNotFound { id: oid.to_owned() })
+ index::traverse::Error::Processor(integrity::Error::OidNotFound { id: oid.to_owned() })
})?;
let actual_pack_offset = index.pack_offset_at_index(entry_in_bundle_index);
if actual_pack_offset != expected_pack_offset {
- return Err(crate::index::traverse::Error::Processor(
+ return Err(index::traverse::Error::Processor(
integrity::Error::PackOffsetMismatch {
id: oid.to_owned(),
expected_pack_offset,
@@ -266,7 +244,7 @@ impl File {
offsets_progress.inc();
}
if should_interrupt.load(std::sync::atomic::Ordering::Relaxed) {
- return Err(crate::index::traverse::Error::Processor(integrity::Error::Interrupted));
+ return Err(index::traverse::Error::Processor(integrity::Error::Interrupted));
}
}
@@ -280,18 +258,9 @@ impl File {
pack_traverse_outcome,
progress: _,
} = bundle
- .verify_integrity(
- progress,
- should_interrupt,
- crate::index::verify::integrity::Options {
- verify_mode,
- traversal,
- make_pack_lookup_cache: make_pack_lookup_cache.clone(),
- thread_limit,
- },
- )
+ .verify_integrity(progress, should_interrupt, options.clone())
.map_err(|err| {
- use crate::index::traverse::Error::*;
+ use index::traverse::Error::*;
match err {
Processor(err) => Processor(integrity::Error::IndexIntegrity(err)),
VerifyChecksum(err) => VerifyChecksum(err),
|
|
chore: change internal dependencies to use `~` instead of `^`
|
f8bf4932511d449e7a7a8d2b9eed5c2322e3fb2f
|
chore
|
https://github.com/mikro-orm/mikro-orm/commit/f8bf4932511d449e7a7a8d2b9eed5c2322e3fb2f
|
change internal dependencies to use `~` instead of `^`
|
diff --git a/package.json b/package.json
index d23cc00..3533339 100644
--- a/package.json
+++ b/package.json
@@ -59,13 +59,13 @@
"access": "public"
},
"dependencies": {
- "@mikro-orm/knex": "^5.4.1",
+ "@mikro-orm/knex": "~5.4.1",
"fs-extra": "10.1.0",
"sqlite3": "5.0.11",
"sqlstring-sqlite": "0.1.1"
},
"devDependencies": {
- "@mikro-orm/core": "^5.4.1"
+ "@mikro-orm/core": "~5.4.1"
},
"peerDependencies": {
"@mikro-orm/core": "^5.0.0",
|
|
fix(sql): walk right join trees and substitute joins with right-side joins with views
|
02315927b93762ab045a11629d3144fbff8545c1
|
fix
|
https://github.com/ibis-project/ibis/commit/02315927b93762ab045a11629d3144fbff8545c1
|
walk right join trees and substitute joins with right-side joins with views
|
diff --git a/query_builder.py b/query_builder.py
index 2846d2c..fff7020 100644
--- a/query_builder.py
+++ b/query_builder.py
@@ -61,21 +61,16 @@ class TableSetFormatter:
if isinstance(left, ops.Join):
self._walk_join_tree(left)
self.join_tables.append(self._format_table(op.right))
- self.join_types.append(jname)
- self.join_predicates.append(op.predicates)
elif isinstance(right, ops.Join):
- # When rewrites are possible at the expression IR stage, we should
- # do them. Otherwise subqueries might be necessary in some cases
- # here
- raise NotImplementedError(
- 'not allowing joins on right ' 'side yet'
- )
+ self.join_tables.append(self._format_table(op.left))
+ self._walk_join_tree(right)
else:
# Both tables
self.join_tables.append(self._format_table(op.left))
self.join_tables.append(self._format_table(op.right))
- self.join_types.append(jname)
- self.join_predicates.append(op.predicates)
+
+ self.join_types.append(jname)
+ self.join_predicates.append(op.predicates)
# Placeholder; revisit when supporting other databases
_non_equijoin_supported = True
diff --git a/relations.py b/relations.py
index 595fbce..9b2460b 100644
--- a/relations.py
+++ b/relations.py
@@ -95,14 +95,25 @@ class SQLQueryResult(TableNode, sch.HasSchema):
def _make_distinct_join_predicates(left, right, predicates):
- # see GH #667
-
- # If left and right table have a common parent expression (e.g. they
- # have different filters), must add a self-reference and make the
- # appropriate substitution in the join predicates
+ import ibis.expr.analysis as L
if left.equals(right):
+ # GH #667: If left and right table have a common parent expression,
+ # e.g. they have different filters, we need to add a self-reference and
+ # make the appropriate substitution in the join predicates
right = right.view()
+ elif isinstance(right.op(), Join):
+ # for joins with joins on the right side we turn the right side into a
+ # view, otherwise the join tree is incorrectly flattened and tables on
+ # the right are incorrectly scoped
+ old = right
+ new = right = right.view()
+ predicates = [
+ L.sub_for(pred, [(old, new)])
+ if isinstance(pred, ir.Expr)
+ else pred
+ for pred in predicates
+ ]
predicates = _clean_join_predicates(left, right, predicates)
return left, right, predicates
@@ -113,9 +124,6 @@ def _clean_join_predicates(left, right, predicates):
result = []
- if not isinstance(predicates, (list, tuple)):
- predicates = [predicates]
-
for pred in predicates:
if isinstance(pred, tuple):
if len(pred) != 2:
@@ -162,7 +170,7 @@ class Join(TableNode):
def __init__(self, left, right, predicates, **kwargs):
left, right, predicates = _make_distinct_join_predicates(
- left, right, predicates
+ left, right, util.promote_list(predicates)
)
super().__init__(
left=left, right=right, predicates=predicates, **kwargs
@@ -241,7 +249,7 @@ class AsOfJoin(Join):
tolerance = rlz.optional(rlz.interval)
def __init__(self, left, right, by, predicates, **kwargs):
- by = _clean_join_predicates(left, right, by)
+ by = _clean_join_predicates(left, right, util.promote_list(by))
super().__init__(
left=left, right=right, by=by, predicates=predicates, **kwargs
)
diff --git a/test_sqlalchemy.py b/test_sqlalchemy.py
index baea481..9ba4923 100644
--- a/test_sqlalchemy.py
+++ b/test_sqlalchemy.py
@@ -901,3 +901,124 @@ def test_no_cross_join(person, visited, survey):
]
).select_from(from_)
_check(expr, ex)
+
+
[email protected]
+def test1():
+ return ibis.table(name="test1", schema=dict(id1="int32", val1="float32"))
+
+
[email protected]
+def test2():
+ return ibis.table(
+ name="test2",
+ schema=ibis.schema(dict(id2a="int32", id2b="int64", val2="float64")),
+ )
+
+
[email protected]
+def test3():
+ return ibis.table(
+ name="test3",
+ schema=dict(id3="string", val2="float64", dt="timestamp"),
+ )
+
+
+def test_gh_1045(test1, test2, test3):
+ t1 = test1
+ t2 = test2
+ t3 = test3
+
+ t3 = t3[[c for c in t3.columns if c != "id3"]].mutate(
+ id3=t3.id3.cast('int64')
+ )
+
+ t3 = t3[[c for c in t3.columns if c != "val2"]].mutate(t3_val2=t3.id3)
+ t4 = t3.join(t2, t2.id2b == t3.id3)
+
+ t1 = t1[[t1[c].name(f"t1_{c}") for c in t1.columns]]
+
+ expr = t1.left_join(t4, t1.t1_id1 == t4.id2a)
+
+ test3 = sa.table(
+ "test3", sa.column("id3"), sa.column("val2"), sa.column("dt")
+ )
+ test2 = sa.table(
+ "test2", sa.column("id2a"), sa.column("id2b"), sa.column("val2")
+ )
+ test1 = sa.table("test1", sa.column("id1"), sa.column("val1"))
+
+ t2 = test1.alias("t2")
+ t0 = sa.select(
+ t2.c.id1.label("t1_id1"),
+ t2.c.val1.label("t1_val1"),
+ ).alias("t0")
+
+ t5 = test3.alias("t5")
+ t4 = sa.select(
+ t5.c.val2,
+ t5.c.dt,
+ sa.cast(t5.c.id3, sa.BigInteger()).label("id3"),
+ ).alias("t4")
+ t3 = test2.alias("t3")
+ t2 = sa.select(t4.c.dt, t4.c.id3, t4.c.id3.label("t3_val2")).alias("t2")
+ t1 = (
+ sa.select(
+ t2.c.dt,
+ t2.c.id3,
+ t2.c.t3_val2,
+ t3.c.id2a,
+ t3.c.id2b,
+ t3.c.val2,
+ )
+ .select_from(t2.join(t3, onclause=t3.c.id2b == t2.c.id3))
+ .alias("t1")
+ )
+
+ ex = sa.select(
+ t0.c.t1_id1,
+ t0.c.t1_val1,
+ t1.c.dt,
+ t1.c.id3,
+ t1.c.t3_val2,
+ t1.c.id2a,
+ t1.c.id2b,
+ t1.c.val2,
+ ).select_from(t0.join(t1, isouter=True, onclause=t0.c.t1_id1 == t1.c.id2a))
+
+ _check(expr, ex)
+
+
+def test_multi_join():
+ t1 = ibis.table(dict(x1="int64", y1="int64"), name="t1")
+ t2 = ibis.table(dict(x2="int64"), name="t2")
+ t3 = ibis.table(dict(x3="int64", y2="int64"), name="t3")
+ t4 = ibis.table(dict(x4="int64"), name="t4")
+
+ j1 = t1.join(t2, t1.x1 == t2.x2)
+ j2 = t3.join(t4, t3.x3 == t4.x4)
+ expr = j1.join(j2, j1.y1 == j2.y2)
+
+ t0 = sa.table("t1", sa.column("x1"), sa.column("y1")).alias("t0")
+ t1 = sa.table("t2", sa.column("x2")).alias("t1")
+
+ t3 = sa.table("t3", sa.column("x3"), sa.column("y2")).alias("t3")
+ t4 = sa.table("t4", sa.column("x4")).alias("t4")
+ t2 = (
+ sa.select(t3.c.x3, t3.c.y2, t4.c.x4)
+ .select_from(t3.join(t4, onclause=t3.c.x3 == t4.c.x4))
+ .alias("t2")
+ )
+ ex = sa.select(
+ t0.c.x1,
+ t0.c.y1,
+ t1.c.x2,
+ t2.c.x3,
+ t2.c.y2,
+ t2.c.x4,
+ ).select_from(
+ t0.join(t1, onclause=t0.c.x1 == t1.c.x2).join(
+ t2, onclause=t0.c.y1 == t2.c.y2
+ )
+ )
+ _check(expr, ex)
|
|
build: try to fix npm dev builds publishing
|
aff5d13c07b34181ad70b0d8e4e834184b4ca7f2
|
build
|
https://github.com/mikro-orm/mikro-orm/commit/aff5d13c07b34181ad70b0d8e4e834184b4ca7f2
|
try to fix npm dev builds publishing
|
diff --git a/nightly.yml b/nightly.yml
index 3900eff..495cdb7 100644
--- a/nightly.yml
+++ b/nightly.yml
@@ -23,8 +23,12 @@ jobs:
- name: Install libkrb5-dev (for mongo)
run: sudo apt install libkrb5-dev
+ - name: Install
+ run: |
+ yarn
+ echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+
- name: Release nightly
- - run: yarn
- - run: yarn release:next --yes --loglevel silly
+ run: yarn release:next --yes --loglevel silly
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
|
build: removed some warnings
chore(engine): removed exported Utils alias imports and exported functions instead
|
7b6b5e2fb21dfbf441672b86e60e56becefa5db4
|
build
|
https://github.com/tsparticles/tsparticles/commit/7b6b5e2fb21dfbf441672b86e60e56becefa5db4
|
removed some warnings
chore(engine): removed exported Utils alias imports and exported functions instead
|
diff --git a/LifeUpdater.ts b/LifeUpdater.ts
index 2faf503..d9f5fbe 100644
--- a/LifeUpdater.ts
+++ b/LifeUpdater.ts
@@ -6,7 +6,7 @@ import { getRangeValue, randomInRange, setRangeValue } from "../../Utils";
export class LifeUpdater implements IParticleUpdater {
constructor(private readonly container: Container) {}
- init(particle: Particle): void {
+ init(): void {
// nothing
}
diff --git a/OutOfCanvasUpdater.ts b/OutOfCanvasUpdater.ts
index 8d761aa..f5e3fce 100644
--- a/OutOfCanvasUpdater.ts
+++ b/OutOfCanvasUpdater.ts
@@ -8,7 +8,7 @@ import { bounceHorizontal, bounceVertical } from "./Utils";
export class OutOfCanvasUpdater implements IParticleUpdater {
constructor(private readonly container: Container) {}
- init(particle: Particle): void {
+ init(): void {
// nothing
}
diff --git a/SizeUpdater.ts b/SizeUpdater.ts
index 1048e65..f1ef9af 100644
--- a/SizeUpdater.ts
+++ b/SizeUpdater.ts
@@ -70,7 +70,7 @@ function updateSize(particle: Particle, delta: IDelta): void {
}
export class SizeUpdater implements IParticleUpdater {
- init(particle: Particle): void {
+ init(): void {
// nothing
}
diff --git a/CanvasUtils.ts b/CanvasUtils.ts
index 3e541c8..2747890 100644
--- a/CanvasUtils.ts
+++ b/CanvasUtils.ts
@@ -468,7 +468,7 @@ export function drawEllipse(
context.stroke();
}
-export function alterHsl(color: IHsl, type: AlterType, value: number) {
+export function alterHsl(color: IHsl, type: AlterType, value: number): IHsl {
return {
h: color.h,
s: color.s,
diff --git a/index.slim.ts b/index.slim.ts
index 776bd96..4eac7a1 100644
--- a/index.slim.ts
+++ b/index.slim.ts
@@ -1,8 +1,4 @@
import { initPjs } from "./pjs";
-import * as CanvasUtils from "./Utils/CanvasUtils";
-import * as ColorUtils from "./Utils/ColorUtils";
-import * as NumberUtils from "./Utils/NumberUtils";
-import * as Utils from "./Utils/Utils";
import { Circle, CircleWarp, Constants, Point, Rectangle } from "./Utils";
import type { IOptions } from "./Options/Interfaces/IOptions";
import type { RecursivePartial } from "./Types";
@@ -22,7 +18,11 @@ const { particlesJS, pJSDom } = initPjs(tsParticles);
export * from "./Core/Particle/Vector";
export * from "./Core/Container";
export * from "./Enums";
-export { CanvasUtils, Circle, CircleWarp, ColorUtils, Constants, NumberUtils, Point, Rectangle, Utils, Main, loadSlim };
+export { Circle, CircleWarp, Constants, Point, Rectangle, Main, loadSlim };
+export * from "./Utils/CanvasUtils";
+export * from "./Utils/ColorUtils";
+export * from "./Utils/NumberUtils";
+export * from "./Utils/Utils";
export * from "./Types";
export * from "./Core/Interfaces";
export * from "./Core/Particle";
diff --git a/index.ts b/index.ts
index f64630b..a0626d4 100644
--- a/index.ts
+++ b/index.ts
@@ -1,9 +1,5 @@
import { initPjs } from "./pjs";
import { Main } from "./main";
-import * as CanvasUtils from "./Utils/CanvasUtils";
-import * as ColorUtils from "./Utils/ColorUtils";
-import * as NumberUtils from "./Utils/NumberUtils";
-import * as Utils from "./Utils/Utils";
import { Circle, CircleWarp, Constants, Point, Rectangle } from "./Utils";
import type { IOptions as ISlimOptions } from "./Options/Interfaces/IOptions";
import type { IAbsorberOptions } from "./Plugins/Absorbers/Options/Interfaces/IAbsorberOptions";
@@ -27,7 +23,11 @@ export * from "./Enums";
export * from "./Plugins/Absorbers/Enums";
export * from "./Plugins/Emitters/Enums";
export * from "./Plugins/PolygonMask/Enums";
-export { CanvasUtils, Circle, CircleWarp, ColorUtils, Constants, NumberUtils, Point, Rectangle, Utils, Main, loadFull };
+export { Circle, CircleWarp, Constants, Point, Rectangle, Main, loadFull };
+export * from "./Utils/CanvasUtils";
+export * from "./Utils/ColorUtils";
+export * from "./Utils/NumberUtils";
+export * from "./Utils/Utils";
export * from "./Types";
export * from "./Core/Interfaces";
export * from "./Core/Particle";
diff --git a/ExternalLighter.ts b/ExternalLighter.ts
index 562874d..ac96111 100644
--- a/ExternalLighter.ts
+++ b/ExternalLighter.ts
@@ -1,4 +1,4 @@
-import { ExternalInteractorBase, HoverMode, Utils } from "tsparticles";
+import { ExternalInteractorBase, HoverMode, isInArray } from "tsparticles";
import type { Container } from "tsparticles";
import { drawLight } from "./Utils";
@@ -33,7 +33,7 @@ export class ExternalLighter extends ExternalInteractorBase {
return false;
}
- return Utils.isInArray(HoverMode.light, events.onHover.mode);
+ return isInArray(HoverMode.light, events.onHover.mode);
}
reset(): void {
diff --git a/ParticlesLighter.ts b/ParticlesLighter.ts
index 3590c9d..b927d55 100644
--- a/ParticlesLighter.ts
+++ b/ParticlesLighter.ts
@@ -1,4 +1,4 @@
-import { HoverMode, ParticlesInteractorBase, Utils } from "tsparticles";
+import { HoverMode, ParticlesInteractorBase, isInArray } from "tsparticles";
import type { Container, Particle } from "tsparticles";
import { drawParticleShadow } from "./Utils";
@@ -31,7 +31,7 @@ export class ParticlesLighter extends ParticlesInteractorBase {
return false;
}
- return Utils.isInArray(HoverMode.light, events.onHover.mode);
+ return isInArray(HoverMode.light, events.onHover.mode);
}
reset(): void {
diff --git a/Utils.ts b/Utils.ts
index 2a4ee94..da7c11a 100644
--- a/Utils.ts
+++ b/Utils.ts
@@ -1,4 +1,4 @@
-import { ColorUtils, Container, ICoordinates, Particle } from "tsparticles";
+import { Container, ICoordinates, Particle, colorToRgb, getStyleFromRgb } from "tsparticles";
export function drawLight(container: Container, context: CanvasRenderingContext2D, mousePos: ICoordinates): void {
const lightOptions = container.actualOptions.interactivity.modes.light.area;
@@ -17,16 +17,16 @@ export function drawLight(container: Container, context: CanvasRenderingContext2
const lightGradient = lightOptions.gradient;
const gradientRgb = {
- start: ColorUtils.colorToRgb(lightGradient.start),
- stop: ColorUtils.colorToRgb(lightGradient.stop),
+ start: colorToRgb(lightGradient.start),
+ stop: colorToRgb(lightGradient.stop),
};
if (!gradientRgb.start || !gradientRgb.stop) {
return;
}
- gradientAmbientLight.addColorStop(0, ColorUtils.getStyleFromRgb(gradientRgb.start));
- gradientAmbientLight.addColorStop(1, ColorUtils.getStyleFromRgb(gradientRgb.stop));
+ gradientAmbientLight.addColorStop(0, getStyleFromRgb(gradientRgb.start));
+ gradientAmbientLight.addColorStop(1, getStyleFromRgb(gradientRgb.stop));
context.fillStyle = gradientAmbientLight;
context.fill();
}
@@ -73,13 +73,13 @@ export function drawParticleShadow(
});
}
- const shadowRgb = ColorUtils.colorToRgb(shadowOptions.color);
+ const shadowRgb = colorToRgb(shadowOptions.color);
if (!shadowRgb) {
return;
}
- const shadowColor = ColorUtils.getStyleFromRgb(shadowRgb);
+ const shadowColor = getStyleFromRgb(shadowRgb);
for (let i = points.length - 1; i >= 0; i--) {
const n = i == points.length - 1 ? 0 : i + 1;
diff --git a/Repulser.ts b/Repulser.ts
index 9e40e26..b965c90 100644
--- a/Repulser.ts
+++ b/Repulser.ts
@@ -1,5 +1,5 @@
import type { Container, IParticle } from "tsparticles";
-import { NumberUtils, Particle, ParticlesInteractorBase, Vector } from "tsparticles";
+import { Particle, ParticlesInteractorBase, Vector, getDistances, clamp } from "tsparticles";
export class Repulser extends ParticlesInteractorBase {
constructor(container: Container) {
@@ -27,14 +27,10 @@ export class Repulser extends ParticlesInteractorBase {
}
const pos2 = p2.getPosition();
- const { dx, dy, distance } = NumberUtils.getDistances(pos2, pos1);
+ const { dx, dy, distance } = getDistances(pos2, pos1);
const velocity = repulseOpt1.speed * repulseOpt1.factor;
if (distance > 0) {
- const repulseFactor = NumberUtils.clamp(
- (1 - Math.pow(distance / repulseOpt1.distance, 2)) * velocity,
- 0,
- velocity
- );
+ const repulseFactor = clamp((1 - Math.pow(distance / repulseOpt1.distance, 2)) * velocity, 0, velocity);
const normVec = Vector.create((dx / distance) * repulseFactor, (dy / distance) * repulseFactor);
p2.position.addTo(normVec);
diff --git a/InfectionInstance.ts b/InfectionInstance.ts
index 182e5ac..ffa0a10 100644
--- a/InfectionInstance.ts
+++ b/InfectionInstance.ts
@@ -1,6 +1,6 @@
import type { IColor, IContainerPlugin, Particle } from "tsparticles";
import { Infecter } from "./Infecter";
-import { Utils } from "tsparticles";
+import { itemFromArray } from "tsparticles";
import type { InfectableContainer, InfectableParticle } from "./Types";
import type { IInfectionOptions } from "./Options/Interfaces/IInfectionOptions";
@@ -23,7 +23,7 @@ export class InfectionInstance implements IContainerPlugin {
return infP.infection.stage === undefined;
});
- const infected = Utils.itemFromArray(notInfected) as InfectableParticle;
+ const infected = itemFromArray(notInfected) as InfectableParticle;
this.container.infecter?.startInfection(infected, 0);
}
diff --git a/MultilineTextDrawer.ts b/MultilineTextDrawer.ts
index af21fb3..9599d7d 100644
--- a/MultilineTextDrawer.ts
+++ b/MultilineTextDrawer.ts
@@ -1,4 +1,4 @@
-import { Utils } from "tsparticles";
+import { isInArray, itemFromArray, loadFont } from "tsparticles";
import type { IShapeDrawer } from "tsparticles/Core/Interfaces/IShapeDrawer";
import type { Container, SingleOrMultiple, IParticle } from "tsparticles";
import type { IShapeValues } from "tsparticles/Options/Interfaces/Particles/Shape/IShapeValues";
@@ -19,15 +19,15 @@ export class MultilineTextDrawer implements IShapeDrawer {
const options = container.options;
const shapeType = "multiline-text";
- if (Utils.isInArray(shapeType, options.particles.shape.type)) {
+ if (isInArray(shapeType, options.particles.shape.type)) {
const shapeOptions = options.particles.shape.options[shapeType] as SingleOrMultiple<IMultilineTextShape>;
if (shapeOptions instanceof Array) {
for (const character of shapeOptions) {
- await Utils.loadFont(character);
+ await loadFont(character);
}
} else {
if (shapeOptions !== undefined) {
- await Utils.loadFont(shapeOptions);
+ await loadFont(shapeOptions);
}
}
}
@@ -50,7 +50,7 @@ export class MultilineTextDrawer implements IShapeDrawer {
if (textParticle.text === undefined) {
textParticle.text =
- textData instanceof Array ? Utils.itemFromArray(textData, particle.randomIndexData) : textData;
+ textData instanceof Array ? itemFromArray(textData, particle.randomIndexData) : textData;
}
const text = textParticle.text;
diff --git a/GradientUpdater.ts b/GradientUpdater.ts
index 3ca5099..474ad83 100644
--- a/GradientUpdater.ts
+++ b/GradientUpdater.ts
@@ -5,7 +5,18 @@ import type {
Particle,
IParticleNumericValueAnimation,
} from "tsparticles";
-import { AnimationStatus, RotateDirection, StartValueType, Utils, ColorUtils, NumberUtils } from "tsparticles";
+import {
+ AnimationStatus,
+ RotateDirection,
+ StartValueType,
+ colorToHsl,
+ getHslAnimationFromHsl,
+ getRangeMax,
+ getRangeMin,
+ getRangeValue,
+ itemFromArray,
+ randomInRange,
+} from "tsparticles";
function updateColorOpacity(delta: IDelta, value: IParticleNumericValueAnimation) {
if (!value.enable) {
@@ -124,7 +135,7 @@ export class GradientUpdater implements IParticleUpdater {
init(particle: Particle): void {
const gradient =
particle.options.gradient instanceof Array
- ? Utils.itemFromArray(particle.options.gradient)
+ ? itemFromArray(particle.options.gradient)
: particle.options.gradient;
if (gradient) {
@@ -159,10 +170,10 @@ export class GradientUpdater implements IParticleUpdater {
const reduceDuplicates = particle.options.reduceDuplicates;
for (const grColor of gradient.colors) {
- const grHslColor = ColorUtils.colorToHsl(grColor.value, particle.id, reduceDuplicates);
+ const grHslColor = colorToHsl(grColor.value, particle.id, reduceDuplicates);
if (grHslColor) {
- const grHslAnimation = ColorUtils.getHslAnimationFromHsl(
+ const grHslAnimation = getHslAnimationFromHsl(
grHslColor,
grColor.value.animation,
particle.container.retina.reduceFactor
@@ -174,10 +185,10 @@ export class GradientUpdater implements IParticleUpdater {
opacity: grColor.opacity
? {
enable: grColor.opacity.animation.enable,
- max: NumberUtils.getRangeMax(grColor.opacity.value),
- min: NumberUtils.getRangeMin(grColor.opacity.value),
+ max: getRangeMax(grColor.opacity.value),
+ min: getRangeMin(grColor.opacity.value),
status: AnimationStatus.increasing,
- value: NumberUtils.getRangeValue(grColor.opacity.value),
+ value: getRangeValue(grColor.opacity.value),
velocity:
(grColor.opacity.animation.speed / 100) * particle.container.retina.reduceFactor,
}
@@ -187,8 +198,8 @@ export class GradientUpdater implements IParticleUpdater {
if (grColor.opacity && addColor.opacity) {
const opacityRange = grColor.opacity.value;
- addColor.opacity.min = NumberUtils.getRangeMin(opacityRange);
- addColor.opacity.max = NumberUtils.getRangeMax(opacityRange);
+ addColor.opacity.min = getRangeMin(opacityRange);
+ addColor.opacity.max = getRangeMax(opacityRange);
const opacityAnimation = grColor.opacity.animation;
@@ -200,7 +211,7 @@ export class GradientUpdater implements IParticleUpdater {
break;
case StartValueType.random:
- addColor.opacity.value = NumberUtils.randomInRange(addColor.opacity);
+ addColor.opacity.value = randomInRange(addColor.opacity);
addColor.opacity.status =
Math.random() >= 0.5 ? AnimationStatus.increasing : AnimationStatus.decreasing;
diff --git a/OrbitUpdater.ts b/OrbitUpdater.ts
index 88411db..3e52dae 100644
--- a/OrbitUpdater.ts
+++ b/OrbitUpdater.ts
@@ -1,5 +1,5 @@
import type { Container, IDelta, IParticleUpdater, Particle, IHsl, IParticleRetinaProps } from "tsparticles";
-import { CanvasUtils, ColorUtils, NumberUtils, OrbitType } from "tsparticles";
+import { colorToHsl, drawEllipse, getRangeValue, OrbitType } from "tsparticles";
type OrbitParticle = Particle & {
orbitColor?: IHsl;
@@ -18,9 +18,9 @@ export class OrbitUpdater implements IParticleUpdater {
const orbitOptions = particlesOptions.orbit;
if (orbitOptions.enable) {
- particle.orbitRotation = NumberUtils.getRangeValue(orbitOptions.rotation.value);
+ particle.orbitRotation = getRangeValue(orbitOptions.rotation.value);
- particle.orbitColor = ColorUtils.colorToHsl(orbitOptions.color);
+ particle.orbitColor = colorToHsl(orbitOptions.color);
particle.retina.orbitRadius =
orbitOptions?.radius !== undefined ? orbitOptions.radius * this.container.retina.pixelRatio : undefined;
@@ -85,7 +85,7 @@ export class OrbitUpdater implements IParticleUpdater {
}
container.canvas.draw((ctx) => {
- CanvasUtils.drawEllipse(
+ drawEllipse(
ctx,
particle,
particle.orbitColor ?? particle.getFillColor(),
|
|
build: added typedoc config to all packages for the website generation
|
2226d500c9e5c8f187393b17c533900a99ed5dfd
|
build
|
https://github.com/tsparticles/tsparticles/commit/2226d500c9e5c8f187393b17c533900a99ed5dfd
|
added typedoc config to all packages for the website generation
|
diff --git a/typedoc.json b/typedoc.json
index 7878599..e9326b6 100644
--- a/typedoc.json
+++ b/typedoc.json
@@ -1,5 +1,4 @@
{
- "gaID": "UA-161253125-1",
"includes": "./markdown",
"entryPoints": [
"./src/"
@@ -9,33 +8,6 @@
"includeVersion": true,
"hideGenerator": true,
"out": "./docs",
- "clarityId": "8q4bxin4tm",
- "carbonServe": "CEAI6KJL",
- "carbonPlacement": "particlesjsorg",
- "keywords": [
- "html",
- "css",
- "javascript",
- "typescript",
- "particles",
- "js",
- "ts",
- "jsx",
- "tsx",
- "canvas",
- "confetti",
- "fireworks",
- "animations",
- "react",
- "vue",
- "angular",
- "svelte",
- "libraries",
- "how",
- "to",
- "create",
- "add"
- ],
"validation": {
"invalidLink": true,
"notDocumented": true
|
|
docs: fix `memtable` docstrings
|
72bc0f5172c0a3d17bde29cfc00db4c60d2fee3a
|
docs
|
https://github.com/rohankumardubey/ibis/commit/72bc0f5172c0a3d17bde29cfc00db4c60d2fee3a
|
fix `memtable` docstrings
|
diff --git a/api.py b/api.py
index ea88dd2..4c797b4 100644
--- a/api.py
+++ b/api.py
@@ -403,15 +403,21 @@ def memtable(
>>> import ibis
>>> t = ibis.memtable([{"a": 1}, {"a": 2}])
>>> t
+ PandasInMemoryTable
+ data:
+ DataFrameProxy:
+ a
+ 0 1
+ 1 2
>>> t = ibis.memtable([{"a": 1, "b": "foo"}, {"a": 2, "b": "baz"}])
>>> t
PandasInMemoryTable
data:
- ((1, 'foo'), (2, 'baz'))
- schema:
- a int8
- b string
+ DataFrameProxy:
+ a b
+ 0 1 foo
+ 1 2 baz
Create a table literal without column names embedded in the data and pass
`columns`
@@ -420,10 +426,22 @@ def memtable(
>>> t
PandasInMemoryTable
data:
- ((1, 'foo'), (2, 'baz'))
- schema:
- a int8
- b string
+ DataFrameProxy:
+ a b
+ 0 1 foo
+ 1 2 baz
+
+ Create a table literal without column names embedded in the data. Ibis
+ generates column names if none are provided.
+
+ >>> t = ibis.memtable([(1, "foo"), (2, "baz")])
+ >>> t
+ PandasInMemoryTable
+ data:
+ DataFrameProxy:
+ col0 col1
+ 0 1 foo
+ 1 2 baz
"""
if columns is not None and schema is not None:
raise NotImplementedError(
|
|
test: make enqueue links tests more stable
|
55182cec06bd6d70dfd3c87457fd28f4e3029402
|
test
|
https://github.com/Hardeepex/crawlee/commit/55182cec06bd6d70dfd3c87457fd28f4e3029402
|
make enqueue links tests more stable
|
diff --git a/main.js b/main.js
index 0e825c6..8229e7c 100644
--- a/main.js
+++ b/main.js
@@ -26,5 +26,5 @@ await Actor.main(async () => {
},
});
- await crawler.run(['https://apify.com/about']);
+ await crawler.run(['https://apify.com/press-kit', 'https://apify.com/about']);
}, mainOptions);
|
|
chore(release): v6.1.11 [skip ci]
|
43fd97e9bb68135d3d9e8648d130baa50aec9125
|
chore
|
https://github.com/mikro-orm/mikro-orm/commit/43fd97e9bb68135d3d9e8648d130baa50aec9125
|
v6.1.11 [skip ci]
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 572c48f..c7555f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [6.1.11](https://github.com/mikro-orm/mikro-orm/compare/v6.1.10...v6.1.11) (2024-03-18)
+
+**Note:** Version bump only for package @mikro-orm/sqlite
+
+
+
+
+
## [6.1.10](https://github.com/mikro-orm/mikro-orm/compare/v6.1.9...v6.1.10) (2024-03-14)
**Note:** Version bump only for package @mikro-orm/sqlite
diff --git a/lerna.json b/lerna.json
index 20e212f..fc7d91d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
- "version": "6.1.10",
+ "version": "6.1.11",
"command": {
"version": {
"conventionalCommits": true,
diff --git a/package.json b/package.json
index dda01b4..762251e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@mikro-orm/sqlite",
- "version": "6.1.10",
+ "version": "6.1.11",
"description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
"main": "dist/index.js",
"module": "dist/index.mjs",
@@ -58,13 +58,13 @@
"access": "public"
},
"dependencies": {
- "@mikro-orm/knex": "6.1.10",
+ "@mikro-orm/knex": "^6.1.11",
"fs-extra": "11.2.0",
"sqlite3": "5.1.7",
"sqlstring-sqlite": "0.1.1"
},
"devDependencies": {
- "@mikro-orm/core": "^6.1.10"
+ "@mikro-orm/core": "^6.1.11"
},
"peerDependencies": {
"@mikro-orm/core": "^6.0.0"
diff --git a/yarn.lock b/yarn.lock
index 62998d1..d50032a 100644
--- a/yarn.lock
+++ b/yarn.lock
Binary files a/yarn.lock and b/yarn.lock differ
|
|
build(macos): update optional mimalloc patch
|
34e64954d4c26d4a35ef72c697271e334a99d379
|
build
|
https://github.com/ibis-project/ibis/commit/34e64954d4c26d4a35ef72c697271e334a99d379
|
update optional mimalloc patch
|
diff --git a/datafusion-macos.patch b/datafusion-macos.patch
index 57980b7..bd779c2 100644
--- a/datafusion-macos.patch
+++ b/datafusion-macos.patch
@@ -1,147 +1,369 @@
diff --git a/Cargo.lock b/Cargo.lock
-index d73083f..489f301 100644
+index e71932b..37f6b15 100644
--- a/Cargo.lock
+++ b/Cargo.lock
-@@ -277,9 +277,9 @@ dependencies = [
+@@ -14,7 +14,7 @@ version = "0.7.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+ dependencies = [
+- "getrandom 0.2.6",
++ "getrandom 0.2.7",
+ "once_cell",
+ "version_check",
+ ]
+@@ -83,9 +83,9 @@ dependencies = [
[[package]]
- name = "datafusion"
--version = "7.0.0"
-+version = "7.1.0"
+ name = "async-trait"
+-version = "0.1.53"
++version = "0.1.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "30cf8e6735817bb021748d72cecc33e468d8775bf749470c52aa7f55ee5cdf9e"
-+checksum = "79a0ea0a500cbfb6b683ad8cc6f403faa7c897432cc8ad0da40c09a9a705255f"
+-checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
++checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
dependencies = [
- "ahash",
- "arrow",
-@@ -384,9 +384,9 @@ dependencies = [
+ "proc-macro2",
+ "quote",
+@@ -291,7 +291,7 @@ dependencies = [
+ "datafusion-physical-expr",
+ "datafusion-row",
+ "futures",
+- "hashbrown 0.12.1",
++ "hashbrown",
+ "lazy_static",
+ "log",
+ "num_cpus",
+@@ -307,7 +307,7 @@ dependencies = [
+ "tempfile",
+ "tokio",
+ "tokio-stream",
+- "uuid 1.0.0",
++ "uuid 1.1.2",
+ ]
+
+ [[package]]
+@@ -364,7 +364,7 @@ dependencies = [
+ "datafusion-common",
+ "datafusion-expr",
+ "datafusion-row",
+- "hashbrown 0.12.1",
++ "hashbrown",
+ "lazy_static",
+ "md-5",
+ "ordered-float 3.0.0",
+@@ -434,13 +434,11 @@ dependencies = [
[[package]]
name = "flate2"
--version = "1.0.22"
-+version = "1.0.23"
+-version = "1.0.23"
++version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
-+checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
+-checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
++checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
dependencies = [
- "cfg-if",
+- "cfg-if",
"crc32fast",
-@@ -701,9 +701,9 @@ dependencies = [
+- "libc",
+ "miniz_oxide",
+ ]
+
+@@ -556,13 +554,13 @@ dependencies = [
[[package]]
- name = "libc"
--version = "0.2.121"
-+version = "0.2.124"
+ name = "getrandom"
+-version = "0.2.6"
++version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f"
-+checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50"
+-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
++checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+ dependencies = [
+ "cfg-if",
+ "libc",
+- "wasi 0.10.2+wasi-snapshot-preview1",
++ "wasi 0.11.0+wasi-snapshot-preview1",
+ ]
+
+ [[package]]
+@@ -577,12 +575,6 @@ version = "1.8.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+-[[package]]
+-name = "hashbrown"
+-version = "0.11.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+-
[[package]]
- name = "libmimalloc-sys"
-@@ -779,12 +779,11 @@ dependencies = [
+ name = "hashbrown"
+ version = "0.12.1"
+@@ -618,12 +610,12 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+ [[package]]
+ name = "indexmap"
+-version = "1.8.1"
++version = "1.9.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
++checksum = "6c6392766afd7964e2531940894cffe4bd8d7d17dbc3c1c4857040fd4b33bdb3"
+ dependencies = [
+ "autocfg",
+- "hashbrown 0.11.2",
++ "hashbrown",
+ ]
+
+ [[package]]
+@@ -676,9 +668,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+ [[package]]
+ name = "lexical-core"
+-version = "0.8.3"
++version = "0.8.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "92912c4af2e7d9075be3e5e3122c4d7263855fa6cce34fbece4dd08e5884624d"
++checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
+ dependencies = [
+ "lexical-parse-float",
+ "lexical-parse-integer",
+@@ -689,9 +681,9 @@ dependencies = [
+
+ [[package]]
+ name = "lexical-parse-float"
+-version = "0.8.3"
++version = "0.8.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f518eed87c3be6debe6d26b855c97358d8a11bf05acec137e5f53080f5ad2dd8"
++checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+ dependencies = [
+ "lexical-parse-integer",
+ "lexical-util",
+@@ -700,9 +692,9 @@ dependencies = [
+
+ [[package]]
+ name = "lexical-parse-integer"
+-version = "0.8.3"
++version = "0.8.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "afc852ec67c6538bbb2b9911116a385b24510e879a69ab516e6a151b15a79168"
++checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+ dependencies = [
+ "lexical-util",
+ "static_assertions",
+@@ -710,18 +702,18 @@ dependencies = [
+
+ [[package]]
+ name = "lexical-util"
+-version = "0.8.3"
++version = "0.8.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c72a9d52c5c4e62fa2cdc2cb6c694a39ae1382d9c2a17a466f18e272a0930eb1"
++checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+ dependencies = [
+ "static_assertions",
+ ]
+
+ [[package]]
+ name = "lexical-write-float"
+-version = "0.8.4"
++version = "0.8.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8a89ec1d062e481210c309b672f73a0567b7855f21e7d2fae636df44d12e97f9"
++checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862"
+ dependencies = [
+ "lexical-util",
+ "lexical-write-integer",
+@@ -730,9 +722,9 @@ dependencies = [
+
+ [[package]]
+ name = "lexical-write-integer"
+-version = "0.8.3"
++version = "0.8.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "094060bd2a7c2ff3a16d5304a6ae82727cb3cc9d1c70f813cc73f744c319337e"
++checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446"
+ dependencies = [
+ "lexical-util",
+ "static_assertions",
+@@ -818,9 +810,9 @@ dependencies = [
[[package]]
name = "miniz_oxide"
--version = "0.4.4"
-+version = "0.5.1"
+-version = "0.5.1"
++version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
-+checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
+-checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
++checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
dependencies = [
"adler",
-- "autocfg",
]
+@@ -933,9 +925,9 @@ dependencies = [
+
+ [[package]]
+ name = "once_cell"
+-version = "1.10.0"
++version = "1.12.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
++checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
[[package]]
-@@ -1047,18 +1046,18 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+ name = "ordered-float"
+@@ -957,9 +949,9 @@ dependencies = [
[[package]]
- name = "proc-macro2"
--version = "1.0.36"
-+version = "1.0.37"
+ name = "parking_lot"
+-version = "0.12.0"
++version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
-+checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
+-checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
++checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
- "unicode-xid",
+ "lock_api",
+ "parking_lot_core",
+@@ -1169,7 +1161,7 @@ version = "0.6.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+ dependencies = [
+- "getrandom 0.2.6",
++ "getrandom 0.2.7",
]
[[package]]
- name = "pyo3"
--version = "0.15.1"
-+version = "0.15.2"
+@@ -1192,9 +1184,9 @@ dependencies = [
+
+ [[package]]
+ name = "regex"
+-version = "1.5.5"
++version = "1.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7cf01dbf1c05af0a14c7779ed6f3aa9deac9c3419606ac9de537a2d649005720"
-+checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752"
+-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
++checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
dependencies = [
- "cfg-if",
- "indoc",
-@@ -1072,18 +1071,18 @@ dependencies = [
+ "aho-corasick",
+ "memchr",
+@@ -1209,9 +1201,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+
+ [[package]]
+ name = "regex-syntax"
+-version = "0.6.25"
++version = "0.6.26"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
++checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
+
+ [[package]]
+ name = "remove_dir_all"
+@@ -1340,9 +1332,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+
+ [[package]]
+ name = "syn"
+-version = "1.0.95"
++version = "1.0.96"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942"
++checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
+ dependencies = [
+ "proc-macro2",
+ "quote",
+@@ -1351,9 +1343,9 @@ dependencies = [
[[package]]
- name = "pyo3-build-config"
--version = "0.15.1"
-+version = "0.15.2"
+ name = "target-lexicon"
+-version = "0.12.3"
++version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dbf9e4d128bfbddc898ad3409900080d8d5095c379632fbbfbb9c8cfb1fb852b"
-+checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410"
+-checksum = "d7fa7e55043acb85fca6b3c01485a2eeb6b69c5d21002e273c79e465f43b7ac1"
++checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1"
+
+ [[package]]
+ name = "tempfile"
+@@ -1413,9 +1405,9 @@ dependencies = [
+
+ [[package]]
+ name = "tokio"
+-version = "1.18.2"
++version = "1.19.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395"
++checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
dependencies = [
+ "num_cpus",
"once_cell",
- ]
+@@ -1426,9 +1418,9 @@ dependencies = [
[[package]]
- name = "pyo3-macros"
--version = "0.15.1"
-+version = "0.15.2"
+ name = "tokio-macros"
+-version = "1.7.0"
++version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "67701eb32b1f9a9722b4bc54b548ff9d7ebfded011c12daece7b9063be1fd755"
-+checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a"
+-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
++checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
dependencies = [
- "pyo3-macros-backend",
+ "proc-macro2",
"quote",
-@@ -1092,9 +1091,9 @@ dependencies = [
+@@ -1437,9 +1429,9 @@ dependencies = [
[[package]]
- name = "pyo3-macros-backend"
--version = "0.15.1"
-+version = "0.15.2"
+ name = "tokio-stream"
+-version = "0.1.8"
++version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f44f09e825ee49a105f2c7b23ebee50886a9aee0746f4dd5a704138a64b0218a"
-+checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095"
+-checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
++checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
dependencies = [
- "proc-macro2",
- "pyo3-build-config",
-@@ -1104,9 +1103,9 @@ dependencies = [
+ "futures-core",
+ "pin-project-lite",
+@@ -1454,9 +1446,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+
+ [[package]]
+ name = "unicode-ident"
+-version = "1.0.0"
++version = "1.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
++checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
[[package]]
- name = "quote"
--version = "1.0.17"
-+version = "1.0.18"
+ name = "unicode-segmentation"
+@@ -1482,16 +1474,16 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58"
-+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+ checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [
- "proc-macro2",
+- "getrandom 0.2.6",
++ "getrandom 0.2.7",
]
-@@ -1341,9 +1340,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
- name = "syn"
--version = "1.0.90"
-+version = "1.0.91"
+ name = "uuid"
+-version = "1.0.0"
++version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f"
-+checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d"
+-checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0"
++checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
dependencies = [
- "proc-macro2",
- "quote",
+- "getrandom 0.2.6",
++ "getrandom 0.2.7",
+ ]
+
+ [[package]]
+@@ -1508,9 +1500,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+ [[package]]
+ name = "wasi"
+-version = "0.10.2+wasi-snapshot-preview1"
++version = "0.11.0+wasi-snapshot-preview1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+ [[package]]
+ name = "winapi"
diff --git a/Cargo.toml b/Cargo.toml
-index ba2f337..40cba00 100644
+index 3d1a98c..4b7e6fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -35,7 +35,7 @@ datafusion = { version = "^7.0.0", features = ["pyarrow"] }
- datafusion-expr = { version = "^7.0.0" }
- datafusion-common = { version = "^7.0.0", features = ["pyarrow"] }
+@@ -35,7 +35,7 @@ datafusion = { version = "^8.0.0", features = ["pyarrow"] }
+ datafusion-expr = { version = "^8.0.0" }
+ datafusion-common = { version = "^8.0.0", features = ["pyarrow"] }
uuid = { version = "0.8", features = ["v4"] }
-mimalloc = { version = "*", default-features = false }
+mimalloc = { version = "*", optional = true, default-features = false }
@@ -149,7 +371,7 @@ index ba2f337..40cba00 100644
[lib]
name = "datafusion_python"
diff --git a/src/lib.rs b/src/lib.rs
-index 977d9e8..ca1cd17 100644
+index 7ad12cc..25b63e8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,6 +15,7 @@
|
|
test(snowflake): fix failing big timestamp tests
|
1f51910a2947724e1ec4099edaffce35a0eb05e6
|
test
|
https://github.com/ibis-project/ibis/commit/1f51910a2947724e1ec4099edaffce35a0eb05e6
|
fix failing big timestamp tests
|
diff --git a/test_temporal.py b/test_temporal.py
index aa56151..1f5e275 100644
--- a/test_temporal.py
+++ b/test_temporal.py
@@ -937,7 +937,6 @@ def test_integer_cast_to_timestamp_scalar(alltypes, df):
["pyspark"],
reason="PySpark doesn't handle big timestamps",
)
[email protected](["snowflake"])
@pytest.mark.notimpl(["bigquery"], reason="bigquery returns a datetime with a timezone")
def test_big_timestamp(con):
# TODO: test with a timezone
@@ -993,11 +992,6 @@ def test_timestamp_date_comparison(backend, alltypes, df, left_fn, right_fn):
@pytest.mark.broken(["clickhouse"], reason="returns incorrect results")
[email protected](
- ["snowflake"],
- reason="ibis returns a string for the timestamp, only for snowflake",
- raises=TypeError,
-)
@pytest.mark.notimpl(["polars", "datafusion", "pyspark"])
def test_large_timestamp(con):
huge_timestamp = datetime.datetime(year=4567, month=1, day=1)
|
|
build: fixing demos
|
3a1281b21209c26bd8623a3910c3eff9cafaa4bc
|
build
|
https://github.com/tsparticles/tsparticles/commit/3a1281b21209c26bd8623a3910c3eff9cafaa4bc
|
fixing demos
|
diff --git a/package.json b/package.json
index 0567597..2c73ce2 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
"tsparticles-interaction-particles-links": "^2.0.5",
"tsparticles-move-base": "^2.0.5",
"tsparticles-move-parallax": "^2.0.5",
+ "tsparticles-particles.js": "^2.0.5",
"tsparticles-plugin-absorbers": "^2.0.5",
"tsparticles-plugin-emitters": "^2.0.5",
"tsparticles-plugin-polygon-mask": "^2.0.5",
|
|
fix(core): expose filters in some repository methods
Closes #1236
|
a1e1553fa96188c0ec7e2e841611cbdfa2f9b01c
|
fix
|
https://github.com/mikro-orm/mikro-orm/commit/a1e1553fa96188c0ec7e2e841611cbdfa2f9b01c
|
expose filters in some repository methods
Closes #1236
|
diff --git a/EntityRepository.ts b/EntityRepository.ts
index e446792..7b3c239 100644
--- a/EntityRepository.ts
+++ b/EntityRepository.ts
@@ -1,7 +1,7 @@
import { EntityManager } from '../EntityManager';
import { EntityData, EntityName, AnyEntity, Primary, Populate, Loaded, New, FilterQuery } from '../typings';
import { QueryOrderMap } from '../enums';
-import { CountOptions, FindOneOptions, FindOneOrFailOptions, FindOptions } from '../drivers/IDatabaseDriver';
+import { CountOptions, DeleteOptions, FindOneOptions, FindOneOrFailOptions, FindOptions, UpdateOptions } from '../drivers/IDatabaseDriver';
import { IdentifiedReference, Reference } from './Reference';
export class EntityRepository<T extends AnyEntity<T>> {
@@ -177,15 +177,15 @@ export class EntityRepository<T extends AnyEntity<T>> {
/**
* Fires native update query. Calling this has no side effects on the context (identity map).
*/
- async nativeUpdate(where: FilterQuery<T>, data: EntityData<T>): Promise<number> {
- return this.em.nativeUpdate(this.entityName, where, data);
+ async nativeUpdate(where: FilterQuery<T>, data: EntityData<T>, options?: UpdateOptions<T>): Promise<number> {
+ return this.em.nativeUpdate(this.entityName, where, data, options);
}
/**
* Fires native delete query. Calling this has no side effects on the context (identity map).
*/
- async nativeDelete(where: FilterQuery<T> | any): Promise<number> {
- return this.em.nativeDelete(this.entityName, where);
+ async nativeDelete(where: FilterQuery<T>, options?: DeleteOptions<T>): Promise<number> {
+ return this.em.nativeDelete(this.entityName, where, options);
}
/**
diff --git a/EntityRepository.test.ts b/EntityRepository.test.ts
index c06f1f5..516b8c0 100644
--- a/EntityRepository.test.ts
+++ b/EntityRepository.test.ts
@@ -77,9 +77,9 @@ describe('EntityRepository', () => {
await repo.nativeInsert({ name: 'bar' });
expect(methods.nativeInsert.mock.calls[0]).toEqual([Publisher, { name: 'bar' }]);
await repo.nativeUpdate({ name: 'bar' }, { name: 'baz' });
- expect(methods.nativeUpdate.mock.calls[0]).toEqual([Publisher, { name: 'bar' }, { name: 'baz' }]);
+ expect(methods.nativeUpdate.mock.calls[0]).toEqual([Publisher, { name: 'bar' }, { name: 'baz' }, undefined]);
await repo.nativeDelete({ name: 'bar' });
- expect(methods.nativeDelete.mock.calls[0]).toEqual([Publisher, { name: 'bar' }]);
+ expect(methods.nativeDelete.mock.calls[0]).toEqual([Publisher, { name: 'bar' }, undefined]);
await repoMongo.aggregate([{ name: 'bar' }]);
expect(methods.aggregate.mock.calls[0]).toEqual([Publisher, [{ name: 'bar' }]]);
});
diff --git a/filters.postgres.test.ts b/filters.postgres.test.ts
index 467dc7f..6c02758 100644
--- a/filters.postgres.test.ts
+++ b/filters.postgres.test.ts
@@ -37,7 +37,6 @@ describe('filters [postgres]', () => {
entities: [Employee, Benefit],
dbName: `mikro_orm_test_gh_1232`,
type: 'postgresql',
- debug: true,
});
await orm.getSchemaGenerator().ensureDatabase();
await orm.getSchemaGenerator().dropSchema();
|
|
feat: args expansion
|
d433bcbcce0675fadb9c6099508987bebff93c88
|
feat
|
https://github.com/erg-lang/erg/commit/d433bcbcce0675fadb9c6099508987bebff93c88
|
args expansion
|
diff --git a/opcode309.rs b/opcode309.rs
index 1f94b11..6b39478 100644
--- a/opcode309.rs
+++ b/opcode309.rs
@@ -113,8 +113,10 @@ impl_u8_enum! {Opcode309;
BUILD_TUPLE_UNPACK_WITH_CALL = 158,
LOAD_METHOD = 160,
CALL_METHOD = 161,
- CALL_FINALLY = 162,
- POP_FINALLY = 163,
+ LIST_EXTEND = 162,
+ SET_UPDATE = 163,
+ DICT_MERGE = 164,
+ DICT_UPDATE = 165,
// Erg-specific opcodes (must have a unary `ERG_`)
// Define in descending order from 219, 255
ERG_POP_NTH = 196,
diff --git a/opcode310.rs b/opcode310.rs
index 837f294..c156d5a 100644
--- a/opcode310.rs
+++ b/opcode310.rs
@@ -111,6 +111,9 @@ impl_u8_enum! {Opcode310;
LOAD_METHOD = 160,
CALL_METHOD = 161,
LIST_EXTEND = 162,
+ SET_UPDATE = 163,
+ DICT_MERGE = 164,
+ DICT_UPDATE = 165,
// Erg-specific opcodes (must have a unary `ERG_`)
// Define in descending order from 219, 255
ERG_POP_NTH = 196,
diff --git a/opcode311.rs b/opcode311.rs
index d517a99..333ecea 100644
--- a/opcode311.rs
+++ b/opcode311.rs
@@ -101,6 +101,9 @@ impl_u8_enum! {Opcode311;
BUILD_STRING = 157,
LOAD_METHOD = 160,
LIST_EXTEND = 162,
+ SET_UPDATE = 163,
+ DICT_MERGE = 164,
+ DICT_UPDATE = 165,
PRECALL = 166,
CALL = 171,
KW_NAMES = 172,
diff --git a/codegen.rs b/codegen.rs
index 3b13b55..dd5e711 100644
--- a/codegen.rs
+++ b/codegen.rs
@@ -609,7 +609,7 @@ impl PyCodeGenerator {
}
fn stack_dec_n(&mut self, n: usize) {
- if n > 0 && self.stack_len() == 0 {
+ if n as u32 > self.stack_len() {
let lasti = self.lasti();
let last = self.cur_block_codeobj().code.last().unwrap();
self.crash(&format!(
@@ -2825,6 +2825,19 @@ impl PyCodeGenerator {
self.write_instr(Opcode310::LIST_TO_TUPLE);
self.write_arg(0);
}
+ self.stack_dec();
+ }
+
+ fn emit_kw_var_args_311(&mut self, pos_len: usize, kw_var: &PosArg) {
+ self.write_instr(BUILD_TUPLE);
+ self.write_arg(pos_len);
+ self.stack_dec_n(pos_len.saturating_sub(1));
+ self.write_instr(BUILD_MAP);
+ self.write_arg(0);
+ self.emit_expr(kw_var.expr.clone());
+ self.write_instr(Opcode311::DICT_MERGE);
+ self.write_arg(1);
+ self.stack_dec();
}
fn emit_var_args_308(&mut self, pos_len: usize, var_args: &PosArg) {
@@ -2839,6 +2852,14 @@ impl PyCodeGenerator {
}
}
+ fn emit_kw_var_args_308(&mut self, pos_len: usize, kw_var: &PosArg) {
+ self.write_instr(BUILD_TUPLE);
+ self.write_arg(pos_len);
+ self.emit_expr(kw_var.expr.clone());
+ self.stack_dec_n(pos_len.saturating_sub(1));
+ self.stack_dec();
+ }
+
fn emit_args_311(&mut self, mut args: Args, kind: AccessKind) {
let argc = args.len();
let pos_len = args.pos_args.len();
@@ -2857,6 +2878,13 @@ impl PyCodeGenerator {
kws.push(ValueObj::Str(arg.keyword.content));
self.emit_expr(arg.expr);
}
+ if let Some(kw_var) = &args.kw_var {
+ if self.py_version.minor >= Some(10) {
+ self.emit_kw_var_args_311(pos_len, kw_var);
+ } else {
+ self.emit_kw_var_args_308(pos_len, kw_var);
+ }
+ }
let kwsc = if !kws.is_empty() {
self.emit_call_kw_instr(argc, kws);
#[allow(clippy::bool_to_int_with_if)]
@@ -2866,9 +2894,9 @@ impl PyCodeGenerator {
1
}
} else {
- if args.var_args.is_some() {
+ if args.var_args.is_some() || args.kw_var.is_some() {
self.write_instr(CALL_FUNCTION_EX);
- if kws.is_empty() {
+ if kws.is_empty() && args.kw_var.is_none() {
self.write_arg(0);
} else {
self.write_arg(1);
diff --git a/inquire.rs b/inquire.rs
index 20d76a8..c3291c5 100644
--- a/inquire.rs
+++ b/inquire.rs
@@ -1081,12 +1081,14 @@ impl Context {
}
// returns callee's type, not the return type
+ #[allow(clippy::too_many_arguments)]
fn search_callee_info(
&self,
obj: &hir::Expr,
attr_name: &Option<Identifier>,
pos_args: &[hir::PosArg],
kw_args: &[hir::KwArg],
+ (var_args, kw_var_args): (Option<&hir::PosArg>, Option<&hir::PosArg>),
input: &Input,
namespace: &Context,
) -> SingleTyCheckResult<VarInfo> {
@@ -1107,10 +1109,24 @@ impl Context {
if let Some(attr_name) = attr_name.as_ref() {
let mut vi =
self.search_method_info(obj, attr_name, pos_args, kw_args, input, namespace)?;
- vi.t = self.resolve_overload(obj, vi.t, pos_args, kw_args, attr_name)?;
+ vi.t = self.resolve_overload(
+ obj,
+ vi.t,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ attr_name,
+ )?;
Ok(vi)
} else {
- let t = self.resolve_overload(obj, obj.t(), pos_args, kw_args, obj)?;
+ let t = self.resolve_overload(
+ obj,
+ obj.t(),
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ obj,
+ )?;
Ok(VarInfo {
t,
..VarInfo::default()
@@ -1155,6 +1171,7 @@ impl Context {
instance: Type,
pos_args: &[hir::PosArg],
kw_args: &[hir::KwArg],
+ (var_args, kw_var_args): (Option<&hir::PosArg>, Option<&hir::PosArg>),
loc: &impl Locational,
) -> SingleTyCheckResult<Type> {
let intersecs = instance.intersection_types();
@@ -1195,7 +1212,15 @@ impl Context {
if self.subtype_of(ty, &input_t) {
if let Ok(instance) = self.instantiate(ty.clone(), obj) {
let subst = self
- .substitute_call(obj, &None, &instance, pos_args, kw_args, self)
+ .substitute_call(
+ obj,
+ &None,
+ &instance,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ self,
+ )
.is_ok();
let eval = self.eval_t_params(instance, self.level, obj).is_ok();
if subst && eval {
@@ -1641,7 +1666,7 @@ impl Context {
)
})?;
let op = hir::Expr::Accessor(hir::Accessor::private(symbol, t));
- self.get_call_t(&op, &None, args, &[], input, namespace)
+ self.get_call_t(&op, &None, args, &[], (None, None), input, namespace)
.map_err(|(_, errs)| {
let hir::Expr::Accessor(hir::Accessor::Ident(op_ident)) = op else {
return errs;
@@ -1695,7 +1720,7 @@ impl Context {
)
})?;
let op = hir::Expr::Accessor(hir::Accessor::private(symbol, vi));
- self.get_call_t(&op, &None, args, &[], input, namespace)
+ self.get_call_t(&op, &None, args, &[], (None, None), input, namespace)
.map_err(|(_, errs)| {
let hir::Expr::Accessor(hir::Accessor::Ident(op_ident)) = op else {
return errs;
@@ -1787,6 +1812,7 @@ impl Context {
/// ↓ don't substitute `Int` to `self`
/// substitute_call(obj: Int, instance: ((self: Int, other: Int) -> Int), [1, 2]) => instance: (Int, Int) -> Int
/// ```
+ #[allow(clippy::too_many_arguments)]
fn substitute_call(
&self,
obj: &hir::Expr,
@@ -1794,6 +1820,7 @@ impl Context {
instance: &Type,
pos_args: &[hir::PosArg],
kw_args: &[hir::KwArg],
+ (var_args, kw_var_args): (Option<&hir::PosArg>, Option<&hir::PosArg>),
namespace: &Context,
) -> TyCheckResult<SubstituteResult> {
match instance {
@@ -1803,6 +1830,7 @@ impl Context {
fv.unsafe_crack(),
pos_args,
kw_args,
+ (var_args, kw_var_args),
namespace,
),
Type::FreeVar(fv) => {
@@ -1816,12 +1844,24 @@ impl Context {
if instance.is_quantified_subr() {
let instance = self.instantiate(instance.clone(), obj)?;
self.substitute_call(
- obj, attr_name, &instance, pos_args, kw_args, namespace,
+ obj,
+ attr_name,
+ &instance,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ namespace,
)?;
return Ok(SubstituteResult::Coerced(instance));
} else if get_hash(instance) != hash {
return self.substitute_call(
- obj, attr_name, instance, pos_args, kw_args, namespace,
+ obj,
+ attr_name,
+ instance,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ namespace,
);
}
}
@@ -1852,17 +1892,36 @@ impl Context {
Ok(SubstituteResult::Ok)
}
}
- Type::Refinement(refine) => {
- self.substitute_call(obj, attr_name, &refine.t, pos_args, kw_args, namespace)
- }
+ Type::Refinement(refine) => self.substitute_call(
+ obj,
+ attr_name,
+ &refine.t,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ namespace,
+ ),
// instance must be instantiated
Type::Quantified(_) => unreachable_error!(TyCheckErrors, TyCheckError, self),
Type::Subr(subr) => {
- let res = self.substitute_subr_call(obj, attr_name, subr, pos_args, kw_args);
+ let res = self.substitute_subr_call(
+ obj,
+ attr_name,
+ subr,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ );
// TODO: change polymorphic type syntax
if res.is_err() && subr.return_t.is_class_type() {
self.substitute_dunder_call(
- obj, attr_name, instance, pos_args, kw_args, namespace,
+ obj,
+ attr_name,
+ instance,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ namespace,
)
.or(res)
} else {
@@ -1870,14 +1929,34 @@ impl Context {
}
}
Type::And(_, _) => {
- let instance =
- self.resolve_overload(obj, instance.clone(), pos_args, kw_args, &obj)?;
- self.substitute_call(obj, attr_name, &instance, pos_args, kw_args, namespace)
+ let instance = self.resolve_overload(
+ obj,
+ instance.clone(),
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ &obj,
+ )?;
+ self.substitute_call(
+ obj,
+ attr_name,
+ &instance,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ namespace,
+ )
}
Type::Failure => Ok(SubstituteResult::Ok),
- _ => {
- self.substitute_dunder_call(obj, attr_name, instance, pos_args, kw_args, namespace)
- }
+ _ => self.substitute_dunder_call(
+ obj,
+ attr_name,
+ instance,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ namespace,
+ ),
}
}
@@ -1888,6 +1967,7 @@ impl Context {
subr: &SubrType,
pos_args: &[hir::PosArg],
kw_args: &[hir::KwArg],
+ (var_args, kw_var_args): (Option<&hir::PosArg>, Option<&hir::PosArg>),
) -> TyCheckResult<SubstituteResult> {
let mut errs = TyCheckErrors::empty();
// method: obj: 1, subr: (self: Int, other: Int) -> Int
@@ -1911,7 +1991,10 @@ impl Context {
} else {
subr.non_default_params.len() + subr.default_params.len()
};
- if (params_len < pos_args.len() || params_len < pos_args.len() + kw_args.len())
+ let there_var = var_args.is_some() || kw_var_args.is_some();
+ if (params_len < pos_args.len()
+ || params_len < pos_args.len() + kw_args.len()
+ || (params_len == pos_args.len() + kw_args.len() && there_var))
&& subr.is_no_var()
{
return Err(self.gen_too_many_args_error(&callee, subr, is_method, pos_args, kw_args));
@@ -2047,7 +2130,59 @@ impl Context {
.into()
})
.collect::<Vec<_>>();
- if !missing_params.is_empty() {
+ if let Some(var_args) = var_args {
+ if !self.subtype_of(
+ var_args.expr.ref_t(),
+ &poly("Iterable", vec![TyParam::t(Obj)]),
+ ) {
+ let err = TyCheckError::type_mismatch_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ var_args.loc(),
+ self.caused_by(),
+ "_",
+ None,
+ &poly("Iterable", vec![TyParam::t(Obj)]),
+ var_args.expr.ref_t(),
+ None,
+ None,
+ );
+ errs.push(err);
+ }
+ }
+ if let Some(kw_var_args) = kw_var_args {
+ if !self.subtype_of(
+ kw_var_args.expr.ref_t(),
+ &poly("Mapping", vec![TyParam::t(Obj), TyParam::t(Obj)]),
+ ) {
+ let err = TyCheckError::type_mismatch_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ kw_var_args.loc(),
+ self.caused_by(),
+ "_",
+ None,
+ &poly("Mapping", vec![TyParam::t(Obj), TyParam::t(Obj)]),
+ kw_var_args.expr.ref_t(),
+ None,
+ None,
+ );
+ errs.push(err);
+ }
+ }
+ if missing_params.is_empty() && (var_args.is_some() || kw_var_args.is_some()) {
+ return Err(TyCheckErrors::from(TyCheckError::too_many_args_error(
+ self.cfg.input.clone(),
+ line!() as usize,
+ callee.loc(),
+ &callee.to_string(),
+ self.caused_by(),
+ params_len,
+ pos_args.len(),
+ kw_args.len(),
+ )));
+ }
+ if !missing_params.is_empty() && var_args.is_none() && kw_var_args.is_none() {
return Err(TyCheckErrors::from(TyCheckError::args_missing_error(
self.cfg.input.clone(),
line!() as usize,
@@ -2068,6 +2203,7 @@ impl Context {
}
}
+ #[allow(clippy::too_many_arguments)]
fn substitute_dunder_call(
&self,
obj: &hir::Expr,
@@ -2075,6 +2211,7 @@ impl Context {
instance: &Type,
pos_args: &[hir::PosArg],
kw_args: &[hir::KwArg],
+ (var_args, kw_var_args): (Option<&hir::PosArg>, Option<&hir::PosArg>),
namespace: &Context,
) -> TyCheckResult<SubstituteResult> {
let ctxs = self
@@ -2121,9 +2258,15 @@ impl Context {
)?;
}
let instance = self.instantiate_def_type(&call_vi.t)?;
- let instance = match self
- .substitute_call(obj, attr_name, &instance, pos_args, kw_args, namespace)?
- {
+ let instance = match self.substitute_call(
+ obj,
+ attr_name,
+ &instance,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ namespace,
+ )? {
SubstituteResult::__Call__(instance)
| SubstituteResult::Coerced(instance) => instance,
SubstituteResult::Ok => instance,
@@ -2138,9 +2281,15 @@ impl Context {
})
{
let instance = self.instantiate_def_type(&call_vi.t)?;
- let instance = match self
- .substitute_call(obj, attr_name, &instance, pos_args, kw_args, namespace)?
- {
+ let instance = match self.substitute_call(
+ obj,
+ attr_name,
+ &instance,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ namespace,
+ )? {
SubstituteResult::__Call__(instance) | SubstituteResult::Coerced(instance) => {
instance
}
@@ -2469,12 +2618,14 @@ impl Context {
Ok(res)
}
+ #[allow(clippy::too_many_arguments)]
pub(crate) fn get_call_t(
&self,
obj: &hir::Expr,
attr_name: &Option<Identifier>,
pos_args: &[hir::PosArg],
kw_args: &[hir::KwArg],
+ (var_args, kw_var_args): (Option<&hir::PosArg>, Option<&hir::PosArg>),
input: &Input,
namespace: &Context,
) -> FailableOption<VarInfo> {
@@ -2492,7 +2643,15 @@ impl Context {
}
}
let found = self
- .search_callee_info(obj, attr_name, pos_args, kw_args, input, namespace)
+ .search_callee_info(
+ obj,
+ attr_name,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ input,
+ namespace,
+ )
.map_err(|err| (None, TyCheckErrors::from(err)))?;
log!(
"Found:\\ncallee: {obj}{}\\nfound: {found}",
@@ -2507,7 +2666,15 @@ impl Context {
fmt_slice(kw_args)
);
let instance = match self
- .substitute_call(obj, attr_name, &instance, pos_args, kw_args, namespace)
+ .substitute_call(
+ obj,
+ attr_name,
+ &instance,
+ pos_args,
+ kw_args,
+ (var_args, kw_var_args),
+ namespace,
+ )
.map_err(|errs| {
(
Some(VarInfo {
diff --git a/hir.rs b/hir.rs
index fd71eb4..6a3bd32 100644
--- a/hir.rs
+++ b/hir.rs
@@ -290,7 +290,8 @@ impl Args {
pub fn len(&self) -> usize {
#[allow(clippy::bool_to_int_with_if)]
let var_argc = if self.var_args.is_none() { 0 } else { 1 };
- self.pos_args.len() + var_argc + self.kw_args.len()
+ let kw_var_argc = if self.kw_var.is_none() { 0 } else { 1 };
+ self.pos_args.len() + var_argc + self.kw_args.len() + kw_var_argc
}
#[inline]
diff --git a/lower.rs b/lower.rs
index 61750b0..ea89b78 100644
--- a/lower.rs
+++ b/lower.rs
@@ -1409,6 +1409,7 @@ impl<A: ASTBuildable> GenericASTLowerer<A> {
&call.attr_name,
&hir_args.pos_args,
&hir_args.kw_args,
+ (hir_args.var_args.as_deref(), hir_args.kw_var.as_deref()),
&self.cfg.input,
&self.module.context,
) {
@@ -1566,6 +1567,7 @@ impl<A: ASTBuildable> GenericASTLowerer<A> {
&Some(attr_name.clone()),
&args,
&[],
+ (None, None),
&self.cfg.input,
&self.module.context,
) {
diff --git a/args_expansion.er b/args_expansion.er
index edd8497..eafefce 100644
--- a/args_expansion.er
+++ b/args_expansion.er
@@ -0,0 +1,12 @@
+foo first: Int, second: Int, third: Int = log first, second, third
+
+foo(*[1, 2, 3])
+foo(1, *[2, 3])
+foo(1, 2, *[3])
+data = {"first": 1, "second": 2, "third": 3}
+foo(**data)
+foo(1, **{"second": 2, "third": 3})
+# FIXME:
+# foo(1, 2, **{"third": 3})
+
+print! "OK"
diff --git a/test.rs b/test.rs
index c983015..ae3791e 100644
--- a/test.rs
+++ b/test.rs
@@ -16,6 +16,11 @@ fn exec_advanced_type_spec() -> Result<(), ()> {
expect_success("tests/should_ok/advanced_type_spec.er", 5)
}
+#[test]
+fn exec_args_expansion() -> Result<(), ()> {
+ expect_success("tests/should_ok/args_expansion.er", 0)
+}
+
#[test]
fn exec_list_test() -> Result<(), ()> {
expect_success("tests/should_ok/list.er", 0)
@@ -502,6 +507,11 @@ fn exec_args() -> Result<(), ()> {
expect_failure("tests/should_err/args.er", 0, 19)
}
+#[test]
+fn exec_args_expansion_err() -> Result<(), ()> {
+ expect_failure("tests/should_err/args_expansion.er", 0, 4)
+}
+
#[test]
fn exec_list_err() -> Result<(), ()> {
expect_failure("examples/list.er", 0, 1)
|
|
chore: remove gdal_2 patch
|
e57be908b85bbc6231f9eb1f9775635b8faa1ded
|
chore
|
https://github.com/rohankumardubey/ibis/commit/e57be908b85bbc6231f9eb1f9775635b8faa1ded
|
remove gdal_2 patch
|
diff --git a/default.nix b/default.nix
index 3f2f223..1af9d5c 100644
--- a/default.nix
+++ b/default.nix
@@ -60,21 +60,6 @@ import sources.nixpkgs {
'';
};
- gdal_2 = super.gdal_2.overrideAttrs (attrs: {
- patches = (attrs.patches or [ ]) ++ [
- (pkgs.fetchpatch {
- url = "https://github.com/OSGeo/gdal/commit/7a18e2669a733ebe3544e4f5c735fd4d2ded5fa3.patch";
- sha256 = "sha256-rBgIxJcgRzZR1gyzDWK/Sh7MdPWeczxEYVELbYEV8JY=";
- relative = "gdal";
- # this doesn't apply correctly because of line endings
- excludes = [ "third_party/LercLib/Lerc2.h" ];
- })
- ];
- # TODO: remove this when in nixos-unstable-small (the fix is merged, but not in
- # nixos-unstable-small yet)
- meta.broken = false;
- });
-
aws-sdk-cpp = (super.aws-sdk-cpp.overrideAttrs (attrs: {
patches = (attrs.patches or [ ]) ++ [
# https://github.com/aws/aws-sdk-cpp/pull/1912
|
|
feat: add `attributes` feature to allow ignore-only stacks.
|
477a1d9089d831cd9ed81f109fc2c89333026965
|
feat
|
https://github.com/Byron/gitoxide/commit/477a1d9089d831cd9ed81f109fc2c89333026965
|
add `attributes` feature to allow ignore-only stacks.
|
diff --git a/Cargo.toml b/Cargo.toml
index f505ac3..9bcb8f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ path = "integrate.rs"
gix-features-parallel = ["gix-features/parallel"]
[dev-dependencies]
-gix-worktree = { path = ".." }
+gix-worktree = { path = "..", features = ["attributes"] }
gix-index = { path = "../../gix-index" }
gix-fs = { path = "../../gix-fs" }
gix-hash = { path = "../../gix-hash" }
diff --git a/delegate.rs b/delegate.rs
index 8412224..4ff1137 100644
--- a/delegate.rs
+++ b/delegate.rs
@@ -27,6 +27,7 @@ pub(crate) type FindFn<'a> = dyn for<'b> FnMut(
pub(crate) struct StackDelegate<'a, 'find> {
pub state: &'a mut State,
pub buf: &'a mut Vec<u8>,
+ #[cfg_attr(not(feature = "attributes"), allow(dead_code))]
pub is_dir: bool,
pub id_mappings: &'a Vec<PathIdMapping>,
pub find: &'find mut FindFn<'find>,
@@ -54,6 +55,7 @@ impl<'a, 'find> gix_fs::stack::Delegate for StackDelegate<'a, 'find> {
rela_dir_cow.as_ref()
};
match &mut self.state {
+ #[cfg(feature = "attributes")]
State::CreateDirectoryAndAttributesStack { attributes, .. } => {
attributes.push_directory(
stack.root(),
@@ -65,6 +67,7 @@ impl<'a, 'find> gix_fs::stack::Delegate for StackDelegate<'a, 'find> {
&mut self.statistics.attributes,
)?;
}
+ #[cfg(feature = "attributes")]
State::AttributesAndIgnoreStack { ignore, attributes } => {
attributes.push_directory(
stack.root(),
@@ -86,6 +89,7 @@ impl<'a, 'find> gix_fs::stack::Delegate for StackDelegate<'a, 'find> {
&mut self.statistics.ignore,
)?
}
+ #[cfg(feature = "attributes")]
State::AttributesStack(attributes) => attributes.push_directory(
stack.root(),
stack.current(),
@@ -109,9 +113,11 @@ impl<'a, 'find> gix_fs::stack::Delegate for StackDelegate<'a, 'find> {
Ok(())
}
+ #[cfg_attr(not(feature = "attributes"), allow(unused_variables))]
fn push(&mut self, is_last_component: bool, stack: &gix_fs::Stack) -> std::io::Result<()> {
self.statistics.delegate.push_element += 1;
match &mut self.state {
+ #[cfg(feature = "attributes")]
State::CreateDirectoryAndAttributesStack {
unlink_on_collision,
attributes: _,
@@ -122,7 +128,9 @@ impl<'a, 'find> gix_fs::stack::Delegate for StackDelegate<'a, 'find> {
&mut self.statistics.delegate.num_mkdir_calls,
*unlink_on_collision,
)?,
- State::AttributesAndIgnoreStack { .. } | State::IgnoreStack(_) | State::AttributesStack(_) => {}
+ #[cfg(feature = "attributes")]
+ State::AttributesAndIgnoreStack { .. } | State::AttributesStack(_) => {}
+ State::IgnoreStack(_) => {}
}
Ok(())
}
@@ -130,23 +138,27 @@ impl<'a, 'find> gix_fs::stack::Delegate for StackDelegate<'a, 'find> {
fn pop_directory(&mut self) {
self.statistics.delegate.pop_directory += 1;
match &mut self.state {
+ #[cfg(feature = "attributes")]
State::CreateDirectoryAndAttributesStack { attributes, .. } => {
attributes.pop_directory();
}
+ #[cfg(feature = "attributes")]
State::AttributesAndIgnoreStack { attributes, ignore } => {
attributes.pop_directory();
ignore.pop_directory();
}
- State::IgnoreStack(ignore) => {
- ignore.pop_directory();
- }
+ #[cfg(feature = "attributes")]
State::AttributesStack(attributes) => {
attributes.pop_directory();
}
+ State::IgnoreStack(ignore) => {
+ ignore.pop_directory();
+ }
}
}
}
+#[cfg(feature = "attributes")]
fn create_leading_directory(
is_last_component: bool,
stack: &gix_fs::Stack,
diff --git a/mod.rs b/mod.rs
index 2c385b0..66ac77c 100644
--- a/mod.rs
+++ b/mod.rs
@@ -1,15 +1,15 @@
-use std::path::PathBuf;
-
use bstr::{BString, ByteSlice};
use gix_glob::pattern::Case;
use crate::{stack::State, PathIdMapping};
+#[cfg(feature = "attributes")]
type AttributeMatchGroup = gix_attributes::Search;
type IgnoreMatchGroup = gix_ignore::Search;
/// State related to attributes associated with files in the repository.
#[derive(Default, Clone)]
+#[cfg(feature = "attributes")]
pub struct Attributes {
/// Attribute patterns which aren't tied to the repository root, hence are global, they contribute first.
globals: AttributeMatchGroup,
@@ -20,7 +20,7 @@ pub struct Attributes {
stack: AttributeMatchGroup,
/// The first time we push the root, we have to load additional information from this file if it exists along with the root attributes
/// file if possible, and keep them there throughout.
- info_attributes: Option<PathBuf>,
+ info_attributes: Option<std::path::PathBuf>,
/// A lookup table to accelerate searches.
collection: gix_attributes::search::MetadataCollection,
/// Where to read `.gitattributes` data from.
@@ -50,6 +50,7 @@ pub struct Ignore {
}
///
+#[cfg(feature = "attributes")]
pub mod attributes;
///
pub mod ignore;
@@ -57,6 +58,7 @@ pub mod ignore;
/// Initialization
impl State {
/// Configure a state to be suitable for checking out files, which only needs access to attribute files read from the index.
+ #[cfg(feature = "attributes")]
pub fn for_checkout(unlink_on_collision: bool, attributes: Attributes) -> Self {
State::CreateDirectoryAndAttributesStack {
unlink_on_collision,
@@ -65,6 +67,7 @@ impl State {
}
/// Configure a state for adding files, with support for ignore files and attribute files.
+ #[cfg(feature = "attributes")]
pub fn for_add(attributes: Attributes, ignore: Ignore) -> Self {
State::AttributesAndIgnoreStack { attributes, ignore }
}
@@ -96,6 +99,7 @@ impl State {
case: Case,
) -> Vec<PathIdMapping> {
let a1_backing;
+ #[cfg(feature = "attributes")]
let a2_backing;
let names = match self {
State::IgnoreStack(ignore) => {
@@ -105,6 +109,7 @@ impl State {
)];
a1_backing.as_ref()
}
+ #[cfg(feature = "attributes")]
State::AttributesAndIgnoreStack { ignore, .. } => {
a2_backing = [
(
@@ -115,6 +120,7 @@ impl State {
];
a2_backing.as_ref()
}
+ #[cfg(feature = "attributes")]
State::CreateDirectoryAndAttributesStack { .. } | State::AttributesStack(_) => {
a1_backing = [(".gitattributes".into(), None)];
a1_backing.as_ref()
@@ -160,13 +166,16 @@ impl State {
pub(crate) fn ignore_or_panic(&self) -> &Ignore {
match self {
State::IgnoreStack(v) => v,
+ #[cfg(feature = "attributes")]
State::AttributesAndIgnoreStack { ignore, .. } => ignore,
+ #[cfg(feature = "attributes")]
State::AttributesStack(_) | State::CreateDirectoryAndAttributesStack { .. } => {
unreachable!("BUG: must not try to check excludes without it being setup")
}
}
}
+ #[cfg(feature = "attributes")]
pub(crate) fn attributes_or_panic(&self) -> &Attributes {
match self {
State::AttributesStack(attributes)
diff --git a/platform.rs b/platform.rs
index 02af329..8028f52 100644
--- a/platform.rs
+++ b/platform.rs
@@ -40,6 +40,7 @@ impl<'a> Platform<'a> {
/// # Panics
///
/// If the cache was configured without attributes.
+ #[cfg(feature = "attributes")]
pub fn matching_attributes(&self, out: &mut gix_attributes::search::Outcome) -> bool {
let attrs = self.parent.state.attributes_or_panic();
let relative_path =
|
|
perf: Make formatting method calls more efficient
If a value must be reused later then it's better to pass it as a &str
instead of cloning it, that means the clone happens in a central
place (inside the method).
By never passing a &String those instances of the method are not monomorphized.
Saves only 0.5K, maybe not worth it in hindsight.
|
d1d9f75d53fae96c779080feca2ae126ad295eed
|
perf
|
https://github.com/jquepi/clap/commit/d1d9f75d53fae96c779080feca2ae126ad295eed
|
Make formatting method calls more efficient
If a value must be reused later then it's better to pass it as a &str
instead of cloning it, that means the clone happens in a central
place (inside the method).
By never passing a &String those instances of the method are not monomorphized.
Saves only 0.5K, maybe not worth it in hindsight.
|
diff --git a/help.rs b/help.rs
index ed0e0a7..f62912e 100644
--- a/help.rs
+++ b/help.rs
@@ -795,8 +795,8 @@ impl<'help, 'app, 'parser, 'writer> Help<'help, 'app, 'parser, 'writer> {
if !first {
self.none("\\n\\n")?;
}
- self.warning(&*format!("{}:\\n", heading))?;
- self.write_args(&*args)?;
+ self.warning(format!("{}:\\n", heading))?;
+ self.write_args(&args)?;
first = false
}
}
diff --git a/errors.rs b/errors.rs
index cf51cd1..5404b7f 100644
--- a/errors.rs
+++ b/errors.rs
@@ -582,14 +582,14 @@ impl Error {
}
1 => {
c.none(" '");
- c.warning(others[0].clone());
+ c.warning(&*others[0]);
c.none("'");
}
_ => {
c.none(":");
for v in &others {
c.none("\\n ");
- c.warning(v.clone());
+ c.warning(&**v);
}
}
}
@@ -605,7 +605,7 @@ impl Error {
let arg = arg.to_string();
start_error(&mut c, "The argument '");
- c.warning(arg.clone());
+ c.warning(&*arg);
c.none("' requires a value but none was supplied");
put_usage(&mut c, usage);
try_help(app, &mut c);
@@ -617,7 +617,7 @@ impl Error {
let mut c = Colorizer::new(true, app.get_color());
start_error(&mut c, "Equal sign is needed when assigning values to '");
- c.warning(&arg);
+ c.warning(&*arg);
c.none("'.");
put_usage(&mut c, usage);
@@ -652,7 +652,7 @@ impl Error {
start_error(&mut c, "");
c.warning(format!("{:?}", bad_val));
c.none(" isn't a valid value for '");
- c.warning(arg.clone());
+ c.warning(&*arg);
c.none("'\\n\\t[possible values: ");
if let Some((last, elements)) = sorted.split_last() {
@@ -691,7 +691,7 @@ impl Error {
let mut c = Colorizer::new(true, app.get_color());
start_error(&mut c, "The subcommand '");
- c.warning(subcmd.clone());
+ c.warning(&*subcmd);
c.none("' wasn't recognized\\n\\n\\tDid you mean ");
c.good(did_you_mean);
c.none("");
@@ -711,7 +711,7 @@ impl Error {
let mut c = Colorizer::new(true, app.get_color());
start_error(&mut c, " The subcommand '");
- c.warning(subcmd.clone());
+ c.warning(&*subcmd);
c.none("' wasn't recognized\\n\\n");
c.warning("USAGE:");
c.none(format!("\\n {} <subcommands>", name));
@@ -734,7 +734,7 @@ impl Error {
for v in &required {
c.none("\\n ");
- c.good(v.clone());
+ c.good(&**v);
}
put_usage(&mut c, usage);
@@ -782,11 +782,11 @@ impl Error {
let curr_occurs = curr_occurs.to_string();
start_error(&mut c, "The argument '");
- c.warning(arg.clone());
+ c.warning(&*arg);
c.none("' allows at most ");
- c.warning(max_occurs.clone());
+ c.warning(&*max_occurs);
c.none(" occurrences, but ");
- c.warning(curr_occurs.clone());
+ c.warning(&*curr_occurs);
c.none(were_provided);
put_usage(&mut c, usage);
try_help(app, &mut c);
@@ -803,9 +803,9 @@ impl Error {
let mut c = Colorizer::new(true, app.get_color());
start_error(&mut c, "The value '");
- c.warning(val.clone());
+ c.warning(&*val);
c.none("' was provided to '");
- c.warning(&arg);
+ c.warning(&*arg);
c.none("' but it wasn't expecting any more values");
put_usage(&mut c, usage);
try_help(app, &mut c);
@@ -827,11 +827,11 @@ impl Error {
let curr_vals = curr_vals.to_string();
start_error(&mut c, "The argument '");
- c.warning(arg.clone());
+ c.warning(&*arg);
c.none("' requires at least ");
- c.warning(min_vals.clone());
+ c.warning(&*min_vals);
c.none(" values, but only ");
- c.warning(curr_vals.clone());
+ c.warning(&*curr_vals);
c.none(were_provided);
put_usage(&mut c, usage);
try_help(app, &mut c);
@@ -895,7 +895,7 @@ impl Error {
start_error(&mut c, "Invalid value");
c.none(" for '");
- c.warning(arg.clone());
+ c.warning(&*arg);
c.none("'");
c.none(format!(": {}", err));
@@ -919,11 +919,11 @@ impl Error {
let curr_vals = curr_vals.to_string();
start_error(&mut c, "The argument '");
- c.warning(arg.clone());
+ c.warning(&*arg);
c.none("' requires ");
- c.warning(num_vals.clone());
+ c.warning(&*num_vals);
c.none(" values, but ");
- c.warning(curr_vals.clone());
+ c.warning(&*curr_vals);
c.none(were_provided);
put_usage(&mut c, usage);
try_help(app, &mut c);
@@ -941,7 +941,7 @@ impl Error {
let arg = arg.to_string();
start_error(&mut c, "The argument '");
- c.warning(arg.clone());
+ c.warning(&*arg);
c.none("' was provided more than once, but cannot be used multiple times");
put_usage(&mut c, usage);
try_help(app, &mut c);
@@ -958,7 +958,7 @@ impl Error {
let mut c = Colorizer::new(true, app.get_color());
start_error(&mut c, "Found argument '");
- c.warning(arg.clone());
+ c.warning(&*arg);
c.none("' which wasn't expected, or isn't valid in this context");
if let Some((flag, subcmd)) = did_you_mean {
@@ -997,7 +997,7 @@ impl Error {
let mut c = Colorizer::new(true, app.get_color());
start_error(&mut c, "Found argument '");
- c.warning(arg.clone());
+ c.warning(&*arg);
c.none("' which wasn't expected, or isn't valid in this context");
c.none(format!(
@@ -1014,7 +1014,7 @@ impl Error {
let mut c = Colorizer::new(true, ColorChoice::Never);
start_error(&mut c, "The argument '");
- c.warning(arg.clone());
+ c.warning(&*arg);
c.none("' wasn't found\\n");
Self::new(c, ErrorKind::ArgumentNotFound, false).set_info(vec![arg])
|
|
docs(cloud): minor updates to Pricing page
|
009faefd14b16d4d80dfc961f931f8621db76096
|
docs
|
https://github.com/wzhiqing/cube/commit/009faefd14b16d4d80dfc961f931f8621db76096
|
minor updates to Pricing page
|
diff --git a/Pricing.mdx b/Pricing.mdx
index 422ed6f..979348a 100644
--- a/Pricing.mdx
+++ b/Pricing.mdx
@@ -36,9 +36,10 @@ scope of support you may receive for your deployment.
The Starter plan starts at a minimum of $99/month and targets low-scale
production that is not business-critical.
-It offers a Production Cluster, the ability to use third-party packages from the
-npm registry, AWS and GCP support in select regions, pre-aggregations of upto
-150GB in size, alerts, auto-suspend controls and a 50,000 queries per day limit.
+It offers a [Production Cluster][ref-cloud-deployment-prod-cluster], the ability
+to use third-party packages from the npm registry, AWS and GCP support in select
+regions, pre-aggregations of upto 150GB in size, [alerts][ref-cloud-alerts],
+auto-suspend controls and a 50,000 queries per day limit.
### Support
@@ -81,8 +82,8 @@ high-scale or mission-critical production deployments with more significant
security and compliance needs.
It offers everything in the [Premium plan](#premium) as well as SAML/LDAP
-support for single sign-on, VPC peering, logs/metrics export, and role-based
-access control.
+support for single sign-on, [VPC peering][ref-cloud-vpc-peering], [logs/metrics
+export][ref-cloud-log-export], and [role-based access control][ref-cloud-acl].
### Support
@@ -99,12 +100,13 @@ Cloud provides a 99.99% uptime SLA for this plan.
## Enterprise Premier
-The Enterprise Premium Plan caters to high-scale, high-availability
+The Enterprise Premium plan caters to high-scale, high-availability
mission-critical production deployments with security and compliance needs.
-It offers everything in the Enterprise plan as well as enabling the use of
-Production Multi-Clusters, unlimited pre-aggregation sizes, support for
-kSQL/Elasticsearch and custom domains.
+It offers everything in the [Enterprise plan](#enterprise) as well as enabling the use of
+[Production Multi-Clusters][ref-cloud-deployment-prod-multicluster], unlimited
+pre-aggregation sizes, support for kSQL/Elasticsearch and [custom
+domains][ref-cloud-custom-domains].
### Support
@@ -153,3 +155,13 @@ CCUs into CCUs for the higher subscription plan at the CCU pricing for that plan
subscription plan). Future purchases and upgrades are subject to the pricing
that is in effect at the time of the order. No credit is allowed for downgrading
CCUs to a lower subscription plan level.
+
+[ref-cloud-deployment-prod-cluster]:
+ /cloud/configuration/deployment-types#production-cluster
+[ref-cloud-alerts]: /cloud/workspace/alerts
+[ref-cloud-log-export]: /cloud/workspace/logs
+[ref-cloud-acl]: /cloud/access-control/
+[ref-cloud-deployment-prod-multicluster]:
+ /cloud/configuration/deployment-types#production-multi-cluster
+[ref-cloud-custom-domains]: /cloud/configuration/custom-domains
+[ref-cloud-vpc-peering]: /cloud/configuration/connecting-with-a-vpc
|
|
fix(snowflake): use `convert_timezone` for timezone conversion instead of invalid postgres `AT TIME ZONE` syntax
|
1595e7b7ceeeb29fc5305dbb243fc326393fec32
|
fix
|
https://github.com/ibis-project/ibis/commit/1595e7b7ceeeb29fc5305dbb243fc326393fec32
|
use `convert_timezone` for timezone conversion instead of invalid postgres `AT TIME ZONE` syntax
|
diff --git a/registry.py b/registry.py
index 1616bf8..2fd022a 100644
--- a/registry.py
+++ b/registry.py
@@ -14,6 +14,8 @@ from ibis import util
from ibis.backends.base.sql.alchemy.registry import (
fixed_arity,
geospatial_functions,
+ get_col,
+ get_sqla_table,
reduction,
unary,
)
@@ -66,6 +68,26 @@ def _literal(t, op):
return _postgres_literal(t, op)
+def _table_column(t, op):
+ ctx = t.context
+ table = op.table
+
+ sa_table = get_sqla_table(ctx, table)
+ out_expr = get_col(sa_table, op)
+
+ if (dtype := op.output_dtype).is_timestamp() and (
+ timezone := dtype.timezone
+ ) is not None:
+ out_expr = sa.func.convert_timezone(timezone, out_expr).label(op.name)
+
+ # If the column does not originate from the table set in the current SELECT
+ # context, we should format as a subquery
+ if t.permit_subquery and ctx.is_foreign_expr(table):
+ return sa.select(out_expr)
+
+ return out_expr
+
+
def _string_find(t, op):
args = [t.translate(op.substr), t.translate(op.arg)]
if (start := op.start) is not None:
@@ -407,6 +429,7 @@ operation_registry.update(
ops.Hash: unary(sa.func.hash),
ops.ApproxMedian: reduction(lambda x: sa.func.approx_percentile(x, 0.5)),
ops.Median: reduction(sa.func.median),
+ ops.TableColumn: _table_column,
}
)
diff --git a/test_client.py b/test_client.py
index 6a679db..18071d2 100644
--- a/test_client.py
+++ b/test_client.py
@@ -74,3 +74,13 @@ def test_repeated_memtable_registration(simple_con, mocker):
# assert that we called _register_in_memory_table exactly n times
assert spy.call_count == n
+
+
+def test_timestamp_tz_column(simple_con):
+ t = simple_con.create_table(
+ ibis.util.gen_name("snowflake_timestamp_tz_column"),
+ schema=ibis.schema({"ts": "string"}),
+ temp=True,
+ ).mutate(ts=lambda t: t.ts.to_timestamp("YYYY-MM-DD HH24-MI-SS"))
+ expr = t.ts
+ assert expr.execute().empty
|
|
feat: add `merge::tree::TreeFavor` similar to `*::FileFavor`.
That way it's possible to control how tree-conflicts should be auto-resolved.
|
e17b3a9c93bd9fc5847c37b1f8e336bc4b1b1e39
|
feat
|
https://github.com/Byron/gitoxide/commit/e17b3a9c93bd9fc5847c37b1f8e336bc4b1b1e39
|
add `merge::tree::TreeFavor` similar to `*::FileFavor`.
That way it's possible to control how tree-conflicts should be auto-resolved.
|
diff --git a/merge.rs b/merge.rs
index c3be52f..7d94ebd 100644
--- a/merge.rs
+++ b/merge.rs
@@ -160,6 +160,7 @@ pub mod tree {
pub struct Options {
inner: gix_merge::tree::Options,
file_favor: Option<FileFavor>,
+ tree_favor: Option<TreeFavor>,
}
impl From<gix_merge::tree::Options> for Options {
@@ -167,6 +168,7 @@ pub mod tree {
Options {
inner: opts,
file_favor: None,
+ tree_favor: None,
}
}
}
@@ -190,6 +192,7 @@ pub mod tree {
opts.blob_merge.resolve_binary_with = Some(resolve_binary);
opts.blob_merge.text.conflict = resolve_text;
}
+ opts.tree_conflicts = value.tree_favor.map(Into::into);
opts
}
}
@@ -202,7 +205,7 @@ pub mod tree {
/// * binary files
/// * symlinks (a form of file after all)
///
- /// Note that that union merges aren't available as they aren't available for binaries or symlinks.
+ /// Note that *union* merges aren't available as they aren't available for binaries or symlinks.
#[derive(Debug, Copy, Clone)]
pub enum FileFavor {
/// Choose *our* side in case of a conflict.
@@ -215,6 +218,35 @@ pub mod tree {
Theirs,
}
+ /// Control how irreconcilable changes to trees should be resolved.
+ ///
+ /// Examples for such issues are:
+ ///
+ /// * *we*: delete, *they*: modify
+ /// * *we*: rename, *they*: rename to something else
+ /// * *we*: delete, *they*: rename
+ ///
+ /// Use this to control which entries are visible to in the resulting tree.
+ /// Also note that this does not apply to the many tree-related changes are reconcilable.
+ #[derive(Debug, Copy, Clone)]
+ pub enum TreeFavor {
+ /// Choose *our* side in case of a conflict.
+ /// Note that content-merges are *still* performed according to the [FileFavor].
+ Ours,
+ /// Choose the state of the shared common ancestor, dropping both *ours* and *their* changes.
+ /// Content merges are not performed here.
+ Ancestor,
+ }
+
+ impl From<TreeFavor> for gix_merge::tree::ResolveWith {
+ fn from(value: TreeFavor) -> Self {
+ match value {
+ TreeFavor::Ours => gix_merge::tree::ResolveWith::Ours,
+ TreeFavor::Ancestor => gix_merge::tree::ResolveWith::Ancestor,
+ }
+ }
+ }
+
/// Builder
impl Options {
/// If *not* `None`, rename tracking will be performed when determining the changes of each side of the merge.
@@ -233,10 +265,22 @@ pub mod tree {
/// When `None`, the default, both sides will be treated equally, and in case of conflict an unbiased representation
/// is chosen both for content and for trees, causing a conflict.
- /// When `Some(favor)` one can choose a side to prefer in order to automatically resolve a conflict meaningfully.
+ ///
+ /// With `Some(favor)` one can choose a side to prefer in order to forcefully resolve an otherwise irreconcilable conflict,
+ /// loosing information in the process.
pub fn with_file_favor(mut self, file_favor: Option<FileFavor>) -> Self {
self.file_favor = file_favor;
self
}
+
+ /// When `None`, the default, both sides will be treated equally, trying to keep both conflicting changes in the tree, possibly
+ /// by renaming one side to move it out of the way.
+ ///
+ /// With `Some(favor)` one can choose a side to prefer in order to forcefully resolve an otherwise irreconcilable conflict,
+ /// loosing information in the process.
+ pub fn with_tree_favor(mut self, tree_favor: Option<TreeFavor>) -> Self {
+ self.tree_favor = tree_favor;
+ self
+ }
}
}
|
|
chore: release new alpha
|
a315c8a19a302dadc6acb3d6b45a71635c7d567f
|
chore
|
https://github.com/pmndrs/react-spring/commit/a315c8a19a302dadc6acb3d6b45a71635c7d567f
|
release new alpha
|
diff --git a/.size-snapshot.json b/.size-snapshot.json
index 4f86c61..1422047 100644
--- a/.size-snapshot.json
+++ b/.size-snapshot.json
@@ -1,21 +1,21 @@
{
"dist/index.js": {
- "bundled": 55978,
- "minified": 20334,
- "gzipped": 7338,
+ "bundled": 56117,
+ "minified": 20348,
+ "gzipped": 7345,
"treeshaked": {
"rollup": {
- "code": 2781,
+ "code": 2791,
"import_statements": 401
},
"webpack": {
- "code": 3982
+ "code": 3984
}
}
},
"dist/index.cjs.js": {
- "bundled": 59227,
- "minified": 22263,
- "gzipped": 7648
+ "bundled": 59366,
+ "minified": 22277,
+ "gzipped": 7657
}
}
diff --git a/package.json b/package.json
index e45f686..22c9aea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@react-spring/core",
- "version": "0.0.1-alpha.1",
+ "version": "0.0.1-alpha.2",
"private": true,
"main": "src/index.ts",
"scripts": {
diff --git a/yarn.lock b/yarn.lock
index c0dc09f..73ce307 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1759,7 +1759,7 @@
"@react-spring/shared" "link:packages/shared"
"@react-spring/core@link:packages/core":
- version "0.0.1-alpha.1"
+ version "0.0.1-alpha.2"
dependencies:
"@react-spring/animated" "link:packages/animated"
"@react-spring/shared" "link:packages/shared"
|
|
chore(deps): default to python 3.11 with nix (#8444)
|
a75531526584c5c5802578fe0680c6f7a0007af1
|
chore
|
https://github.com/rohankumardubey/ibis/commit/a75531526584c5c5802578fe0680c6f7a0007af1
|
default to python 3.11 with nix (#8444)
|
diff --git a/flake.nix b/flake.nix
index b23c1f2..1a3e86a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -127,7 +127,7 @@
packages = {
inherit (pkgs) ibis39 ibis310 ibis311;
- default = pkgs.ibis310;
+ default = pkgs.ibis311;
inherit (pkgs) update-lock-files gen-all-extras gen-examples check-release-notes-spelling;
};
@@ -137,7 +137,7 @@
ibis310 = mkDevShell pkgs.ibisDevEnv310;
ibis311 = mkDevShell pkgs.ibisDevEnv311;
- default = ibis310;
+ default = ibis311;
preCommit = pkgs.mkShell {
name = "preCommit";
diff --git a/overlay.nix b/overlay.nix
index 73f9900..a42a945 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -73,7 +73,7 @@ in
gen-examples = pkgs.writeShellApplication {
name = "gen-examples";
runtimeInputs = [
- pkgs.ibisDevEnv310
+ pkgs.ibisDevEnv311
(pkgs.rWrapper.override {
packages = with pkgs.rPackages; [
Lahman
|
|
ci: temporarily add pure-sasl to impala conda dependencies (#2987)
|
9e1bbaab2e02922f82863ac0ca80f0c96460203a
|
ci
|
https://github.com/rohankumardubey/ibis/commit/9e1bbaab2e02922f82863ac0ca80f0c96460203a
|
temporarily add pure-sasl to impala conda dependencies (#2987)
|
diff --git a/impala.yml b/impala.yml
index deb7266..500b67a 100644
--- a/impala.yml
+++ b/impala.yml
@@ -6,3 +6,5 @@ dependencies:
- thrift_sasl
- python-hdfs
- boost
+ # TODO:remove when https://github.com/conda-forge/impyla-feedstock/pull/28 lands
+ - pure-sasl
diff --git a/merge_and_update_env.sh b/merge_and_update_env.sh
index 8ce75e0..088ae51 100644
--- a/merge_and_update_env.sh
+++ b/merge_and_update_env.sh
@@ -9,8 +9,8 @@ if [ "$#" -eq 0 ]; then
exit 1
fi
-# install conda-merge
-mamba install --name ibis conda-merge
+# install conda-merge, don't try to update already installed dependencies
+mamba install --freeze-installed --name ibis conda-merge
additional_env_files=()
diff --git a/test_client.py b/test_client.py
index 596f7c3..84d7861 100644
--- a/test_client.py
+++ b/test_client.py
@@ -26,7 +26,19 @@ def test_kerberos_deps_installed(env, test_data_db):
# errors and occur, because there is no kerberos server in
# the CI pipeline, but they imply our imports have succeeded.
# See: https://github.com/ibis-project/ibis/issues/2342
- with pytest.raises((AttributeError, TTransportException)):
+ excs = (AttributeError, TTransportException)
+ try:
+ # TLDR: puresasl is using kerberos, and not pykerberos
+ #
+ # see https://github.com/requests/requests-kerberos/issues/63
+ # for why both libraries exist
+ from kerberos import GSSError
+ except ImportError:
+ pass
+ else:
+ excs += (GSSError,)
+
+ with pytest.raises(excs):
ibis.impala.connect(
host=env.impala_host,
database=test_data_db,
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.