code for 2.07

.github/workflows/check-coverage.yml

@@ -28,10 +28,11 @@ jobs:
       run: |
         python --version
         python -m pip install --upgrade pip
-        pip install -e .[build]
-        pip install -e .[test]
+        python -m pip install --upgrade build
+        pip install .
+        pip install .[test]
         doit version
-        python setup.py build
+        python -m build
 
     #  https://github.com/marketplace/actions/pytest-coverage-comment
     - name: Generate coverage report

.github/workflows/generate-metadata.yml

@@ -20,12 +20,15 @@ jobs:
 
     - name: Install App and Extras
       run: |
+        python --version
         python -m pip install --upgrade pip
-        python -m pip install -e .[build]
+        python -m pip install --upgrade build
+        pip install .
+        pip install .[test]
         doit version
-        python setup.py build
+        python -m build
 
-    - name: Generate dependencies list
+    - name: Run license check
       run: python bin/license-checker.py
 
     - name: Type-check
@@ -35,7 +38,10 @@ jobs:
       run: black . --check
 
     - name: Generate pyinstaller specs
-      run: echo Using locally generated specs
-      # pyi-makespec tabcmd\tabcmd.py -n tabcmd-windows -i res\tabcmd.ico -F -c --version-file versionfile.txt --onefile  --collect-data tabcmd.locales &&
-      # pyi-makespec tabcmd\tabcmd.py -n tabcmd-mac -i res\tabcmd.icns -F -c --version-file versionfile.txt --onefile --collect-data tabcmd.locales --osx-bundle-identifier com.tableau.tabcmd
-      # 3. Unix
+      run: |
+          echo "Using manually generated specs"
+
+  # todo: add hidden dependencies to these command lines
+  # pyi-makespec tabcmd\tabcmd.py -n tabcmd-windows -i res\tabcmd.ico -F -c --version-file versionfile.txt --onefile  --collect-data tabcmd.locales
+  # pyi-makespec tabcmd\tabcmd.py -n tabcmd-mac -i res\tabcmd.icns -F -c --version-file versionfile.txt --onefile --collect-data tabcmd.locales --osx-bundle-identifier com.tableau.tabcmd
+  # 3. Unix

.github/workflows/package.yml

@@ -26,13 +26,12 @@ jobs:
             TARGET: windows
             CMD_BUILD: >
               pyinstaller tabcmd-windows.spec --clean --noconfirm --distpath ./dist/windows
-            OUT_FILE_NAME: tabcmd.exe
+            OUT_FILE_NAME: tabcmd-windows.exe
             ASSET_MIME: application/vnd.microsoft.portable-executable
           - os: macos-latest
             TARGET: macos
             CMD_BUILD:  >
-              pyinstaller tabcmd-mac.spec --clean --noconfirm --distpath ./dist/macos &&
-              cwd && ls && ls dist
+              pyinstaller tabcmd-mac.spec --clean --noconfirm --distpath ./dist/macos && ls && ls dist
             # zip -r9 mac tabcmd-mac*
             OUT_FILE_NAME: tabcmd-mac.app  # tabcmd.zip
             ASSET_MIME: application/zip
@@ -54,10 +53,13 @@ jobs:
 
     - name: Install dependencies and build
       run: |
-        pip install -e .[build]
-        pip install -e .[package]
+        python --version
+        python -m pip install --upgrade pip
+        python -m pip install --upgrade build
+        pip install .
+        pip install .[test]
         doit version
-        python setup.py build
+        python -m build
 
     - name: Package with pyinstaller for ${{matrix.TARGET}}
       run: ${{matrix.CMD_BUILD}}
@@ -66,7 +68,7 @@ jobs:
       uses: WebFreak001/upload-asset@v1.0.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # automatically provided by github actions
