Skip to content

Commit a8826fa

Browse files
authored
Conslidate Python deps with workspace and update CI to deploy Kerberos feature (#93)
1 parent adedc18 commit a8826fa

File tree

6 files changed

+44
-8
lines changed

6 files changed

+44
-8
lines changed

.github/workflows/python-release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: PyO3/maturin-action@v1
3636
with:
3737
target: ${{ matrix.target }}
38-
args: --release --out dist --find-interpreter --manifest-path python/Cargo.toml
38+
args: --release --out dist --find-interpreter --manifest-path python/Cargo.toml --features kerberos
3939
sccache: 'true'
4040
container: quay.io/pypa/manylinux2014_${{ matrix.target }}:latest
4141
docker-options: -e LD_LIBRARY_PATH=/opt/rh/llvm-toolset-7.0/root/usr/lib64 -e LLVM_CONFIG_PATH=/opt/rh/llvm-toolset-7.0/root/usr/bin/llvm-config
@@ -61,7 +61,7 @@ jobs:
6161
uses: PyO3/maturin-action@v1
6262
with:
6363
target: ${{ matrix.target }}
64-
args: --release --out dist --find-interpreter --manifest-path python/Cargo.toml
64+
args: --release --out dist --find-interpreter --manifest-path python/Cargo.toml --features kerberos
6565
sccache: 'true'
6666
env:
6767
BINDGEN_EXTRA_CLANG_ARGS: "-I/usr/local/include"
@@ -80,7 +80,7 @@ jobs:
8080
uses: PyO3/maturin-action@v1
8181
with:
8282
command: sdist
83-
args: --out dist --manifest-path python/Cargo.toml
83+
args: --out dist --manifest-path python/Cargo.toml --features kerberos
8484
- name: Upload sdist
8585
uses: actions/upload-artifact@v3
8686
with:

.github/workflows/python-test.yml

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ jobs:
6868
sccache: 'true'
6969
container: 'off'
7070
working-directory: ./python
71+
args: --features kerberos
7172

7273
- name: Install dev dependencies and run tests
7374
run: |

Cargo.lock

+31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ resolver = "2"
99
bytes = "1"
1010
chrono = "0.4"
1111
futures = "0.3"
12+
log = "0.4"
13+
thiserror = "1"
1214
tokio = "1"
1315

1416
[profile.bench]

crates/hdfs-native/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,22 @@ readme = "../../README.md"
1111
license = "Apache-2.0"
1212

1313
[dependencies]
14+
aes = "0.8"
1415
base64 = "0.21"
1516
bytes = { workspace = true }
1617
cbc = "0.1"
1718
chrono = { workspace = true }
1819
cipher = "0.4"
1920
crc = "3.1.0-beta.1"
21+
ctr = "0.9"
2022
des = "0.8"
2123
futures = { workspace = true }
2224
g2p = "1"
2325
hex = "0.4"
2426
hmac = "0.12"
2527
libc = "0.2"
2628
libgssapi = { version = "0.7", default-features = false, optional = true }
27-
log = "0.4"
29+
log = { workspace = true }
2830
md-5 = "0.10"
2931
num-traits = "0.2"
3032
once_cell = "1"
@@ -34,7 +36,7 @@ rand = "0.8"
3436
regex = "1"
3537
roxmltree = "0.18"
3638
socket2 = "0.5"
37-
thiserror = "1"
39+
thiserror = { workspace = true }
3840
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "net", "io-util", "macros", "sync", "time"] }
3941
url = "2"
4042
users = { version = "0.11", default-features = false }

python/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ doc = false
2525
name = "hdfs_native._internal"
2626

2727
[dependencies]
28-
bytes = "1.4"
28+
bytes = { workspace = true }
2929
env_logger = "0.10"
3030
hdfs-native = { path = "../crates/hdfs-native" }
3131
log = "0.4"
3232
pyo3 = { version = "0.20", features = ["extension-module", "abi3", "abi3-py38"] }
33-
thiserror = "1.0.43"
34-
tokio = { version = "1.28", features = ["rt-multi-thread"] }
33+
thiserror = { workspace = true }
34+
tokio = { workspace = true, features = ["rt-multi-thread"] }
3535

3636
[features]
3737
kerberos = ["hdfs-native/kerberos"]

0 commit comments

Comments
 (0)