From 3ded676db9c1aedad48f53d9d4534f7f9f5344c0 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Tue, 11 Jul 2023 21:11:30 +0200 Subject: [PATCH] Try to update execnet --- flake.nix | 9 ++++++ poetry.lock | 76 ++++++++++++++++++++++++++++++++++++++++++++------ pyproject.toml | 1 - 3 files changed, 77 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index cf56b93..9248a5b 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,15 @@ { projectDir = ./.; groups = [ "main" "dev" ]; + overrides = poetry2nix.defaultPoetryOverrides.extend + (self: super: { + execnet = super.execnet.overridePythonAttrs + ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ super.hatchling ]; + } + ); + }); }; inventoryPackage = prev.poetry2nix.mkPoetryApplication { projectDir = ./.; diff --git a/poetry.lock b/poetry.lock index b525113..21aff96 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,9 +1,10 @@ -# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. +# This file is automatically @generated by Poetry and should not be changed by hand. [[package]] name = "asgiref" version = "3.7.2" description = "ASGI specs, helper code, and adapters" +category = "main" optional = false python-versions = ">=3.7" files = [ @@ -21,6 +22,7 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] name = "astroid" version = "2.15.6" description = "An abstract syntax tree for Python with inference support." +category = "dev" optional = false python-versions = ">=3.7.2" files = [ @@ -40,6 +42,7 @@ wrapt = [ name = "black" version = "22.12.0" description = "The uncompromising code formatter." +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -75,6 +78,7 @@ uvloop = ["uvloop (>=0.15.2)"] name = "click" version = "8.1.4" description = "Composable command line interface toolkit" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -89,6 +93,7 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} name = "colorama" version = "0.4.6" description = "Cross-platform colored terminal text." +category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" files = [ @@ -100,6 +105,7 @@ files = [ name = "coverage" version = "6.5.0" description = "Code coverage measurement for Python" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -165,6 +171,7 @@ toml = ["tomli"] name = "dill" version = "0.3.6" description = "serialize all of python" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -179,6 +186,7 @@ graph = ["objgraph (>=1.7.2)"] name = "django" version = "4.2.3" description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design." +category = "main" optional = false python-versions = ">=3.8" files = [ @@ -199,6 +207,7 @@ bcrypt = ["bcrypt"] name = "django-crispy-forms" version = "1.14.0" description = "Best way to have Django DRY forms" +category = "main" optional = false python-versions = ">=3.7" files = [ @@ -210,6 +219,7 @@ files = [ name = "django-filter" version = "23.2" description = "Django-filter is a reusable Django application for allowing users to filter querysets dynamically." +category = "main" optional = false python-versions = ">=3.7" files = [ @@ -224,6 +234,7 @@ Django = ">=3.2" name = "django-floppyforms" version = "1.9.0" description = "Full control of form rendering in the templates" +category = "main" optional = false python-versions = "*" files = [ @@ -235,6 +246,7 @@ files = [ name = "django-guardian" version = "2.4.0" description = "Implementation of per object permissions for Django." +category = "main" optional = false python-versions = ">=3.5" files = [ @@ -249,6 +261,7 @@ Django = ">=2.2" name = "django-htmx" version = "1.16.0" description = "Extensions for using Django with htmx." +category = "main" optional = false python-versions = ">=3.8" files = [ @@ -263,6 +276,7 @@ Django = ">=3.2" name = "django-model-utils" version = "4.3.1" description = "Django model mixins and utilities" +category = "main" optional = false python-versions = ">=3.7" files = [ @@ -277,6 +291,7 @@ Django = ">=3.2" name = "django-nested-admin" version = "4.0.2" description = "Django admin classes that allow for nested inlines" +category = "main" optional = false python-versions = ">=3.6" files = [ @@ -295,6 +310,7 @@ test = ["Pillow", "dj-database-url", "django-selenosis", "pytest", "pytest-cov", name = "django-stubs" version = "4.2.3" description = "Mypy stubs for Django" +category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -312,12 +328,13 @@ types-PyYAML = "*" typing-extensions = "*" [package.extras] -compatible-mypy = ["mypy (==1.4.*)"] +compatible-mypy = ["mypy (>=1.4.0,<1.5.0)"] [[package]] name = "django-stubs-ext" version = "4.2.2" description = "Monkey-patching and extensions for django-stubs" +category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -333,6 +350,7 @@ typing-extensions = "*" name = "django-tables2" version = "2.6.0" description = "Table/data-grid framework for Django" +category = "main" optional = false python-versions = "*" files = [ @@ -350,6 +368,7 @@ tablib = ["tablib"] name = "docstring-to-markdown" version = "0.12" description = "On the fly conversion of Python docstrings to markdown" +category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -361,6 +380,7 @@ files = [ name = "exceptiongroup" version = "1.1.2" description = "Backport of PEP 654 (exception groups)" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -373,22 +393,24 @@ test = ["pytest (>=6)"] [[package]] name = "execnet" -version = "1.9.0" +version = "2.0.2" description = "execnet: rapid multi-Python deployment" +category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.7" files = [ - {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"}, - {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"}, + {file = "execnet-2.0.2-py3-none-any.whl", hash = "sha256:88256416ae766bc9e8895c76a87928c0012183da3cc4fc18016e6f050e025f41"}, + {file = "execnet-2.0.2.tar.gz", hash = "sha256:cc59bc4423742fd71ad227122eb0dd44db51efb3dc4095b45ac9a08c770096af"}, ] [package.extras] -testing = ["pre-commit"] +testing = ["hatch", "pre-commit", "pytest", "tox"] [[package]] name = "faker" version = "12.0.1" description = "Faker is a Python package that generates fake data for you." +category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -403,6 +425,7 @@ python-dateutil = ">=2.4" name = "gunicorn" version = "20.1.0" description = "WSGI HTTP Server for UNIX" +category = "main" optional = false python-versions = ">=3.5" files = [ @@ -423,6 +446,7 @@ tornado = ["tornado (>=0.2)"] name = "iniconfig" version = "2.0.0" description = "brain-dead simple config-ini parsing" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -434,6 +458,7 @@ files = [ name = "isort" version = "5.12.0" description = "A Python utility / library to sort Python imports." +category = "dev" optional = false python-versions = ">=3.8.0" files = [ @@ -451,6 +476,7 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"] name = "jedi" version = "0.18.2" description = "An autocompletion tool for Python that can be used for text editors." +category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -470,6 +496,7 @@ testing = ["Django (<3.1)", "attrs", "colorama", "docopt", "pytest (<7.0.0)"] name = "lazy-object-proxy" version = "1.9.0" description = "A fast and thorough lazy object proxy." +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -515,6 +542,7 @@ files = [ name = "mccabe" version = "0.7.0" description = "McCabe checker, plugin for flake8" +category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -526,6 +554,7 @@ files = [ name = "mixer" version = "7.2.2" description = "Mixer -- Is a fixtures replacement. Supported Django ORM, SqlAlchemy ORM, Mongoengine ODM and custom python objects." +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -543,6 +572,7 @@ tests = ["Django (>=3.0)", "Flask (>=1.0)", "Marshmallow (>=3.9)", "SQLAlchemy ( name = "mypy" version = "1.4.1" description = "Optional static typing for Python" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -589,6 +619,7 @@ reports = ["lxml"] name = "mypy-extensions" version = "1.0.0" description = "Type system extensions for programs checked with the mypy type checker." +category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -600,6 +631,7 @@ files = [ name = "packaging" version = "23.1" description = "Core utilities for Python packages" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -611,6 +643,7 @@ files = [ name = "parso" version = "0.8.3" description = "A Python Parser" +category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -626,6 +659,7 @@ testing = ["docopt", "pytest (<6.0.0)"] name = "pathspec" version = "0.11.1" description = "Utility library for gitignore style pattern matching of file paths." +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -637,6 +671,7 @@ files = [ name = "platformdirs" version = "3.8.1" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -652,6 +687,7 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.3.1)", "pytest- name = "pluggy" version = "1.2.0" description = "plugin and hook calling mechanisms for python" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -667,6 +703,7 @@ testing = ["pytest", "pytest-benchmark"] name = "psycopg2-binary" version = "2.9.6" description = "psycopg2 - Python-PostgreSQL Database Adapter" +category = "main" optional = false python-versions = ">=3.6" files = [ @@ -738,6 +775,7 @@ files = [ name = "pylint" version = "2.17.4" description = "python code static checker" +category = "dev" optional = false python-versions = ">=3.7.2" files = [ @@ -767,6 +805,7 @@ testutils = ["gitpython (>3)"] name = "pylint-django" version = "2.5.3" description = "A Pylint plugin to help Pylint understand the Django web framework" +category = "dev" optional = false python-versions = "*" files = [ @@ -786,6 +825,7 @@ with-django = ["Django"] name = "pylint-plugin-utils" version = "0.8.2" description = "Utilities and helpers for writing Pylint plugins" +category = "dev" optional = false python-versions = ">=3.7,<4.0" files = [ @@ -800,6 +840,7 @@ pylint = ">=1.7" name = "pytest" version = "7.4.0" description = "pytest: simple powerful testing with Python" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -822,6 +863,7 @@ testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "no name = "pytest-cov" version = "4.1.0" description = "Pytest plugin for measuring coverage." +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -840,6 +882,7 @@ testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtuale name = "pytest-django" version = "4.5.2" description = "A Django plugin for pytest." +category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -858,6 +901,7 @@ testing = ["Django", "django-configurations (>=2.0)"] name = "pytest-xdist" version = "3.3.1" description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -878,6 +922,7 @@ testing = ["filelock"] name = "python-dateutil" version = "2.8.2" description = "Extensions to the standard Python datetime module" +category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" files = [ @@ -892,6 +937,7 @@ six = ">=1.5" name = "python-lsp-jsonrpc" version = "1.0.0" description = "JSON RPC 2.0 server library" +category = "dev" optional = false python-versions = "*" files = [ @@ -909,6 +955,7 @@ test = ["coverage", "pycodestyle", "pyflakes", "pylint", "pytest", "pytest-cov"] name = "python-lsp-server" version = "1.7.4" description = "Python Language Server for the Language Server Protocol" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -942,6 +989,7 @@ yapf = ["whatthepatch (>=1.0.2,<2.0.0)", "yapf (>=0.33.0)"] name = "python-monkey-business" version = "1.0.0" description = "Utility functions for monkey-patching python code" +category = "main" optional = false python-versions = "*" files = [ @@ -956,6 +1004,7 @@ six = ">=1.7.0" name = "pyyaml" version = "6.0" description = "YAML parser and emitter for Python" +category = "main" optional = false python-versions = ">=3.6" files = [ @@ -1005,6 +1054,7 @@ files = [ name = "setuptools" version = "68.0.0" description = "Easily download, build, install, upgrade, and uninstall Python packages" +category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1021,6 +1071,7 @@ testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs ( name = "six" version = "1.16.0" description = "Python 2 and 3 compatibility utilities" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" files = [ @@ -1032,6 +1083,7 @@ files = [ name = "sqlparse" version = "0.4.4" description = "A non-validating SQL parser." +category = "main" optional = false python-versions = ">=3.5" files = [ @@ -1048,6 +1100,7 @@ test = ["pytest", "pytest-cov"] name = "tomli" version = "2.0.1" description = "A lil' TOML parser" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1059,6 +1112,7 @@ files = [ name = "tomlkit" version = "0.11.8" description = "Style preserving TOML library" +category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1070,6 +1124,7 @@ files = [ name = "types-pytz" version = "2023.3.0.0" description = "Typing stubs for pytz" +category = "dev" optional = false python-versions = "*" files = [ @@ -1081,6 +1136,7 @@ files = [ name = "types-pyyaml" version = "6.0.12.10" description = "Typing stubs for PyYAML" +category = "dev" optional = false python-versions = "*" files = [ @@ -1092,6 +1148,7 @@ files = [ name = "typing-extensions" version = "4.7.1" description = "Backported and Experimental Type Hints for Python 3.7+" +category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1103,6 +1160,7 @@ files = [ name = "tzdata" version = "2023.3" description = "Provider of IANA time zone data" +category = "main" optional = false python-versions = ">=2" files = [ @@ -1114,6 +1172,7 @@ files = [ name = "ujson" version = "5.8.0" description = "Ultra fast JSON encoder and decoder for Python" +category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1184,6 +1243,7 @@ files = [ name = "wrapt" version = "1.15.0" description = "Module for decorators, wrappers and monkey patching." +category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" files = [ @@ -1267,4 +1327,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "2016bf5367ba3a277c52e5fe933d97d23734d5a88b5df2deb760ec2e7295ba88" +content-hash = "cb35732dcebee79ef85f21373e38b82e20cba84234202c675371cd92dc4d473e" diff --git a/pyproject.toml b/pyproject.toml index 5cb682c..b5c5745 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -81,7 +81,6 @@ python-lsp-server = "^1.7.3" mypy = "^1.4.1" django-stubs = "^4.2.3" pylint-django = "^2.5.3" -execnet = "~1.9.0" [build-system] requires = ["poetry-core>=1.0.0"]