Merge pull request #8823 from gavindsouza/updated-requirements

chore: pinned requirements

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 dist: trusty
-sudo: required
 
 addons:
   hosts:
@@ -39,6 +38,16 @@ matrix:
     env: DB=mariadb TYPE=server
     script: bench --site test_site run-tests --coverage
 
+before_install:
+  # install wkhtmltopdf
+  - wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
+  - tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
+  - sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
+  - sudo chmod o+x /usr/local/bin/wkhtmltopdf
+
+  # install cups
+  - sudo apt-get install libcups2-dev
+
 install:
   - cd ~
   - source ./.nvm/nvm.sh
@@ -52,23 +61,20 @@ install:
   - mkdir ~/frappe-bench/sites/test_site
   - cp $TRAVIS_BUILD_DIR/.travis/$DB.json ~/frappe-bench/sites/test_site/site_config.json
 
-  - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
-  - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
+  - if [ $DB == "mariadb" ];then
+      mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'";
+      mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'";
+      mysql -u root -e "CREATE DATABASE test_frappe";
+      mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'";
+      mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'";
+      mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'";
+      mysql -u root -e "FLUSH PRIVILEGES";
+    fi
 
-  - mysql -u root -e "CREATE DATABASE test_frappe"
-  - mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
-  - mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
-
-  - mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
-  - mysql -u root -e "FLUSH PRIVILEGES"
-
-  - psql -c "CREATE DATABASE test_frappe" -U postgres
-  - psql -c "CREATE USER test_frappe WITH PASSWORD 'test_frappe'" -U postgres
-
-  - wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
-  - tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
-  - sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
-  - sudo chmod o+x /usr/local/bin/wkhtmltopdf
+  - if [ $DB == "postgres" ];then
+      psql -c "CREATE DATABASE test_frappe" -U postgres;
+      psql -c "CREATE USER test_frappe WITH PASSWORD 'test_frappe'" -U postgres;
+    fi
 
   - cd ./frappe-bench
 

requirements.txt

@@ -1,68 +1,68 @@
-boto3
-chardet
-dropbox==9.1.0
-gunicorn
-jinja2
-markdown2==2.3.6
-PyMySQL
-maxminddb-geolite2
-python-dateutil
-pytz
-six
-werkzeug
-semantic_version
-rauth>=0.6.2
-requests
-redis==2.10.6
-selenium
-babel==2.6.0
-ipython
-html2text==2016.9.19
-email_reply_parser
-click==7.0
-num2words==0.5.5
-watchdog==0.8.0
+Babel==2.6.0
+beautifulsoup4==4.8.1
+bleach-whitelist==0.0.10
 bleach==2.1.4
-bleach-whitelist
-Pillow
-beautifulsoup4
-rq==0.12.0
-schedule
-cryptography
-pyopenssl
-ndg-httpsclient
-pyasn1
-zxcvbn-python
-unittest-xml-reporting
-oauthlib
-requests-oauthlib
-pdfkit
-PyJWT
-PyPDF2
-openpyxl
-pyotp
-pyqrcode
-pypng
-premailer
-croniter
-googlemaps==3.1.1
-braintree
-future
-passlib
-google-api-python-client
-google-auth
-google-auth-httplib2
-google-auth-oauthlib
-faker
-stripe
-coverage
-urllib3
+boto3==1.10.18
+braintree==3.57.1
+chardet==3.0.4
+Click==7.0
+coverage==4.5.4
+croniter==0.3.30
+cryptography==2.8
+dropbox==9.1.0
+email-reply-parser==0.5.9
+Faker==2.0.4
+frontmatter==3.0.5
+future==0.18.2
 GitPython==2.1.11
-psycopg2==2.7.5
+google-api-python-client==1.7.11
+google-auth-httplib2==0.0.3
+google-auth-oauthlib==0.4.1
+google-auth==1.7.1
+googlemaps==3.1.1
+gunicorn==19.9.0
+html2text==2016.9.19
+ipython==5.8.0
+Jinja2==2.10.3
+markdown2==2.3.5
+maxminddb-geolite2==2018.703
+ndg-httpsclient==0.5.1
+num2words==0.5.5
+oauthlib==3.1.0
+openpyxl==2.6.4
+passlib==1.7.1
+pdfkit==0.6.1
+Pillow==6.2.1
+premailer==3.6.1
 psycopg2-binary==2.7.5
-sqlparse==0.2.4
+psycopg2==2.7.5
+pyasn1==0.4.7
 Pygments==2.2.0
-frontmatter
+PyJWT==1.7.1
+PyMySQL==0.9.3
+pyOpenSSL==19.0.0
+pyotp==2.3.0
+PyPDF2==1.26.0
+pypng==0.0.20
+PyQRCode==1.2.1
+python-dateutil==2.8.1
+pytz==2019.3
 PyYAML==3.13
-xlrd
-RestrictedPython==5.0
+rauth==0.7.3
+redis==2.10.6
+requests-oauthlib==1.3.0
+requests==2.22.0
+RestrictedPython==5.0
+rq==0.12.0
+schedule==0.6.0
+selenium==3.141.0
+semantic-version==2.8.2
+six==1.13.0
+sqlparse==0.2.4
+stripe==2.40.0
+unittest-xml-reporting==2.5.2
+urllib3==1.25.7
+watchdog==0.8.0
+Werkzeug==0.16.0
+xlrd==1.2.0
+zxcvbn-python==4.4.24