Skip to content

Commit

Permalink
Merge branch 'angr:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielBotnik authored Nov 9, 2024
2 parents 8b92373 + a4fa0da commit 7fc464f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
macos:
name: Test macOS
runs-on: macos-12
runs-on: macos-15
steps:
- uses: actions/checkout@v3
with:
Expand Down
18 changes: 9 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ repos:
#

- repo: https://github.com/abravalheri/validate-pyproject
rev: v0.20.2
rev: v0.22
hooks:
- id: validate-pyproject
fail_fast: true

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
# General
- id: check-merge-conflict
Expand All @@ -33,7 +33,7 @@ repos:
fail_fast: true

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: check-ast
fail_fast: true
Expand All @@ -43,13 +43,13 @@ repos:
#

- repo: https://github.com/asottile/setup-cfg-fmt
rev: v2.5.0
rev: v2.7.0
hooks:
- id: setup-cfg-fmt
args: ["--include-version-classifiers"]

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: mixed-line-ending
- id: trailing-whitespace
Expand All @@ -60,20 +60,20 @@ repos:
- id: rm-unneeded-f-str

- repo: https://github.com/asottile/pyupgrade
rev: v3.17.0
rev: v3.19.0
hooks:
- id: pyupgrade
args: [--py310-plus]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.8
rev: v0.7.2
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]

# Last modifier: Coding Standard
- repo: https://github.com/psf/black
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black

Expand All @@ -93,7 +93,7 @@ repos:
- id: rst-inline-touching-normal

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: debug-statements
- id: check-builtin-literals
Expand Down
2 changes: 1 addition & 1 deletion cle/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from __future__ import annotations

__version__ = "9.2.121.dev0"
__version__ = "9.2.128.dev0"

from .address_translator import AT, AddressTranslator
from .backends import (
Expand Down
5 changes: 3 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ classifiers =
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
Programming Language :: Python :: 3.13

[options]
packages = find:
install_requires =
archinfo==9.2.121.dev0
archinfo==9.2.128.dev0
cart
pefile
pyelftools>=0.27
pyvex==9.2.121.dev0
pyvex==9.2.128.dev0
sortedcontainers>=2.0
python_requires = >=3.10
tests_require = cffi
Expand Down

0 comments on commit 7fc464f

Please sign in to comment.