From 36b4820f519d93bad998302141ae6de2cb15191c Mon Sep 17 00:00:00 2001
From: Alan Fregtman <941331+darkvertex@users.noreply.github.com>
Date: Wed, 30 Jun 2021 01:15:18 -0400
Subject: Implement "glob:" directive for declarative "data_files" option.

---
 setuptools/tests/test_config.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'setuptools/tests')

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 21f1becd..c86c8573 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -893,6 +893,41 @@ class TestOptions:
             ]
             assert sorted(dist.data_files) == sorted(expected)
 
+    def test_data_files_globby(self, tmpdir):
+        fake_env(
+            tmpdir,
+            '[options.data_files]\n'
+            'cfg =\n'
+            '      a/b.conf\n'
+            '      c/d.conf\n'
+            'data = glob: *.dat\n'
+            'icons = \n'
+            '      glob: *.ico\n'
+            'audio = \n'
+            '      glob:*.wav\n'
+            '      sounds.db\n'
+        )
+
+        # Create dummy files for glob()'s sake:
+        tmpdir.join('a.dat').write('')
+        tmpdir.join('b.dat').write('')
+        tmpdir.join('c.dat').write('')
+        tmpdir.join('a.ico').write('')
+        tmpdir.join('b.ico').write('')
+        tmpdir.join('c.ico').write('')
+        tmpdir.join('beep.wav').write('')
+        tmpdir.join('boop.wav').write('')
+        tmpdir.join('sounds.db').write('')
+
+        with get_dist(tmpdir) as dist:
+            expected = [
+                ('cfg', ['a/b.conf', 'c/d.conf']),
+                ('data', ['a.dat', 'b.dat', 'c.dat']),
+                ('icons', ['a.ico', 'b.ico', 'c.ico']),
+                ('audio', ['beep.wav', 'boop.wav', 'sounds.db']),
+            ]
+            assert sorted(dist.data_files) == sorted(expected)
+
     def test_python_requires_simple(self, tmpdir):
         fake_env(
             tmpdir,
-- 
cgit v1.2.1


From cb05fb0c94716b1d328ecca0573346218505b859 Mon Sep 17 00:00:00 2001
From: Alan Fregtman <941331+darkvertex@users.noreply.github.com>
Date: Wed, 21 Jul 2021 17:34:14 -0400
Subject: Update globbing for [options.data_files] to be implicit, not
 requiring a custom directive.

---
 setuptools/tests/test_config.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'setuptools/tests')

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index c86c8573..5172c6de 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -900,12 +900,13 @@ class TestOptions:
             'cfg =\n'
             '      a/b.conf\n'
             '      c/d.conf\n'
-            'data = glob: *.dat\n'
+            'data = *.dat\n'
             'icons = \n'
-            '      glob: *.ico\n'
+            '      *.ico\n'
             'audio = \n'
-            '      glob:*.wav\n'
+            '      *.wav\n'
             '      sounds.db\n'
+            'strangeness = literal_weird_filename?.txt\n'
         )
 
         # Create dummy files for glob()'s sake:
@@ -918,6 +919,7 @@ class TestOptions:
         tmpdir.join('beep.wav').write('')
         tmpdir.join('boop.wav').write('')
         tmpdir.join('sounds.db').write('')
+        tmpdir.join('literal_weird_filename?.txt').write('')
 
         with get_dist(tmpdir) as dist:
             expected = [
@@ -925,6 +927,7 @@ class TestOptions:
                 ('data', ['a.dat', 'b.dat', 'c.dat']),
                 ('icons', ['a.ico', 'b.ico', 'c.ico']),
                 ('audio', ['beep.wav', 'boop.wav', 'sounds.db']),
+                ('strangeness', ['literal_weird_filename?.txt']),
             ]
             assert sorted(dist.data_files) == sorted(expected)
 
-- 
cgit v1.2.1


From f094b7767b35e23f8e81f2f54c67cac9043e66be Mon Sep 17 00:00:00 2001
From: Alan Fregtman <941331+darkvertex@users.noreply.github.com>
Date: Wed, 21 Jul 2021 23:30:32 -0400
Subject: globbing for [options.data_files]: Remove special treatment for
 filenames with globby characters that exist literally.

---
 setuptools/tests/test_config.py | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'setuptools/tests')

diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py
index 5172c6de..ec65250e 100644
--- a/setuptools/tests/test_config.py
+++ b/setuptools/tests/test_config.py
@@ -906,7 +906,6 @@ class TestOptions:
             'audio = \n'
             '      *.wav\n'
             '      sounds.db\n'
-            'strangeness = literal_weird_filename?.txt\n'
         )
 
         # Create dummy files for glob()'s sake:
@@ -919,7 +918,6 @@ class TestOptions:
         tmpdir.join('beep.wav').write('')
         tmpdir.join('boop.wav').write('')
         tmpdir.join('sounds.db').write('')
-        tmpdir.join('literal_weird_filename?.txt').write('')
 
         with get_dist(tmpdir) as dist:
             expected = [
@@ -927,7 +925,6 @@ class TestOptions:
                 ('data', ['a.dat', 'b.dat', 'c.dat']),
                 ('icons', ['a.ico', 'b.ico', 'c.ico']),
                 ('audio', ['beep.wav', 'boop.wav', 'sounds.db']),
-                ('strangeness', ['literal_weird_filename?.txt']),
             ]
             assert sorted(dist.data_files) == sorted(expected)
 
-- 
cgit v1.2.1