From c24f3f89b6609dba3ff159ad8c656691505d8e98 Mon Sep 17 00:00:00 2001 From: WyattBlue Date: Sun, 17 Dec 2023 00:30:29 -0500 Subject: [PATCH 1/2] Update docs Update documentation to what we do now. Point to active url --- docs/Makefile | 2 +- docs/conf.py | 4 ++-- docs/overview/installation.rst | 15 ++++++--------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index f26ef7dc3..b1791159f 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -38,5 +38,5 @@ open: open _build/html/index.html upload: - rsync -avxP --delete _build/html/ pyav.org:/srv/pyav.org/www/httpdocs/docs/develop/ + rsync -avxP --delete _build/html/ root@basswood-io.com:/var/www/pyav diff --git a/docs/conf.py b/docs/conf.py index cc97c4397..11cc7cd2e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -72,8 +72,8 @@ master_doc = 'index' # General information about the project. -project = u'PyAV' -copyright = u'2017, Mike Boers' +project = 'PyAV' +copyright = '2023, The PyAV Team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/overview/installation.rst b/docs/overview/installation.rst index e97da901e..67b2655d6 100644 --- a/docs/overview/installation.rst +++ b/docs/overview/installation.rst @@ -11,7 +11,7 @@ Since release 8.0.0 binary wheels are provided on PyPI for Linux, Mac and Window pip install av -Currently FFmpeg 5.1.3 is used with the following features enabled for all platforms: +Currently FFmpeg 6.0 is used with the following features enabled for all platforms: - fontconfig - gmp @@ -77,10 +77,10 @@ and a few other tools in general: - Python's development headers -Mac OS X -^^^^^^^^ +MacOS +^^^^^ -On **Mac OS X**, Homebrew_ saves the day:: +On **MacOS**, Homebrew_ saves the day:: brew install ffmpeg pkg-config @@ -115,7 +115,7 @@ Building from the latest source :: # Get PyAV from GitHub. - git clone git@github.com:PyAV-Org/PyAV.git + git clone https://github.com/PyAV-Org/PyAV.git cd PyAV # Prep a virtualenv. @@ -129,11 +129,8 @@ Building from the latest source # Build PyAV. make - # or - python setup.py build_ext --inplace - -On **Mac OS X** you may have issues with regards to Python expecting gcc but finding clang. Try to export the following before installation:: +On **MacOS** you may have issues with regards to Python expecting gcc but finding clang. Try to export the following before installation:: export ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future From 3a4fb29c0207487e6cd9b703d15cca09a729683b Mon Sep 17 00:00:00 2001 From: WyattBlue Date: Thu, 21 Dec 2023 02:50:09 -0500 Subject: [PATCH 2/2] Change url to my activate link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b6bbe56c9..b4dedceed 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Have fun, [read the docs][docs], [come chat with us][gitter], and good luck! [conda-badge]: https://img.shields.io/conda/vn/conda-forge/av.svg?colorB=CCB39A [conda]: https://anaconda.org/conda-forge/av [docs-badge]: https://img.shields.io/badge/docs-on%20pyav.org-blue.svg -[docs]: http://pyav.org/docs +[docs]: https://pyav.basswood-io.com [gitter-badge]: https://img.shields.io/gitter/room/nwjs/nw.js.svg?logo=gitter&colorB=cc2b5e [gitter]: https://app.gitter.im/#/room/#PyAV-Org_User-Help:gitter.im [pypi-badge]: https://img.shields.io/pypi/v/av.svg?colorB=CCB39A @@ -75,6 +75,6 @@ Have fun, [read the docs][docs], [come chat with us][gitter], and good luck! [github-tests]: https://github.com/PyAV-Org/PyAV/actions?workflow=tests [github]: https://github.com/PyAV-Org/PyAV -[ffmpeg]: http://ffmpeg.org/ +[ffmpeg]: https://ffmpeg.org/ [conda-forge]: https://conda-forge.github.io/ [conda-install]: https://docs.conda.io/projects/conda/en/latest/user-guide/install/index.html