Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
eeeebbbbrrrr committed Jan 19, 2021
2 parents 2d59833 + deec571 commit b8c8e10
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 27 deletions.
14 changes: 7 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pgx-parent"
version = "0.1.16"
version = "0.1.17"
authors = ["ZomboDB, LLC <[email protected]>"]
edition = "2018"
license = "MIT"
Expand Down
4 changes: 2 additions & 2 deletions cargo-pgx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo-pgx"
version = "0.1.16"
version = "0.1.17"
authors = ["ZomboDB, LLC <[email protected]>"]
edition = "2018"
license = "MIT"
Expand All @@ -17,7 +17,7 @@ clap = { version = "2.33.3", features = [ "yaml" ] }
colored = "2.0.0"
env_proxy = "0.4.1"
num_cpus = "1.13.0"
pgx-utils = { path = "../pgx-utils", version = "0.1.16"}
pgx-utils = { path = "../pgx-utils", version = "0.1.17"}
proc-macro2 = { version = "1.0.24", features = [ "span-locations" ] }
quote = "1.0.8"
rayon = "1.5.0"
Expand Down
4 changes: 3 additions & 1 deletion cargo-pgx/src/commands/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ fn configure_postgres(pg_config: &PgConfig, pgdir: &PathBuf) -> Result<(), std::
pg_config.major_version()?,
pg_config.minor_version()?
);
let mut command = std::process::Command::new("./configure");
let mut configure_path = pgdir.clone();
configure_path.push("configure");
let mut command = std::process::Command::new(configure_path);

command
.arg(format!("--prefix={}", get_pg_installdir(pgdir).display()))
Expand Down
6 changes: 3 additions & 3 deletions cargo-pgx/src/templates/cargo_toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ pg13 = ["pgx/pg13", "pgx-tests/pg13" ]
pg_test = []

[dependencies]
pgx = "0.1.16"
pgx-macros = "0.1.16"
pgx = "0.1.17"
pgx-macros = "0.1.17"

[dev-dependencies]
pgx-tests = "0.1.16"
pgx-tests = "0.1.17"

[profile.dev]
panic = "unwind"
Expand Down
4 changes: 2 additions & 2 deletions pgx-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pgx-macros"
version = "0.1.16"
version = "0.1.17"
authors = ["ZomboDB, LLC <[email protected]>"]
edition = "2018"
license = "MIT"
Expand All @@ -14,7 +14,7 @@ readme = "README.md"
proc-macro = true

[dependencies]
pgx-utils = { path = "../pgx-utils", version = "0.1.16"}
pgx-utils = { path = "../pgx-utils", version = "0.1.17"}
proc-macro2 = "1.0.24"
quote = "1.0.8"
syn = { version = "1.0.58", features = [ "extra-traits", "full", "fold", "parsing" ] }
Expand Down
6 changes: 3 additions & 3 deletions pgx-pg-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pgx-pg-sys"
version = "0.1.16"
version = "0.1.17"
authors = ["ZomboDB, LLC <[email protected]>"]
edition = "2018"
license = "MIT"
Expand All @@ -25,14 +25,14 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
memoffset = "0.6.1"
once_cell = "1.5.2"
pgx-macros = { path = "../pgx-macros/", version = "0.1.16"}
pgx-macros = { path = "../pgx-macros/", version = "0.1.17"}

[build-dependencies]
bindgen = "0.56.0"
build-deps = "0.1.4"
colored = "2.0.0"
num_cpus = "1.13.0"
pgx-utils = { path = "../pgx-utils/", version = "0.1.16"}
pgx-utils = { path = "../pgx-utils/", version = "0.1.17"}
proc-macro2 = "1.0.24"
quote = "1.0.8"
rayon = "1.5.0"
Expand Down
8 changes: 4 additions & 4 deletions pgx-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pgx-tests"
version = "0.1.16"
version = "0.1.17"
authors = ["ZomboDB, LLC <[email protected]>"]
edition = "2018"
license = "MIT"
Expand Down Expand Up @@ -29,9 +29,9 @@ no-default-features = true
colored = "2.0.0"
lazy_static = "1.4.0"
libc = "0.2.82"
pgx = { path = "../pgx", default-features = false, version= "0.1.16"}
pgx-macros = { path = "../pgx-macros", version= "0.1.16"}
pgx-utils = { path = "../pgx-utils", version= "0.1.16"}
pgx = { path = "../pgx", default-features = false, version= "0.1.17"}
pgx-macros = { path = "../pgx-macros", version= "0.1.17"}
pgx-utils = { path = "../pgx-utils", version= "0.1.17"}
postgres = "0.19.0"
regex = "1.4.3"
serde = "1.0.120"
Expand Down
2 changes: 1 addition & 1 deletion pgx-utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pgx-utils"
version = "0.1.16"
version = "0.1.17"
authors = ["ZomboDB, LLC <[email protected]>"]
edition = "2018"
license = "MIT"
Expand Down
6 changes: 3 additions & 3 deletions pgx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pgx"
version = "0.1.16"
version = "0.1.17"
authors = ["ZomboDB, LLC <[email protected]>"]
edition = "2018"
license = "MIT"
Expand Down Expand Up @@ -30,8 +30,8 @@ no-default-features = true
enum-primitive-derive = "0.2.1"
num-traits = "0.2.14"
seahash = "4.1.0"
pgx-macros = { path = "../pgx-macros/", version = "0.1.16" }
pgx-pg-sys = { path = "../pgx-pg-sys", version = "0.1.16" }
pgx-macros = { path = "../pgx-macros/", version = "0.1.17" }
pgx-pg-sys = { path = "../pgx-pg-sys", version = "0.1.17" }
serde = { version = "1.0.120", features = [ "derive" ] }
serde_cbor = "0.11.1"
serde_json = "1.0.61"
Expand Down

0 comments on commit b8c8e10

Please sign in to comment.