Projectfile #39

amjith · 2017-09-23T05:00:19Z

Description

This will make the init command and the new command interactive.

Checklist

amjith · 2017-09-23T05:00:35Z

I'll fix the conflicts and make the tests pass.

ofek · 2017-09-23T16:24:31Z

Thanks! I'll look this over later after I fix master. My initial impression though is I would prefer to enable interactivity with an -i/--interactive flag. Only being interactive makes the config file way less useful and as a user I would want non-interactive by default.

amjith · 2017-09-23T19:37:24Z

I think you make a good point. Except the package name and the description all the other questions are pretty static and it can be supplied by the config file.

I'll change the behavior to add a -i option for interactive.

amjith · 2017-09-24T05:52:23Z

The tests are now passing. But I haven't added new tests to cover the code that I have added. I'll work on adding tests tomorrow. In the meantime, I welcome any comments or suggestions.

amjith · 2017-09-25T05:15:58Z

I've added tests to the interactive init command. I have also fixed the failing tests. The PR is pretty big. I'm happy to do a screen share and walk you through the main points if you're interested.

I'll add more tests to the interactive new command as well, but I think this PR is ready for your review.

ofek · 2017-09-25T19:25:40Z

hatch/commands/init.py

@@ -14,7 +14,7 @@

 @click.command(context_settings=CONTEXT_SETTINGS,
               short_help='Creates a new Python project in the current directory')
-@click.argument('name')
+@click.argument('name', nargs=-1)


required=False

ofek · 2017-09-25T19:26:29Z

hatch/commands/new.py

@@ -15,7 +15,7 @@

 @click.command(context_settings=CONTEXT_SETTINGS,
               short_help='Creates a new Python project')
-@click.argument('name')
+@click.argument('name', nargs=-1, default=None)


required=False

ofek · 2017-09-25T19:28:47Z

hatch/commands/init.py

+        package_name = name[0]
+
+    if interactive or not name:
+        pname = os.path.split(cwd)[-1]


use basepath from hatch.utils

ofek · 2017-09-25T19:58:05Z

hatch/files/vc/git.py

+                shell=NEED_SUBPROCESS_SHELL)
+        return email.strip().decode('utf-8')
+    except:
+        return None


Good idea! Just return instead of return None and add # no cov to each function definition.

ofek · 2017-09-25T20:02:29Z

hatch/settings.py

@@ -19,8 +20,8 @@
        ('build', ''),
    ])),
    ('pypi_username', ''),
-    ('name', 'U.N. Owen'),
-    ('email', '[email protected]'),
+    ('author', get_user() or 'U.N. Owen'),


I understand the decision here, but can we please keep it as before? It would be a breaking change.

ofek · 2017-09-25T20:13:08Z

In init and new command files can you please change from hatch.settings import load_settings to from hatch.settings import copy_default_settings, load_settings and use that new function in the except FileNotFoundError:? That was an oversight of mine.

You can then use the default settings in the functions.

ofek · 2017-09-25T21:42:37Z

After those changes, we also need to make ourselves the tool.hatch as we discussed.

Here are some examples I've found:

ofek · 2017-09-25T22:42:44Z

pypa/pip#4144 (comment)

ofek · 2017-09-26T02:50:15Z

tests/files/licenses/test_apache2.py

@@ -25,7 +25,7 @@ def test_name():
    with temp_chdir() as d:
        settings = copy_default_settings()
        settings['licenses'] = ['apache2']
-        settings['name'] = 'Don Quixote'
+        settings['author'] = 'Don Quixote'


ofek · 2017-09-26T02:50:28Z

tests/files/licenses/test_cc0.py

@@ -25,7 +25,7 @@ def test_name():
    with temp_chdir() as d:
        settings = copy_default_settings()
        settings['licenses'] = ['cc0']
-        settings['name'] = 'Guy Fawkes'
+        settings['author'] = 'Guy Fawkes'


ofek · 2017-09-26T02:50:38Z

tests/files/licenses/test_mit.py

@@ -25,7 +25,7 @@ def test_name():
    with temp_chdir() as d:
        settings = copy_default_settings()
        settings['licenses'] = ['mit']
-        settings['name'] = 'Don Quixote'
+        settings['author'] = 'Don Quixote'


ofek · 2017-09-26T02:50:53Z

tests/files/licenses/test_mpl.py

@@ -25,7 +25,7 @@ def test_name():
    with temp_chdir() as d:
        settings = copy_default_settings()
        settings['licenses'] = ['mpl']
-        settings['name'] = 'Red Panda'
+        settings['author'] = 'Red Panda'


ofek · 2017-09-26T02:52:41Z

Sorry, I missed a few.

ofek · 2017-09-26T15:20:58Z

Looks great! We just need to change the pyproject.toml: pypa/pip#4144 (comment) until end of thread

So, initially I was thinking we could have metadata and commands, but exclude packages for when Hatch supports Pipfiles. Sound good?

amjith · 2017-09-26T15:26:33Z

Looks like one test is failing on one Python36-x64 Appveyor.

Looks to me it's a timeout failure. Can you take a look?

ofek · 2017-09-26T15:29:44Z

That's just virtualenv being slow, it happens sometimes :/

ofek · 2017-09-27T01:17:41Z

