Merge branch 'beta' into dev

Gallopsled · Nov 14, 2023 · 89650ac · 89650ac
2 parents a7c0385 + d643a33
commit 89650ac
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -6,4 +6,4 @@ 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
 recursive-include pwn    *.py *.asm *.rst *.md *.txt *.sh
-recursive-exclude *.pyc
+global-exclude *.pyc
diff --git a/extra/docker/beta/Dockerfile b/extra/docker/beta/Dockerfile
@@ -2,6 +2,6 @@ FROM pwntools/pwntools:stable
 
 USER root
 RUN python2.7 -m pip install --upgrade git+https://github.com/Gallopsled/pwntools@beta \
-    && python3 -m pip install --upgrade git+https://github.com/Gallopsled/pwntools@beta
+    && python3 -m pip install --force-reinstall --upgrade git+https://github.com/Gallopsled/pwntools@beta
 RUN PWNLIB_NOTERM=1 pwn update
 USER pwntools
diff --git a/extra/docker/dev/Dockerfile b/extra/docker/dev/Dockerfile
@@ -2,6 +2,6 @@ FROM pwntools/pwntools:stable
 
 USER root
 RUN python2.7 -m pip install --upgrade git+https://github.com/Gallopsled/pwntools@dev \
-    && python3 -m pip install --upgrade git+https://github.com/Gallopsled/pwntools@dev
+    && python3 -m pip install --force-reinstall --upgrade git+https://github.com/Gallopsled/pwntools@dev
 RUN PWNLIB_NOTERM=1 pwn update
 USER pwntools
diff --git a/extra/docker/stable/Dockerfile b/extra/docker/stable/Dockerfile
@@ -2,6 +2,6 @@ FROM pwntools/pwntools:base
 
 USER root
 RUN python2.7 -m pip install --upgrade git+https://github.com/Gallopsled/pwntools@stable \
-    && python3 -m pip install --upgrade git+https://github.com/Gallopsled/pwntools@stable
+    && python3 -m pip install --force-reinstall --upgrade git+https://github.com/Gallopsled/pwntools@stable
 RUN PWNLIB_NOTERM=1 pwn update
 USER pwntools
diff --git a/setup.py b/setup.py
@@ -3,14 +3,12 @@
 
 import glob
 import os
-import platform
-import subprocess
 import sys
-import traceback
 from distutils.command.install import INSTALL_SCHEMES
 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
@@ -50,6 +48,7 @@
 
     import toml
     project = toml.load('pyproject.toml')['project']
+    compat['packages'] = find_packages()
     compat['install_requires'] = project['dependencies']
     compat['name'] = project['name']
     # https://github.com/pypa/pip/issues/7953