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.

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

Fix jsonschema dependency, update others #351

Merged
merged 4 commits into from
Nov 27, 2023
Merged
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
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ install: ## Install project dependencies
`if [ "${DEV}" = "0" ]; then echo "--no-dev"; fi`

lint: ## Lint with all tools
make isort black flake mypy
make isort black ruff mypy

test: ## Run test suite
# FIXME: https://github.com/pytest-dev/pytest-xdist/issues/385#issuecomment-1177147322
Expand Down Expand Up @@ -61,8 +61,8 @@ isort: ## Format with isort
black: ## Format with black
poetry run black src tests scripts --exclude ".*/docs.py"

flake: ## Lint with flake8
poetry run flakeheaven lint src tests scripts
ruff: ## Lint with ruff
poetry run ruff check src tests scripts

mypy: ## Lint with mypy
poetry run mypy src scripts tests
Expand All @@ -74,8 +74,8 @@ build: ## Build Python wheel package
poetry build

image: ## Build Docker image
docker buildx build . --file pytezos.dockerfile -t pytezos:${TAG}
docker buildx build . --file michelson-kernel.dockerfile -t michelson-kernel:${TAG}
docker buildx build . --file pytezos.dockerfile -t pytezos:${TAG} --load
docker buildx build . --file michelson-kernel.dockerfile -t michelson-kernel:${TAG} --load

release-patch: ## Release patch version
bumpversion patch
Expand Down Expand Up @@ -103,7 +103,7 @@ update: ## Update dependencies, export requirements.txt

poetry export --without-hashes -o requirements.txt
poetry export --without-hashes -o requirements.dev.txt --with dev
poetry remove jupyter-client ipykernel notebook
poetry remove notebook
poetry export --without-hashes -o requirements.slim.txt

mv pyproject.toml.bak pyproject.toml
Expand Down
2 changes: 1 addition & 1 deletion michelson-kernel.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ USER pytezos
ENV PATH="/opt/pytezos/bin:$PATH"
ENV PYTHONPATH="/home/pytezos:/home/pytezos/src:/opt/pytezos/src:/opt/pytezos/lib/python3.11/site-packages:$PYTHONPATH"
WORKDIR /home/pytezos/
ENTRYPOINT [ "/opt/pytezos/bin/jupyter", "notebook", "--port=8888", "--ip=0.0.0.0", "--no-browser", "--no-mathjax" ]
ENTRYPOINT [ "/opt/pytezos/bin/jupyter-notebook", "--port=8888", "--ip=0.0.0.0" , "--no-browser", "--no-mathjax" ]
EXPOSE 8888

COPY --chown=pytezos --from=compile-image /opt/pytezos /opt/pytezos
Expand Down
2,490 changes: 1,248 additions & 1,242 deletions poetry.lock

Large diffs are not rendered by default.

50 changes: 31 additions & 19 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,18 @@ packages = [

[tool.poetry.dependencies]
python = ">=3.8,<3.12"
attrs = "^21.4.0"
attrs = ">=21.4.0"
base58 = "^2.1.1"
cattrs = "^22.1.0"
cattrs = ">=22.1.0"
click = "^8.1.3"
cryptography = "^41.0.0"
deprecation = "^2.1.0"
docker = "^6.0.0"
fastecdsa = "^2.2.3"
ipykernel = "^6.6.0"
jsonschema = "^4.3.2"
jupyter-client = "^8.0.2"
mnemonic = "^0.20"
netstruct = "^1.1.2"
notebook = "^6.4.6"
notebook = "^6.5.6"
ply = "^3.11"
py-ecc = "^6.0.0"
pysodium = "^0.7.10"
Expand All @@ -72,11 +70,6 @@ simple-bson = "^0.0.3"
black = "*"
bump2version = "*"
diff-cover = "*"
flake8-return = "*"
flake8-comprehensions = "*"
flake8-bugbear = "*"
flake8-simplify = "*"
flakeheaven = "*"
isort = "*"
mypy = "*"
pytest = "*"
Expand All @@ -95,6 +88,7 @@ types-simplejson = "*"
types-tabulate = "*"
parameterized = "*"
PyYAML = "*"
ruff = "*"

[tool.poetry.scripts]
pytezos = 'pytezos.cli.cli:cli'
Expand All @@ -109,15 +103,33 @@ line-length = 120
target-version = ['py38', 'py39', 'py310', 'py311']
skip-string-normalization = true

[tool.flakeheaven]
format = "colored"
max_line_length = 120
show_source = true
extended_default_ignore = []

[tool.flakeheaven.plugins]
"flake8-*" = ["+*", "-C417", "-SIM106", "-SIM114", "-SIM102", "-R504", "-R505", "-R506", "-R507"]
flake8-docstrings = ["-*"]
[tool.ruff]
line-length = 120
ignore = [
"B904",
"C417",
"C901",
"E402",
"E713",
"E721",
"E741",
"F401",
"F403",
"F405",
"F541",
"F811",
"F821",
"F841",
"R504",
"R505",
"R506",
"R507",
"SIM102",
"SIM108",
"SIM114",
]
target-version = "py311"
extend-select = ["B", "C", "R", "SIM"]

[build-system]
requires = ["poetry_core>=1.0.0"]
Expand Down
Loading
Loading