hatch/commands/new.py


    if os.path.exists(d):
        echo_failure('Directory `{}` already exists.'.format(d))
        sys.exit(1)

+    if licenses:
+        settings['licenses'] = map(str.strip, licenses.split(','))


In init this comes after the interactive branch. What do you want to give precedence?

If the user runs this:

hatch init -i -l 'mit,mpl'

Hatch will use the mit,mpl as the default value during the interactive mode. If the user chooses to override it during the interactive mode then the overridden value from the interactive mode will be used.

Right now the thing is that in new the if licenses comes before the if interactive but in init it's the opposite.

Good catch. They were functionally equivalent. But I've changed the code to match the same pattern in both files.

ofek · 2017-09-27T01:19:17Z

tests/commands/test_init.py

+        runner.invoke(hatch, ['init', '-i', '--basic', '-ne'], input='ok\n0.1.0\nTest Description\nPicard\[email protected]\nmpl\n')
+
+        assert os.path.exists(os.path.join(d, 'ok', '__init__.py'))
+        assert "__version__ = '0.1.0'\n" == open(os.path.join(d, 'ok', '__init__.py')).read()


use https://github.com/ofek/hatch/blob/ae3e9d4c4a569955f3fc98d4a07c6f0ffea5e1dc/tests/utils.py#L37

ofek · 2017-09-27T01:19:33Z

tests/commands/test_new.py

+        runner.invoke(hatch, ['new', '-i', '--basic', '-ne'], input='ok\n0.1.0\nTest Description\nPicard\[email protected]\nmpl\n')
+
+        assert os.path.exists(os.path.join(d, 'ok', 'ok', '__init__.py'))
+        assert "__version__ = '0.1.0'\n" == open(os.path.join(d, 'ok', 'ok', '__init__.py')).read()


use https://github.com/ofek/hatch/blob/ae3e9d4c4a569955f3fc98d4a07c6f0ffea5e1dc/tests/utils.py#L37

ofek · 2017-09-27T01:20:14Z

The PR looks great except the pyproject.toml needs:

[build-system]
requires = ["setuptools", "wheel"]

and put metadata right under [tool.hatch].

ofek · 2017-09-27T14:10:31Z

Tests failing due to source -> metadata change.

amjith · 2017-09-27T20:36:22Z

WooHoo!! 🎉

amjith added 3 commits September 22, 2017 22:00

Initial implementation of pyproject file.

b353e58

Make init interactive.

4c884ad

Make new interactive.

974b020

amjith force-pushed the projectfile branch from 6df9902 to 974b020 Compare September 23, 2017 05:03

amjith added 6 commits September 23, 2017 20:25

Guess username and email from git config.

3d84279

Add -i option to make init command interactive.

4b8ac22

Add -i option to make new command interactive.

4b35b6e

Handle the supplied license.

2e931da

Don't force package_name into settings.

4c7e0e9

Fix failing setup tests.

dff25d9

amjith added 3 commits September 24, 2017 20:47

Use the version number in __init__.py creation.

5cedca5

Add tests for interactive init and fix various bugs.

dd61c90

Fix failing setup tests.

b550bbf

Add toml as a dependency for testing.

3290028

amjith force-pushed the projectfile branch from cc3d727 to 3290028 Compare September 25, 2017 05:39

amjith added 4 commits September 24, 2017 23:07

Fixing tests.

e391cc4

Update appveyor dependency.

eb275fc

Add tests for interactive new.

2d8af52

Merge branch 'master' into projectfile

3d3e66b

ofek reviewed Sep 25, 2017

View reviewed changes

Fix the PR comments.

7cae8d6

ofek reviewed Sep 26, 2017

View reviewed changes

Fix the license tests.

c9a5b75

Change projectfile format.

45e4050

ofek reviewed Sep 27, 2017

View reviewed changes

amjith added 4 commits September 26, 2017 18:31

Use read_file in tests.

0250257

Add build-system section to pyproject.toml

52f08af

Replace [[source]] with [metadata] in pyproject.

af8e6e1

Match new with init.

0b8bec6

Fix tests to look for metadata instead of source.

37af406

ofek merged commit 9cf614f into pypa:master Sep 27, 2017

amjith deleted the projectfile branch September 27, 2017 20:36

Uh oh!

Projectfile #39

Projectfile #39

Uh oh!

Conversation

amjith commented Sep 23, 2017

Description

Checklist

Uh oh!

amjith commented Sep 23, 2017

Uh oh!

ofek commented Sep 23, 2017

Uh oh!

amjith commented Sep 23, 2017

Uh oh!

amjith commented Sep 24, 2017

Uh oh!

amjith commented Sep 25, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ofek commented Sep 25, 2017

Uh oh!

ofek commented Sep 25, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ofek commented Sep 25, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ofek commented Sep 26, 2017

Uh oh!

ofek commented Sep 26, 2017

Uh oh!

amjith commented Sep 26, 2017

Uh oh!

ofek commented Sep 26, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ofek commented Sep 27, 2017

Uh oh!

ofek commented Sep 27, 2017

Uh oh!

amjith commented Sep 27, 2017

Uh oh!

Uh oh!

ofek commented Sep 25, 2017 •

edited

Loading