From 980fa25b4a3dcb439403eec991737238e2063203 Mon Sep 17 00:00:00 2001
From: Mohamed El Morabity <melmorabity@fedoraproject.org>
Date: Jul 22 2020 13:48:05 +0000
Subject: Update requirements patch to drop version condition on PyMySQL (RHBZ #1858698)


---

diff --git a/.gitignore b/.gitignore
index ac97efa..f1ef57a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /python-opentelemetry-0.8.0.tar.gz
+/opentelemetry-0.8.0.tar.gz
diff --git a/python-opentelemetry-0.8.0-requirements.patch b/python-opentelemetry-0.8.0-requirements.patch
index c0cf6e4..b888fd4 100644
--- a/python-opentelemetry-0.8.0-requirements.patch
+++ b/python-opentelemetry-0.8.0-requirements.patch
@@ -1,6 +1,6 @@
 diff -up ./ext/opentelemetry-ext-grpc/setup.cfg.orig ./ext/opentelemetry-ext-grpc/setup.cfg
 --- ./ext/opentelemetry-ext-grpc/setup.cfg.orig	2020-05-28 00:01:25.000000000 +0200
-+++ ./ext/opentelemetry-ext-grpc/setup.cfg	2020-06-16 00:43:49.473406328 +0200
++++ ./ext/opentelemetry-ext-grpc/setup.cfg	2020-07-22 15:36:54.423409039 +0200
 @@ -41,7 +41,7 @@ package_dir=
  packages=find_namespace:
  install_requires =
@@ -12,7 +12,7 @@ diff -up ./ext/opentelemetry-ext-grpc/setup.cfg.orig ./ext/opentelemetry-ext-grp
  test =
 diff -up ./ext/opentelemetry-ext-psycopg2/setup.cfg.orig ./ext/opentelemetry-ext-psycopg2/setup.cfg
 --- ./ext/opentelemetry-ext-psycopg2/setup.cfg.orig	2020-05-28 00:01:25.000000000 +0200
-+++ ./ext/opentelemetry-ext-psycopg2/setup.cfg	2020-06-16 00:36:18.692531417 +0200
++++ ./ext/opentelemetry-ext-psycopg2/setup.cfg	2020-07-22 15:36:54.424409014 +0200
 @@ -43,7 +43,7 @@ install_requires =
      opentelemetry-api == 0.8b0
      opentelemetry-ext-dbapi == 0.8b0
@@ -22,9 +22,21 @@ diff -up ./ext/opentelemetry-ext-psycopg2/setup.cfg.orig ./ext/opentelemetry-ext
      wrapt >= 1.0.0, < 2.0.0
  
  [options.extras_require]
+diff -up ./ext/opentelemetry-ext-pymysql/setup.cfg.orig ./ext/opentelemetry-ext-pymysql/setup.cfg
+--- ./ext/opentelemetry-ext-pymysql/setup.cfg.orig	2020-05-28 00:01:25.000000000 +0200
++++ ./ext/opentelemetry-ext-pymysql/setup.cfg	2020-07-22 15:46:53.190393966 +0200
+@@ -43,7 +43,7 @@ install_requires =
+     opentelemetry-api == 0.8b0
+     opentelemetry-ext-dbapi == 0.8b0
+     opentelemetry-auto-instrumentation == 0.8b0
+-    PyMySQL ~=  0.9.3
++    PyMySQL
+ 
+ [options.extras_require]
+ test =
 diff -up ./ext/opentelemetry-ext-redis/setup.cfg.orig ./ext/opentelemetry-ext-redis/setup.cfg
 --- ./ext/opentelemetry-ext-redis/setup.cfg.orig	2020-05-28 00:01:25.000000000 +0200
-+++ ./ext/opentelemetry-ext-redis/setup.cfg	2020-06-16 00:44:40.056163347 +0200
++++ ./ext/opentelemetry-ext-redis/setup.cfg	2020-07-22 15:36:54.424409014 +0200
 @@ -43,7 +43,7 @@ install_requires =
      opentelemetry-api == 0.8b0
      opentelemetry-auto-instrumentation == 0.8b0
diff --git a/python-opentelemetry.spec b/python-opentelemetry.spec
index 067640e..62997b6 100644
--- a/python-opentelemetry.spec
+++ b/python-opentelemetry.spec
@@ -3,12 +3,12 @@
 
 Name:           python-%{srcname}
 Version:        0.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The OpenTelemetry Python client
 
 License:        ASL 2.0
 URL:            https://github.com/open-telemetry/%{srcname}-python/
-Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0:        %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz
 # Fix Python requirement versions
 Patch0:         %{name}-0.8.0-requirements.patch
 
@@ -267,7 +267,9 @@ This package provides documentation for %{name}.
 %autosetup -p0 -n %{srcname}-python-%{version}
 
 # Remove bundled egg-info
-rm -rf *.egg-info
+for i in $(find . -name "setup.py"); do
+    rm -rf ${i%/*}/src/*.egg-info
+done
 
 # Delete extensions which can't be installed because of missing dependencies in
 # Fedora
@@ -327,8 +329,6 @@ popd
 export PYTHONPATH=$RPM_BUILD_ROOT/%{python3_sitelib}/:tests/util/src/
 for i in $(find . -name "setup.py" -not -path "./tests/*" -not -path "./docs/*"); do
     d=${i%/*}
-    pytest_args=()
-    [[ "$d" == "./opentelemetry-sdk" ]] && pytest_args=("-k" "not test_shutdown")
     pytest-%{python3_version} ${i%/*} \
         --deselect=opentelemetry-sdk/tests/trace/test_trace.py::TestTracer::test_shutdown
 done
@@ -540,6 +540,9 @@ done
 
 
 %changelog
+* Wed Jul 22 2020 Mohamed El Morabity <melmorabity@fedoraproject.org> - 0.8.0-2
+- Update requirements patch to drop version condition on PyMySQL (RHBZ #1858698)
+
 * Thu Jun 18 2020 Mohamed El Morabity <melmorabity@fedoraproject.org> - 0.8.0-1
 - Update to 0.8.0
 
diff --git a/sources b/sources
index 8878426..de4641d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-opentelemetry-0.8.0.tar.gz) = 088b6a597c7dc4340790b74753d6d7a6bb53dd6b0deffbfc58a6ec3ec8b87feb2350599cdacb104faa6f7250e6dbb660934fe3e3448224bc8b16b308f9ad3bcb
+SHA512 (opentelemetry-0.8.0.tar.gz) = 088b6a597c7dc4340790b74753d6d7a6bb53dd6b0deffbfc58a6ec3ec8b87feb2350599cdacb104faa6f7250e6dbb660934fe3e3448224bc8b16b308f9ad3bcb