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

Add tclk session template #1027

Merged
merged 69 commits into from
Sep 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
08fc91a
Add initial metadata
texasaggie97-zz Aug 29, 2019
9d53c62
Create nitclk.mak
texasaggie97-zz Aug 29, 2019
39c2ed7
Remove numpy restriction
texasaggie97-zz Aug 29, 2019
571206f
Upgrade pip
texasaggie97-zz Aug 29, 2019
b7732eb
Remove specific version of flake8
texasaggie97-zz Aug 29, 2019
41cf6ca
Add basepython section
texasaggie97-zz Aug 29, 2019
e074561
Try using pypy3.5
texasaggie97-zz Aug 29, 2019
defd961
Go back to pypy3 and remove basepython block
texasaggie97-zz Aug 29, 2019
ae86324
Don't need to run build_test for all builds - only 3.6
texasaggie97-zz Aug 29, 2019
5a97c42
Remove warning from coverage
texasaggie97-zz Aug 30, 2019
ef21c76
Undo previous change
texasaggie97-zz Aug 30, 2019
143e08f
Try disabling faulthandler
texasaggie97-zz Aug 30, 2019
3673d09
Remove --no-faulthandler
texasaggie97-zz Aug 30, 2019
f1ae55d
pypy needs an older version of pytest
texasaggie97-zz Aug 30, 2019
a4a28fa
Use platform_python_implementation since implementation_name is not d…
texasaggie97-zz Aug 30, 2019
1251734
Try to get back to the initial coverage
texasaggie97-zz Aug 30, 2019
b3005f0
Do the same thing for build_test
texasaggie97-zz Aug 30, 2019
b6b5a30
Remove redundant pip
texasaggie97-zz Aug 30, 2019
d8f4566
Merge branch 'clean_tox' into add_tclk/metadata
texasaggie97-zz Aug 30, 2019
5e4c3da
Merge branch 'add_tclk/metadata' into add_tclk/simple_codegen
texasaggie97-zz Aug 30, 2019
8fd761d
Add codecov file to try to control limits for passing
texasaggie97-zz Sep 3, 2019
8052328
Merge branch 'clean_tox' into build/codecov
texasaggie97-zz Sep 3, 2019
d7f5f9c
Merge branch 'build/codecov' into add_tclk/metadata
texasaggie97-zz Sep 3, 2019
09cac06
Merge branch 'add_tclk/metadata' into add_tclk/simple_codegen
texasaggie97-zz Sep 3, 2019
d84d22f
Enable nitclk build
texasaggie97-zz Sep 3, 2019
b135799
There are some files we will need to skip for now
texasaggie97-zz Sep 3, 2019
b1f3290
Add generated nitclk files
texasaggie97-zz Sep 3, 2019
c31a6b4
Update generated files
texasaggie97-zz Sep 3, 2019
7baef6a
Can't skip README.rst
texasaggie97-zz Sep 3, 2019
f05da64
Update templates
texasaggie97-zz Sep 3, 2019
31d1509
Add new cases for buffers with a converter
texasaggie97-zz Sep 3, 2019
95c96da
Need to handle ' []' to normalize everything
texasaggie97-zz Sep 3, 2019
0ac90fa
Get the session handle name from config instead of hardcoding 'vi'
texasaggie97-zz Sep 3, 2019
7ab3975
Temp commit
texasaggie97-zz Sep 3, 2019
76c608e
Fix syntax error
texasaggie97-zz Sep 4, 2019
0d71be0
Test new cases
texasaggie97-zz Sep 4, 2019
cabe80f
Merge branch 'master' into add_tclk/simple_codegen
texasaggie97-zz Sep 4, 2019
c6e0a7c
Force change
texasaggie97-zz Sep 4, 2019
a40e9c5
Update generated files
texasaggie97-zz Sep 4, 2019
3afc75e
Merge branch 'master' into add_tclk/simple_codegen
texasaggie97-zz Sep 4, 2019
f8eda3f
Update generated files
texasaggie97-zz Sep 4, 2019
af28fc7
Merge branch 'add_tclk/simple_codegen' into add_tclk/codegen_changes
texasaggie97-zz Sep 4, 2019
22890c1
Add different target for pr (project) and commit (patch)
texasaggie97-zz Sep 4, 2019
ea12f9b
threshold should be number
texasaggie97-zz Sep 4, 2019
b040199
Renumber scaler cases to be in order used in the code
texasaggie97-zz Sep 4, 2019
37b11e0
Update generated files
texasaggie97-zz Sep 4, 2019
4b1082b
Renumber buffer cases to match order used in code
texasaggie97-zz Sep 4, 2019
30bc0ce
Move and rename test to match case (C020)
texasaggie97-zz Sep 4, 2019
4d3ae50
Merge branch 'master' into add_tclk/fix_case_sequence
texasaggie97-zz Sep 4, 2019
5534ccf
Merge branch 'master' into add_tclk/nitclk_template_changes
texasaggie97-zz Sep 4, 2019
7b37c71
Merge branch 'add_tclk/fix_case_sequence' into add_tclk/nitclk_templa…
texasaggie97-zz Sep 4, 2019
24bd847
Update generated files
texasaggie97-zz Sep 4, 2019
5650e56
Merge branch 'master' into add_tclk/nitclk_template_changes
texasaggie97-zz Sep 4, 2019
a65cc12
Add nitclk specific session template
texasaggie97-zz Sep 5, 2019
70f9dbb
No longer need to skip generating session.py
texasaggie97-zz Sep 5, 2019
aea6f50
Add new session.py
texasaggie97-zz Sep 5, 2019
f3a32c8
Merge branch 'master' into add_tclk/add_tclk_session
texasaggie97-zz Sep 18, 2019
04bb37c
Update generated files
texasaggie97-zz Sep 18, 2019
297a67e
Don't need the extra line
texasaggie97-zz Sep 18, 2019
d22e852
Don't need the extra line
texasaggie97-zz Sep 18, 2019
3b4ce9b
Update generated files
texasaggie97-zz Sep 18, 2019
6417a88
get_session_number() is now private
texasaggie97-zz Sep 18, 2019
2c12924
Remove repeated calabilities list
texasaggie97-zz Sep 18, 2019
fadd8b3
Don't need if since we know tclk has attributes
texasaggie97-zz Sep 18, 2019
c748a85
Change session handle name
texasaggie97-zz Sep 18, 2019
bffda2a
Update generated files
texasaggie97-zz Sep 18, 2019
b690670
Change attribute class name to remove ViInt32
texasaggie97-zz Sep 18, 2019
124ea84
Update generated files
texasaggie97-zz Sep 18, 2019
be7d608
Update docstring
texasaggie97-zz Sep 18, 2019
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
2 changes: 1 addition & 1 deletion build/templates/_attributes.py.mako
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class AttributeEnum(object):


