Skip to content

Commit

Permalink
Merge branch 'main' into cli-help
Browse files Browse the repository at this point in the history
  • Loading branch information
mvadari authored Oct 25, 2023
2 parents 3aa17b8 + 85113fc commit 3ede509
Show file tree
Hide file tree
Showing 23 changed files with 261 additions and 231 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/lint_type_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,36 @@ on:
pull_request:
workflow_dispatch:

env:
POETRY_VERSION: 1.4.2
PYTHON_VERSION: "3.8"

jobs:
lint-and-type-check:
name: Lint and type-check
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Load cached .local
id: cache-poetry
uses: actions/cache@v3
with:
path: /home/runner/.local
key: dotlocal-3.11-${{ hashFiles('.github/workflows') }}
key: dotlocal-${{ env.POETRY_VERSION }}

- name: Install poetry
if: steps.cache-poetry.outputs.cache-hit != 'true'
run: |
curl -sSL https://install.python-poetry.org/ | python -
curl -sSL https://install.python-poetry.org/ | python - --version ${{ env.POETRY_VERSION }}
echo "$HOME/.local/bin" >> $GITHUB_PATH
- name: Install Python + Retrieve Poetry dependencies from cache
uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: ${{ env.PYTHON_VERSION }}
cache: "poetry"

- name: Display Python version
Expand Down
21 changes: 12 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,21 @@ on:
branches: [main]
pull_request:
paths-ignore:
- "docs/**"
- "scripts/**"
- "**.md"
- ".vscode/**"
workflow_dispatch:

env:
POETRY_VERSION: 1.4.2

jobs:
test:
name: Test
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
matrix:
# we have to use 3.7.1 to get around openssl issues
# TODO: add 3.7 once xrpl-py has been updated
python-version: ["3.8", "3.9", "3.10", "3.11"]
fail-fast: false

Expand All @@ -27,20 +28,22 @@ jobs:
uses: actions/checkout@v3

- name: Load cached .local
id: cache-poetry
uses: actions/cache@v3
with:
path: /home/runner/.local
key: dotlocal-${{ matrix.python-version }}-${{ hashFiles('.github/workflows') }}
key: dotlocal-${{ matrix.python-version }}-${{ env.POETRY_VERSION }}

- name: Install poetry
if: steps.cache-poetry.outputs.cache-hit != 'true'
run: |
curl -sSL https://install.python-poetry.org/ | python -
curl -sSL https://install.python-poetry.org/ | python - --version ${{ env.POETRY_VERSION }}
echo "$HOME/.local/bin" >> $GITHUB_PATH
- name: Install Python + Retrieve Poetry dependencies from cache
uses: actions/setup-python@v4
with:
python-version: "${{ matrix.python-version }}"
python-version: ${{ matrix.python-version }}
cache: "poetry"

- name: Display Python version
Expand All @@ -52,8 +55,8 @@ jobs:

- name: Pull images from docker
run: |
docker pull legleux/rippled-xbridge-test
docker pull legleux/xbridge_witnessd-test
docker pull rippleci/rippled:2.0.0-b4
docker pull rippleci/xbwd
- name: Run tests
id: runTests
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"python.defaultInterpreterPath": ".venv/bin/python",
"python.formatting.provider": "black",
"python.linting.pylintEnabled": false,
"python.linting.flake8Enabled": true,
Expand Down
31 changes: 29 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [[Unreleased]]

### Fixed

- Throw an error if a transaction fails instead of continuing

### Changed

- Switched to Docker containers with the latest versions of rippled and the witness server

## [0.3.3] - 2023-10-10

### Fixed

- Updated xrpl-py version to the latest to fix `XChainCreateBridge`` serialization

## [0.3.2] - 2023-09-25

### Fixed

- Updated xrpl-py beta version to add support for Network ID feature

## [0.3.1] - 2023-07-12

### Fixed

- Better error handling for the `account_objects` call in `bridge create`
- Fix docker-compose.yml file error when using this package via `pip`

## [0.3.0] - 2023-04-17

### Added
Expand All @@ -30,11 +57,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Updated to match the latest versions of rippled and the witness server
- Update to match the latest versions of rippled and the witness server

### Fixed

- Fixed a key algorithm-seed type mismatch for IOU bridge config generation
- Fix a key algorithm-seed type mismatch for IOU bridge config generation

## [0.1.0] - 2023-02-22

Expand Down
Loading

0 comments on commit 3ede509

Please sign in to comment.