From a5b116c2332fd12a98b8afc4dda6ee9e0b989f43 Mon Sep 17 00:00:00 2001 From: David Glick Date: Mon, 16 Mar 2020 13:00:27 -0400 Subject: [PATCH 1/2] Update dependencies --- requirements.txt | 10 +++++----- requirements_dev.txt | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2a5500865a..726885ab40 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,18 +2,18 @@ asn1crypto==1.3.0 certifi==2019.11.28 cffi==1.14.0 chardet==3.0.4 -click==7.0 +click==7.1.1 coloredlogs==14.0 cryptography==2.8 docutils==0.16 github3.py==1.3.0 -humanfriendly==7.1.1 +humanfriendly==8.1 jinja2==2.11.1 jwcrypto==0.7 -keyring==21.1.0 +keyring==21.2.0 lxml==4.5.0 MarkupSafe==1.1.1 -pycparser==2.19 +pycparser==2.20 pydantic==1.4 PyJWT==1.7.1 python-dateutil==2.8.1 @@ -29,7 +29,7 @@ sarge==0.1.5.post0 selenium==3.141.0 simple-salesforce==0.75.3 six==1.14.0 -SQLAlchemy==1.3.13 +SQLAlchemy==1.3.15 terminaltables==3.1.0 unicodecsv==0.14.1 uritemplate==3.0.1 diff --git a/requirements_dev.txt b/requirements_dev.txt index 19c2415331..093cf1fd58 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -4,10 +4,10 @@ black==19.10b0 coverage==5.0.3 coveralls==1.11.1 flake8==3.7.9 -pre-commit==2.1.1 -pytest==5.3.5 -responses==0.10.11 -Sphinx==2.4.3 +pre-commit==2.2.0 +pytest==5.4.1 +responses==0.10.12 +Sphinx==2.4.4 testfixtures==6.14.0 tox==3.14.5 twine==3.1.1 From 7cef001a86c8e8667247ff54dd8e3e6c6ee65af0 Mon Sep 17 00:00:00 2001 From: David Glick Date: Mon, 16 Mar 2020 14:42:24 -0400 Subject: [PATCH 2/2] Use normal dev org for robot tests --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c03ebf4fda..69c4211096 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -114,8 +114,8 @@ jobs: command: | echo $SFDX_HUB_KEY_BASE64 | base64 --decode > sfdx.key sfdx force:auth:jwt:grant --clientid $SFDX_CLIENT_ID --jwtkeyfile sfdx.key --username $SFDX_HUB_USERNAME --setdefaultdevhubusername -a hub - venv/bin/cci org info prerelease > org_info.txt - venv/bin/cci org default prerelease + venv/bin/cci org info dev > org_info.txt + venv/bin/cci org default dev - run: name: Run robot tests command: |