# nitclk specific attribute type
class AttributeViInt32SessionReference(Attribute):
class AttributeSessionReference(Attribute):

def __get__(self, session, session_type):
# Import here to avoid a circular dependency when initial import happens
Expand Down
4 changes: 2 additions & 2 deletions build/templates/_converters.py.mako
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,12 @@ def convert_to_nitclk_session_number(item):
- NI-TClk Session Num
'''
try:
return item.tclk.get_session_number()
return item.tclk._get_session_number()
except KeyError:
pass

try:
return item.get_session_number()
return item._get_session_number()
except KeyError:
pass

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
# built documents.
#
# The full version, including alpha/beta/rc tags.
release = '1.1.3.dev0'
release = '0.1.0.dev0'
# The short X.Y version.
version = release[:3]

Expand Down
2 changes: 1 addition & 1 deletion generated/nidcpower/_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def __set__(self, session, value):


# nitclk specific attribute type
class AttributeViInt32SessionReference(Attribute):
class AttributeSessionReference(Attribute):

def __get__(self, session, session_type):
# Import here to avoid a circular dependency when initial import happens
Expand Down
4 changes: 2 additions & 2 deletions generated/nidcpower/_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ def convert_to_nitclk_session_number(item):
- NI-TClk Session Num
'''
try:
return item.tclk.get_session_number()
return item.tclk._get_session_number()
except KeyError:
pass

try:
return item.get_session_number()
return item._get_session_number()
except KeyError:
pass

Expand Down
2 changes: 1 addition & 1 deletion generated/nidigital/_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def __set__(self, session, value):


# nitclk specific attribute type
class AttributeViInt32SessionReference(Attribute):
class AttributeSessionReference(Attribute):

def __get__(self, session, session_type):
# Import here to avoid a circular dependency when initial import happens
Expand Down
4 changes: 2 additions & 2 deletions generated/nidigital/_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ def convert_to_nitclk_session_number(item):
- NI-TClk Session Num
'''
try:
return item.tclk.get_session_number()
return item.tclk._get_session_number()
except KeyError:
pass

try:
return item.get_session_number()
return item._get_session_number()
except KeyError:
pass

Expand Down
2 changes: 1 addition & 1 deletion generated/nidmm/_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def __set__(self, session, value):


# nitclk specific attribute type
class AttributeViInt32SessionReference(Attribute):
class AttributeSessionReference(Attribute):

def __get__(self, session, session_type):
# Import here to avoid a circular dependency when initial import happens
Expand Down
4 changes: 2 additions & 2 deletions generated/nidmm/_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ def convert_to_nitclk_session_number(item):
- NI-TClk Session Num
'''
try:
return item.tclk.get_session_number()
return item.tclk._get_session_number()
except KeyError:
pass

