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.

Sign up for GitHub

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

Support Python 3.7 #917

Merged
merged 5 commits into from
Aug 20, 2018
Merged

Support Python 3.7 #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
557d801
Don't register overload for six.string_types
texasaggie97-zz Aug 2, 2018
13a683d
Update generated files
texasaggie97-zz Aug 2, 2018
09107b4
Python 3.7 is no longer allowed to fail
texasaggie97-zz Aug 2, 2018
2967782
Update change log
texasaggie97-zz Aug 2, 2018
b93ed71
Declare Python 3.7 support
texasaggie97-zz Aug 2, 2018
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
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ jobs:
sudo: true
matrix:
allow_failures:
- python: 3.7 # remove once #895 is fixed
- python: 3.8-dev
- python: nightly

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
## [Unreleased]
* ### ALL
* #### Added
* Support for Python 3.7
* #### Changed
* #### Removed
* ### NI-DMM
Expand Down
1 change: 0 additions & 1 deletion build/templates/_converters.py.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ def _(repeated_capability, prefix):


# This parsing function duplicate the parsing in the driver, so if changes to the allowed format are made there, they will need to be replicated here.
@_convert_repeated_capabilities.register(six.string_types) # noqa: F811
@_convert_repeated_capabilities.register(six.text_type) # noqa: F811
@_convert_repeated_capabilities.register(str) # noqa: F811
def _(repeated_capability, prefix):
Expand Down
1 change: 1 addition & 0 deletions build/templates/setup.py.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ setup(
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Topic :: System :: Hardware :: Hardware Drivers"
Expand Down
1 change: 0 additions & 1 deletion generated/nidcpower/_converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def _(repeated_capability, prefix):


# This parsing function duplicate the parsing in the driver, so if changes to the allowed format are made there, they will need to be replicated here.
@_convert_repeated_capabilities.register(six.string_types) # noqa: F811
@_convert_repeated_capabilities.register(six.text_type) # noqa: F811
@_convert_repeated_capabilities.register(str) # noqa: F811
def _(repeated_capability, prefix):
Expand Down
1 change: 0 additions & 1 deletion generated/nidmm/_converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def _(repeated_capability, prefix):


# This parsing function duplicate the parsing in the driver, so if changes to the allowed format are made there, they will need to be replicated here.
@_convert_repeated_capabilities.register(six.string_types) # noqa: F811
@_convert_repeated_capabilities.register(six.text_type) # noqa: F811
@_convert_repeated_capabilities.register(str) # noqa: F811
def _(repeated_capability, prefix):
Expand Down
1 change: 0 additions & 1 deletion generated/nifake/_converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def _(repeated_capability, prefix):


# This parsing function duplicate the parsing in the driver, so if changes to the allowed format are made there, they will need to be replicated here.
@_convert_repeated_capabilities.register(six.string_types) # noqa: F811
@_convert_repeated_capabilities.register(six.text_type) # noqa: F811
@_convert_repeated_capabilities.register(str) # noqa: F811
def _(repeated_capability, prefix):
Expand Down
1 change: 0 additions & 1 deletion generated/nifgen/_converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def _(repeated_capability, prefix):


# This parsing function duplicate the parsing in the driver, so if changes to the allowed format are made there, they will need to be replicated here.
@_convert_repeated_capabilities.register(six.string_types) # noqa: F811
@_convert_repeated_capabilities.register(six.text_type) # noqa: F811
@_convert_repeated_capabilities.register(str) # noqa: F811
def _(repeated_capability, prefix):
Expand Down
1 change: 0 additions & 1 deletion generated/nimodinst/_converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def _(repeated_capability, prefix):


# This parsing function duplicate the parsing in the driver, so if changes to the allowed format are made there, they will need to be replicated here.
@_convert_repeated_capabilities.register(six.string_types) # noqa: F811
@_convert_repeated_capabilities.register(six.text_type) # noqa: F811
@_convert_repeated_capabilities.register(str) # noqa: F811
def _(repeated_capability, prefix):
Expand Down
1 change: 0 additions & 1 deletion generated/niscope/_converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def _(repeated_capability, prefix):


# This parsing function duplicate the parsing in the driver, so if changes to the allowed format are made there, they will need to be replicated here.
@_convert_repeated_capabilities.register(six.string_types) # noqa: F811
@_convert_repeated_capabilities.register(six.text_type) # noqa: F811
@_convert_repeated_capabilities.register(str) # noqa: F811
def _(repeated_capability, prefix):
Expand Down
1 change: 0 additions & 1 deletion generated/niswitch/_converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ def _(repeated_capability, prefix):


# This parsing function duplicate the parsing in the driver, so if changes to the allowed format are made there, they will need to be replicated here.
@_convert_repeated_capabilities.register(six.string_types) # noqa: F811
@_convert_repeated_capabilities.register(six.text_type) # noqa: F811
@_convert_repeated_capabilities.register(str) # noqa: F811
def _(repeated_capability, prefix):
Expand Down
1 change: 1 addition & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[tox]
envlist = build_test, codegen, py{27,34,35,36,37,38,py,py3}-test, flake8, docs, pkg-{nidmm,nidcpower,nifgen,niscope,niswitch,nimodinst}
skip_missing_interpreters=True
ignore_basepython_conflict=True
skipsdist = true
toxworkdir = .tox/{env:BITNESS:64}

Expand Down