Skip to content

Commit

Permalink
Fix server -> tabpy_server
Browse files Browse the repository at this point in the history
  • Loading branch information
Olek Golovatyi committed Jul 28, 2020
1 parent 012e802 commit d1e54b9
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
exclude \
tabpy/server/state.ini
tabpy/tabpy_server/state.ini

include \
CHANGELOG \
LICENSE \
tabpy/VERSION \
tabpy/server/state.ini.template \
tabpy/server/static/* \
tabpy/server/common/default.conf
tabpy/tabpy_server/state.ini.template \
tabpy/tabpy_server/static/* \
tabpy/tabpy_server/common/default.conf
6 changes: 3 additions & 3 deletions docs/TableauConfiguration.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ documentation page.

To configure Tableau Server 2018.2 and newer versions to connect to TabPy server
follow instructions on Tableau
[Configure Connections to Analytics Extensions](https://onlinehelp.tableau.com/current/server/en-us/tsm.htm)
[Configure Connections to Analytics Extensions](https://onlinehelp.tableau.com/current/tabpy_server/en-us/tsm.htm)
page.

Specific details about how to configure a secure connection to TabPy, enable or
disable connections and other setting can be found at Tableau
[TSM Security documentation](https://onlinehelp.tableau.com/current/server/en-us/cli_security_tsm.htm#tsm_security_vizql-extsvc-ssl-enable)
[TSM Security documentation](https://onlinehelp.tableau.com/current/tabpy_server/en-us/cli_security_tsm.htm#tsm_security_vizql-extsvc-ssl-enable)
page.

For how to configure TabPy instance follow instructions at
Expand All @@ -44,7 +44,7 @@ For how to configure TabPy instance follow instructions at

For Tableau workbooks with embedded Python code to work on Tableau Server 10.1
or later, you need to go through a similar setup but using the
[tabadmin](https://onlinehelp.tableau.com/current/server/en-us/tabadmin.htm)
[tabadmin](https://onlinehelp.tableau.com/current/tabpy_server/en-us/tabadmin.htm)
command line utility. The two server settings that need to be configured are
`vizqlserver.extsvc.host` and `vizqlserver.extsvc.port`.

Expand Down
6 changes: 3 additions & 3 deletions docs/server-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ at [`logging.config` documentation page](https://docs.python.org/3.6/library/log
server. Default value - `tabpy/server` subfolder in TabPy package
folder.
- `TABPY_STATIC_PATH` - absolute path for location of static files (index.html
page) for TabPy instance. Default value - `tabpy/server/static`
page) for TabPy instance. Default value - `tabpy/tabpy_server/static`
subfolder in TabPy package folder.
- `TABPY_PWD_FILE` - absolute path to password file. Setting up this parameter
makes TabPy require credentials with HTTP(S) requests. More details about
Expand Down Expand Up @@ -104,7 +104,7 @@ settings._
# TABPY_STATE_PATH = <package-path>/tabpy/server

# Where static pages live
# TABPY_STATIC_PATH = <package-path>/tabpy/server/static
# TABPY_STATIC_PATH = <package-path>/tabpy/tabpy_server/static

# For how to configure TabPy authentication read
# docs/server-config.md.
Expand Down Expand Up @@ -256,7 +256,7 @@ as explained in Python documentation at
[Logging Configuration page](https://docs.python.org/3.6/library/logging.config.html).

A default config provided with TabPy is at
[`tabpy-server/server/common/default.conf`](tabpy-server/server/common/default.conf)
[`tabpy-server/tabpy_server/common/default.conf`](tabpy-server/tabpy_server/common/default.conf)
and has a configuration for console and file loggers. Changing the config file
allows the user to modify the log level, format of the logged messages and
add or remove loggers.
Expand Down
2 changes: 1 addition & 1 deletion tabpy/tabpy_server/common/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# TABPY_STATE_PATH = ./tabpy/server

# Where static pages live
# TABPY_STATIC_PATH = ./tabpy/server/static
# TABPY_STATIC_PATH = ./tabpy/tabpy_server/static

# For how to configure TabPy authentication read
# Authentication section in docs/server-config.md.
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/resources/deploy_and_evaluate_model.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TABPY_PORT = 9008
# TABPY_STATE_PATH = ./tabpy/server

# Where static pages live
# TABPY_STATIC_PATH = ./tabpy/server/static
# TABPY_STATIC_PATH = ./tabpy/tabpy_server/static

# For how to configure TabPy authentication read
# Authentication section in docs/server-config.md.
Expand Down

0 comments on commit d1e54b9

Please sign in to comment.