From 82146eda3d253da6a92c4fc0de14009665794f7e Mon Sep 17 00:00:00 2001 From: Michael H Date: Sun, 15 Apr 2018 18:44:16 -0400 Subject: [PATCH] [V3/docs] New Audio, remove old reqs... (#1503) * typo fix * update docs with up to date reqs (remove old) and reccommend venv usage * remove youtube_dl from reqs * adding the mac doc update after verifying correctness * venv installation required for py3.5 ... * remove venv stuff, that can be handled on a unified page in a later PR --- docs/guide_data_conversion.rst | 2 +- docs/install_centos.rst | 2 +- docs/install_debian.rst | 2 +- docs/install_mac.rst | 2 -- docs/install_raspbian.rst | 3 ++- docs/install_ubuntu.rst | 3 ++- requirements.txt | 1 - 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/guide_data_conversion.rst b/docs/guide_data_conversion.rst index 8c7254af1..a25c58204 100644 --- a/docs/guide_data_conversion.rst +++ b/docs/guide_data_conversion.rst @@ -82,7 +82,7 @@ Here's an example of that in use: need to be awaited """ - # First we give the converter out cog's Config instance. + # First we give the converter our cog's Config instance. converter = dc(self.config) # next we design a way to get all of the data into Config's internal diff --git a/docs/install_centos.rst b/docs/install_centos.rst index 2f27f38e3..b25d6799b 100644 --- a/docs/install_centos.rst +++ b/docs/install_centos.rst @@ -12,7 +12,7 @@ Installing pre-requirements yum -y groupinstall development yum -y install https://centos7.iuscommunity.org/ius-release.rpm - yum -y install yum-utils wget which python35u python35u-pip python35u-devel openssl-devel libffi-devel git opus-devel java-1.8.0-openjdk + yum -y install yum-utils wget which python35u python35u-pip python35u-devel openssl-devel libffi-devel git java-1.8.0-openjdk sh -c "$(wget https://gist.githubusercontent.com/mustafaturan/7053900/raw/27f4c8bad3ee2bb0027a1a52dc8501bf1e53b270/latest-ffmpeg-centos6.sh -O -)" -------------- diff --git a/docs/install_debian.rst b/docs/install_debian.rst index d146668e7..669e51b0f 100644 --- a/docs/install_debian.rst +++ b/docs/install_debian.rst @@ -14,7 +14,7 @@ Installing pre-requirements echo "deb http://httpredir.debian.org/debian stretch-backports main contrib non-free" >> /etc/apt/sources.list apt-get update - apt-get install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git ffmpeg libopus-dev unzip default-jre -y + apt-get install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git unzip default-jre -y ------------------ Installing the bot diff --git a/docs/install_mac.rst b/docs/install_mac.rst index fd7e7b06f..2cbb12af4 100644 --- a/docs/install_mac.rst +++ b/docs/install_mac.rst @@ -15,8 +15,6 @@ Installing pre-requirements * After the installation, install the required packages by pasting the commands and pressing enter, one-by-one: * :code:`brew install python3 --with-brewed-openssl` * :code:`brew install git` - * :code:`brew install ffmpeg --with-ffplay` - * :code:`brew install opus` * :code:`brew tap caskroom/versions` * :code:`brew cask install java8` diff --git a/docs/install_raspbian.rst b/docs/install_raspbian.rst index 690258101..1453ce438 100644 --- a/docs/install_raspbian.rst +++ b/docs/install_raspbian.rst @@ -10,7 +10,8 @@ Installing pre-requirements .. code-block:: none - sudo apt-get install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git libav-tools libopus-dev unzip default-jre -y + sudo apt-get install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git unzip default-jre -y + -------------- Installing Red diff --git a/docs/install_ubuntu.rst b/docs/install_ubuntu.rst index 742fd1980..21a61151f 100644 --- a/docs/install_ubuntu.rst +++ b/docs/install_ubuntu.rst @@ -12,7 +12,8 @@ Installing the pre-requirements .. code-block:: none - sudo apt install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git ffmpeg libopus-dev unzip default-jre -y + sudo apt install python3.5-dev python3-pip build-essential libssl-dev libffi-dev git unzip default-jre -y + ------------------ Installing the bot diff --git a/requirements.txt b/requirements.txt index 577d7bff7..77cdcd6c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ yarl==0.18.0 aiohttp>=2.0.0,<2.3.0 appdirs==1.4.3 -youtube_dl raven==6.5.0 colorama==0.3.9 aiohttp-json-rpc==0.8.7