Skip to content

Commit

Permalink
Use improved "naming things" from "wetterdienst.ui" also for "extras"
Browse files Browse the repository at this point in the history
  • Loading branch information
amotl committed Apr 6, 2021
1 parent 0b915bb commit 08d93d9
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/release/full/Dockerfile
Expand Up @@ -45,7 +45,7 @@ COPY --from=build-step /usr/local/lib /usr/local/lib
COPY dist/wetterdienst-*.whl /tmp/

# Install latest wheel package.
RUN pip install $(ls -c /tmp/wetterdienst-*-py3-none-any.whl)[http,sql,export,duckdb,influxdb,cratedb,mysql,postgresql,radar,bufr,ui]
RUN pip install $(ls -c /tmp/wetterdienst-*-py3-none-any.whl)[sql,export,duckdb,influxdb,cratedb,mysql,postgresql,radar,bufr,restapi,explorer]

# Purge /tmp directory
RUN rm /tmp/*
Expand Down
2 changes: 1 addition & 1 deletion .github/release/standard/Dockerfile
Expand Up @@ -7,7 +7,7 @@ ENV TERM linux
COPY dist/wetterdienst-*.whl /tmp/

# Install latest wheel package.
RUN pip install $(ls -c /tmp/wetterdienst-*-py3-none-any.whl)[http,sql,export]
RUN pip install $(ls -c /tmp/wetterdienst-*-py3-none-any.whl)[sql,export,restapi]

# Purge /tmp directory
RUN rm /tmp/*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/install.sh
Expand Up @@ -10,7 +10,7 @@ fi
echo "Installing package and requirements for ${flavor}"

if [[ "${flavor}" = "testing" ]]; then
poetry install --no-interaction --extras=http --extras=sql --extras=export --extras=ui
poetry install --no-interaction --extras=sql --extras=export --extras=restapi --extras=explorer

elif [[ "${flavor}" = "docs" ]]; then
poetry install --no-interaction --extras=docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Expand Up @@ -54,7 +54,7 @@ jobs:
key: poetry-${{ runner.os }}-py${{ matrix.python-version }}-${{ hashFiles('poetry.lock') }}-${{ env.CACHE_NUMBER }}

- name: Install dependencies
#run: poetry install --no-interaction --no-root --extras=http --extras=sql --extras=export --extras=ui
#run: poetry install --no-interaction --no-root --extras=sql --extras=export --extras=restapi --extras=explorer
run: .github/workflows/install.sh testing
#if: steps.poetry-cache-flag.outputs.cache-hit != 'true'

Expand Down
6 changes: 3 additions & 3 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions pyproject.toml
Expand Up @@ -108,12 +108,12 @@ crate = { version = "^0.25.0", optional = true, extras
mysqlclient = { version = "^2.0.1", optional = true , markers = "sys_platform != 'darwin' or (sys_platform == 'darwin' and platform_machine != 'arm64')"} # not supported through h5py
psycopg2-binary = { version = "^2.8.6", optional = true }

# HTTP service
# HTTP REST API service
fastapi = { version = "^0.61.1", optional = true }
uvicorn = { version = "^0.13.3", optional = true }
wradlib = { version = "^1.9.0", optional = true , markers = "sys_platform != 'darwin' or (sys_platform == 'darwin' and platform_machine != 'arm64')"} # not supported through h5py

# UI
# Explorer UI service
plotly = { version = "^4.14.3", optional = true }
dash = { version = "^1.19.0", optional = true }
dash-bootstrap-components = { version = "^0.12.0", optional = true }
Expand Down Expand Up @@ -171,8 +171,8 @@ docs = [
"matplotlib",
"ipython"
]
http = ["fastapi", "uvicorn"]
ui = ["plotly", "dash", "dash-bootstrap-components"]
restapi = ["fastapi", "uvicorn"]
explorer = ["plotly", "dash", "dash-bootstrap-components"]
sql = ["duckdb"]
export = ["openpyxl", "sqlalchemy", "pyarrow", "xarray", "zarr"]
duckdb = ["duckdb"]
Expand Down Expand Up @@ -235,7 +235,7 @@ pycodestyle = ["-E501", "-B950"]
pycodestyle = ["-E501", "-B950"]

[tool.poe.tasks]
install_dev = "poetry install -E ipython -E docs -E http -E sql -E export -E duckdb -E influxdb -E cratedb -E mysql -E postgresql -E radar -E bufr -E ui"
install_dev = "poetry install -E ipython -E docs -E sql -E export -E duckdb -E influxdb -E cratedb -E mysql -E postgresql -E radar -E bufr -E restapi -E explorer"
black = "black wetterdienst example tests"
isort = "isort wetterdienst example tests"
format = ["black", "isort"]
Expand All @@ -250,7 +250,7 @@ markers = [
"remote: Tests accessing the internet.",
"slow: Slow tests.",
"sql: All tests related to SQL.",
"ui: All tests related to UI.",
"explorer: All tests related to the explorer UI.",
]
addopts = "-vvv --webdriver=Firefox --headless"

Expand Down
8 changes: 4 additions & 4 deletions tests/ui/explorer/test_ui.py
Expand Up @@ -24,7 +24,7 @@


@pytest.mark.slow
@pytest.mark.ui
@pytest.mark.explorer
def test_app_layout(wetterdienst_ui, dash_tre):

# Sanity check if we are on the right page.
Expand All @@ -37,7 +37,7 @@ def test_app_layout(wetterdienst_ui, dash_tre):


@pytest.mark.slow
@pytest.mark.ui
@pytest.mark.explorer
def test_app_data_stations_success(wetterdienst_ui, dash_tre):
"""
Verify if data for "stations" has been correctly propagated.
Expand Down Expand Up @@ -67,7 +67,7 @@ def test_app_data_stations_success(wetterdienst_ui, dash_tre):


@pytest.mark.slow
@pytest.mark.ui
@pytest.mark.explorer
def test_app_data_stations_failed(wetterdienst_ui, dash_tre):
"""
Verify if data for "stations" has been correctly propagated.
Expand All @@ -89,7 +89,7 @@ def test_app_data_stations_failed(wetterdienst_ui, dash_tre):


@pytest.mark.slow
@pytest.mark.ui
@pytest.mark.explorer
def test_app_data_values(wetterdienst_ui, dash_tre):
"""
Verify if data for "values" has been correctly propagated.
Expand Down

0 comments on commit 08d93d9

Please sign in to comment.