From c08c0a4343499f2d130b531ed30122f4d9d3d31d Mon Sep 17 00:00:00 2001
From: Tomáš Hrnčiar <thrnciar@redhat.com>
Date: Nov 15 2021 13:38:27 +0000
Subject: Update to 1.1.11


---

diff --git a/.gitignore b/.gitignore
index 5f57c28..050f2ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /poetry-1.1.7.tar.gz
 /poetry-1.1.8.tar.gz
 /poetry-1.1.10.tar.gz
+/poetry-1.1.11.tar.gz
diff --git a/0002-env-ignore-warnings-when-executing-python-scripts.patch b/0002-env-ignore-warnings-when-executing-python-scripts.patch
deleted file mode 100644
index 2d6ba71..0000000
--- a/0002-env-ignore-warnings-when-executing-python-scripts.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From d434304815cab06590d787d1cbb6eaff347fdd35 Mon Sep 17 00:00:00 2001
-From: Arun Babu Neelicattu <arun.neelicattu@gmail.com>
-Date: Fri, 1 Oct 2021 14:56:59 +0200
-Subject: [PATCH]  env: ignore warnings when executing python scripts
-
-When executing python scripts with an intent to deserialise via
-`json.loads` we need to ensure we ignore warnings. This is required
-because, warnings can cause a `JSONDecodeError`.
----
- poetry/utils/env.py | 20 +++++++++-----------
- 1 file changed, 9 insertions(+), 11 deletions(-)
-
-diff --git a/poetry/utils/env.py b/poetry/utils/env.py
-index ac24937..bdece3b 100644
---- a/poetry/utils/env.py
-+++ b/poetry/utils/env.py
-@@ -1147,6 +1147,9 @@ class Env(object):
-         cmd = pip + list(args)
-         return self._run(cmd, **kwargs)
- 
-+    def run_python_script(self, content: str, **kwargs: Any) -> str:
-+        return self.run("python", "-W", "ignore", "-", input_=content, **kwargs)
-+
-     def _run(self, cmd, **kwargs):
-         """
-         Run a command inside the Python environment.
-@@ -1357,19 +1360,15 @@ class VirtualEnv(Env):
-         # In this case we need to get sys.base_prefix
-         # from inside the virtualenv.
-         if base is None:
--            self._base = Path(
--                self.run(self._executable, "-", input_=GET_BASE_PREFIX).strip()
--            )
-+            self._base = Path(self.run_python_script(GET_BASE_PREFIX).strip())
- 
-     @property
-     def sys_path(self):  # type: () -> List[str]
--        output = self.run(self._executable, "-", input_=GET_SYS_PATH)
--
-+        output = self.run_python_script(GET_SYS_PATH)
-         return json.loads(output)
- 
-     def get_version_info(self):  # type: () -> Tuple[int]
--        output = self.run(self._executable, "-", input_=GET_PYTHON_VERSION)
--
-+        output = self.run_python_script(GET_PYTHON_VERSION)
-         return tuple([int(s) for s in output.strip().split(".")])
- 
-     def get_python_implementation(self):  # type: () -> str
-@@ -1406,12 +1405,12 @@ class VirtualEnv(Env):
-             """
-         )
- 
--        output = self.run(self._executable, "-", input_=script)
-+        output = self.run_python_script(script)
- 
-         return [Tag(*t) for t in json.loads(output)]
- 
-     def get_marker_env(self):  # type: () -> Dict[str, Any]
--        output = self.run(self._executable, "-", input_=GET_ENVIRONMENT_INFO)
-+        output = self.run_python_script(GET_ENVIRONMENT_INFO)
- 
-         return json.loads(output)
- 
-@@ -1542,8 +1541,7 @@ class GenericEnv(VirtualEnv):
-                 self._pip_executable = pip_executable
- 
-     def get_paths(self):  # type: () -> Dict[str, str]
--        output = self.run(self._executable, "-", input_=GET_PATHS_FOR_GENERIC_ENVS)
--
-+        output = self.run_python_script(GET_PATHS)
-         return json.loads(output)
- 
-     def execute(self, bin, *args, **kwargs):  # type: (str, str, Any) -> Optional[int]
--- 
-2.31.1
-
diff --git a/poetry.spec b/poetry.spec
index 585099f..eaac258 100644
--- a/poetry.spec
+++ b/poetry.spec
@@ -4,7 +4,7 @@ projects, ensuring you have the right stack everywhere.}
 
 Name:           poetry
 Summary:        Python dependency management and packaging made easy
-Version:        1.1.10
+Version:        1.1.11
 Release:        1%{?dist}
 
 License:        MIT
@@ -15,10 +15,6 @@ Source0:        https://github.com/python-poetry/poetry/archive/%{version}/poetr
 # Fix a typo in autospec, causing error on Python 3.10+
 Patch1:         https://github.com/python-poetry/poetry/pull/3544.patch
 
-# Backport upstream patch to fix error on Python 3.10+
-# https://github.com/python-poetry/poetry/pull/3895
-Patch2:         0002-env-ignore-warnings-when-executing-python-scripts.patch
-
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -113,6 +109,9 @@ done
 
 
 %changelog
+* Mon Nov 15 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.1.11-1
+- Update to 1.1.11
+
 * Fri Oct 01 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.1.10
 - Update to 1.1.10
 
diff --git a/sources b/sources
index 061fdde..a0ee8be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (poetry-1.1.10.tar.gz) = f1469cafa72091294fb58ac2dfd9d33d5753200458fb6c04028fa215defc264ab7ed14ba4dc9fcd73340586c60e6c70009809d3a73d88a823893c909cccf3cf0
+SHA512 (poetry-1.1.11.tar.gz) = 7ca4a39a9dcd0087d9e2c4c77a96ebcca1c74ac742a63c04606ac0fad87654f1a590f2d127acc1cac5d181ffb9badaba9780919f94d9b4482221a99a32a5f834