Skip to content

Commit 558d5e4

Browse files
authored
Fix assets for pyabc visserver. (#616)
* Fix assets for pyabc visserver. * Update R. * Fix for logo path in abc-server-dash * Preparing release notes for next patch release. * Updating about.rst. * Updating changelog.
1 parent d1542fb commit 558d5e4

File tree

7 files changed

+19
-9
lines changed

7 files changed

+19
-9
lines changed

.github/workflows/deploy.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ name: Deploy
33
on:
44
release:
55
types: [created]
6+
67

78
jobs:
89
deploy:
910
runs-on: ubuntu-latest
1011
strategy:
1112
matrix:
12-
python-version: [3.8]
13+
python-version: [3.9]
1314

1415
steps:
1516
- name: Check out repository

.github/workflows/install_deps.sh

+2-5
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@ do
3434
brew install r
3535
else
3636
# Linux
37-
sudo apt-key adv \
38-
--keyserver keyserver.ubuntu.com \
39-
--recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9
40-
sudo add-apt-repository \
41-
'deb https://cloud.r-project.org/bin/linux/ubuntu focal-cran40/'
37+
wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | sudo gpg --dearmor -o /usr/share/keyrings/r-project.gpg
38+
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
4239
sudo apt-get update
4340
sudo apt-get install r-base
4441
fi

CHANGELOG.rst

+11
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ Release Notes
77
0.12 Series
88
...........
99

10+
0.12.13 (2023-11-08)
11+
--------------------
12+
13+
Fixes (#615):
14+
15+
* Fix for wrong assets path in abc-server-dash
16+
17+
General
18+
19+
* Added new maintainers to RTD's about section
20+
1021

1122
0.12.12 (2023-08-18)
1223
--------------------

MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ recursive-include pyabc/visserver/static *
33
recursive-include pyabc/visserver/templates *
44
include pyabc/storage/alembic.ini
55
recursive-include pyabc/storage/migrations *
6+
recursive-include pyabc/visserver/assets *

doc/about.rst

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Authors
1414

1515
The first main developer of the package was Emmanuel Klinger, with major contributions from Dennis Rickert and Nick Jagiella.
1616
Currently, the main developer and maintainer is Yannik Schaelte.
17+
Additional maintainers are Jonas Arruda and Stephan Grein.
1718
Emad Alamoudi is co-developer with various contributions.
1819
Elba Raimúndez-Álvarez contributed to the examples.
1920
Felipe Reck contributed to the "look-ahead" Redis-based sampler and example notebook.

pyabc/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.12.12'
1+
__version__ = '0.12.13'

pyabc/visserver/server_dash.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@
2323
matplotlib.use('Agg')
2424

2525
static = str(pathlib.Path(__file__).parent.absolute()) + '/assets/'
26-
static_logo = Path(str(pathlib.Path(__file__).parent.absolute())).parent.parent
2726
DOWNLOAD_DIR = tempfile.mkdtemp() + '/'
2827
db_path = DOWNLOAD_DIR
2928
parameter = ""
3029
square_png = static + 'square_v2.png'
3130
square_base64 = base64.b64encode(open(square_png, 'rb').read()).decode('ascii')
32-
pyABC_png = str(static_logo) + '/doc/logo/logo.png'
31+
pyABC_png = str(static) + '/pyABC_logo.png'
3332
pyABC_base64 = base64.b64encode(open(pyABC_png, 'rb').read()).decode('ascii')
3433
para_list = []
3534
colors = {

0 commit comments

Comments
 (0)