hiro/poetry2nix
1
0
Fork 0
mirror of https://github.com/vale981/poetry2nix synced 2025-03-06 01:31:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: try bumping poetry version

Browse source
This commit is contained in:
Phillip Cloud 2023-09-05 07:28:31 -04:00
parent 04cad0685d
commit 4e02899c4b
No known key found for this signature in database
GPG key ID: D908212070FD785E
5 changed files with 638 additions and 784 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
overlay.nix
View file

@ -1,7 +1,4 @@
final: prev: { final: prev: {
poetry2nix = import ./default.nix { pkgs = final; }; poetry2nix = import ./default.nix { pkgs = final; };
poetry = prev.callPackage ./pkgs/poetry { python = final.python3; inherit (final) poetry2nix; }; poetry = prev.callPackage ./pkgs/poetry { python = final.python3; inherit (final) poetry2nix; };
} }

1222
pkgs/poetry/poetry.lock generated
View file

File diff suppressed because it is too large Load diff

190
pkgs/poetry/pyproject.toml
View file

@ -1,108 +1,81 @@
[tool.poetry] [tool.poetry]
name = "poetry" name = "poetry"
version = "1.3.2" version = "1.6.1"
description = "Python dependency management and packaging made easy." description = "Python dependency management and packaging made easy."
authors = [ authors = ["Sébastien Eustace <sebastien@eustace.io>"]
"Sébastien Eustace <sebastien@eustace.io>",
]
maintainers = [ maintainers = [
"Arun Babu Neelicattu <arun.neelicattu@gmail.com>", "Arun Babu Neelicattu <arun.neelicattu@gmail.com>",
"Bjorn Neergaard <bjorn@neersighted.com>", "Bjorn Neergaard <bjorn@neersighted.com>",
"Branch Vincent <branchevincent@gmail.com>", "Branch Vincent <branchevincent@gmail.com>",
"Bryce Drennan <github@accounts.brycedrennan.com>",
"Daniel Eades <danieleades@hotmail.com>",
"Randy Döring <radoering.poetry@gmail.com>", "Randy Döring <radoering.poetry@gmail.com>",
"Steph Samson <hello@stephsamson.com>", "Steph Samson <hello@stephsamson.com>",
"finswimmer <finswimmer77@gmail.com>", "finswimmer <finswimmer77@gmail.com>",
"Secrus <b.sokorski@gmail.com>",
] ]
license = "MIT" license = "MIT"
readme = "README.md" readme = "README.md"
packages = [{ include = "poetry", from = "src" }]
packages = [ include = [{ path = "tests", format = "sdist" }]
{ include = "poetry", from = "src" }
]
include = [
{ path = "tests", format = "sdist" }
]
homepage = "https://python-poetry.org/" homepage = "https://python-poetry.org/"
repository = "https://github.com/python-poetry/poetry" repository = "https://github.com/python-poetry/poetry"
documentation = "https://python-poetry.org/docs" documentation = "https://python-poetry.org/docs"
keywords = ["packaging", "dependency", "poetry"] keywords = ["packaging", "dependency", "poetry"]
classifiers = [ classifiers = [
"Topic :: Software Development :: Build Tools", "Topic :: Software Development :: Build Tools",
"Topic :: Software Development :: Libraries :: Python Modules" "Topic :: Software Development :: Libraries :: Python Modules",
] ]
[tool.poetry.urls] [tool.poetry.urls]
Changelog = "https://python-poetry.org/history/" Changelog = "https://python-poetry.org/history/"
[tool.poetry.build]
generate-setup-file = false
# Requirements # Requirements
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.7" python = "^3.8"
poetry-core = "1.4.0" poetry-core = "1.7.0"
poetry-plugin-export = "^1.2.0" poetry-plugin-export = "^1.5.0"
"backports.cached-property" = { version = "^1.0.2", python = "<3.8" } build = "^0.10.0"
cachecontrol = { version = "^0.12.9", extras = ["filecache"] } cachecontrol = { version = "^0.13.0", extras = ["filecache"] }
cleo = "^2.0.0" cleo = "^2.0.0"
crashtest = "^0.4.1" crashtest = "^0.4.1"
dulwich = "^0.20.46" dulwich = "^0.21.2"
filelock = "^3.8.0" importlib-metadata = { version = ">=4.4", python = "<3.10" }
html5lib = "^1.0" installer = "^0.7.0"
importlib-metadata = { version = "^4.4", python = "<3.10" } # jsonschema 4.18 uses Rust-based libraries which causes issues when building from source
jsonschema = "^4.10.0" jsonschema = ">=4.10.0,<4.18.0"
keyring = "^23.9.0" keyring = "^24.0.0"
# packaging uses calver, so version is unclamped # packaging uses calver, so version is unclamped
packaging = ">=20.4" packaging = ">=20.4"
pexpect = "^4.7.0" pexpect = "^4.7.0"
pkginfo = "^1.5" pkginfo = "^1.9.4"
platformdirs = "^2.5.2" platformdirs = "^3.0.0"
requests = "^2.18" pyproject-hooks = "^1.0.0"
requests-toolbelt = ">=0.9.1,<0.11.0" requests = "^2.26"
requests-toolbelt = ">=0.9.1,<2"
shellingham = "^1.5" shellingham = "^1.5"
tomli = { version = "^2.0.1", python = "<3.11" } tomli = { version = "^2.0.1", python = "<3.11" }
# exclude 0.11.2 and 0.11.3 due to https://github.com/sdispater/tomlkit/issues/225 tomlkit = ">=0.11.4,<1.0.0"
tomlkit = ">=0.11.1,<1.0.0,!=0.11.2,!=0.11.3"
# trove-classifiers uses calver, so version is unclamped # trove-classifiers uses calver, so version is unclamped
trove-classifiers = ">=2022.5.19" trove-classifiers = ">=2022.5.19"
# exclude 20.4.5 - 20.4.6 due to https://github.com/pypa/pip/issues/9953 virtualenv = "^20.22.0"
virtualenv = [
{ version = "^20.4.3,!=20.4.5,!=20.4.6", markers = "sys_platform != 'win32' or python_version != '3.9'" },
# see https://github.com/python-poetry/poetry/pull/6950 for details
{ version = "^20.4.3,!=20.4.5,!=20.4.6,<20.16.6", markers = "sys_platform == 'win32' and python_version == '3.9'" },
]
xattr = { version = "^0.10.0", markers = "sys_platform == 'darwin'" } xattr = { version = "^0.10.0", markers = "sys_platform == 'darwin'" }
urllib3 = "^1.26.0"
[tool.poetry.group.dev.dependencies] [tool.poetry.group.dev.dependencies]
pre-commit = "^2.6" pre-commit = ">=2.6"
[tool.poetry.group.test.dependencies] [tool.poetry.group.test.dependencies]
# Cachy frozen to test backwards compatibility for `poetry.utils.cache`. deepdiff = "^6.3"
cachy = "0.3.0"
deepdiff = "^5.0"
flatdict = "^4.0.1"
httpretty = "^1.0" httpretty = "^1.0"
pytest = "^7.1" pytest = "^7.1"
pytest-cov = "^4.0" pytest-cov = "^4.0"
pytest-mock = "^3.9" pytest-mock = "^3.9"
pytest-randomly = "^3.12" pytest-randomly = "^3.12"
pytest-xdist = { version = "^2.5", extras = ["psutil"] } pytest-xdist = { version = "^3.1", extras = ["psutil"] }
zipp = { version = "^3.4", python = "<3.8" }
[tool.poetry.group.typing.dependencies] [tool.poetry.group.typing.dependencies]
mypy = ">=0.990" mypy = ">=1.0"
types-html5lib = ">=1.1.9"
types-jsonschema = ">=4.9.0" types-jsonschema = ">=4.9.0"
types-requests = ">=2.28.8" types-requests = ">=2.28.8"
typing-extensions = { version = "^4.0.0", python = "<3.8" }
# only used in github actions # only used in github actions
[tool.poetry.group.github-actions] [tool.poetry.group.github-actions]
@ -110,30 +83,63 @@ optional = true
[tool.poetry.group.github-actions.dependencies] [tool.poetry.group.github-actions.dependencies]
pytest-github-actions-annotate-failures = "^0.1.7" pytest-github-actions-annotate-failures = "^0.1.7"
[tool.poetry.scripts] [tool.poetry.scripts]
poetry = "poetry.console.application:main" poetry = "poetry.console.application:main"
[build-system] [build-system]
requires = ["poetry-core>=1.1.0"] requires = ["poetry-core>=1.5.0"]
build-backend = "poetry.core.masonry.api" build-backend = "poetry.core.masonry.api"
[tool.isort] [tool.ruff]
py_version = 37 fix = true
profile = "black" unfixable = [
force_single_line = true "ERA", # do not autoremove commented out code
combine_as_imports = true ]
lines_between_types = 1 target-version = "py38"
lines_after_imports = 2 line-length = 88
src_paths = ["src", "tests"] extend-select = [
extend_skip = ["setup.py"] "B", # flake8-bugbear
known_third_party = ["poetry.core"] "C4", # flake8-comprehensions
"ERA", # flake8-eradicate/eradicate
"I", # isort
"N", # pep8-naming
"PIE", # flake8-pie
"PGH", # pygrep
"RUF", # ruff checks
"SIM", # flake8-simplify
"TCH", # flake8-type-checking
"TID", # flake8-tidy-imports
"UP", # pyupgrade
]
ignore = [
"B904", # use 'raise ... from err'
"B905", # use explicit 'strict=' parameter with 'zip()'
"N818", # Exception name should be named with an Error suffix
]
extend-exclude = [
"docs/*",
# External to the project's coding standards
"tests/**/fixtures/*",
]
[tool.ruff.flake8-tidy-imports]
ban-relative-imports = "all"
[tool.ruff.isort]
force-single-line = true
lines-between-types = 1
lines-after-imports = 2
known-first-party = ["poetry"]
known-third-party = ["poetry.core"]
required-imports = ["from __future__ import annotations"]
[tool.ruff.per-file-ignores]
"src/poetry/console/*" = ["RUF012"] # Can't annotate properly until new version of Cleo
[tool.black] [tool.black]
target-version = ['py37'] target-version = ['py38']
preview = true preview = true
force-exclude = ''' force-exclude = '''
.*/setup\.py$ .*/setup\.py$
@ -141,7 +147,7 @@ force-exclude = '''
[tool.mypy] [tool.mypy]
files = "src" files = "src, tests"
mypy_path = "src" mypy_path = "src"
namespace_packages = true namespace_packages = true
explicit_package_bases = true explicit_package_bases = true
@ -152,43 +158,43 @@ enable_error_code = [
"redundant-expr", "redundant-expr",
"truthy-bool", "truthy-bool",
] ]
exclude = [
"tests/fixtures",
"tests/masonry/builders/fixtures",
"tests/utils/fixtures",
]
# use of importlib-metadata backport at python3.7 makes it impossible to # use of importlib-metadata backport makes it impossible to satisfy mypy
# satisfy mypy without some ignores: but we get a different set of ignores at # without some ignores: but we get different sets of ignores at different
# different python versions. # python versions.
#
# <https://github.com/python/mypy/issues/8823>, meanwhile suppress that
# warning.
[[tool.mypy.overrides]] [[tool.mypy.overrides]]
module = [ module = [
'poetry.console.commands.self.show.plugins', 'poetry.plugins.plugin_manager',
'poetry.installation.executor', 'poetry.repositories.installed_repository',
'poetry.mixology.version_solver', 'poetry.utils.env.site_packages',
'poetry.plugins.plugin_manager', 'tests.console.commands.self.test_show_plugins',
'poetry.repositories.installed_repository', 'tests.helpers',
'poetry.utils.env', 'tests.repositories.test_installed_repository',
] ]
warn_unused_ignores = false warn_unused_ignores = false
[[tool.mypy.overrides]] [[tool.mypy.overrides]]
module = [ module = [
'cachecontrol.*', 'deepdiff.*',
'lockfile.*', 'httpretty.*',
'pexpect.*', 'keyring.*',
'pkginfo.*', 'pexpect.*',
'requests_toolbelt.*', 'requests_toolbelt.*',
'shellingham.*', 'shellingham.*',
'virtualenv.*', 'virtualenv.*',
'xattr.*', 'xattr.*',
] ]
ignore_missing_imports = true ignore_missing_imports = true
[tool.pytest.ini_options] [tool.pytest.ini_options]
addopts = "-n auto" addopts = "-n auto"
testpaths = [ testpaths = ["tests"]
"tests"
]
[tool.coverage.report] [tool.coverage.report]

4
pkgs/poetry/src.json
View file

@ -1,8 +1,8 @@
{ {
"owner": "python-poetry", "owner": "python-poetry",
"repo": "poetry", "repo": "poetry",
"rev": "1.3.0", "rev": "1.6.1",
"sha256": "16ng59ykm7zkjizmwb482y0hawpjjr5mvl0ahjd790xzxcc2bbbv", "sha256": "0vp70xgmd50ad4k8wx0fkslgvlhkyx6cglqzcdwmpiv2hm7xiszw",
"fetchSubmodules": true "fetchSubmodules": true
} }

3
pkgs/poetry/update.nix
View file

@ -1,6 +1,5 @@
let let
sources = import ../../nix/sources.nix; pkgs = import <nixpkgs> {
pkgs = import sources.nixpkgs {
overlays = [ overlays = [
(import ../../overlay.nix) (import ../../overlay.nix)
]; ];