From b17d88e49b653a1e4be89048445a86aed59af2c3 Mon Sep 17 00:00:00 2001 From: Shuai Wang Date: Mon, 11 Oct 2021 14:39:40 -0700 Subject: [PATCH 1/2] Fix dependency order --- src/azure-cli/requirements.py3.Darwin.txt | 4 ++-- src/azure-cli/requirements.py3.Linux.txt | 4 ++-- src/azure-cli/requirements.py3.windows.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index a1e87b27922..a7ebbffff8a 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -106,7 +106,9 @@ idna==2.8 invoke==1.2.0 isodate==0.6.0 Jinja2==2.11.3 +javaproperties==0.5.1 jmespath==0.9.5 +jsondiff==1.2.0 knack==0.8.2 MarkupSafe==1.1.1 msal==1.10.0 @@ -138,5 +140,3 @@ wcwidth==0.1.7 websocket-client==0.56.0 wrapt==1.11.2 xmltodict==0.12.0 -jsondiff==1.2.0 -javaproperties==0.5.1 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index 3e06fc94ad2..43b674fed0e 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -107,7 +107,9 @@ idna==2.8 invoke==1.2.0 isodate==0.6.0 Jinja2==2.11.3 +javaproperties==0.5.1 jmespath==0.9.5 +jsondiff==1.2.0 knack==0.8.2 MarkupSafe==1.1.1 msal==1.10.0 @@ -139,5 +141,3 @@ wcwidth==0.1.7 websocket-client==0.56.0 wrapt==1.11.2 xmltodict==0.12.0 -jsondiff==1.2.0 -javaproperties==0.5.1 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 32d91988bb6..506b5b846af 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -105,7 +105,9 @@ idna==2.8 invoke==1.2.0 isodate==0.6.0 Jinja2==2.11.3 +javaproperties==0.5.1 jmespath==0.9.5 +jsondiff==1.2.0 knack==0.8.2 MarkupSafe==1.1.1 msal==1.10.0 @@ -138,5 +140,3 @@ vsts==0.1.25 wcwidth==0.1.7 websocket-client==0.56.0 xmltodict==0.12.0 -jsondiff==1.2.0 -javaproperties==0.5.1 From fc8090b0927881230a4cb821eaf39f39fb0d09ac Mon Sep 17 00:00:00 2001 From: jiasli <4003950+jiasli@users.noreply.github.com> Date: Tue, 12 Oct 2021 10:04:27 +0800 Subject: [PATCH 2/2] sort --- src/azure-cli/requirements.py3.Darwin.txt | 6 +++--- src/azure-cli/requirements.py3.Linux.txt | 4 ++-- src/azure-cli/requirements.py3.windows.txt | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index a7ebbffff8a..9ffea8e6023 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -85,14 +85,14 @@ azure-mgmt-sqlvirtualmachine==1.0.0b1 azure-mgmt-storage==19.0.0 azure-mgmt-synapse==2.0.0 azure-mgmt-trafficmanager==0.51.0 -azure-multiapi-storage==0.6.2 azure-mgmt-web==4.0.0 +azure-multiapi-storage==0.6.2 azure-nspkg==3.0.2 azure-storage-common==1.4.2 azure-synapse-accesscontrol==0.5.0 azure-synapse-artifacts==0.8.0 -azure-synapse-spark==0.2.0 azure-synapse-managedprivateendpoints==0.3.0 +azure-synapse-spark==0.2.0 bcrypt==3.2.0 certifi==2019.6.16 cffi==1.14.4 @@ -105,8 +105,8 @@ humanfriendly==9.1 idna==2.8 invoke==1.2.0 isodate==0.6.0 -Jinja2==2.11.3 javaproperties==0.5.1 +Jinja2==2.11.3 jmespath==0.9.5 jsondiff==1.2.0 knack==0.8.2 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index 43b674fed0e..ede0fb8419f 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -91,8 +91,8 @@ azure-nspkg==3.0.2 azure-storage-common==1.4.2 azure-synapse-accesscontrol==0.5.0 azure-synapse-artifacts==0.8.0 -azure-synapse-spark==0.2.0 azure-synapse-managedprivateendpoints==0.3.0 +azure-synapse-spark==0.2.0 bcrypt==3.2.0 certifi==2019.6.16 cffi==1.14.4 @@ -106,8 +106,8 @@ humanfriendly==9.1 idna==2.8 invoke==1.2.0 isodate==0.6.0 -Jinja2==2.11.3 javaproperties==0.5.1 +Jinja2==2.11.3 jmespath==0.9.5 jsondiff==1.2.0 knack==0.8.2 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 506b5b846af..a450211ebba 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -91,8 +91,8 @@ azure-nspkg==3.0.2 azure-storage-common==1.4.2 azure-synapse-accesscontrol==0.5.0 azure-synapse-artifacts==0.8.0 -azure-synapse-spark==0.2.0 azure-synapse-managedprivateendpoints==0.3.0 +azure-synapse-spark==0.2.0 bcrypt==3.2.0 certifi==2019.6.16 cffi==1.14.4 @@ -104,8 +104,8 @@ humanfriendly==9.1 idna==2.8 invoke==1.2.0 isodate==0.6.0 -Jinja2==2.11.3 javaproperties==0.5.1 +Jinja2==2.11.3 jmespath==0.9.5 jsondiff==1.2.0 knack==0.8.2