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

Convert to Python 3 #1128

Merged
merged 57 commits into from
Nov 15, 2020
Merged
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
8eba0b8
Conform with Python 3 syntax
jleveque Sep 21, 2020
10e7c84
More Python 3 fixes
jleveque Sep 22, 2020
6e404cb
Make syntax compliant
jleveque Sep 22, 2020
e4a18b3
More manual changes
jleveque Sep 23, 2020
f795f10
[config/main.py] Replace map calls with for loop
jleveque Oct 3, 2020
fb001ba
Remove unnecessary casts from range to list
jleveque Oct 5, 2020
2513adf
[config/main.py] Add spaces after commas, prettify line breaks
jleveque Oct 5, 2020
60b9d8b
[config/main.py] Simplify line
jleveque Oct 9, 2020
c4e1e9a
Simplify check
jleveque Oct 10, 2020
95e97f6
[conftest.py] Go back to aboslute import to work with new changes
jleveque Oct 14, 2020
13c77d3
Update comments
jleveque Oct 17, 2020
d6fe8f2
Convert new consutil/lib.py changes to Python 3
jleveque Nov 4, 2020
5bfa5ac
[show/fgnhg.py] Convert to Python 3
jleveque Nov 4, 2020
f78840b
More updates
jleveque Nov 5, 2020
2d08766
Fix conftest.py
jleveque Nov 5, 2020
48d4e8e
Fix tests/system_health_test.py
jleveque Nov 5, 2020
4b0d47a
Fix conftest.py
jleveque Nov 5, 2020
19f2c50
Don't pass 'decode_responses=True' to SonicV2Connector as it is no lo…
jleveque Nov 6, 2020
1977972
Convert sonic_sku_create.py and related tests to Python 3
jleveque Nov 6, 2020
14699f2
More unicode -> str
jleveque Nov 9, 2020
5b7aafb
Make syntax Python 3-compliant
jleveque Nov 9, 2020
5d917e6
Set universal_newlines=True for all subprocess commands where stdout …
jleveque Nov 9, 2020
cd6e41f
Fix up crm_test.py
jleveque Nov 10, 2020
824bbb4
Alphabetize
jleveque Nov 11, 2020
ee359a8
Update README.md to reflect building and testing Python 3 package
jleveque Nov 12, 2020
9417e85
Fix the path of the sonic_sku_create.py script
jleveque Nov 12, 2020
2a36866
[config/feature.py] Arrange imports
jleveque Nov 13, 2020
f585baa
Remove unnecessary conversion to list
jleveque Nov 13, 2020
165ba67
Don't pass 'version' to ArgumentParser constructor; deprecated in Pyt…
jleveque Nov 13, 2020
3c0a7ee
Replace some missed dict.iteritems() with dict.items()
jleveque Nov 14, 2020
eb4d163
[aclshow] Open COUNTER_POSITION file in text mode, not binary
jleveque Nov 14, 2020
318f918
Remove support for Python 2
jleveque Nov 14, 2020
ded2b3a
Replace 'universal_newline=True' with new (as of Python 3.7) alias 't…
jleveque Nov 14, 2020
6234a4e
Replace '__builtin__' with 'builtins'
jleveque Nov 14, 2020
fbb7c40
Update expected output for CRM tests (order changed)
jleveque Nov 14, 2020
cf8d3cc
Update expected output for fgnhg tests (order changed)
jleveque Nov 14, 2020
c8606f4
Fix filter_fdb_entries.py
jleveque Nov 14, 2020
24e86db
Update shebangs to python3
jleveque Nov 14, 2020
2b26277
Pickle fixes to work with Python 3
jleveque Nov 14, 2020
1a6ff76
itervalues -> values, iterkeys -> keys
jleveque Nov 14, 2020
e38a403
[intfutil] Fix print statements
jleveque Nov 14, 2020
ee02aa2
[intfutil] Fix another missed line which wasn't Python 3-compliant
jleveque Nov 14, 2020
3f224ee
Update expected output for drops_group_test tests (order changed)
jleveque Nov 14, 2020
f210dbf
More Python 3 fixes
jleveque Nov 14, 2020
0771e0b
Add 'text=True' param to all subprocess.check_output() calls
jleveque Nov 14, 2020
1c47985
Replace 'file.next()' with 'next(file)' to comply with Python 3
jleveque Nov 14, 2020
139aa89
Update expected output for system_health_test tests (order changed)
jleveque Nov 14, 2020
a14c529
Update expected output for vlan_test tests (order changed)
jleveque Nov 14, 2020
d39bae2
Python 3 fix for watermarkstat
jleveque Nov 14, 2020
a28fec8
[show/vlan] Remove unnecessary str() conversions
jleveque Nov 14, 2020
254d57a
[show/vlan] Fix '<' not supported between instances of 'tuple' and 'str'
jleveque Nov 14, 2020
75de4f2
[pcmping] xrange() -> range()
jleveque Nov 14, 2020
7472e21
Remove unnecessary list() conversions
jleveque Nov 14, 2020
bec1ae8
[acl_loader/main.py] Update methods from ipaddr module forms to ipadd…
jleveque Nov 14, 2020
bb029e1
Remove shebangs and main() functions from files which do not need them
jleveque Nov 14, 2020
6b019ab
[pcmping] Revert unnecessary changes
jleveque Nov 14, 2020
800350f
Remove duplicate import
jleveque Nov 14, 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
Prev Previous commit
Next Next commit
Fix the path of the sonic_sku_create.py script
jleveque committed Nov 14, 2020
commit 9417e85263d84655179965b26805d351dbf3072c
2 changes: 1 addition & 1 deletion tests/sku_create_test.py
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
input_path = os.path.join(modules_path, "tests/sku_create_input")
output_dir_path = os.path.join(modules_path, "tests/sku_create_input/Mellanox-SN2700-D48C8_NEW")
sku_def_file = os.path.join(input_path, "Mellanox-SN2700-D48C8.xml")
sku_create_script = os.path.join(scripts_path, "sonic_sku_create.py")
sku_create_script = "sonic_sku_create.py"
output_file_path = os.path.join(modules_path, "tests/sku_create_input/Mellanox-SN2700-D48C8_NEW/port_config.ini")
model_file_path = os.path.join(modules_path, "tests/sku_create_input/Mellanox-SN2700-D48C8/port_config.ini")