From 17e38283d8c818122edb5e7cc609b5398703c865 Mon Sep 17 00:00:00 2001
From: Matt Davis <6775756+nitzmahone@users.noreply.github.com>
Date: Tue, 6 Aug 2024 13:06:05 -0700
Subject: [PATCH 1/2] fix `setup.py test` and issue deprecation warning (#820)

* direct invocation of `setup.py` commands has been long deprecated by setuptools

(cherry picked from commit f74f3350b530450ecd033ba5aceb334c4af867bd)
---
 setup.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 09fecb8e..96913ef6 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 
 NAME = 'PyYAML'
-VERSION = '6.0.2rc1'
+VERSION = '6.0.1'
 DESCRIPTION = "YAML parser and emitter for Python"
 LONG_DESCRIPTION = """\
 YAML is a data serialization format designed for human readability
@@ -28,8 +28,6 @@
     "Programming Language :: Cython",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -300,6 +298,11 @@ def run(self):
         tempdir = tempfile.TemporaryDirectory(prefix='test_pyyaml')
 
         try:
+            warnings.warn(
+                "Direct invocation of `setup.py` is deprecated by `setuptools` and will be removed in a future release. PyYAML tests should be run via `pytest`.",
+                DeprecationWarning,
+            )
+
             # have to create a subdir since we don't get dir_exists_ok on copytree until 3.8
             temp_test_path = pathlib.Path(tempdir.name) / 'pyyaml'
             shutil.copytree(build_cmd.build_lib, temp_test_path)
@@ -351,5 +354,5 @@ def run(self):
 
         distclass=Distribution,
         cmdclass=cmdclass,
-        python_requires='>=3.6',
+        python_requires='>=3.8',
     )

From a206f1269be48e2a2f99f761e0e6995542c11d96 Mon Sep 17 00:00:00 2001
From: Matt Davis <nitzmahone@redhat.com>
Date: Tue, 6 Aug 2024 11:34:13 -0700
Subject: [PATCH 2/2] release 6.0.2

---
 CHANGES              | 3 +--
 lib/yaml/__init__.py | 2 +-
 setup.py             | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 94226924..bedc8376 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,8 @@
 For a complete changelog, see:
 
 * https://github.com/yaml/pyyaml/commits/
-* https://bitbucket.org/xi/pyyaml/commits/
 
-6.0.2rc1 (2024-06-10)
+6.0.2 (2024-08-06)
 
 * https://github.com/yaml/pyyaml/pull/808 -- Support for Cython 3.x and Python 3.13
 
diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py
index 93291f36..2ec4f203 100644
--- a/lib/yaml/__init__.py
+++ b/lib/yaml/__init__.py
@@ -8,7 +8,7 @@
 from .loader import *
 from .dumper import *
 
-__version__ = '6.0.2rc1'
+__version__ = '6.0.2'
 try:
     from .cyaml import *
     __with_libyaml__ = True
diff --git a/setup.py b/setup.py
index 96913ef6..ab9197d0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 
 NAME = 'PyYAML'
-VERSION = '6.0.1'
+VERSION = '6.0.2'
 DESCRIPTION = "YAML parser and emitter for Python"
 LONG_DESCRIPTION = """\
 YAML is a data serialization format designed for human readability