remove __init__.py from top level stdlib (#118)

automerged PR by conda-forge/automerge-action
conda-forge · Mar 8, 2024 · 700b59c · 700b59c
2 parents d57c623 + 9d2d23a
commit 700b59c
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 11 deletions.
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -39,13 +39,14 @@ source:
       - patches/0004-PyPy-is-not-affected-by-bpo-35797.patch
       - patches/0005-underlying-_putwch-on-windows-accepts-a-chr-not-an-i.patch
       - patches/0006-refactor-to-properly-create-ppc64-import-suffixes.patch  # [name_suffix == "3.9"]
+      - patches/0033-remove-top-level-__init__.py-issue-4885.patch
 
   - url: https://downloads.python.org/pypy/pypy2.7-v7.3.6-win64.zip           # [win]
     sha256: fcc8f6b3b472a77eaa754951f288fe234b4953bfba845888dd839b9b862cb891  # [win]
     folder: pypy2-binary                                                      # [win]
 
 build:
-  number: 0
+  number: 1
   skip_compile_pyc:
     - lib*
 

diff --git a/recipe/patches/0033-remove-top-level-__init__.py-issue-4885.patch b/recipe/patches/0033-remove-top-level-__init__.py-issue-4885.patch
@@ -0,0 +1,24 @@
+From ac21be539816ae0bd43cd7fc41ea29f6ec1be826 Mon Sep 17 00:00:00 2001
+Date: Sun, 4 Feb 2024 23:11:15 +0200
+Subject: [PATCH] remove top level __init__.py (issue 4885)
+
+---
+ pypy/tool/release/package.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
+index 95159d03c0f..5c626528d42 100755
+--- a/pypy/tool/release/package.py
++++ b/pypy/tool/release/package.py
+@@ -358,6 +358,8 @@ def create_package(basedir, options, _fake=False):
+                                            '*.lib', '*.exp', '*.manifest', '__pycache__'))
+     for file in ['README.rst',]:
+         shutil.copy(str(basedir.join(file)), str(pypydir))
++    for file in ['__init__.py',]:
++        os.unlink(str(target / file))
+     # Use original LICENCE file
+     base_file = str(basedir.join('LICENSE'))
+     with open(base_file) as fid:
+-- 
+2.34.1
+