Merge pull request #1634 from freakboy3742/src-install

Revert usage of automatic discovery by setuptools.

MANIFEST.in

@@ -1,15 +1,28 @@
 include .coveragerc
 include .pre-commit-config.yaml
-include check-packaging.sh
 include CONTRIBUTING.md
 include LICENSE
 include README.rst
 include release.sh
 include tox.ini
-recursive-exclude attic *
-recursive-exclude contrib *
-recursive-exclude demo *
-recursive-exclude nursery *
+include pyproject.toml
+
+prune attic
+
+include demo/AUTHORS
+include demo/CONTRIBUTING.md
+include demo/LICENSE
+include demo/MANIFEST.in
+include demo/README.rst
+include demo/pyproject.toml
+include demo/setup.cfg
+include demo/setup.py
+recursive-include demo *.icns
+recursive-include demo *.ico
+recursive-include demo *.png
+recursive-include demo *.py
+prune demo/build
+prune demo/dist
 
 include docs/make.bat
 include docs/Makefile
@@ -40,11 +53,13 @@ recursive-include examples *.html
 recursive-include examples README
 prune examples/*/.vscode
 prune examples/*/android
-prune examples/*/cocoa
-prune examples/*/gtk
+prune examples/*/linux
 prune examples/*/iOS
+prune examples/*/macOS
 prune examples/*/web
-prune examples/*/winforms
+prune examples/*/windows
+
+prune nursery
 
 include src/winforms/src/toga_winforms/libs/WebView2/LICENSE.md
 include src/winforms/src/toga_winforms/libs/WebView2/README.md
@@ -56,11 +71,13 @@ recursive-include src *.js
 recursive-include src *.png
 recursive-include src *.py
 recursive-include src *.rst
+recursive-include src pyproject.toml
 recursive-include src CONTRIBUTING.md
 recursive-include src LICENSE
 recursive-include src MANIFEST.in
 recursive-include src/winforms/src/toga_winforms/libs/WebView2 *.dll
 prune src/*/build
+prune src/*/dist
 prune src/*/.eggs
 
 include src/core/tests/testbed/installed.dist-info/INSTALLER

pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=60"]
+build-backend = "setuptools.build_meta"

setup.cfg

@@ -48,6 +48,7 @@ keywords =
 [options]
 zip_safe = False
 python_requires = >= 3.7
+packages =
 
 [flake8]
 max-complexity = 25

src/android/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=60"]
+build-backend = "setuptools.build_meta"

src/android/setup.cfg

@@ -38,11 +38,15 @@ keywords =
     android
 
 [options]
+packages = find:
 package_dir =
     = src
 python_requires = >= 3.6
 zip_safe = False
 
+[options.packages.find]
+where = src
+
 [flake8]
 exclude=\
     .eggs/*,\

src/cocoa/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=60"]
+build-backend = "setuptools.build_meta"

src/cocoa/setup.cfg

@@ -39,11 +39,15 @@ keywords =
     cocoa
 
 [options]
+packages = find:
 package_dir =
     = src
 python_requires = >= 3.6
 zip_safe = False
 
+[options.packages.find]
+where = src
+
 [flake8]
 exclude=\
     .eggs/*,\

src/core/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=60"]
+build-backend = "setuptools.build_meta"

src/core/setup.cfg

@@ -50,6 +50,7 @@ keywords =
 install_requires =
     travertino>=0.1.3
     importlib_metadata; python_version<"3.8"
+packages = find:
 package_dir =
     = src
 python_requires = >= 3.6
@@ -61,6 +62,9 @@ toga.resources =
     *.ico
     *.png
 
+[options.packages.find]
+where = src
+
 [flake8]
 exclude=\
     .eggs/*,\

src/dummy/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=60"]
+build-backend = "setuptools.build_meta"

src/dummy/setup.cfg

@@ -37,11 +37,15 @@ keywords =
     testing
 
 [options]
+packages = find:
 package_dir =
     = src
 python_requires = >= 3.6
 zip_safe = False
 
+[options.packages.find]
+where = src
+
 [flake8]
 exclude=\
     .eggs/*,\

src/gtk/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=60"]
+build-backend = "setuptools.build_meta"

src/gtk/setup.cfg

@@ -39,11 +39,15 @@ keywords =
     gtk
 
 [options]
+packages = find:
 package_dir =
     = src
 python_requires = >= 3.6
 zip_safe = False
 
+[options.packages.find]
+where = src
+
 [flake8]
 exclude=\
     .eggs/*,\

src/iOS/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=60"]
+build-backend = "setuptools.build_meta"

src/iOS/setup.cfg

@@ -38,11 +38,15 @@ keywords =
     iOS
 
 [options]
+packages = find:
 package_dir =
     = src
 python_requires = >= 3.6
 zip_safe = False
 
+[options.packages.find]
+where = src
+
 [flake8]
 exclude=\
     .eggs/*,\

src/web/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=60"]
+build-backend = "setuptools.build_meta"

src/web/setup.cfg

@@ -37,6 +37,7 @@ keywords =
     web
 
 [options]
+packages = find:
 package_dir =
     = src
 python_requires = >= 3.6
@@ -46,6 +47,9 @@ zip_safe = False
 toga_web =
     static/**
 
+[options.packages.find]
+where = src
+
 [flake8]
 exclude=\
     .eggs/*,\

src/web/setup.py

@@ -20,10 +20,6 @@
 setup(
     version=version,
     install_requires=[
-        # TODO: Due to https://github.com/pyodide/pyodide/issues/2408, the name
-        # toga-core is ambigous when on the package hasn't been published to
-        # PyPI. As a workaround, don't specify the dependency, and manually
-        # ensure that toga-core is installed.
-        # 'toga-core==%s' % version,
+        'toga-core==%s' % version,
     ],
 )

src/winforms/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=60"]
+build-backend = "setuptools.build_meta"

src/winforms/setup.cfg

@@ -39,6 +39,7 @@ keywords =
     winforms
 
 [options]
+packages = find:
 package_dir =
     = src
 python_requires = >= 3.6
@@ -48,6 +49,9 @@ zip_safe = False
 toga_winforms =
     libs/WebView2/**
 
+[options.packages.find]
+where = src
+
 [flake8]
 exclude=\
     .eggs/*,\