-        OS: windows # just a variable we use in the name pattern
+        OS: windows # a variable we use in the name pattern?
       with:
         file: ./dist/${{ matrix.TARGET }}/tabcmd/${{ matrix.OUT_FILE_NAME}}
         mime: ${{ matrix.ASSET_MIME}} # required by GitHub API

.github/workflows/publish-pypi.yml

@@ -23,9 +23,13 @@ jobs:
           python-version: 3.8
       - name: Build dist files
         run: |
-          pip install -e .[build]
+          python --version
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade build
+          pip install .
+          pip install .[package]
           doit version
-          python setup.py sdist --formats=gztar
+          python -m build
       - name: Publish distribution 📦 to Test PyPI
         if: ${{ inputs.is_draft }}
         uses: pypa/gh-action-pypi-publish@release/v1  # license BSD-2

.github/workflows/run-e2-tests.yml

@@ -34,10 +34,11 @@ jobs:
       run: |
         python --version
         python -m pip install --upgrade pip
-        pip install -e .[build]
-        pip install -e .[test]
+        python -m pip install --upgrade build
+        pip install .
+        pip install .[test]
         doit version
-        python setup.py build
+        python -m build
 
     - name: Run e2e tests
       run: | 

.github/workflows/run-tests.yml

@@ -31,10 +31,11 @@ jobs:
       run: |
         python --version
         python -m pip install --upgrade pip
-        pip install -e .[build]
-        pip install -e .[test]
+        python -m pip install --upgrade build
+        pip install .
+        pip install .[test]
         doit version
-        python setup.py build
+        python -m build
 
     - name: Test with pytest
       run: pytest

pyproject.toml

@@ -1,7 +1,73 @@
 [build-system]
 requires = ["build", "setuptools>=62", "wheel", "setuptools_scm>=6.2"]
+build-backend = "setuptools.build_meta"
 [tool.setuptools_scm]
-"local_scheme"= "no-local-version"  # require pypi supported versions always
+local_scheme = "no-local-version"  # require pypi supported versions always
+[tool.setuptools]
+packages = ["tabcmd"]
+[tool.setuptools.package-data]
+tabcmd = ["tabcmd.locales/**/*.mo"]
 [tool.black]
 line-length = 120
+target-version = ['py37', 'py38', 'py39', 'py310']
 extend-exclude = '^/bin/*'
+[tool.mypy]
+disable_error_code = [
+    'misc',
+    'import'
+]
+files = ["tabcmd", "tests"]
+show_error_codes = true
+ignore_missing_imports = true
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+addopts = "--junitxml=./test.junit.xml"
+
+[project]
+name="tabcmd"
+dynamic = ["version"]
+description="A command line client for working with Tableau Server."
+authors = [{name="Tableau", email="github@tableau.com"}]
+license = {file = "LICENSE"}
+readme = "README.md"
+requires-python = ">=3.7"
+classifiers = [
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.7",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10"
+]
+dependencies = [
+    'argparse',
+    "appdirs",
+    "doit",
+    "ftfy",
+    "polling2",
+    "pyinstaller_versionfile",
+    "requests>=2.11,<3.0",
+    "setuptools_scm",
+    "types-appdirs",
+    "types-mock",
+    "types-requests",
+    "types-setuptools",
+    "tableauserverclient>=0.19",
+    "urllib3>=1.24.3,<2.0",
+]
+[project.optional-dependencies]
+test = [
+    "black",
+    "mock",
+    "mypy",
+    "pytest>=7.0",
+    "pytest-cov",
+    "pytest-order",
+    "pytest-runner",
+    "requests-mock>=1.0,<2.0"]
+localize = ["doit", "ftfy"]
+package = ["pyinstaller>=5.1"]
+[project.urls]
+repository = "https://github.com/tableau/tabcmd"
+[project.scripts]
+tabcmd = "tabcmd.tabcmd:main"

setup.py

@@ -1,63 +1,4 @@
-from setuptools import setup, find_packages
+# legacy stub setup.py, do not add configuration here
+from setuptools import setup
 
