From 6fcfc0aa41f9bc5a17c69257f267333683affe52 Mon Sep 17 00:00:00 2001 From: Jac Date: Sat, 18 Jun 2022 14:55:19 -0700 Subject: [PATCH 1/6] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7321a0..e927c32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ +## 010 (June 2022) +* Add service/schema attributes + ## 091 (March 2022) * Add attribute for hidden field From 6349427f5a1d0adf299cdb1d4c21f2b66e1997f3 Mon Sep 17 00:00:00 2001 From: Jac Date: Sat, 18 Jun 2022 14:59:43 -0700 Subject: [PATCH 2/6] condense jobs so package is available to publish --- .github/workflows/publish-pypi.yml | 36 ++++++++++-------------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index 314e3ce..76c0495 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -7,7 +7,7 @@ on: jobs: - build: + build-then-publish: runs-on: ubuntu-latest strategy: matrix: @@ -25,32 +25,20 @@ jobs: if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - name: Package run: | + python setup.py build python setup.py sdist python setup.py bdist_wheel - - - test-deploy: - if: github.ref_type == 'tag' && contains(github.ref_name, 'test') - needs: build - environment: - name: test-pypi - runs-on: ubuntu-latest - steps: - - name: Publish 📦 to Test PyPI - uses: pypa/gh-action-pypi-publish@master + - name: Publish distribution 📦 to Test PyPI + if: github.ref_type == 'tag' && contains(github.ref_name, 'test') + uses: pypa/gh-action-pypi-publish@release/v1 # license BSD-2 with: - password: ${{ secrets.TEST_PYPI_TOKEN }} + password: ${{ secrets.TEST_PYPI_API_TOKEN }} repository_url: https://test.pypi.org/legacy/ - - - production-deploy: - needs: build - environment: - name: pypi - runs-on: ubuntu-latest - steps: - - name: Publish 📦 to Real PyPI - uses: pypa/gh-action-pypi-publish@master + - name: Publish distribution 📦 to PyPI + if: ${{ github.ref == 'refs/heads/master' && inputs.is_draft }} + - uses: pypa/gh-action-pypi-publish@release/v1 # license BSD-2 with: password: ${{ secrets.PYPI_API_TOKEN }} - repository_url: https://pypi.org/legacy/ + + + From 0a50006782f76bccd3c94e1531aed2bad305de67 Mon Sep 17 00:00:00 2001 From: Jac Date: Sat, 18 Jun 2022 22:42:36 -0700 Subject: [PATCH 3/6] yaml fix github doesn't support if on steps --- .github/workflows/publish-pypi.yml | 65 ++++++++++++++---------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index 76c0495..f974ccc 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -1,44 +1,39 @@ name: Publish to PyPi + on: workflow_dispatch: - release: - types: [created] + inputs: + is_draft: + description: 'Test PyPi' + required: true + type: boolean + push: + branches: development, main jobs: - - build-then-publish: + build-n-publish: + name: Build dist files for PyPi runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.9] steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install wheel - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - - name: Package - run: | - python setup.py build - python setup.py sdist - python setup.py bdist_wheel - - name: Publish distribution 📦 to Test PyPI - if: github.ref_type == 'tag' && contains(github.ref_name, 'test') - uses: pypa/gh-action-pypi-publish@release/v1 # license BSD-2 - with: - password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository_url: https://test.pypi.org/legacy/ - - name: Publish distribution 📦 to PyPI - if: ${{ github.ref == 'refs/heads/master' && inputs.is_draft }} - - uses: pypa/gh-action-pypi-publish@release/v1 # license BSD-2 - with: - password: ${{ secrets.PYPI_API_TOKEN }} - + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - uses: actions/setup-python@v1 + with: + python-version: 3.8 + - name: Build dist files + run: > + python -m pip install --upgrade pip && pip install -e .[test] && + python setup.py build && python res/versioning && python setup.py build && + python setup.py sdist --formats=gztar + - name: Publish distribution 📦 to Test PyPI + uses: pypa/gh-action-pypi-publish@release/v1 # license BSD-2 + with: + password: ${{ secrets.TEST_PYPI_API_TOKEN }} + repository_url: https://test.pypi.org/legacy/ + - name: Publish distribution 📦 to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 # license BSD-2 + with: + password: ${{ secrets.PYPI_API_TOKEN }} - From 96c4489a5cb5d80d02237c06cee340e509b95a34 Mon Sep 17 00:00:00 2001 From: Jac Date: Sat, 18 Jun 2022 22:51:30 -0700 Subject: [PATCH 4/6] Update publish-pypi.yml --- .github/workflows/publish-pypi.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index f974ccc..9c208c4 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -3,11 +3,6 @@ name: Publish to PyPi on: workflow_dispatch: - inputs: - is_draft: - description: 'Test PyPi' - required: true - type: boolean push: branches: development, main @@ -24,8 +19,8 @@ jobs: python-version: 3.8 - name: Build dist files run: > - python -m pip install --upgrade pip && pip install -e .[test] && - python setup.py build && python res/versioning && python setup.py build && + python -m pip install --upgrade pip && pip install -e .[build] && + python setup.py build && python setup.py sdist --formats=gztar - name: Publish distribution 📦 to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 # license BSD-2 From a8c85b30862d231cfebbc8b55013316225245581 Mon Sep 17 00:00:00 2001 From: Jac Fitzgerald Date: Sat, 18 Jun 2022 23:10:43 -0700 Subject: [PATCH 5/6] Bump version to 0.10 for release --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3f5ba92..4264448 100644 --- a/setup.py +++ b/setup.py @@ -2,13 +2,15 @@ setup( name='tableaudocumentapi', - version='0.9', + version='0.10', author='Tableau', author_email='github@tableau.com', url='https://github.com/tableau/document-api-python', packages=['tableaudocumentapi'], license='MIT', description='A Python module for working with Tableau files.', + long_description="file: README.md", + long_description_content_type="text/markdown", test_suite='test', install_requires=['lxml'] ) From e66a3d5a7209f3cdecd457980b389eee7acd3dcc Mon Sep 17 00:00:00 2001 From: Shohei Hagiwara Date: Thu, 14 Jul 2022 17:16:18 +0900 Subject: [PATCH 6/6] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1b48b76..3ae1b5f 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Features include: - Get all fields in a data source - Get all fields in use by certain sheets in a workbook -For Hyper files, take a look a the [Tableau Hyper API](https://help.tableau.com/current/api/hyper_api/en-us/index.html). +For Hyper files, take a look at the [Tableau Hyper API](https://help.tableau.com/current/api/hyper_api/en-us/index.html). We don't support creating files from scratch, adding extracts into workbooks or data sources, or updating field information