Skip to content

Commit

Permalink
Merge pull request #310 from pkgw/fix-309
Browse files Browse the repository at this point in the history
Address #309
  • Loading branch information
pkgw committed Jul 27, 2021
2 parents 66cde5d + 44fd25c commit 8911198
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ci/azure-sdist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
# alternatives but nothing is official yet.

- bash: |
set -euo pipefail
set -eo pipefail # no -u to work around Conda activatio bug (2021 July)
eval "$($CONDA/bin/conda shell.bash hook)"
set -x
conda activate
Expand Down
1 change: 1 addition & 0 deletions pywwt/layers.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from matplotlib.pyplot import cm
from matplotlib.colors import Colormap
from astropy import units as u
import astropy.units.imperial # noqa: F401
from astropy.table import Column
from astropy.table import Table
from astropy.time import Time
Expand Down
2 changes: 1 addition & 1 deletion pywwt/qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

__all__ = ['WWTQtClient']

APP_LIVENESS_DEADLINE = 2.5 # seconds
APP_LIVENESS_DEADLINE = 10 # seconds


class WWTWebEngineView(QWebEngineView):
Expand Down

0 comments on commit 8911198

Please sign in to comment.