Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci fix attempt #230

Open
wants to merge 5 commits into
base: inlining-checkout
Choose a base branch
from
Open

ci fix attempt #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1bca99
ci fix attempt
lassejaco Jan 27, 2023
e502718
trigger build
lassejaco Jan 27, 2023
51ecb0b
lint errors
lassejaco Jan 27, 2023
47940d5
no 3.11
lassejaco Jan 27, 2023
c612652
lint again
lassejaco Jan 27, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/tox.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
toxenv: py310-core
- python-version: "3.10"
toxenv: py310-integration
- python-version: "3.11"
toxenv: py311-core
- python-version: "3.11"
toxenv: py311-integration
# - python-version: "3.11"
# toxenv: py311-core
# - python-version: "3.11"
# toxenv: py311-integration
Comment on lines +29 to +32
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we maybe just remove it instead of commenting it out?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure; do we have plans to support it? I guess the cleanest thing is to actually solve whatever is causing 3.11 to not work, but on the other hand maybe it doesn't matter

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really would remove it before merging - having this just commented out is not a good style.


steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 2 additions & 1 deletion pretix_eth/exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def payment_to_row(payment):
completion_date,
payment.state,
fiat_amount,
Web3.fromWei(int(token_amount), 'ether'),
Web3.from_wei(int(token_amount), 'ether'),
currency_type,
sender_address,
recipient_address,
Expand All @@ -74,6 +74,7 @@ def payment_to_row(payment):
token_address,
token_rate,
]

return row


Expand Down
2 changes: 1 addition & 1 deletion pretix_eth/management/commands/confirm_payments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def confirm_payments_for_event(self, event: Event, no_dry_run, log_verbosity=0):
f" hash={signed_message.transaction_hash} not found,"
f" skipping."
)
if signed_message.age > order_payment.payment_provider.settings.PAYMENT_NOT_RECIEVED_RETRY_TIMEOUT:
if signed_message.age > order_payment.payment_provider.settings.PAYMENT_NOT_RECIEVED_RETRY_TIMEOUT: # noqa: E501
signed_message.invalidate()
continue

Expand Down
1 change: 0 additions & 1 deletion pretix_eth/network/tokens.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,6 @@ def payment_instructions(
}



class ETHArbitrum(Arbitrum):
"""
Ethereum on Arbitrum mainnet Network
Expand Down
9 changes: 5 additions & 4 deletions pretix_eth/payment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,18 @@ def settings_form_fields(self):
label=_("Payment retry timeout in seconds"),
help_text=_(
"Customers will be allowed to pay again after their previous payment "
"hasn't arrived for a given time. 1800s (30min) is a reasonable starting value"
"hasn't arrived for a given time. 1800s (30min) is a reasonable starting value" # noqa: E501
),
initial=30*60,
initial=30 * 60,
)
),
(
"SAFETY_BLOCK_COUNT",
forms.IntegerField(
label=_("Number of blocks to be mined after a transaction for it to be considered accepted by the chain."),
label=_(
"Number of blocks to be mined after a transaction for it to be considered accepted by the chain."), # noqa: E501
help_text=_(
"Higher value means better protection from (hypothetical) double spending attacks, "
"Higher value means better protection from (hypothetical) double spending attacks, " # noqa: E501
"at the cost of payment confirmation latency."
),
initial=5,
Expand Down