Fix example_pkg to use bleaching during build

pquentin · pquentin · commit 3a485ca9fafd · 2018-11-07T10:47:09.000+04:00
See https://python-packaging.readthedocs.io/en/latest/non-code-files.html to understand the include_package_data part. It is needed because in CI, we install the package and run tests on the installed package.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 # Add any project-specific files here:
+asyncbleach/_tests/example_pkg/build/
 
 bench/results/
 bench/env/
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,4 +2,5 @@ include README.rst CHEATSHEET.rst LICENSE* CODE_OF_CONDUCT* CONTRIBUTING*
 include .coveragerc .style.yapf
 include test-requirements.txt
 recursive-include docs *
+recursive-include asyncbleach/_tests/example_pkg *
 prune docs/build
diff --git a/asyncbleach/_tests/example_pkg/setup.py b/asyncbleach/_tests/example_pkg/setup.py
@@ -9,7 +9,7 @@
     author_email="author@example.com",
     description="A package used to test asyncbleach",
     url="https://github.com/pypa/sampleproject",
-    packages=setuptools.find_packages(),
-     cmdclass={'build_py': bleach_build_py},
-      package_dir={'': 'src'},
+    packages=['example_pkg', 'example_pkg._async'],
+    cmdclass={'build_py': bleach_build_py},
+    package_dir={'': 'src'},
 )
diff --git a/asyncbleach/_tests/example_pkg/src/example_pkg/__init__.py b/asyncbleach/_tests/example_pkg/src/example_pkg/__init__.py
@@ -1,5 +1 @@
 name = "example_pkg"
-
-
-async def f(): 
-    return await 1
diff --git a/asyncbleach/_tests/example_pkg/src/example_pkg/_async/__init__.py b/asyncbleach/_tests/example_pkg/src/example_pkg/_async/__init__.py
@@ -0,0 +1,2 @@
+async def f():
+    return await 1
diff --git a/asyncbleach/_tests/test_asyncbleach.py b/asyncbleach/_tests/test_asyncbleach.py
@@ -1,4 +1,5 @@
 import os
+import shutil
 import tempfile
 
 from setuptools import sandbox
@@ -12,7 +13,6 @@ def test_asyncbleach():
         with open(os.path.join(tmpdir1, "source.py"), 'w') as f:
             f.write("async def f(): return await 1 \n")
 
-
         asyncbleach.bleach(
             os.path.join(tmpdir1, "source.py"), fromdir=tmpdir1, todir=tmpdir2
         )
@@ -23,7 +23,21 @@ def test_asyncbleach():
             assert bleached_code == "def f(): return 1 \n"
 
 
-
 def test_bleach_build_py():
-    path_to_setup_py = os.path.join(os.path.dirname(os.path.abspath(__file__)), './example_pkg/setup.py')
-    sandbox.run_setup(path_to_setup_py, ['build'])
+    with tempfile.TemporaryDirectory() as tmpdir:
+        source_pkg_dir = os.path.join(
+            os.path.dirname(os.path.abspath(__file__)), 'example_pkg'
+        )
+        pkg_dir = os.path.join(tmpdir, 'example_pkg')
+        shutil.copytree(source_pkg_dir, pkg_dir)
+
+        pkg_dir = os.path.join(tmpdir, 'example_pkg')
+        path_to_setup_py = os.path.join(pkg_dir, 'setup.py')
+        sandbox.run_setup(path_to_setup_py, ['build'])
+
+        bleached = os.path.join(
+            pkg_dir, 'build/lib/example_pkg/_sync/__init__.py'
+        )
+        with open(bleached) as f:
+            bleached_code = f.read()
+            assert bleached_code == "def f():\n    return 1\n"
diff --git a/setup.py b/setup.py
@@ -13,6 +13,7 @@
     author="Ratan Kulshreshtha",
     author_email="ratan.shreshtha@gmail.com",
     license="MIT -or- Apache License 2.0",
+    include_package_data=True,
     packages=find_packages(),
     install_requires=[
         "trio",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# Add any project-specific files here:`
	`2`	`+asyncbleach/_tests/example_pkg/build/`
`2`	`3`
`3`	`4`	`bench/results/`
`4`	`5`	`bench/env/`