Add findns: directive to config #1420

silkentrance · 2018-07-11T17:02:44Z

Summary of changes

extend documentation on new findns: directive
realize new findns: directive

Pull Request Checklist

Changes have tests
News fragment added in changelog.d. See documentation for details

silkentrance · 2018-07-11T17:05:17Z

@pganssle Have a look and tell me if that is the right direction. I so, I will continue with implementing required tests.

pganssle · 2018-07-11T17:23:22Z

Is there a reason it can't be find_namespace? I'm even dubious about the find_packages_ns name, since it seems too obscure to me, I'd rather it be find_namespace_packages or something.

silkentrance · 2018-07-11T17:24:58Z

@pganssle can we handle this in a different issue/PR?

silkentrance · 2018-07-11T17:25:24Z

As for the directive, sure, this I can rename right now.

pganssle · 2018-07-11T17:59:18Z

The find_packages_ns stuff is indeed a completely different discussion so don't worry about that.

pganssle · 2018-07-11T18:03:41Z

This seems like it will work, but the implementation might be a bit cleaner if you do this:

directive = value.split(':', 1)[0]
if directive not in {'find', 'find_namespace'}:
    ...

silkentrance · 2018-07-11T18:04:48Z

@pganssle good point, but this will be a different commit
but still I have to find out whether it is find_namespace... will think about that

silkentrance · 2018-07-11T18:15:16Z

@pganssle note that with the latest commit I refrained from using string.split() and instead used value.strip(). and maybe even this op is redundant as the parser might have normalized the value already, but we can never know...

agronholm

Minor things

agronholm · 2018-07-11T18:20:11Z

docs/setuptools.txt

@@ -2389,8 +2389,8 @@ Metadata and options are set in the config sections of the same name.
 * In some cases, complex values can be provided in dedicated subsections for
  clarity.

-* Some keys allow ``file:``, ``attr:``, and ``find:`` directives in order to
-  cover common usecases.
+* Some keys allow ``file:``, ``attr:``, and ``find:`` and ``find_namespace:`` directives i


Typo at the end?

will look into this

agronholm · 2018-07-11T18:20:47Z

setuptools/config.py

-        if not value.startswith(find_directive):
-            return self._parse_list(value)
+        if not trimmed_value in find_directives:
+          return self._parse_list(value)


Bad indentation

oops nice find

and there was even more where this came from...

agronholm · 2018-07-11T18:21:58Z

setuptools/config.py


        return find_packages(**find_kwargs)

    def parse_section_packages__find(self, section_options):
-        """Parses `packages.find` configuration file section.
+        """Parses `packages.find[ns]` configuration file section.


Does this really use a packages.findns section? The tests do not.

nice find, fixing right now

agronholm · 2018-07-11T18:25:00Z

setuptools/tests/test_config.py

+            '    fake_package.sub_one\n'
+        )
+        with get_dist(tmpdir) as dist:
+            assert set(dist.packages) == set(


You can use a set literal here. Python 2.6 support was dropped in v37.

The other tests also use the non set literal, should I proceed?

silkentrance · 2018-07-11T18:52:40Z

If you comply to the changes, I will proceed with fixing #1421 based upon these changes.

pganssle · 2018-07-11T18:58:11Z

setuptools/tests/test_config.py


+py2_only = pytest.mark.xfail(not PY2, reason="Test runs on Python 2 only")


I think these should be pytest.mark.skip, not xfail.

will have to fix the tests for find_packages_ns as well. you would want to fix the other tests that use that pattern.

six.PY2 seems to fail when marking tests for specific versions

SKIP [1] setuptools/tests/test_config.py:604: Test runs on Python 2 only

I think that's indicating that the test was skipped. When you mark something xfail, it actually runs the test and ignores the result if it fails (or if you make it a strict xfail, actually fails the test suite if the test passes). skip doesn't run the test at all, so I believe that message is expected.

You are right that we should be switching many xfails over to skip. I was planning on doing that at some point, but it takes time to figure out which ones are intended as an actual xfail (which generally means "this should work but it's a known bug - when this test starts passing drop this decorator") and which are just using the wrong decorator for skip.

agronholm

Looks alright now!

silkentrance · 2018-07-11T20:07:32Z

currently working on py2_only/py3_only for test_config. It does not seem to work as expected, reporting false results.

tomorrow will be a new day...

pganssle · 2018-07-11T20:27:47Z

@silkentrance That's my mistake, the correct mark is skipif, skip skips unconditionally (though I'm not sure why it accepts a random argument).

pganssle · 2018-07-11T20:29:04Z

I pushed an updated version with the proper decorator to your branch.

silkentrance · 2018-07-12T15:35:17Z

@pganssle thanks. I did find out about skipif in the morning, too. Yesterday I was way too tired...

silkentrance · 2018-07-12T16:01:07Z

I have refactored out the markers for py2/py3 into tests/init.py since they had been redeclared. Other test modules can be refactored, too, but I leave it at that for the time being.

