Skip to content

{CI} Fix dependency version in setup.py, drop eoan package #16306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fengzhou-msft merged 2 commits into from
Dec 17, 2020
Merged

{CI} Fix dependency version in setup.py, drop eoan package #16306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2176ff3
fix telemetry version, drop eoan
fengzhou-msft Dec 17, 2020
cd624c8
fix core dependency
fengzhou-msft Dec 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,9 +671,6 @@ jobs:
Bionic:
deb_system: ubuntu
distro: bionic
Eoan:
deb_system: ubuntu
distro: eoan
Focal:
deb_system: ubuntu
distro: focal
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/debian/test_deb_in_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apt install -y apt-transport-https git gcc python3-dev

# The distros that need libssl1.1
case ${DISTRO} in
bionic|buster|eoan|focal|groovy) apt install -y libssl1.1;;
bionic|buster|focal|groovy) apt install -y libssl1.1;;
*) :;;
esac

Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli-core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
DEPENDENCIES = [
'adal~=1.2.3',
'argcomplete~=1.8',
'azure-cli-telemetry==1.0.6',
'azure-cli-telemetry==1.0.6.*',
'colorama~=0.4.1',
'humanfriendly>=4.7,<9.0',
'jmespath',
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
'antlr4-python3-runtime~=4.7.2',
'azure-appconfiguration~=1.1.1',
'azure-batch~=10.0.0',
'azure-cli-core=={}.*'.format(VERSION),
'azure-cli-core=={}.*'.format(".".join(VERSION.split(".")[:3])),
Copy link
Member Author

@fengzhou-msft fengzhou-msft Dec 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VERSION can be in the format of 2.16.0 or 2.16.0.devN. Both cases will result in azure-cli-core==2.16.0.*.

Copy link
Member Author

@fengzhou-msft fengzhou-msft Dec 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems 2.16.0.* can match with both 2.16.0 and 2.16.0.devN, but 2.16.0.devN.* cannot match 2.16.0.devN in pip 20.3.

'azure-cosmos~=3.0,>=3.0.2',
'azure-datalake-store~=0.0.49',
'azure-functions-devops-build~=0.0.22',
Expand Down