diff --git a/.coveragerc b/.coveragerc deleted file mode 100755 index 6a64b4d1..00000000 --- a/.coveragerc +++ /dev/null @@ -1,15 +0,0 @@ -[report] -# Exclude lines that match patterns from coverage report. -exclude_lines = - if __name__ == .__main__.: - \\$ - -# Only show one number after decimal point in report. -precision = 1 - -[run] -omit = - tabpy/models/* - tabpy/tabpy.py - tabpy/utils/* - tests/* diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c3e8d5b9..9a9017fc 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -3,14 +3,14 @@ name: Test Run on Pull Request on: [pull_request] jobs: - ubuntu-build: + build: name: ${{ matrix.python-version }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: python-version: [3.6, 3.7, 3.8] - os: [ubuntu-latest] + os: [ubuntu-latest, windows-latest, macos-latest] steps: - uses: actions/checkout@v1 @@ -27,63 +27,6 @@ jobs: pip install -r requirements_test.txt pip install -r requirements_dev.txt - - name: Test with pytest - run: | - pytest tests --cov=tabpy - coveralls - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - - windows-build: - name: ${{ matrix.python-version }} on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - - strategy: - matrix: - python-version: [3.7, 3.8] - os: [windows-latest] - - steps: - - uses: actions/checkout@v1 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install -r requirements_test.txt - - - name: Test with pytest - run: | - pytest tests - - mac-build: - name: ${{ matrix.python-version }} on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - - strategy: - matrix: - python-version: [3.7, 3.8] - os: [macos-latest] - - steps: - - uses: actions/checkout@v1 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install -r requirements_test.txt - - name: Test with pytest run: | pytest tests diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d6c135be..12fc4b4a 100755 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -3,14 +3,14 @@ name: Test Run on Push on: [push] jobs: - ubuntu-build: + build: name: ${{ matrix.python-version }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: python-version: [3.6, 3.7, 3.8] - os: [ubuntu-latest] + os: [ubuntu-latest, windows-latest, macos-latest] steps: - uses: actions/checkout@v1 @@ -27,63 +27,7 @@ jobs: pip install -r requirements_test.txt pip install -r requirements_dev.txt - - name: Test with pytest - run: | - pytest tests --cov=tabpy - coveralls - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - - windows-build: - name: ${{ matrix.python-version }} on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - - strategy: - matrix: - python-version: [3.7, 3.8] - os: [windows-latest] - - steps: - - uses: actions/checkout@v1 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install -r requirements_test.txt - - - name: Test with pytest - run: | - pytest tests - - mac-build: - name: ${{ matrix.python-version }} on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - - strategy: - matrix: - python-version: [3.7, 3.8] - os: [macos-latest] - - steps: - - uses: actions/checkout@v1 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install -r requirements_test.txt - - name: Test with pytest run: | pytest tests + \ No newline at end of file diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 22572143..d8a1c64c 100755 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,24 +1,37 @@ build: - environment: - python: 3.6 - nodes: - analysis: - project_setup: - override: - - pip install sklearn pandas numpy textblob nltk scipy - tests: - override: - - py-scrutinizer-run - - - command: pylint-run - use_website_config: true - tests: true + environment: + python: 3.7.6 + nodes: + coverage: + project_setup: + override: + - pip install -r requirements.txt + - pip install -r requirements_test.txt + - pip install -r requirements_dev.txt + tests: + override: + - command: 'pytest tests --cov=tabpy --cov-config=setup.cfg' + coverage: + file: '.coverage' + config_file: 'setup.cfg' + format: 'py-cc' + analysis: + project_setup: + override: + - pip install -r requirements_test.txt + tests: + override: + - py-scrutinizer-run + - + command: pylint-run + use_website_config: true + tests: true checks: - python: - code_rating: true - duplicate_code: true + python: + code_rating: true + duplicate_code: true filter: - excluded_paths: - - '*/test/*' - dependency_paths: - - 'lib/*' + excluded_paths: + - '*/tests/*' + dependency_paths: + - 'lib/*' diff --git a/CHANGELOG b/CHANGELOG index 7fa45cce..c57d48fc 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,17 @@ # Changelog +## v1.0.0 + +### Improvements + +- Minor: feature name changed to analytics extensions. +- Startup script files deleted. +- Index page updated. + +### Other + +- TabPy is now Tableau Supported (used to be Community Supported). + ## v0.9.0 ### Improvements diff --git a/README.md b/README.md index c10dedd5..5d25900f 100755 --- a/README.md +++ b/README.md @@ -1,16 +1,15 @@ # TabPy -[![Community Supported](https://img.shields.io/badge/Support%20Level-Community%20Supported-457387.svg)](https://www.tableau.com/support-levels-it-and-developer-tools) +[![Tableau Supported](https://img.shields.io/badge/Support%20Level-Tableau%20Supported-53bd92.svg)](https://www.tableau.com/support-levels-it-and-developer-tools) [![GitHub](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://raw.githubusercontent.com/Tableau/TabPy/master/LICENSE) [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/tableau/tabpy/Test%20Run%20on%20Push)](https://github.com/tableau/TabPy/actions?query=workflow%3A%22Test+Run+on+Push%22) -[![Coverage Status](https://img.shields.io/coveralls/github/tableau/TabPy.svg)](https://coveralls.io/github/tableau/TabPy) +![Scrutinizer coverage (GitHub/BitBucket)](https://img.shields.io/scrutinizer/coverage/g/tableau/tabpy) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/tableau/TabPy/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/tableau/TabPy/?branch=master) [![Python 3.6](https://img.shields.io/badge/python-3.6-blue.svg)](https://www.python.org/downloads/release/python-360/) [![Python 3.7](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/downloads/release/python-370/) [![Python 3.8](https://img.shields.io/badge/python-3.8-blue.svg)](https://www.python.org/downloads/release/python-380/) - ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/tabpy?label=PyPI%20Python%20versions) ![PyPI - Wheel](https://img.shields.io/pypi/wheel/tabpy) [![PyPI version](https://badge.fury.io/py/tabpy.svg)](https://pypi.python.org/pypi/tabpy/) diff --git a/requirements_test.txt b/requirements_test.txt index 2bbfacd9..2762eadc 100755 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,3 +1,4 @@ -coveralls +hypothesis pytest -pytest-cov \ No newline at end of file +pytest-cov +twisted diff --git a/setup.cfg b/setup.cfg index cfde7fc9..87902928 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,4 +8,20 @@ max-line-length = 98 max-line-length = 98 [bdist_wheel] -universal=1 \ No newline at end of file +universal=1 + +[report] +# Exclude lines that match patterns from coverage report. +exclude_lines = + if __name__ == .__main__.: + \\$ + +# Only show one number after decimal point in report. +precision = 1 + +[run] +omit = + tabpy/models/* + tabpy/tabpy.py + tabpy/utils/* + tests/* diff --git a/startup.cmd b/startup.cmd deleted file mode 100755 index 48ddf7e7..00000000 --- a/startup.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO off -ECHO TabPy is a PIP package now, install it with "pip install tabpy". -ECHO For more information read https://tableau.github.io/TabPy/. diff --git a/startup.sh b/startup.sh deleted file mode 100755 index 1057d0b4..00000000 --- a/startup.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -echo TabPy is a PIP package now, install it with "pip install tabpy". -echo For more information read https://tableau.github.io/TabPy/. diff --git a/tabpy/VERSION b/tabpy/VERSION index 899f24fc..afaf360d 100755 --- a/tabpy/VERSION +++ b/tabpy/VERSION @@ -1 +1 @@ -0.9.0 \ No newline at end of file +1.0.0 \ No newline at end of file diff --git a/tabpy/tabpy_server/static/index.html b/tabpy/tabpy_server/static/index.html index 37088552..52784f13 100644 --- a/tabpy/tabpy_server/static/index.html +++ b/tabpy/tabpy_server/static/index.html @@ -65,6 +65,7 @@

Useful links:

  • TabPy Documentation
  • TabPy Source Code
  • TabPy PyPi
    • +
  • Tableau Sci-Fi - Advanced Analytics Team blog