Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
__pycache__/
*.py[cod]
*$py.class
test.junit.xml
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's gonna end up in here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the junior version of the results that our internal build system needs for test runs

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Junit not junior

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll get to be a grown-up results file someday, little test.junit.xml


# C extensions
*.so
Expand Down Expand Up @@ -145,4 +146,4 @@ $RECYCLE.BIN/

# Documentation
docs/_site/
docs/.jekyll-metadata
docs/.jekyll-metadata
6 changes: 6 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ versionfile_build = tableauserverclient/_version.py
tag_prefix = v
#parentdir_prefix =

[aliases]
smoke=pytest
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means smoke will run unittests AND smoke, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. I have smoke running both the test directory and the smoke directory. Test will only run the test directory


[tool:pytest]
testpaths = test smoke
addopts = --junitxml=./test.junit.xml
8 changes: 6 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,14 @@
license='MIT',
description='A Python module for working with the Tableau Server REST API.',
test_suite='test',
setup_requires=[
'pytest-runner'
],
install_requires=[
'requests>=2.11,<2.12.0a0'
'requests>=2.11,<3.0'
],
tests_require=[
'requests-mock>=1.0,<1.1a0'
'requests-mock>=1.0,<2.0',
'pytest'
]
)
Empty file added smoke/__init__.py
Empty file.