try:
return item.get_session_number()
return item._get_session_number()
except KeyError:
pass

Expand Down
2 changes: 1 addition & 1 deletion generated/nifake/_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def __set__(self, session, value):


# nitclk specific attribute type
class AttributeViInt32SessionReference(Attribute):
class AttributeSessionReference(Attribute):

def __get__(self, session, session_type):
# Import here to avoid a circular dependency when initial import happens
Expand Down
4 changes: 2 additions & 2 deletions generated/nifake/_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ def convert_to_nitclk_session_number(item):
- NI-TClk Session Num
'''
try:
return item.tclk.get_session_number()
return item.tclk._get_session_number()
except KeyError:
pass

try:
return item.get_session_number()
return item._get_session_number()
except KeyError:
pass

Expand Down
2 changes: 1 addition & 1 deletion generated/nifgen/_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def __set__(self, session, value):


# nitclk specific attribute type
class AttributeViInt32SessionReference(Attribute):
class AttributeSessionReference(Attribute):

def __get__(self, session, session_type):
# Import here to avoid a circular dependency when initial import happens
Expand Down
4 changes: 2 additions & 2 deletions generated/nifgen/_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ def convert_to_nitclk_session_number(item):
- NI-TClk Session Num
'''
try:
return item.tclk.get_session_number()
return item.tclk._get_session_number()
except KeyError:
pass

try:
return item.get_session_number()
return item._get_session_number()
except KeyError:
pass

Expand Down
4 changes: 2 additions & 2 deletions generated/nimodinst/_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ def convert_to_nitclk_session_number(item):
- NI-TClk Session Num
'''
try:
return item.tclk.get_session_number()
return item.tclk._get_session_number()
except KeyError:
pass

try:
return item.get_session_number()
return item._get_session_number()
except KeyError:
pass

Expand Down
2 changes: 1 addition & 1 deletion generated/niscope/_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def __set__(self, session, value):


# nitclk specific attribute type
class AttributeViInt32SessionReference(Attribute):
class AttributeSessionReference(Attribute):

def __get__(self, session, session_type):
# Import here to avoid a circular dependency when initial import happens
Expand Down
4 changes: 2 additions & 2 deletions generated/niscope/_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ def convert_to_nitclk_session_number(item):
- NI-TClk Session Num
'''
try:
return item.tclk.get_session_number()
return item.tclk._get_session_number()
except KeyError:
pass

try:
return item.get_session_number()
return item._get_session_number()
except KeyError:
pass

Expand Down
4 changes: 2 additions & 2 deletions generated/nise/_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ def convert_to_nitclk_session_number(item):
- NI-TClk Session Num
'''
try:
return item.tclk.get_session_number()
return item.tclk._get_session_number()
except KeyError:
pass

try:
return item.get_session_number()
return item._get_session_number()
except KeyError:
pass

Expand Down
2 changes: 1 addition & 1 deletion generated/niswitch/_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def __set__(self, session, value):


# nitclk specific attribute type
class AttributeViInt32SessionReference(Attribute):
class AttributeSessionReference(Attribute):

def __get__(self, session, session_type):
# Import here to avoid a circular dependency when initial import happens
Expand Down
4 changes: 2 additions & 2 deletions generated/niswitch/_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ def convert_to_nitclk_session_number(item):
- NI-TClk Session Num
'''
try:
return item.tclk.get_session_number()
return item.tclk._get_session_number()
except KeyError:
pass

try:
return item.get_session_number()
return item._get_session_number()
except KeyError:
pass

Expand Down
2 changes: 1 addition & 1 deletion generated/nitclk/_attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def __set__(self, session, value):


# nitclk specific attribute type
class AttributeViInt32SessionReference(Attribute):
class AttributeSessionReference(Attribute):

def __get__(self, session, session_type):
# Import here to avoid a circular dependency when initial import happens
Expand Down
4 changes: 2 additions & 2 deletions generated/nitclk/_converters.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ def convert_to_nitclk_session_number(item):
- NI-TClk Session Num
'''
try:
return item.tclk.get_session_number()
return item.tclk._get_session_number()
except KeyError:
pass

try:
return item.get_session_number()
return item._get_session_number()
except KeyError:
pass

Expand Down
Loading