Skip to content

Commit 5484be2

Browse files
authored
Merge pull request #54 from Microsoft/users/tedchamb/regen
bump version to 0.1.3 and fix dev_setup script
2 parents 5521bfa + d7ecc20 commit 5484be2

File tree

3 files changed

+9
-16
lines changed

3 files changed

+9
-16
lines changed

scripts/dev_setup.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import os
1111
from subprocess import check_call, CalledProcessError
1212

13-
root_dir = os.path.abspath(os.path.join(os.path.abspath(__file__), '..', '..'))
14-
1513

1614
def exec_command(command):
1715
try:
@@ -23,25 +21,20 @@ def exec_command(command):
2321
sys.exit(1)
2422

2523

26-
packages = [os.path.dirname(p) for p in glob.glob('vsts*/setup.py')]
27-
28-
# Extract nspkg and sort nspkg by number of "-"
29-
nspkg_packages = [p for p in packages if "nspkg" in p]
30-
nspkg_packages.sort(key=lambda x: len([c for c in x if c == '-']))
31-
32-
content_packages = [p for p in packages if p not in nspkg_packages]
33-
3424
print('Running dev setup...')
25+
26+
root_dir = os.path.abspath(os.path.join(os.path.abspath(__file__), '..', '..'))
3527
print('Root directory \'{}\'\n'.format(root_dir))
3628

29+
exec_command('python -m pip install --upgrade pip')
30+
exec_command('python -m pip install --upgrade wheel')
31+
3732
# install general requirements
3833
if os.path.isfile('./requirements.txt'):
3934
exec_command('pip install -r requirements.txt')
4035

41-
# install packages
42-
for package_list in [nspkg_packages, content_packages]:
43-
for package_name in package_list:
44-
exec_command('pip install -e {}'.format(package_name))
36+
# install dev packages
37+
exec_command('pip install -e vsts')
4538

4639
# install packaging requirements
4740
if os.path.isfile('./scripts/packaging_requirements.txt'):

vsts/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from setuptools import setup, find_packages
77

88
NAME = "vsts"
9-
VERSION = "0.1.2"
9+
VERSION = "0.1.3"
1010

1111
# To install the library, run the following
1212
#

vsts/vsts/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# Licensed under the MIT License. See License.txt in the project root for license information.
44
# --------------------------------------------------------------------------------------------
55

6-
VERSION = "0.1.2"
6+
VERSION = "0.1.3"

0 commit comments

Comments
 (0)