Skip to content

Commit 4d92ec4

Browse files
authored
Merge pull request #35 from b-long/feature/multi-file-encrypt
Add support for multi-file NPE encrypt and decrypt
2 parents 7cd409e + 8c903d8 commit 4d92ec4

14 files changed

Lines changed: 532 additions & 56 deletions

.github/workflows/build-golang-macos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ jobs:
4747
4848
# - uses: ./.github/workflows/platform-integration-test.yaml
4949
# with:
50-
# wheel: dist/otdf_python-0.2.3-py3-none-any.whl
50+
# wheel: dist/otdf_python-0.2.4-py3-none-any.whl

.github/workflows/build-golang-ubuntu.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ jobs:
4343
4444
- uses: actions/cache/restore@v4
4545
with:
46-
path: dist/otdf_python-0.2.3-py3-none-any.whl
46+
path: dist/otdf_python-0.2.4-py3-none-any.whl
4747
key: ${{ runner.os }}${{ matrix.python3_version }}-data-${{ github.sha }}
4848

4949
- uses: actions/cache/save@v4
5050
with:
51-
path: dist/otdf_python-0.2.3-py3-none-any.whl
51+
path: dist/otdf_python-0.2.4-py3-none-any.whl
5252
key: ${{ runner.os }}${{ matrix.python3_version }}-data-${{ github.sha }}
5353
restore-keys: |
5454
${{ runner.os }}${{ matrix.python3_version }}-data-
@@ -61,5 +61,5 @@ jobs:
6161
needs: build
6262
uses: ./.github/workflows/platform-integration-test.yaml
6363
with:
64-
wheel: dist/otdf_python-0.2.3-py3-none-any.whl
64+
wheel: dist/otdf_python-0.2.4-py3-none-any.whl
6565
python_version: ${{ matrix.python3_version }}

.github/workflows/platform-integration-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
- uses: actions/cache/restore@v4
3131
with:
32-
path: dist/otdf_python-0.2.3-py3-none-any.whl
32+
path: dist/otdf_python-0.2.4-py3-none-any.whl
3333
key: ${{ runner.os }}${{ inputs.python_version }}-data-${{ github.sha }}
3434

3535
- name: Prove that the input file is available

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ Install from the [Python Package Index (PyPI)](https://pypi.org):
2727
pip install otdf_python
2828

2929
# Install a pinned version
30-
pip install otdf-python==0.2.3
30+
pip install otdf-python==0.2.4
3131

3232
# Install a pinned version, from test.pypi.org
33-
pip install -i https://test.pypi.org/simple/ otdf-python==0.2.3
33+
pip install -i https://test.pypi.org/simple/ otdf-python==0.2.4
3434
```
3535

3636
## Usage

build-scripts/ci-build.sh

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,47 +13,63 @@ printf """
1313
1414
"""
1515

16+
echo "✨✨✨ Display Python version"
1617
echo "python -VV"
1718
python -VV
1819

20+
echo "✨✨✨ Display Python executable path"
1921
echo 'python -c "import sys; print(sys.executable)"'
2022
python -c "import sys; print(sys.executable)"
2123

24+
echo "✨✨✨ Display pip version"
2225
echo 'pip -V'
2326
pip -V
2427

28+
echo "✨✨✨ Install poetry"
2529
echo 'pip install poetry'
2630
pip install poetry
2731

32+
echo "✨✨✨ List home directory contents"
2833
# Look for go/bin (skip, we know it exists)
2934
echo '$HOME/'
3035
ls -la "$HOME/"
3136

32-
echo '$HOME/.local/'
33-
ls -la "$HOME/.local/"
34-
37+
echo "✨✨✨ List Go directory contents"
3538
echo '$HOME/go/'
3639
ls -la "$HOME/go/"
3740

41+
echo "✨✨✨ Display Go version"
42+
go version
43+
44+
echo "✨✨✨ Add Go bin directory to PATH"
3845
# Add Go bin directory to PATH
3946
echo "export PATH=$PATH:~/.local/go/bin" >> $GITHUB_ENV
4047

48+
echo "✨✨✨ Install dependencies with poetry"
4149
# Since we don't have our wheel build / install configured yet we use '--no-root'
4250
poetry install --no-root
4351

52+
echo "✨✨✨ Activate poetry environment"
4453
source $(poetry env info --path)/bin/activate
4554

55+
echo "✨✨✨ Add Go bin directory to PATH again"
4656
# Add Go bin directory to PATH
4757
echo "export PATH=$PATH:~/.local/go/bin" >> $GITHUB_ENV
4858

59+
echo "✨✨✨ Install goimports"
4960
go install golang.org/x/tools/cmd/goimports@latest
5061

62+
echo "✨✨✨ Install gopy"
5163
go install github.com/go-python/gopy@latest
5264

65+
echo "✨✨✨ Upgrade setuptools and wheel"
5366
poetry run pip install --upgrade setuptools wheel
5467

68+
echo "✨✨✨ Build gopy"
5569
gopy build --output=otdf_python -vm=python3 .
5670

71+
echo "✨✨✨ Build wheel"
5772
poetry run python3 setup.py bdist_wheel
5873

59-
pip install dist/otdf_python-0.2.3-py3-none-any.whl
74+
echo "✨✨✨ Install wheel"
75+
pip install dist/otdf_python-0.2.4-py3-none-any.whl

build-scripts/make_and_validate_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ python3 -m pip install --upgrade setuptools wheel
4747
python3 setup.py bdist_wheel
4848

4949
# Prove that the wheel can be installed
50-
pip install dist/otdf_python-0.2.3-py3-none-any.whl
50+
pip install dist/otdf_python-0.2.4-py3-none-any.whl
5151

5252
if [[ "$SKIP_TESTS" == "-s" || "$SKIP_TESTS" == "--skip-tests" ]]; then
5353
echo "Build is complete, skipping tests."

build-scripts/uv_make_and_validate_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ loud_print "Installing wheel"
7070
uv venv .venv-wheel --python 3.12 "$PY_TYPE"
7171
source "${BUILD_ROOT}/.venv-wheel/bin/activate"
7272
pip install pybindgen
73-
pip install dist/otdf_python-0.2.3-py3-none-any.whl
73+
pip install dist/otdf_python-0.2.4-py3-none-any.whl
7474

7575
if [[ "$SKIP_TESTS" == "-s" || "$SKIP_TESTS" == "--skip-tests" ]]; then
7676
echo "Build is complete, skipping tests."

0 commit comments

Comments
 (0)