-setup(
-    name="tabcmd",
-    author="Tableau",
-    author_email="github@tableau.com",
-    description="A command line client for working with Tableau Server.",
-    long_description="A command line client for working with Tableau Server.",
-    license="MIT",
-    url="https://github.com/tableau/tabcmd",
-    python_requires=">=3.7",
-    packages=find_packages(),
-    package_data={"tabcmd": ["tabcmd.locales/**/*.mo"]},
-    include_package_data=True,
-    entry_points={"console_scripts": ["tabcmd = tabcmd.tabcmd:main"]},
-    setup_requires=[
-        # copy of pyproject.toml for back compat
-        "build",
-        "setuptools>=62",
-        "setuptools_scm>=6.2",
-        "wheel",
-    ],
-    install_requires=[
-        "polling2",
-        "requests>=2.11,<3.0",
-        "tableauserverclient>=0.19",
-        "urllib3>=1.24.3,<2.0",
-    ],
-    extras_require={
-        "localize": [
-            "doit",
-            "ftfy",
-        ],
-        "build": [
-            "appdirs",
-            "black",
-            "doit",
-            "ftfy",
-            "mypy",
-            "pyinstaller_versionfile",
-            "setuptools>=62",
-            "setuptools_scm",
-            "types-appdirs",
-            "types-mock",
-            "types-requests",
-            "types-setuptools",
-        ],
-        "package": [
-            "pyinstaller>=5.1",
-            "pyinstaller-versionfile",
-        ],
-        "test": [
-            "mock",
-            "pytest",
-            "pytest-cov",
-            "pytest-order",
-            "pytest-runner",
-            "requests-mock>=1.0,<2.0",
-        ],
-    },
-    test_suite="tests",
-    zip_safe=False,
-)
+setup()

tabcmd-linux.spec

@@ -12,7 +12,7 @@ a = Analysis(
     pathex=[],
     binaries=[],
     datas=datas,
-    hiddenimports=[],
+    hiddenimports=['tableauserverclient', 'requests.packages.urllib3', 'pkg_resources'],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],

tabcmd-mac.spec

@@ -13,7 +13,7 @@ a = Analysis(
     pathex=[],
     binaries=[],
     datas=datas,
-    hiddenimports=[],
+    hiddenimports=['tableauserverclient', 'requests.packages.urllib3', 'pkg_resources'],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],

tabcmd-windows.spec

@@ -12,7 +12,7 @@ a = Analysis(
     pathex=[],
     binaries=[],
     datas=datas,
-    hiddenimports=[],
+    hiddenimports=['tableauserverclient', 'requests', 'pkg_resources'],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],

tabcmd.spec

@@ -9,7 +9,7 @@ a = Analysis(
     pathex=[],
     binaries=[],
     datas=[],
-    hiddenimports=[],
+    hiddenimports=['tableauserverclient', 'requests.packages.urllib3', 'pkg_resources'],
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],

tabcmd/commands/auth/session.py

@@ -214,7 +214,7 @@ def create_session(self, args):
         self._read_existing_state()
         self._update_session_data(args)
         self.logging_level = args.logging_level or self.logging_level
-        self.logger = log(__name__, self.logging_level)
+        self.logger = self.logger or log(__class__.__name__, self.logging_level)
 
         credentials = None
         if args.password:
@@ -245,8 +245,8 @@ def create_session(self, args):
             signed_in_object = self._sign_in(credentials)
 
         if not signed_in_object:
-            missing_var = _("editdomain.errors.requires_nickname_name").format("username", "token")
-            Errors.exit_with_error(self.logger, _("session.errors.missing_arguments").format(missing_var))
+            message = "Run 'tabcmd login -h' for details on required arguments"
+            Errors.exit_with_error(self.logger, _("session.errors.missing_arguments").format(message))
         if args.no_cookie:
             self._remove_json()
         else: