Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-golang-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ jobs:

# - uses: ./.github/workflows/platform-integration-test.yaml
# with:
# wheel: dist/otdf_python-0.2.3-py3-none-any.whl
# wheel: dist/otdf_python-0.2.4-py3-none-any.whl
6 changes: 3 additions & 3 deletions .github/workflows/build-golang-ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ jobs:

- uses: actions/cache/restore@v4
with:
path: dist/otdf_python-0.2.3-py3-none-any.whl
path: dist/otdf_python-0.2.4-py3-none-any.whl
key: ${{ runner.os }}${{ matrix.python3_version }}-data-${{ github.sha }}

- uses: actions/cache/save@v4
with:
path: dist/otdf_python-0.2.3-py3-none-any.whl
path: dist/otdf_python-0.2.4-py3-none-any.whl
key: ${{ runner.os }}${{ matrix.python3_version }}-data-${{ github.sha }}
restore-keys: |
${{ runner.os }}${{ matrix.python3_version }}-data-
Expand All @@ -61,5 +61,5 @@ jobs:
needs: build
uses: ./.github/workflows/platform-integration-test.yaml
with:
wheel: dist/otdf_python-0.2.3-py3-none-any.whl
wheel: dist/otdf_python-0.2.4-py3-none-any.whl
python_version: ${{ matrix.python3_version }}
2 changes: 1 addition & 1 deletion .github/workflows/platform-integration-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

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

- name: Prove that the input file is available
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ Install from the [Python Package Index (PyPI)](https://pypi.org):
pip install otdf_python

# Install a pinned version
pip install otdf-python==0.2.3
pip install otdf-python==0.2.4

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

## Usage
Expand Down
24 changes: 20 additions & 4 deletions build-scripts/ci-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,47 +13,63 @@ printf """

"""

echo "✨✨✨ Display Python version"
echo "python -VV"
python -VV

echo "✨✨✨ Display Python executable path"
echo 'python -c "import sys; print(sys.executable)"'
python -c "import sys; print(sys.executable)"

echo "✨✨✨ Display pip version"
echo 'pip -V'
pip -V

echo "✨✨✨ Install poetry"
echo 'pip install poetry'
pip install poetry

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

echo '$HOME/.local/'
ls -la "$HOME/.local/"

echo "✨✨✨ List Go directory contents"
echo '$HOME/go/'
ls -la "$HOME/go/"

echo "✨✨✨ Display Go version"
go version

echo "✨✨✨ Add Go bin directory to PATH"
# Add Go bin directory to PATH
echo "export PATH=$PATH:~/.local/go/bin" >> $GITHUB_ENV

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

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

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

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

echo "✨✨✨ Install gopy"
go install github.com/go-python/gopy@latest

echo "✨✨✨ Upgrade setuptools and wheel"
poetry run pip install --upgrade setuptools wheel

echo "✨✨✨ Build gopy"
gopy build --output=otdf_python -vm=python3 .

echo "✨✨✨ Build wheel"
poetry run python3 setup.py bdist_wheel

pip install dist/otdf_python-0.2.3-py3-none-any.whl
echo "✨✨✨ Install wheel"
pip install dist/otdf_python-0.2.4-py3-none-any.whl
2 changes: 1 addition & 1 deletion build-scripts/make_and_validate_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ python3 -m pip install --upgrade setuptools wheel
python3 setup.py bdist_wheel

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

if [[ "$SKIP_TESTS" == "-s" || "$SKIP_TESTS" == "--skip-tests" ]]; then
echo "Build is complete, skipping tests."
Expand Down
2 changes: 1 addition & 1 deletion build-scripts/uv_make_and_validate_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ loud_print "Installing wheel"
uv venv .venv-wheel --python 3.12 "$PY_TYPE"
source "${BUILD_ROOT}/.venv-wheel/bin/activate"
pip install pybindgen
pip install dist/otdf_python-0.2.3-py3-none-any.whl
pip install dist/otdf_python-0.2.4-py3-none-any.whl

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