Skip to content
Open
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/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.9", "3.10"]
os:
- ubuntu-latest
- macos-latest
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2

python:
version: "3.8"
version: "3.9"
install:
- method: pip
path: .
Expand Down
2 changes: 1 addition & 1 deletion examples/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def build_parser(description: str) -> argparse.ArgumentParser:
"--payment-driver", "--driver", help="Payment driver name, for example `erc20`"
)
parser.add_argument(
"--payment-network", "--network", help="Payment network name, for example `holesky`"
"--payment-network", "--network", help="Payment network name, for example `hoodi`"
)
parser.add_argument("--subnet-tag", help="Subnet name, for example `public`")
parser.add_argument(
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ requires = ["poetry_core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry.dependencies]
python = "^3.8"
python = "^3.9"

aiohttp = "^3.8"
aiohttp = "^3.12.5"
aiohttp-sse-client = "^0.2.1"

async_exit_stack = "^1.0.1"
Expand Down Expand Up @@ -87,7 +87,7 @@ tests_unit = {cmd = "pytest --cov=yapapi --cov-report html --cov-report term -sv
tests_integration_init = { sequence = ["_gothv_env", "_gothv_requirements", "_gothv_assets"], help="Initialize the integration test environment"}
tests_integration = { cmd = ".envs/yapapi-goth/bin/python -m pytest -svx tests/goth_tests --config-override docker-compose.build-environment.use-prerelease=false --config-path tests/goth_tests/assets/goth-config.yml --ssh-verify-connection --reruns 3 --only-rerun AssertionError --only-rerun TimeoutError --only-rerun goth.runner.exceptions.TimeoutError --only-rerun goth.runner.exceptions.TemporalAssertionError --only-rerun urllib.error.URLError --only-rerun goth.runner.exceptions.CommandError --only-rerun requests.exceptions.ConnectionError --only-rerun OSError --only-rerun requests.exceptions.ReadTimeout", help = "Run the integration tests"}
_gothv_env = "python -m venv .envs/yapapi-goth"
_gothv_requirements = ".envs/yapapi-goth/bin/pip install -U --extra-index-url https://test.pypi.org/simple/ goth==0.17.0 pip pytest pytest-asyncio pytest-rerunfailures pexpect"
_gothv_requirements = ".envs/yapapi-goth/bin/pip install -U --extra-index-url https://test.pypi.org/simple/ goth==0.22.1 pip pytest pytest-asyncio pytest-rerunfailures pexpect"
_gothv_assets = ".envs/yapapi-goth/bin/python -m goth create-assets tests/goth_tests/assets"

clean = {cmd = "rm -rf .coverage .requirements.txt dist md handbook build", help = "Clean all development related files" }
Expand Down
2 changes: 1 addition & 1 deletion tests/goth_tests/___test_resubscription.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ async def worker(work_ctx, tasks):
async with Golem(
budget=10.0,
event_consumer=monitor.add_event_sync,
payment_network="holesky",
payment_network="hoodi",
) as golem:
task: Task # mypy needs this for some reason
async for task in golem.execute_tasks(
Expand Down
2 changes: 1 addition & 1 deletion tests/goth_tests/test_agreement_termination/requestor.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ async def worker(ctx: WorkContext, tasks):
async with Golem(
budget=10.0,
subnet_tag="goth",
payment_network="holesky",
payment_network="hoodi",
) as golem:
tasks = [Task(data=n) for n in range(6)]
async for task in golem.execute_tasks(
Expand Down
2 changes: 1 addition & 1 deletion tests/goth_tests/test_async_task_generation/requestor.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async def worker(work_ctx, tasks):
budget=10.0,
subnet_tag="goth",
event_consumer=log_event_repr,
payment_network="holesky",
payment_network="hoodi",
) as golem:
# We use an async task generator that yields tasks removed from
# an async queue. Each computed task will potentially spawn
Expand Down
2 changes: 1 addition & 1 deletion tests/goth_tests/test_concurrent_executors/requestor.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ async def duplicator(work_ctx, tasks):
output = result.stdout.strip()
task.accept_result(output)

async with Golem(budget=1.0, subnet_tag="goth", payment_network="holesky") as golem:
async with Golem(budget=1.0, subnet_tag="goth", payment_network="hoodi") as golem:
# Construct a pipeline:
#
# input_tasks
Expand Down
2 changes: 1 addition & 1 deletion tests/goth_tests/test_instance_restart/requestor.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ async def shutdown(self):


async def main():
async with Golem(budget=1.0, subnet_tag="goth", payment_network="holesky") as golem:
async with Golem(budget=1.0, subnet_tag="goth", payment_network="hoodi") as golem:
# Start a cluster with a single service.
# The first instance will fail before reaching the `running` state
# due to an error. Another instance should be spawned in its place.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ async def main():
strategy=ShortDebitNoteIntervalAndPaymentTimeout(),
subnet_tag="goth",
event_consumer=log_event_repr,
payment_network="holesky",
payment_network="hoodi",
) as golem:
logger = logging.getLogger("yapapi")
logger.handlers[0].setLevel(logging.DEBUG)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async def worker(work_ctx, tasks):
budget=10.0,
subnet_tag="goth",
event_consumer=log_event_repr,
payment_network="holesky",
payment_network="hoodi",
) as golem:
tasks = [Task(data=n) for n in range(3)]
async for task in golem.execute_tasks(
Expand Down
2 changes: 1 addition & 1 deletion tests/goth_tests/test_recycle_ip/ssh_recycle_ip.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ async def main():
async with Golem(
budget=1.0,
subnet_tag="goth",
payment_network="holesky",
payment_network="hoodi",
) as golem:
network = await golem.create_network("192.168.0.1/24")
proxy = SocketProxy(ports=[2222])
Expand Down
4 changes: 2 additions & 2 deletions yapapi/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
)

DEFAULT_DRIVER: str = os.getenv("YAGNA_PAYMENT_DRIVER", "erc20").lower()
DEFAULT_NETWORK: str = os.getenv("YAGNA_PAYMENT_NETWORK", "holesky").lower()
DEFAULT_NETWORK: str = os.getenv("YAGNA_PAYMENT_NETWORK", "hoodi").lower()
DEFAULT_SUBNET: Optional[str] = os.getenv("YAGNA_SUBNET", "public")

MAX_CONCURRENTLY_PROCESSED_DEBIT_NOTES: Final[int] = 10
Expand Down Expand Up @@ -125,7 +125,7 @@ def __init__(
environment variable, defaults to `erc20`. Only payment platforms with
the specified driver will be used
:param payment_network: name of the payment network to use. Uses `YAGNA_PAYMENT_NETWORK`
environment variable, defaults to `holesky`. Only payment platforms with the specified
environment variable, defaults to `hoodi`. Only payment platforms with the specified
network will be used
:param stream_output: stream computation output from providers
:param api_config: configuration of yagna low level api
Expand Down
4 changes: 2 additions & 2 deletions yapapi/golem.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def __init__(
environment variable, defaults to `erc20`. Only payment platforms with
the specified driver will be used
:param payment_network: name of the network to use. Uses `YAGNA_PAYMENT_NETWORK` environment
variable, defaults to `holesky`. Only payment platforms with the specified
variable, defaults to `hoodi`. Only payment platforms with the specified
network will be used
:param event_consumer: a callable that processes events related to the computation; by
default it is a function that logs all events
Expand Down Expand Up @@ -192,7 +192,7 @@ def event_consumer(event: "yapapi.events.AgreementConfirmed"):

@staticmethod
def _parse_event_cls_or_name(
event_cls_or_name: Union[Type[events.Event], str]
event_cls_or_name: Union[Type[events.Event], str],
) -> Type[events.Event]:
if isinstance(event_cls_or_name, type):
return event_cls_or_name
Expand Down
Loading