'exclude' should be able to override 'include' matches

brechtm · brechtm · commit 26217e1b5b3a · 2021-01-21T13:49:36.000+01:00
Note that this behavior was different for files in dirs; see "if file.is_dir():" block a bit higher in the code. Related: python-poetry/poetry#1336
diff --git a/poetry/core/masonry/builders/builder.py b/poetry/core/masonry/builders/builder.py
@@ -182,9 +182,7 @@ def find_files_to_add(
                     path=file, project_root=self._path, source_root=source_root
                 )
 
-                if self.is_excluded(
-                    file.relative_to(source_root)
-                ) and isinstance(include, PackageInclude):
+                if self.is_excluded(file.relative_to(source_root)):
                     continue
 
                 if file.suffix == ".pyc":

Original file line number	Diff line number	Diff line change
`@@ -182,9 +182,7 @@ def find_files_to_add(`
`182`	`182`	`path=file, project_root=self._path, source_root=source_root`
`183`	`183`	`)`
`184`	`184`
`185`		`- if self.is_excluded(`
`186`		`- file.relative_to(source_root)`
`187`		`- ) and isinstance(include, PackageInclude):`
	`185`	`+ if self.is_excluded(file.relative_to(source_root)):`
`188`	`186`	`continue`
`189`	`187`
`190`	`188`	`if file.suffix == ".pyc":`