Skip to content

Commit a54df6f

Browse files
authored
resolve 409 failures by enabling dev versioning for mgmt/nspkg, but _not_ auto incrementing (Azure#19868)
1 parent f496498 commit a54df6f

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

eng/tox/sanitize_setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def process_requires(setup_py_path):
9696
requires = [
9797
Requirement.parse(r)
9898
for r in get_install_requires(setup_py_path)
99-
if r.startswith("azure") and "-nspkg" not in r
99+
if r.startswith("azure")
100100
]
101101
# Find package requirements that are not available on PyPI
102102
requirement_to_update = {}

eng/versioning/version_increment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def increment_version(old_version):
4242

4343
package_name = args.package_name.replace('_', '-')
4444

45-
packages = get_packages(args, package_name)
45+
packages = get_packages(args, package_name, additional_excludes = ["mgmt", "-nspkg"])
4646

4747
package_map = { pkg[1][0]: pkg for pkg in packages }
4848

eng/versioning/version_shared.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434

3535
logging.getLogger().setLevel(logging.INFO)
3636

37-
def path_excluded(path):
38-
return "-nspkg" in path or "tests" in path or "mgmt" in path or is_metapackage(path)
37+
def path_excluded(path, additional_excludes):
38+
return any([excl in path for excl in additional_excludes]) or "tests" in path or is_metapackage(path)
3939

4040
# Metapackages do not have an 'azure' folder within them
4141
def is_metapackage(package_path):
@@ -44,13 +44,13 @@ def is_metapackage(package_path):
4444
azure_path = path.join(dir_path, 'azure')
4545
return not path.exists(azure_path)
4646

47-
def get_setup_py_paths(glob_string, base_path):
47+
def get_setup_py_paths(glob_string, base_path, additional_excludes):
4848
setup_paths = process_glob_string(glob_string, base_path)
49-
filtered_paths = [path.join(p, 'setup.py') for p in setup_paths if not path_excluded(p)]
49+
filtered_paths = [path.join(p, 'setup.py') for p in setup_paths if not path_excluded(p, additional_excludes)]
5050
return filtered_paths
5151

5252

53-
def get_packages(args, package_name = ""):
53+
def get_packages(args, package_name = "", additional_excludes = []):
5454
# This function returns list of path to setup.py and setup info like install requires, version for all packages discovered using glob
5555
# Followiong are the list of arguements expected and parsed by this method
5656
# service, glob_string
@@ -59,7 +59,7 @@ def get_packages(args, package_name = ""):
5959
else:
6060
target_dir = root_dir
6161

62-
paths = get_setup_py_paths(args.glob_string, target_dir)
62+
paths = get_setup_py_paths(args.glob_string, target_dir, additional_excludes)
6363

6464
# Check if package is excluded if a package name param is passed
6565
if package_name and not any(filter(lambda x: package_name == os.path.basename(os.path.dirname(x)), paths)):

0 commit comments

Comments
 (0)