Revert "Patch jaydebeapi (#4402)" (#4424)

This reverts commit 3a353a8.
DataDog · Nov 12, 2019 · 000486f · 000486f
1 parent b9c2fbd
commit 000486f
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 60 deletions.
diff --git a/omnibus/config/patches/datadog-agent-integrations-py2/jpype_0_7.patch b/omnibus/config/patches/datadog-agent-integrations-py2/jpype_0_7.patch
diff --git a/omnibus/config/patches/datadog-agent-integrations-py3/jpype_0_7.patch b/omnibus/config/patches/datadog-agent-integrations-py3/jpype_0_7.patch
diff --git a/omnibus/config/software/datadog-agent-integrations-py2.rb b/omnibus/config/software/datadog-agent-integrations-py2.rb
@@ -257,10 +257,8 @@
     # Patch applies to only one file: set it explicitly as a target, no need for -p
     if windows?
       patch :source => "create-regex-at-runtime.patch", :target => "#{python_2_embedded}/Lib/site-packages/yaml/reader.py"
-      patch :source => "jpype_0_7.patch", :target => "#{python_2_embedded}/Lib/site-packages/jaydebeapi/__init__.py"
     else
       patch :source => "create-regex-at-runtime.patch", :target => "#{install_dir}/embedded/lib/python2.7/site-packages/yaml/reader.py"
-      patch :source => "jpype_0_7.patch", :target => "#{install_dir}/embedded/lib/python2.7/site-packages/jaydebeapi/__init__.py"
     end
 
   end

diff --git a/omnibus/config/software/datadog-agent-integrations-py3.rb b/omnibus/config/software/datadog-agent-integrations-py3.rb
@@ -264,14 +264,6 @@
         command "#{pip} install --no-deps .", :env => nix_build_env, :cwd => "#{project_dir}/#{check}"
       end
     end
-
-    # Patch applies to only one file: set it explicitly as a target, no need for -p
-    if windows?
-      patch :source => "jpype_0_7.patch", :target => "#{python_3_embedded}/Lib/site-packages/jaydebeapi/__init__.py"
-    else
-      patch :source => "jpype_0_7.patch", :target => "#{install_dir}/embedded/lib/python3.7/site-packages/jaydebeapi/__init__.py"
-    end
-
   end
 
   # Run pip check to make sure the agent's python environment is clean, all the dependencies are compatible

diff --git a/releasenotes/notes/patch-jaydebeapi-for-new-jpype-23b8199845e669d7.yaml b/releasenotes/notes/patch-jaydebeapi-for-new-jpype-23b8199845e669d7.yaml