diff --git a/cyberpanel.sh b/cyberpanel.sh index 7f718f8ec..850289478 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -476,11 +476,7 @@ EOF check_return fi - if [[ $SERVER_OS == "CentOS" ]]; then - pip3.6 install virtualenv==16.7.9 - else - pip3.6 install virtualenv - fi + pip3.6 install virtualenv check_return fi @@ -500,9 +496,7 @@ EOF DEBIAN_FRONTEND=noninteractive apt install -y python3-venv check_return - if [[ $UBUNTU_20 == "True" ]]; then - pip3 install virtualenv==16.7.9 - fi + pip3 install virtualenv check_return fi @@ -1187,24 +1181,24 @@ pip_virtualenv() { if [[ $DEV == "ON" ]]; then #install dev branch - #wget https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt + wget https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt virtualenv -p /usr/bin/python3 /usr/local/CyberPanel if [[ $UBUNTU_20 == "False" ]]; then source /usr/local/CyberPanel/bin/activate - wget -O /usr/local/cyberpanel-pip.zip https://rep.cyberpanel.net/cyberpanel-pip-3.zip - check_return - unzip /usr/local/cyberpanel-pip.zip -d /usr/local - check_return - pip3.6 install --ignore-installed /usr/local/pip-packs/* + #wget -O /usr/local/cyberpanel-pip.zip https://rep.cyberpanel.net/cyberpanel-pip-3.zip + #check_return + #unzip /usr/local/cyberpanel-pip.zip -d /usr/local + #check_return + pip3.6 install --ignore-installed -r requirments.txt check_return else . /usr/local/CyberPanel/bin/activate - wget -O /usr/local/cyberpanel-pip.zip https://rep.cyberpanel.net/ubuntu-pip-3.zip - check_return - unzip /usr/local/cyberpanel-pip.zip -d /usr/local - check_return - pip3 install --ignore-installed /usr/local/packages/* + #wget -O /usr/local/cyberpanel-pip.zip https://rep.cyberpanel.net/ubuntu-pip-3.zip + #check_return + #unzip /usr/local/cyberpanel-pip.zip -d /usr/local + #check_return + pip3 install --ignore-installed -r requirments.txt check_return fi fi diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh index 30bd28e86..ed5906ab6 100644 --- a/cyberpanel_upgrade.sh +++ b/cyberpanel_upgrade.sh @@ -307,7 +307,7 @@ if [ $SERVER_OS = "Ubuntu" ]; then pip3 install virtualenv check_return else - pip3.6 install virtualenv==16.7.9 + pip3.6 install virtualenv check_return fi @@ -325,19 +325,20 @@ else fi rm -f requirments.txt +wget https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt -if [[ $UBUNTU_20 == "False" ]]; then - wget -O /usr/local/cyberpanel-pip.zip https://rep.cyberpanel.net/cyberpanel-pip-3.zip -else - wget -O /usr/local/cyberpanel-pip.zip https://rep.cyberpanel.net/ubuntu-pip-3.zip -fi - -check_return -rm -rf /usr/local/pip-packs/ -rm -rf /usr/local/packages - -unzip /usr/local/cyberpanel-pip.zip -d /usr/local -check_return +#if [[ $UBUNTU_20 == "False" ]]; then +# wget -O /usr/local/cyberpanel-pip.zip https://rep.cyberpanel.net/cyberpanel-pip-3.zip +#else +# wget -O /usr/local/cyberpanel-pip.zip https://rep.cyberpanel.net/ubuntu-pip-3.zip +#fi +# +#check_return +#rm -rf /usr/local/pip-packs/ +#rm -rf /usr/local/packages +# +#unzip /usr/local/cyberpanel-pip.zip -d /usr/local +#check_return . /usr/local/CyberPanel/bin/activate check_return @@ -345,15 +346,15 @@ if [ $SERVER_OS = "Ubuntu" ]; then . /usr/local/CyberPanel/bin/activate check_return if [[ $UBUNTU_20 == "False" ]]; then - pip3 install --ignore-installed /usr/local/pip-packs/* + pip3 install --ignore-installed -r requirments.txt else - pip3 install --ignore-installed /usr/local/packages/* + pip3 install --ignore-installed -r requirments.txt fi check_return else - source /usr/local/CyberPanel/bin/activate - check_return - pip3.6 install --ignore-installed /usr/local/pip-packs/* + #source /usr/local/CyberPanel/bin/activate + #check_return + pip3.6 install --ignore-installed -r requirments.txt check_return fi @@ -390,19 +391,22 @@ fi check_return +rm -f requirments.txt +wget https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt + if [ $SERVER_OS = "Ubuntu" ]; then . /usr/local/CyberCP/bin/activate check_return if [[ $UBUNTU_20 == "False" ]]; then - pip3 install --ignore-installed /usr/local/pip-packs/* + pip3 install --ignore-installed -r requirments.txt else - pip3 install --ignore-installed /usr/local/packages/* + pip3 install --ignore-installed -r requirments.txt fi check_return else source /usr/local/CyberCP/bin/activate check_return - pip3.6 install --ignore-installed /usr/local/pip-packs/* + pip3.6 install --ignore-installed -r requirments.txt check_return fi diff --git a/requirments.txt b/requirments.txt index ff9efbc01..afd0c78e3 100755 --- a/requirments.txt +++ b/requirments.txt @@ -1,68 +1,91 @@ -acme==0.21.1 -asgiref==3.2.3 -asn1crypto==0.24.0 -Babel==0.9.6 -backports.ssl-match-hostname==3.5.0.1 -bcrypt==3.1.7 -boto3==1.9.64 -botocore==1.12.64 -certifi==2018.4.16 +acme==1.9.0 +asgiref==3.3.1 +asn1crypto==1.4.0 +Babel==2.8.0 +backports.ssl-match-hostname==3.7.0.1 +bcrypt==3.2.0 +beautifulsoup4==4.9.3 +boto3==1.16.13 +botocore==1.19.13 +cachetools==4.1.1 +certifi==2020.11.8 +cffi==1.14.3 chardet==3.0.4 -cloudflare==2.6.1 -ConfigArgParse==0.15.2 +cloudflare==2.8.13 +ConfigArgParse==1.2.3 configobj==5.0.6 -cryptography==2.8 -decorator==3.4.0 -Django==3.0.1 -docker==3.6.0 +cryptography==3.2.1 +decorator==4.4.2 +Django==3.1.3 +docker==4.3.1 docker-pycreds==0.4.0 -docutils==0.14 -enum34==1.1.6 +docutils==0.16 +enum34==1.1.10 +filelock==3.0.12 funcsigs==1.0.2 future==0.18.2 -google-api-python-client==1.9.3 -google-auth-httplib2==0.0.3 -google-auth-oauthlib==0.4.1 -idna==2.6 -ipaddress==1.0.16 -IPy==0.75 -Jinja2==2.7.2 -jmespath==0.9.3 -josepy==1.1.0 -jsonpatch==1.2 -jsonpointer==1.9 -MarkupSafe==0.19 -mock==2.0.0 -mysqlclient==1.4.6 -paramiko==2.7.1 -parsedatetime==2.4 -pbr==4.0.4 -pexpect==4.4.0 -prettytable==0.7.2 -psutil==5.4.3 +google-api-core==1.23.0 +google-api-python-client==1.12.5 +google-auth==1.23.0 +google-auth-httplib2==0.0.4 +google-auth-oauthlib==0.4.2 +googleapis-common-protos==1.52.0 +httplib2==0.18.1 +idna==2.10 +ipaddress==1.0.23 +IPy==1.0 +Jinja2==2.11.2 +jmespath==0.10.0 +josepy==1.5.0 +jsonlines==1.2.0 +jsonpatch==1.26 +jsonpointer==2.0 +MarkupSafe==1.1.1 +mock==4.0.2 +mysqlclient==2.0.1 +oauthlib==3.1.0 +paramiko==2.7.2 +parsedatetime==2.6 +pbr==5.5.1 +pexpect==4.8.0 +prettytable==1.0.1 +protobuf==3.13.0 +psutil==5.7.3 ptyprocess==0.6.0 py3dns==3.2.1 -pycparser==2.18 +pyasn1==0.4.8 +pyasn1-modules==0.2.8 +pycparser==2.20 pygpgme==0.3 -PyNaCl==1.3.0 -pyOpenSSL==17.5.0 +PyNaCl==1.4.0 +pyOpenSSL==19.1.0 +pyotp==2.4.1 pyRFC3339==1.1 -python-dateutil==2.7.5 -pytz==2018.4 -pyudev==0.15 +python-dateutil==2.8.1 +pytz==2020.4 +pyudev==0.22.0 pyxattr==0.7.1 -pyotp==2.4.0 -PyYAML==3.10 -requests==2.18.4 -requests-file==1.4.3 -s3transfer==0.1.13 -tornado==6.0.4 -six==1.13.0 -sqlparse==0.3.0 -tldextract==2.2.0 -urllib3==1.22 -websocket-client==0.56.0 -zope.component==4.4.1 -zope.event==4.3.0 -zope.interface==4.5.0 -validators==0.14.2 \ No newline at end of file +PyYAML==5.3.1 +requests==2.24.0 +requests-file==1.5.1 +requests-oauthlib==1.3.0 +requests-toolbelt==0.9.1 +rsa==4.6 +s3transfer==0.3.3 +six==1.15.0 +soupsieve==2.0.1 +sqlparse==0.4.1 +tldextract==3.0.2 +tornado==6.1 +uritemplate==3.0.1 +urllib3==1.25.11 +validators==0.18.1 +wcwidth==0.2.5 +websocket-client==0.57.0 +zope.component==4.6.2 +zope.deferredimport==4.3.1 +zope.deprecation==4.4.0 +zope.event==4.5.0 +zope.hookable==5.0.1 +zope.interface==5.2.0 +zope.proxy==4.3.5 \ No newline at end of file