Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ship unminified js #2029

Merged
merged 3 commits into from Jun 25, 2012
Merged

Ship unminified js #2029

merged 3 commits into from Jun 25, 2012

Conversation

minrk
Copy link
Member

@minrk minrk commented Jun 24, 2012

For packaging.

closes #1265

Includes unminified single-file versions of prettify, jQuery-1.7.1, and jquery/jquery-ui@ba8f147

These files are totally unused.

@minrk
Copy link
Member Author

minrk commented Jun 24, 2012

js is also moved to top-level dir so it will only be included in sdists, not installs.

@takluyver
Copy link
Member

What's the status with the different types of download we offer? I seem to remember that we already have a 'complete' tarball including doc sources, and a smaller tarball so pip install ipython is faster. We should make sure that people using pip or easy_install aren't waiting for an unused copy of jquery to download each time.

@minrk
Copy link
Member Author

minrk commented Jun 24, 2012

I think we just have one sdist, which no longer has the built docs, and would have this js. I don't think there are any tarballs with the docs other than downloading a snapshot of the ipython-doc repo.

@minrk
Copy link
Member Author

minrk commented Jun 24, 2012

If we want it to only be in the repo, and in no installs, then we can remove it from the manifest. In that case, the release tag on GitHub would have it, but sdists would not.

@takluyver
Copy link
Member

I think I'd go with that path (removing it from the manifest), and point packagers to the tag-tarball on Github. For people regularly creating virtualenvs, I'd like to keep the download from pypi as small as possible.

@minrk
Copy link
Member Author

minrk commented Jun 24, 2012

@takluyver sounds good. For that matter, we could exclude the doc sources from the sdist, if we really wanted to keep it small.

@minrk
Copy link
Member Author

minrk commented Jun 25, 2012

removed from manifest.

@takluyver
Copy link
Member

I'd lean that way, although we should think about it a bit, because there'll always be that time you want to refer to the docs somewhere without wifi, like on a plane.

  • If you've got a git clone of the repository, you've got the doc sources handy anyway.
  • On Ubuntu, ipython currently suggests ipython-doc, so it's not automatically pulled in. We could ask Julian to upgrade that to 'recommends', so it would be installed by default with ipython.
  • I don't know if EPD/Python(x,y) ship docs - but presumably our sdist doesn't affect them.
  • We could offer a docs download if you know you're going to be disconnected.

@fperez
Copy link
Member

fperez commented Jun 25, 2012

Let's consider what we do with docs separately... I've been thinking recently that, given the discussions we had at pydata indicating there will be no improvements to python docstrings forthcoming from python-dev ever, IPython should take the lead in offering documentation access to users.

Solid, easy to find help with good search and relevant examples is the one area where Matlab/Mathematica literally mop the floor with the python tools. It's not even funny how utterly pathetic our solutions are compared to what those environments offer on this front. But I think we now have in IPython enough machinery (in particular in the notebook) to tackle that problem, and to start thinking about how to offer better interactive access to help. Ultimately I'd like to do so for all the various projects, but we should obviously start by testing any ideas on IPython itself, before we suggest other projects adopt this.

@fperez
Copy link
Member

fperez commented Jun 25, 2012

Back to the topic of this PR, once we hear from @juliantaylor if it satisfies Debian's packaging policies in full, then I think we can merge. Thanks @minrk for taking care of this one!

@juliantaylor
Copy link
Contributor

this should be enough to remove the need for repackaging (and the +dfsg) suffix. Thank you.
but why the toplevel directory? isn't the pip version generated from a sdist which can exclude it via the manifest?

I don't really want to bump the -docs to recommends, as a low bandwidth user I like my packages small and granular.
Its by far the largest package, not necessary for using the package and experienced users usually know that -doc's are not installed by default with the package.
For less experienced users there it is now quite prominently displayed in the software center as an addon.
(btw. a good screenshot for the software center should be added, http://screenshots.ubuntu.com/upload, the data is shared between multiple distributions)

and exclude it from MANIFEST, so it will not be in sdists,
only available in the repo / via release tag.
@minrk
Copy link
Member Author

minrk commented Jun 25, 2012

but why the toplevel directory? isn't the pip version generated from a sdist which can exclude it via the manifest?

Honestly, I don't know where the best place is to put it. It didn't seem right that it was in the static dir, which looked too much to me like actually used code, and was available to notebook clients. And yes, it is easy to exclude or include it from anything, no matter where we put it.

Perhaps the most logical location is external/js, since these really are external dependencies (this PR now reflects this).

@juliantaylor thanks for your patience, and all your packaging help. Sorry for the bother.

@fperez
Copy link
Member

fperez commented Jun 25, 2012

+1 for external, just so it doesn't clutter the top level. Can you make that change before we merge it then?

@minrk
Copy link
Member Author

minrk commented Jun 25, 2012

already did :)

@minrk
Copy link
Member Author

minrk commented Jun 25, 2012

I clobbered the original commit, so it looks like I did it yesterday (git time machines ftw!)

fperez added a commit that referenced this pull request Jun 25, 2012
Ship unminified js for easier packaging.  We now conform to the Debian packaging guidelines regarding the presence of binary blobs (the minified JS sources).

Includes unminified single-file versions of prettify, jQuery-1.7.1, and jquery/jquery-ui@ba8f147. 

These files are totally unused by us, as we use the minified code, but allow packagers to validate/reminify/etc according to their own policies.

Closes #1265.
@fperez fperez merged commit ca6c4d0 into ipython:master Jun 25, 2012
@fperez
Copy link
Member

fperez commented Jun 25, 2012

sneaky; not fair to win an email race with a time machine ;)

@minrk minrk deleted the unminified2 branch March 31, 2014 23:36
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
Ship unminified js for easier packaging.  We now conform to the Debian packaging guidelines regarding the presence of binary blobs (the minified JS sources).

Includes unminified single-file versions of prettify, jQuery-1.7.1, and jquery/jquery-ui@ba8f147. 

These files are totally unused by us, as we use the minified code, but allow packagers to validate/reminify/etc according to their own policies.

Closes ipython#1265.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

please ship unminified js and css sources
4 participants