Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix assets for pyabc visserver. #616

Merged
merged 8 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ name: Deploy
on:
release:
types: [created]


jobs:
deploy:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
python-version: [3.9]

steps:
- name: Check out repository
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,8 @@ do
brew install r
else
# Linux
sudo apt-key adv \
--keyserver keyserver.ubuntu.com \
--recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9
sudo add-apt-repository \
'deb https://cloud.r-project.org/bin/linux/ubuntu focal-cran40/'
wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | sudo gpg --dearmor -o /usr/share/keyrings/r-project.gpg
echo "deb [signed-by=/usr/share/keyrings/r-project.gpg] https://cloud.r-project.org/bin/linux/ubuntu jammy-cran40/" | sudo tee -a /etc/apt/sources.list.d/r-project.list
sudo apt-get update
sudo apt-get install r-base
fi
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ Release Notes
0.12 Series
...........

0.12.13 (2023-11-08)
--------------------

Fixes (#615):

* Fix for wrong assets path in abc-server-dash

General

* Added new maintainers to RTD's about section


0.12.12 (2023-08-18)
--------------------
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ recursive-include pyabc/visserver/static *
recursive-include pyabc/visserver/templates *
include pyabc/storage/alembic.ini
recursive-include pyabc/storage/migrations *
recursive-include pyabc/visserver/assets *
1 change: 1 addition & 0 deletions doc/about.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Authors

The first main developer of the package was Emmanuel Klinger, with major contributions from Dennis Rickert and Nick Jagiella.
Currently, the main developer and maintainer is Yannik Schaelte.
Additional maintainers are Jonas Arruda and Stephan Grein.
Emad Alamoudi is co-developer with various contributions.
Elba Raimúndez-Álvarez contributed to the examples.
Felipe Reck contributed to the "look-ahead" Redis-based sampler and example notebook.
Expand Down
2 changes: 1 addition & 1 deletion pyabc/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.12.12'
__version__ = '0.12.13'
3 changes: 1 addition & 2 deletions pyabc/visserver/server_dash.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@
matplotlib.use('Agg')

static = str(pathlib.Path(__file__).parent.absolute()) + '/assets/'
static_logo = Path(str(pathlib.Path(__file__).parent.absolute())).parent.parent
DOWNLOAD_DIR = tempfile.mkdtemp() + '/'
db_path = DOWNLOAD_DIR
parameter = ""
square_png = static + 'square_v2.png'
square_base64 = base64.b64encode(open(square_png, 'rb').read()).decode('ascii')
pyABC_png = str(static_logo) + '/doc/logo/logo.png'
pyABC_png = str(static) + '/pyABC_logo.png'
pyABC_base64 = base64.b64encode(open(pyABC_png, 'rb').read()).decode('ascii')
para_list = []
colors = {
Expand Down
Loading