diff --git a/python-poetry.changes b/python-poetry.changes index e30fbe6..04c3325 100644 --- a/python-poetry.changes +++ b/python-poetry.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 28 07:22:24 UTC 2023 - Dirk Müller + +- add unlimit-jsonschema.patch to avoid installation issue + ------------------------------------------------------------------- Sat Sep 23 10:03:42 UTC 2023 - Ben Greiner @@ -223,7 +228,7 @@ Wed Dec 14 13:02:26 UTC 2022 - Daniel Garcia ------------------------------------------------------------------- Tue Dec 13 21:07:43 UTC 2022 - Ben Greiner -- Update to 1.3.1 +- Update to 1.3.1 * Fix an issue where an explicit dependency on lockfile was missing, resulting in a broken Poetry in rare circumstances (7169). @@ -232,7 +237,7 @@ Tue Dec 13 21:07:43 UTC 2022 - Ben Greiner ------------------------------------------------------------------- Tue Dec 13 16:01:04 UTC 2022 - Yogalakshmi Arunachalam -- Update to 1.3.0 +- Update to 1.3.0 Added * Mark the lock file with an @generated comment as used by common tooling (#2773). * poetry check validates trove classifiers and warns for deprecations (#2881). @@ -273,7 +278,7 @@ Tue Dec 13 16:01:04 UTC 2022 - Yogalakshmi Arunachalam * Fix an issue where the solver could silently swallow ValueError (#6790). Docs * Improve documentation of package sources (#5605). - * Correct the default cache path on Windows (#7012). + * Correct the default cache path on Windows (#7012). ------------------------------------------------------------------- Mon Oct 10 20:02:18 UTC 2022 - Ben Greiner @@ -470,34 +475,34 @@ Wed Apr 14 21:36:47 UTC 2021 - Ben Greiner Tue Oct 27 09:32:31 UTC 2020 - Benjamin Greiner - Update to version 1.1.4 - * Added installer.parallel boolean flag (defaults to - true) configuration to enable/disable parallel - execution of operations when using the new installer. + * Added installer.parallel boolean flag (defaults to + true) configuration to enable/disable parallel + execution of operations when using the new installer. (#3088) - * When using system environments as an unprivileged user, - user site and bin directories are created if they do + * When using system environments as an unprivileged user, + user site and bin directories are created if they do not already exist. (#3107) - * Fixed editable installation of poetry projects when - using system environments. (#3107) - * Fixed locking of nested extra activations. If you were - affected by this issue, you will need to regenerate the + * Fixed editable installation of poetry projects when + using system environments. (#3107) + * Fixed locking of nested extra activations. If you were + affected by this issue, you will need to regenerate the lock file using poetry lock --no-update. (#3229) - * Fixed prioritisation of non-default custom package + * Fixed prioritisation of non-default custom package sources. (#3251) - * Fixed detection of installed editable packages when + * Fixed detection of installed editable packages when non-poetry managed .pth file exists. (#3210) - * Fixed scripts generated by editable builder to use + * Fixed scripts generated by editable builder to use valid import statements. (#3214) - * Fixed recursion error when locked dependencies contain + * Fixed recursion error when locked dependencies contain cyclic dependencies. (#3237) - * Fixed propagation of editable flag for VCS + * Fixed propagation of editable flag for VCS dependencies. (#3264) - Refresh poetry-1645-1.1.patch ------------------------------------------------------------------- Wed Oct 21 09:47:53 UTC 2020 - Benjamin Greiner -- Run tests in virtualenv gh#python-poetry/poetry#1645 +- Run tests in virtualenv gh#python-poetry/poetry#1645 - Add poetry-1645-1.1.patch gh#python-poetry/poetry#3255 ------------------------------------------------------------------- @@ -508,7 +513,7 @@ Thu Oct 15 12:15:27 UTC 2020 - Benjamin Greiner stderr. (#3131) * Fixed KeyError when PATH is not defined in environment variables. (#3159) - * Fixed error when using config command in a directory with an + * Fixed error when using config command in a directory with an existing pyproject.toml without any Poetry configuration. (#3172) * Fixed incorrect inspection of package requirements when same @@ -517,18 +522,18 @@ Thu Oct 15 12:15:27 UTC 2020 - Benjamin Greiner * Fixed show command to use already resolved package metadata. (#3117) * Fixed multiple issues with export command output when using - requirements.txt format. (#3119) + requirements.txt format. (#3119) ------------------------------------------------------------------- Thu Oct 8 13:29:35 UTC 2020 - Benjamin Greiner - Update to version 1.1.2 - * Dependency installation of editable packages and all - uninstall operations are now performed serially within + * Dependency installation of editable packages and all + uninstall operations are now performed serially within their corresponding priority groups. (#3099) - * Improved package metadata inspection of nested poetry + * Improved package metadata inspection of nested poetry projects within project path dependencies. (#3105) - * Fixed export of requirements.txt when project + * Fixed export of requirements.txt when project dependency contains git dependencies. (#3100) - Add missing virtualenv and poetry-core runtime requirements - Install using pip with poetry-core backend @@ -542,26 +547,26 @@ Mon Oct 5 12:17:17 UTC 2020 - Benjamin Greiner - Update to version 1.1.1 * Added --no-update option to lock command. (#3034) - * Fixed resolution of packages with missing required extras. + * Fixed resolution of packages with missing required extras. (#3035) - * Fixed export of requirements.txt dependencies to include + * Fixed export of requirements.txt dependencies to include development dependencies. (#3024) - * Fixed incorrect selection of unsupported binary distribution + * Fixed incorrect selection of unsupported binary distribution formats when selecting a package artifact to install. (#3058) - * Fixed incorrect use of system executable when building package + * Fixed incorrect use of system executable when building package distributions via build command. (#3056) - * Fixed errors in init command when specifying --dependency in - non-interactive mode when a pyproject.toml file already exists. + * Fixed errors in init command when specifying --dependency in + non-interactive mode when a pyproject.toml file already exists. (#3076) - * Fixed incorrect selection of configured source url when a - publish repository url configuration with the same name already + * Fixed incorrect selection of configured source url when a + publish repository url configuration with the same name already exists. (#3047) - * Fixed dependency resolution issues when the same package is + * Fixed dependency resolution issues when the same package is specified in multiple dependency extras. (#3046) - More changes for rc, beta and alpha releases see CHANGELOG.md - Update URL and GitHub repo address - Update requirements according to pyproject.toml -- Update test suite setup and test deselection +- Update test suite setup and test deselection * gh#python-poetry/poetry#1645 ------------------------------------------------------------------- @@ -569,7 +574,7 @@ Wed Aug 5 12:12:11 UTC 2020 - Benjamin Greiner - Update to version 1.0.10 * The lock files are now versioned to ease transitions for lock - file format changes, with warnings being displayed on + file format changes, with warnings being displayed on incompatibility detection (#2695). * The init and new commands will now provide hints on invalid given licenses (#1634). @@ -579,7 +584,7 @@ Wed Aug 5 12:12:11 UTC 2020 - Benjamin Greiner * Fixed the shell command for tcsh shells (#2583). * Fixed errors when installing directory or file dependencies in some cases (#2582). - + ------------------------------------------------------------------- Wed Jul 29 10:32:43 UTC 2020 - Benjamin Greiner diff --git a/python-poetry.spec b/python-poetry.spec index aabea7b..4272303 100644 --- a/python-poetry.spec +++ b/python-poetry.spec @@ -36,6 +36,7 @@ URL: https://python-poetry.org/ # PyPI sdist doesnt contain tests Source: https://github.com/python-poetry/poetry/archive/%{version}.tar.gz#/poetry-%{version}.tar.gz Patch0: build-1.patch +Patch1: unlimit-jsonschema.patch BuildRequires: %{python_module base >= 3.8} BuildRequires: %{python_module pip} BuildRequires: %{python_module poetry-core = 1.7.0} @@ -55,6 +56,7 @@ Requires: python-poetry-plugin-export >= 1.5.0 Requires: python-importlib-metadata >= 4.4 %endif Requires: python-installer >= 0.7.0 +Requires: python-jsonschema >= 4.10.0 Requires: python-keyring >= 24.0 Requires: python-packaging >= 20.4 Requires: python-pexpect >= 4.7.0 @@ -63,7 +65,6 @@ Requires: python-platformdirs >= 3.0.0 Requires: python-pyproject-hooks >= 1.0.0 Requires: python-requests >= 2.26 Requires: python-shellingham >= 1.5 -Requires: (python-jsonschema >= 4.10.0 with python-jsonschema < 4.18) Requires: (python-requests-toolbelt >= 0.9.1 with python-requests-toolbelt < 2) %if 0%{?python_version_nodots} < 311 Requires: python-tomli >= 2.0.1 diff --git a/unlimit-jsonschema.patch b/unlimit-jsonschema.patch new file mode 100644 index 0000000..7392082 --- /dev/null +++ b/unlimit-jsonschema.patch @@ -0,0 +1,14 @@ +Index: poetry-1.6.1/pyproject.toml +=================================================================== +--- poetry-1.6.1.orig/pyproject.toml ++++ poetry-1.6.1/pyproject.toml +@@ -41,8 +41,7 @@ crashtest = "^0.4.1" + dulwich = "^0.21.2" + importlib-metadata = { version = ">=4.4", python = "<3.10" } + installer = "^0.7.0" +-# jsonschema 4.18 uses Rust-based libraries which causes issues when building from source +-jsonschema = ">=4.10.0,<4.18.0" ++jsonschema = ">=4.10.0" + keyring = "^24.0.0" + # packaging uses calver, so version is unclamped + packaging = ">=20.4"