Re: setup.py doesn't use PKG-INFO.TXT

2014-11-10 Thread Matt Wilkie
On Mon, Nov 10, 2014 at 11:00 AM, Edward K. Ream 
wrote:

> Matt, do you hang out on #leo on irc?  It can sometimes be easier to chat
> there...


I'm about to, installing a client now.

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at http://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.


Re: setup.py doesn't use PKG-INFO.TXT

2014-11-10 Thread Edward K. Ream
On Mon, Nov 10, 2014 at 12:56 PM, Edward K. Ream 
wrote:

>
> On Mon, Nov 10, 2014 at 12:46 PM, Matt Wilkie  wrote:
>


> ...and I think I may have just stuck my foot in it again a few seconds ago
>> attempting to sync with your changes. I don't think I'm liking the GitHub
>> native Windows client.
>>
>
> ​Everything looks good here, after ​
>
> ​fdf67e9.
>

Matt, do you hang out on #leo on irc?  It can sometimes be easier to chat
there...

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at http://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.


Re: setup.py doesn't use PKG-INFO.TXT

2014-11-10 Thread Edward K. Ream
On Mon, Nov 10, 2014 at 12:46 PM, Matt Wilkie  wrote:

>
>
> ...and I think I may have just stuck my foot in it again a few seconds ago
> attempting to sync with your changes. I don't think I'm liking the GitHub
> native Windows client.
>

​Everything looks good here, after ​

​fdf67e9.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at http://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.


Re: setup.py doesn't use PKG-INFO.TXT

2014-11-10 Thread Edward K. Ream
On Mon, Nov 10, 2014 at 12:42 PM, Matt Wilkie  wrote:

>
> I chose delete because in the resultant sdist tree there appear both
> PKG-INFO and PKG-INFO.TXT, with different content.
>

​I see.  Distro issues can be really tricky...​


I just noticed that .gitattributes says `setup.py   export-ignore`, which
> might be why Davy is not seeing it when trying to use pip to install direct
> from GitHub.
>

​Right.  d0530af changed .gitattributes, ​
 as well as restoring pkg-info.txt ;-)​

​To repeat, my tests are complete: setup.py is now included everywhere.​

​EKR

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at http://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.


Re: setup.py doesn't use PKG-INFO.TXT

2014-11-10 Thread Matt Wilkie
On Mon, Nov 10, 2014 at 10:42 AM, Edward K. Ream 
wrote:

> ​Let me emphasize that I'm willing to consider removing pkg-info.txt, but
> I'd like more warning in future.​
>
> ​Rev 7e0964a contains code that I used to verify that setup.py now appears
> in Leo-5.0-b1.zip. This is all I need to do right now.
>
> If you want to test without pkg-info.txt, I would suggest temporarily
> removing it and then restoring it with git before pushing anything.
>

All my changes were supposed to happen only in a branch, not on master.

...and I think I may have just stuck my foot in it again a few seconds ago
attempting to sync with your changes. I don't think I'm liking the GitHub
native Windows client.

-matt

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at http://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.


Re: setup.py doesn't use PKG-INFO.TXT

2014-11-10 Thread Matt Wilkie
> The present make-leo script wants a proper PKG-INFO.TXT available so that
> it can appear in the .zip file and executable installer.
>

oh, I didn't know it was used in other places!


> I don't mind a script ignoring PKG-INFO.TXT and creating a new one, but
> deleting the existing file seems extreme.
>

I chose delete because in the resultant sdist tree there appear both
PKG-INFO and PKG-INFO.TXT, with different content.

I was just about to commit several files that allow setup.py to appear in
> the leo-editor folder in both the .zip and .exe files.
>

I just noticed that .gitiattributes says `setup.py   export-ignore`, which
might be why Davy is not seeing it when trying to use pip to install direct
from GitHub.


> In future, though, please don't delete nodes from leoDist.leo.  Instead,
> change @asis to @@asis.
>

Ahh, yes of course; wish I thought of that less drastic method. Well now I
know. :)

-matt

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at http://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.


Re: setup.py doesn't use PKG-INFO.TXT

2014-11-10 Thread Edward K. Ream
On Mon, Nov 10, 2014 at 12:35 PM, Edward K. Ream 
wrote:

​> ​
I see what you've done, but I don't think I like it.

​Let me emphasize that I'm willing to consider removing pkg-info.txt, but
I'd like more warning in future.​

​Rev 7e0964a contains code that I used to verify that setup.py now appears
in Leo-5.0-b1.zip. This is all I need to do right now.

If you want to test without pkg-info.txt, I would suggest temporarily
removing it and then restoring it with git before pushing anything.

Let me know if this doesn't work for you.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at http://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.


Re: setup.py doesn't use PKG-INFO.TXT

2014-11-10 Thread Edward K. Ream
On Mon, Nov 10, 2014 at 12:17 PM, Matt Wilkie  wrote:

> Edward,
>
> ((long story short: program description built by setup.py, PKG-INFO,
> doesn't match PKG-INFO.TXT))
>

​I see what you've done, but I don't think I like it.

The present make-leo script wants a proper PKG-INFO.TXT available so that
it can appear in the .zip file and executable installer.

I don't mind a script ignoring PKG-INFO.TXT and creating a new one, but
deleting the existing file seems extreme.

I was just about to commit several files that allow setup.py to appear in
the leo-editor folder in both the .zip and .exe files.

I just pushed d0530af, which reverses the deletion of pkg-info.txt.  We can
discuss this further ;-)  In future, though, please don't delete nodes from
leoDist.leo.  Instead, change @asis to @@asis.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at http://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.


Re: setup.py doesn't use PKG-INFO.TXT

2014-11-10 Thread Matt Wilkie
>I'm proposing the 2nd route be the default. Committing an example of
changes in a few minutes.

I created a branch and a pull request,
https://github.com/leo-editor/leo-editor/pull/94, but am not sure I did it
correctly because github is telling me "We can’t automatically merge this
pull request.". (branching is relatively unexplored territory for me).

-matt
​

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To post to this group, send email to leo-editor@googlegroups.com.
Visit this group at http://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/d/optout.