Make it not crash nor include spurious files

Gallopsled · Apr 18, 2023 · aa7c762 · aa7c762
1 parent 04c3525
commit aa7c762
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -165,7 +165,7 @@ jobs:
       if: matrix.python-version != '2.7'
       run: |
         python setup.py sdist
-        python setup.py bdist_wheel --universal
+        python setup.py bdist_wheel
 
     - uses: actions/upload-artifact@v2
       with:

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,7 @@
+graft build
 graft examples
 graft extra
+graft travis
 include *.md *.txt *.sh *.yml MANIFEST.in
 recursive-include docs   *.rst *.png Makefile *.py *.txt
 recursive-include pwnlib *.py *.asm *.rst *.md *.txt *.sh __doc__ *.mako

diff --git a/pyproject.toml b/pyproject.toml
@@ -59,3 +59,12 @@ dependencies = [
 [project.urls]
 homepage = "https://pwntools.com"
 download = "https://github.com/Gallopsled/pwntools/releases"
+
+[tool.distutils.bdist_wheel]
+universal = 1
+
+[tool.setuptools]
+include-package-data = false
+
+[tool.setuptools.packages.find]
+namespaces = false
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -11,7 +11,6 @@
 from distutils.sysconfig import get_python_inc
 from distutils.util import convert_path
 
-from setuptools import find_packages
 from setuptools import setup
 
 # Get all template files
@@ -60,7 +59,6 @@
     sys.exit(-1)
 
 setup(
-    packages             = find_packages(),
     version              = '4.11.0dev',
     data_files           = [('pwntools-doc',
                              glob.glob('*.md') + glob.glob('*.txt')),