* fix #1419 PEP420: add find_namespace: directive * fix #1419 PEP420: add find_namespace: directive to documentation * fix #1419 PEP420: add tests * fix #1419 PEP420: clean up code * fix #1419 PEP420: fix typo in documentation * fix #1419 PEP420: fix typo in documentation * fix #1419 PEP420: clean up code * fix #1419 PEP420: add changelog entry * fixup! fix #1419 PEP420: add tests * fix #1419 PEP420: cleanup code refactor markers * #1420: Rename find_namespace_ns to find_namespace_packages * #1420: update changelog entry

fix pypa#1419 PEP420: add find_namespace: directive

f541a7b

silkentrance force-pushed the gh-1419 branch 2 times, most recently from 42c3da2 to 81ae059 Compare July 11, 2018 17:34

fix pypa#1419 PEP420: add find_namespace: directive to documentation

8eeca1e

silkentrance force-pushed the gh-1419 branch from 81ae059 to 8eeca1e Compare July 11, 2018 17:36

fix pypa#1419 PEP420: add tests

101b616

fix pypa#1419 PEP420: clean up code

21a67f6

agronholm requested changes Jul 11, 2018

View reviewed changes

silkentrance added 4 commits July 11, 2018 20:31

fix pypa#1419 PEP420: fix typo in documentation

091a720

fix pypa#1419 PEP420: fix typo in documentation

5f1d155

fix pypa#1419 PEP420: clean up code

924f41c

fix pypa#1419 PEP420: add changelog entry

9b26ea5

silkentrance mentioned this pull request Jul 11, 2018

Refactor rename find_packages_ns to find_namespace_packages #1421

Closed

pganssle reviewed Jul 11, 2018

View reviewed changes

agronholm approved these changes Jul 11, 2018

View reviewed changes

fixup! fix pypa#1419 PEP420: add tests

e1e8659

silkentrance mentioned this pull request Jul 12, 2018

Rename find_namepaces_ns to find_namespace_packages #1423

Merged

2 tasks

fix pypa#1419 PEP420: cleanup code refactor markers

3c30cf3

silkentrance force-pushed the gh-1419 branch from 6deb251 to 3c30cf3 Compare July 12, 2018 18:41

silkentrance added a commit to coldrye-collaboration/setuptools that referenced this pull request Jul 12, 2018

pypa#1420: Rename find_namespace_ns to find_namespace_packages

c391c3d

silkentrance added a commit to coldrye-collaboration/setuptools that referenced this pull request Jul 14, 2018

pypa#1420: update changelog entry

d442acc

silkentrance added a commit to coldrye-collaboration/setuptools that referenced this pull request Jul 18, 2018

pypa#1420: update changelog entry

13ba278

pganssle pushed a commit to coldrye-collaboration/setuptools that referenced this pull request Aug 11, 2018

pypa#1420: Rename find_namespace_ns to find_namespace_packages

2208622

pganssle pushed a commit to coldrye-collaboration/setuptools that referenced this pull request Aug 11, 2018

pypa#1420: update changelog entry

889beb5

silkentrance closed this Aug 14, 2018

silkentrance deleted the gh-1419 branch August 14, 2018 20:30

silkentrance added a commit to coldrye-collaboration/setuptools that referenced this pull request Aug 14, 2018

pypa#1420: Rename find_namespace_ns to find_namespace_packages

a753be4

silkentrance added a commit to coldrye-collaboration/setuptools that referenced this pull request Aug 14, 2018

pypa#1420: update changelog entry

4ab668c


		py2_only = pytest.mark.xfail(not PY2, reason="Test runs on Python 2 only")

Add findns: directive to config #1420

Add findns: directive to config #1420

Conversation

silkentrance commented Jul 11, 2018 • edited Loading

Summary of changes

Pull Request Checklist

silkentrance commented Jul 11, 2018

pganssle commented Jul 11, 2018

silkentrance commented Jul 11, 2018

silkentrance commented Jul 11, 2018

pganssle commented Jul 11, 2018

pganssle commented Jul 11, 2018

silkentrance commented Jul 11, 2018 • edited Loading

silkentrance commented Jul 11, 2018 • edited Loading

agronholm left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

silkentrance commented Jul 11, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

agronholm left a comment

Choose a reason for hiding this comment

silkentrance commented Jul 11, 2018 • edited Loading

pganssle commented Jul 11, 2018

pganssle commented Jul 11, 2018

silkentrance commented Jul 12, 2018

silkentrance commented Jul 12, 2018 • edited Loading

silkentrance commented Jul 11, 2018 •

edited

Loading

silkentrance commented Jul 11, 2018 •

edited

Loading

silkentrance commented Jul 11, 2018 •

edited

Loading

silkentrance commented Jul 11, 2018 •

edited

Loading

silkentrance commented Jul 12, 2018 •

edited

Loading