Skip to content

Commit a728b5d

Browse files
authored
Merge pull request #207 from plotly/update-docker-image-final
Update docker image [final]
2 parents 01621b4 + 4bce937 commit a728b5d

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

.circleci/config.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
version: 2
1+
version: 2.1
2+
3+
orbs:
4+
percy: percy/[email protected]
5+
browser-tools: circleci/[email protected]
26

37
jobs:
48

59
test:
610
working_directory: ~/dashjl
711
docker:
8-
- image: plotly/julia:ci
12+
- image: etpinard/dashjl-tests:0.3.0
913
auth:
1014
username: dashautomation
1115
password: $DASH_PAT_DOCKERHUB
@@ -15,6 +19,8 @@ jobs:
1519
steps:
1620
- checkout
1721

22+
- browser-tools/install-browser-tools
23+
1824
- run:
1925
name: ℹ️ CI Context
2026
command: |
@@ -37,8 +43,9 @@ jobs:
3743
command: |
3844
python -m venv venv
3945
. venv/bin/activate
46+
pip install --upgrade pip wheel
4047
git clone --depth 1 https://github.com/plotly/dash.git -b dev dash-main
41-
cd dash-main && pip install -e .[dev,testing] --progress-bar off && cd ~/dashjl
48+
cd dash-main && pip install -e .[ci,dev,testing] --progress-bar off && cd ..
4249
export PATH=$PATH:/home/circleci/.local/bin/
4350
pytest --headless --nopercyfinalize --junitxml=test-reports/dashjl.xml --percy-assets=test/assets/ test/integration/
4451
- store_artifacts:
@@ -48,13 +55,11 @@ jobs:
4855
- store_artifacts:
4956
path: /tmp/dash_artifacts
5057

51-
- run:
52-
name: 🦔 percy finalize
53-
command: npx percy finalize --all
54-
5558
workflows:
5659
version: 2
5760
build:
5861
jobs:
59-
- "test"
60-
when: false # disable this workflow until Percy tests are functional again
62+
- test
63+
- percy/finalize_all:
64+
requires:
65+
- test

build/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM circleci/python:3.7-stretch-node-browsers
2-
MAINTAINER Ryan Patrick Kyle "[email protected]"
1+
FROM cimg/python:3.9.9-browsers
2+
MAINTAINER Etienne Tétreault-Pinard "[email protected]"
33

44
RUN sudo apt-get update \
55
&& sudo apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false
66

77
RUN cd /usr/local/src \
88
&& sudo mkdir /usr/local/src/julia \
99
&& sudo curl -o julia.tar.gz --location --show-error \
10-
https://julialang-s3.julialang.org/bin/linux/x64/1.5/julia-1.5.1-linux-x86_64.tar.gz \
10+
https://julialang-s3.julialang.org/bin/linux/x64/1.9/julia-1.9.1-linux-x86_64.tar.gz \
1111
&& sudo tar --extract --gzip --strip 1 --directory=/usr/local/src/julia --file=julia.tar.gz \
12-
&& sudo ln -s /usr/local/src/julia/bin/julia /usr/local/bin/julia
12+
&& sudo ln -s /usr/local/src/julia/bin/julia /usr/local/bin/julia

test/integration/callbacks/jl_callback_context/jlcbcx001_modified_response.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ callback!(app,
1313
) do value
1414
cookie = HTTP.Cookie("dash_cookie", value * " - cookie")
1515

16-
println(String(cookie, false))
16+
cookie_str = HTTP.Cookies.stringify(cookie)
17+
println(cookie_str)
1718
http_response = callback_context().response
18-
push!(http_response.headers, "Set-Cookie"=>String(cookie, false))
19+
push!(http_response.headers, "Set-Cookie"=>cookie_str)
1920
return value * " - output"
2021
end
2122

22-
run_server(app)
23+
run_server(app)

test/integration/callbacks/test_callback_context.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_jlcbcx001_modified_response(dashjl):
2020
dashjl.wait_for_text_to_equal("#output", "abcd - output")
2121
cookie = dashjl.driver.get_cookie("dash_cookie")
2222
# cookie gets json encoded
23-
assert cookie["value"] == 'abcd - cookie'
23+
assert cookie["value"] == '"abcd - cookie"'
2424

2525
assert not dashjl.get_logs()
2626

@@ -34,4 +34,4 @@ def test_jlcbcx002_triggered(dashjl):
3434
dashjl.find_element("#" + btn).click()
3535
dashjl.wait_for_text_to_equal(
3636
"#output", "Just clicked {} for the {} time!".format(btn, i)
37-
)
37+
)

0 commit comments

Comments
 (0)