Skip to content

Commit

Permalink
Merge branch 'main' into ga-pypi-release
Browse files Browse the repository at this point in the history
  • Loading branch information
justinr1234 authored Oct 29, 2024
2 parents 9bcda8e + edfb99b commit 64cf7da
Show file tree
Hide file tree
Showing 19 changed files with 569 additions and 370 deletions.
6 changes: 6 additions & 0 deletions .ci-config/rippled.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -182,3 +182,9 @@ PriceOracle
fixEmptyDID
fixXChainRewardRounding
fixPreviousTxnID

# This section can be used to simulate various FeeSettings scenarios for rippled node in standalone mode
[voting]
reference_fee = 200 # 200 drops
account_reserve = 20000000 # 20 XRP
owner_reserve = 5000000 # 5 XRP
10 changes: 5 additions & 5 deletions .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Integration test

env:
POETRY_VERSION: 1.4.2
POETRY_VERSION: 1.8.3
RIPPLED_DOCKER_IMAGE: rippleci/rippled:2.2.0-b3

on:
Expand All @@ -17,15 +17,15 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]

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

- name: Load cached .local
id: cache-poetry
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/.local
key: dotlocal-${{ env.POETRY_VERSION }}
Expand All @@ -41,7 +41,7 @@ jobs:
echo "$HOME/.local/bin" >> $GITHUB_PATH
- name: Install Python + Retrieve Poetry dependencies from cache
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/snippet_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ on:
workflow_dispatch:

env:
POETRY_VERSION: 1.4.2
POETRY_VERSION: 1.8.3

jobs:
snippet-test:
name: Snippet test
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]

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

- name: Load cached .local
id: cache-poetry
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/.local
key: dotlocal-${{ env.POETRY_VERSION }}
Expand All @@ -35,7 +35,7 @@ jobs:
echo "$HOME/.local/bin" >> $GITHUB_PATH
- name: Install Python + Retrieve Poetry dependencies from cache
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/unit_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:

env:
POETRY_VERSION: 1.4.2
POETRY_VERSION: 1.8.3

jobs:
lint-and-type-check:
Expand All @@ -19,11 +19,11 @@ jobs:

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

- name: Load cached .local
id: cache-poetry
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/.local
key: dotlocal-${{ env.POETRY_VERSION }}
Expand All @@ -35,7 +35,7 @@ jobs:
echo "$HOME/.local/bin" >> $GITHUB_PATH
- name: Install Python + Retrieve Poetry dependencies from cache
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON_VERSION }}
cache: "poetry"
Expand All @@ -60,15 +60,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]

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

- name: Load cached .local
id: cache-poetry
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/.local
key: dotlocal-${{ env.POETRY_VERSION }}
Expand All @@ -80,7 +80,7 @@ jobs:
echo "$HOME/.local/bin" >> $GITHUB_PATH
- name: Install Python + Retrieve Poetry dependencies from cache
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "poetry"
Expand Down
9 changes: 9 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ build:
os: ubuntu-22.04
tools:
python: "3.11"
jobs:
post_create_environment:
# Install poetry
# https://python-poetry.org/docs/#installing-manually
- python -m pip install poetry
post_install:
# Install dependencies with 'docs' dependency group
# https://python-poetry.org/docs/managing-dependencies/#dependency-groups
- VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH poetry install

python:
install:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [[Unreleased]]

### Added
- Add `include_deleted` to ledger_entry request

### BREAKING CHANGE:
- Remove Python 3.7 support to fix dependency installation and use 3.8 as new default.

### Fixed
- Grab the FeeSettings values from the latest validated ledger. Remove hard-coded reference to 10 drops as the reference transaction cost.

## [3.0.0] - 2024-07-16

### BREAKING CHANGE
Expand Down
4 changes: 1 addition & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#
import os
import sys
import sphinx_rtd_theme

sys.path.insert(0, os.path.abspath("../"))

Expand All @@ -30,7 +29,7 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ["sphinx.ext.autodoc", "sphinx.ext.napoleon"]
extensions = ["sphinx.ext.autodoc", "sphinx.ext.napoleon", "sphinx_rtd_theme"]

# Add any paths that contain templates here, relative to this directory.
templates_path = ["_templates"]
Expand All @@ -50,7 +49,6 @@

# This overrides Sphinx's default theme of 'alabaster'
html_theme = "sphinx_rtd_theme"
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
Expand Down
2 changes: 1 addition & 1 deletion docs/source/snippets.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Look Up a Transaction on the Ledger
Send a Transaction and See if It Gets Validated
-----------------------------------------------

.. literalinclude:: ../../snippets/reliable_transaction_submission.py
.. literalinclude:: ../../snippets/submit_payment.py

Set a Regular Key
-----------------------------------------------
Expand Down
Loading

0 comments on commit 64cf7da

Please sign in to comment.