Skip to content
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.

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

Remove +dev from versions #4684

Merged
merged 5 commits into from Oct 17, 2017
Merged

Remove +dev from versions #4684

merged 5 commits into from Oct 17, 2017

Conversation

derekbekoe
Copy link
Member

  • Remove +dev version nos.
  • Remove 'unreleased' from release notes
  • Fix scripts
  • CI to verify the above

ALL_MODULES=""
for f in $share_folder/build/*
do ALL_MODULES="$ALL_MODULES $f"
done
Copy link
Contributor

Choose a reason for hiding this comment

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

You can list all sub-directories in one command:

ls -d ./src/command_modules/*/

Copy link
Member Author

Choose a reason for hiding this comment

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

I need all the filepaths, not the sub-directories.
i.e. azure-cli.whl core.whl storage.whl etc.

Copy link
Contributor

Choose a reason for hiding this comment

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

then do
find $share_folder/build/ -name "*.whl"

Copy link
Member Author

Choose a reason for hiding this comment

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

okay done.

ALL_MODULES=""
for f in $share_folder/build/*
do ALL_MODULES="$ALL_MODULES $f"
done
Copy link
Contributor

Choose a reason for hiding this comment

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

Same.

pip install pylint flake8
pip install azure-cli-fulltest -f $share_folder/build
Copy link
Contributor

Choose a reason for hiding this comment

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

Why can't we use azure-cli-fulltest anymore?

Copy link
Member Author

Choose a reason for hiding this comment

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

$ALL_MODULES includes azure-cli-fulltest as well.

Background to this change though is pip install azure-cli-fulltest -f $share_folder/build, the -f may not install the .whl in the directory if there's a newer version available on PyPI.
I want to make sure we're running tests with the version in the directory. By specifying all the whl files, we ensure that we're installing the right packages.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok. we should look into this. may be the azure-cli-fulltest should match the exact version.

else
sed -i "s/^VERSION = [\"']\(.*\)+dev[\"']/VERSION = \"\1+dev.$version\"/" $each
sed -i "s/^VERSION = [\"']\(.*\)[\"']/VERSION = \"\1.$version\"/" $each
Copy link
Contributor

Choose a reason for hiding this comment

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

This is used to generate edge build. With the +dev gone, we need to make sure the version scheme still works for edge build.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes. Can you take a look at this since you know about this? Is there something I can do to verify?

Copy link
Contributor

@troydai troydai Oct 17, 2017

Choose a reason for hiding this comment

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

use .devN

For example.

The version in the source code is 2.0.19. The version of the latest PyPI package is 2.0.18
The nightly version become 2.0.19.dev4345. The digits follows dev is Travis build number.
After release, the latest package in PyPI is 2.0.19. In the meantime, source code version is upgraded to 2.0.20.

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

okay done.

@@ -3,3 +3,6 @@
Release History
===============

0.1.0+dev
Copy link
Contributor

Choose a reason for hiding this comment

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

This package should follow the same scheme.

Copy link
Member Author

Choose a reason for hiding this comment

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

Okay done.

@derekbekoe
Copy link
Member Author

@troydai Feedback addressed. Can you take another look?

for f in $share_folder/build/*
do ALL_MODULES="$ALL_MODULES $f"
done
ALL_MODULES=find $share_folder/build/ -name "*.whl"
Copy link
Contributor

Choose a reason for hiding this comment

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

ALL_MODULES=`find $share_folder/build/ -name "*.whl"`

@troydai troydai merged commit af881c5 into Azure:master Oct 17, 2017
@derekbekoe derekbekoe deleted the no-plus-dev branch October 17, 2017 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants