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

Resolve documentation build errors #526

Merged
merged 1 commit into from
Apr 5, 2017
Merged

Conversation

mbeacom
Copy link
Collaborator

@mbeacom mbeacom commented Apr 5, 2017

The goal of this PR is to resolve build ERRORS during make html.

  • Add missing dependencies to documentation requirement file.
  • Fix missing toctree entries and link errors.

Note: Once this is merged, we should re-deploy the documentation pages.

@mbeacom mbeacom added documentation Related to documentation in official project docs or individual docstrings. enhancement Positive change that does not change the API, i.e. improved performance, using less memory etc. labels Apr 5, 2017
@coveralls
Copy link

coveralls commented Apr 5, 2017

Coverage Status

Coverage remained the same at 50.16% when pulling a4a8c9e on mbeacom:dev-docs into 332ca21 on Zulko:master.

Copy link
Collaborator

@keikoro keikoro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mbeacom I realise a number of the things I marked weren't your changes at all but were already part of the original docs/previous version of them, though it might make sense to fix them right now, in one go. (Otherwise I'll have to go in and fix them (again) at a later point. ^^)

Compositing audio clips
~~~~~~~~~~~~~~~~~~~~~~~~


Exporting and previewing audio clips
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can also export assign an audio clip as the soundtrack of a video clip with ::

I'm guessing this should just be "assign"?

@@ -53,36 +54,95 @@ VideoClip
:width: 128 px
:align: center

Note: three next sections are in construction
Note that clips make with a `make_frame` do not have an explicit frame rate, so you must provide a frame rate (``fps``, frames er second) for ``write_gif`` and ``write_videofile``, and more generally for any methods that requires iterating through the frames.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*per second

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*methods that require
(also, I think it's iterate over)

myclip = VideoFileClip("some_video.avi")
myclip = VideoFileClip("some_animation.gif")

Note that these clips will have an ``fps`` (frame per second) attribute, which will be transmitted if you do small modifications of the clip, and will be used by default in ``write_videofile``, ``write_gif``, etc. For instance: ::
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

frames per second, make small modifications to


clip = ImageSequenceClip(images_list, fps=25)

where ``images_list`` can be either a list of image names (that will be *played*) in that order, a folder name (at which case all the image files in the folder will be played in alphanumerical order), or a list of frames (Numpy arrays), obtained for instance from other clips.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in which case


where ``images_list`` can be either a list of image names (that will be *played*) in that order, a folder name (at which case all the image files in the folder will be played in alphanumerical order), or a list of frames (Numpy arrays), obtained for instance from other clips.

When you provide a folder name or list of file names, you can choose ``load_images=True`` to specify that all images should be loaded into the RAM. This is only interesting if you have a small number of images that will be each used more than once (e.g. if the images form a looping animation).
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that will each be used

@@ -7,29 +7,29 @@ OpenCV is very optional, its installation is not always simple and I found it to
The installation seems easy for Windows. On linux, here is what I found on the Internet:

- Remove any other version of OpenCV if you installed it through a package manager.
- Unzip the source code of `OpenCV 2.4.6`_ in some folder. open a terminal in this folder.
- Unzip the source code of `OpenCV 2.4.6` in some folder. open a terminal in this folder.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Open

@@ -5,7 +5,7 @@ Organization of MoviePy's code

This reviews the folders and files in moviepy's code. It's very easy:

At the root of the project you have everything required for the packaging and installation of moviepy (README, setup.py, LICENCE) etc. Then you the ``docs/`` folder with the source code of the documentation (see :ref:`updating_docs`), a folder for some :ref:`examples`, and the main folder ``moviepy/`` for the source code of the library itself.
At the root of the project you have everything required for the packaging and installation of moviepy (README, setup.py, LICENCE) etc. Then you the ``docs/`` folder with the source code of the documentation, a folder for some :ref:`examples`, and the main folder ``moviepy/`` for the source code of the library itself.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MoviePy
also, there is a word missing, but no idea what it is: "Then you the docs"

@@ -20,4 +20,4 @@ If you want to hack into the code or locate a particular function, read :ref:`co
audiotools
ffmpeg
decorators

code_origanization
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

organization? (spelling?)

@@ -25,7 +25,7 @@ I can't seem to read any video with MoviePy
""""""""""""""""""""""""""""""""""""""""""""""

Known reason: you have a deprecated version of FFMPEG, install a recent version from the
website, not from your OS's repositories ! (see :ref:`installation`).
website, not from your OS's repositories ! (see :ref:`install`).
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

repositories! (no space)

@@ -114,7 +114,7 @@ Or use `this script <https://gist.github.com/Zulko/b910c8b22e8e1c01fae6>`_ to ma
Data animations
----------------

This `tutorial <https://zulko.github.io/blog/2014/11/13/things-you-can-do-with-python-and-pov-ray/>`_ shows how to use MoviePy to animate the different Python vizualization libraries: Mayavi, Vispy, Scikit-image, Matplotlib, etc.
This `data animation tutorial <https://zulko.github.io/blog/2014/11/13/things-you-can-do-with-python-and-pov-ray/>`_ shows how to use MoviePy to animate the different Python vizualization libraries: Mayavi, Vispy, Scikit-image, Matplotlib, etc.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

visualization

@mbeacom
Copy link
Collaborator Author

mbeacom commented Apr 5, 2017

@kerstin I didn't mean for this PR to be copy changes. The only copy that was changed was to resolve errors or consolidate.

The goal of this PR is to resolve build ERRORS during make html.

@mbeacom
Copy link
Collaborator Author

mbeacom commented Apr 5, 2017

@Earney @Zulko Anyone else have opinions on this?
I can make the copy changes here or split them off into a separate PR.

I'm not at all opposed to the changes requested here, but I wasn't looking to modify actual copy until after the documentation was at a buildable state (i.e. the follow-up PR to this being merged).

It's a matter of preference, but I prefer to limit PRs to a specific goal and try not to trail off on random line changes beyond what's necessary for the resolution and syntax-based formatting changes.

Additionally, the copy changes that did make their way into this PR were due to completing of the video/audio clips documentation separation. The copy should have come directly from one of previously existing files.

Just a note: I did make the mistake of updating the copyright in this PR versus waiting for the follow-up which was a consistency mistake on my part. Sorry about that!

Thank you all!

@coveralls
Copy link

coveralls commented Apr 5, 2017

Coverage Status

Coverage remained the same at 50.16% when pulling f30a439 on mbeacom:dev-docs into 6da89ec on Zulko:master.

@ghost
Copy link

ghost commented Apr 5, 2017

I believe it is best to limit PRs to a specific goal as much as possible, but a few minor random line changes would be okay from time to time, but shouldn't be a day to day practice. (I know I have been guilty of this numerous times!)

@mbeacom
Copy link
Collaborator Author

mbeacom commented Apr 5, 2017

@Earney Do you think I should make the requested corrections in this PR or offload them to another PR following merging this one?

@ghost
Copy link

ghost commented Apr 5, 2017

@mbeacom I don't care. I haven't spent much time in the docs, so I leave that up to you guys on what you think is best for this PR.

@mbeacom mbeacom merged commit 5eda6c0 into Zulko:master Apr 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Related to documentation in official project docs or individual docstrings. enhancement Positive change that does not change the API, i.e. improved performance, using less memory etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants