Skip to content

Commit

Permalink
Merge branch 'master' into bump-to-react-18
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenthoms committed Dec 19, 2024
2 parents 6f50f9c + f08d7ad commit ed488b7
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 11 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/webviz-core-components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- name: 📖 Checkout commit locally
uses: actions/checkout@v3

- name: 🐍 Set up Python ${{ matrix.python-version }}
- name: 🐍 Set up Python 3.8
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
python-version: 3.8 # For compiling the JavaScript part we need dash<2.5, which is not supported on recent versions of Python

- name: ℹ️ Node and npm versions
run: |
Expand All @@ -50,6 +50,11 @@ jobs:
run: |
npm run build --prefix ./react
- name: 🐍 Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: 📦 Install webviz-core-components with dependencies
run: |
pip install --upgrade pip
Expand Down Expand Up @@ -91,7 +96,6 @@ jobs:
cp ../README.md .
npm version --no-git-tag-version ${GITHUB_REF//refs\/tags\//}
npm config set '//registry.npmjs.org/:_authToken' '${NPM_TOKEN}'
npm config set always-auth true
# Use 'latest' tag if $NPM_PUBLISH_TAG is not set:
npm publish --access public --tag ${NPM_PUBLISH_TAG:-latest}
Expand Down
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [UNRELEASED] - YYYY-MM-DD
## [0.7.0] - 2024-01-29

### Changed

Expand All @@ -17,7 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- [#275](https://github.com/equinor/webviz-core-components/pull/275) - Added `WebvizDialog` component. New dialog component which handles multiple instances simultaneously, where the currently active dialog is placed on top and highlighted with box shadow.
- [#275](https://github.com/equinor/webviz-core-components/pull/275) - Added `WebvizDialog` component. New dialog component which handles multiple instances simultaneously, where the currently active dialog is placed on top and highlighted with box shadow.
- [#299](https://github.com/equinor/webviz-core-components/pull/299) - Support Python 3.11 and 3.12.

### Changed

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Total alerts](https://img.shields.io/lgtm/alerts/g/equinor/webviz-core-components.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/equinor/webviz-core-components/alerts/)
[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/equinor/webviz-core-components.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/equinor/webviz-core-components/context:javascript)
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/equinor/webviz-core-components.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/equinor/webviz-core-components/context:python)
[![Python 3.8 | 3.9 | 3.10](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10-blue.svg)](https://www.python.org/)
[![Python 3.8 | 3.9 | 3.10 | 3.11 | 3.12](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)](https://www.python.org/)
[![Code style: black](https://img.shields.io/badge/code%20style-black%20%28Python%29-000000.svg)](https://github.com/psf/black)
[![code style: prettier](https://img.shields.io/badge/code_style-prettier%20%28JavaScript%29-ff69b4.svg)](https://github.com/prettier/prettier)

Expand Down
16 changes: 16 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
If you discover a security vulnerability in this project, please follow these steps to responsibly disclose it:

1. **Do not** create a public GitHub issue for the vulnerability.

2. Follow our guideline for Responsible Disclosure Policy at https://www.equinor.com/about-us/csirt to report the issue

The following information will help us triage your report more quickly:

- Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
- Full paths of source file(s) related to the manifestation of the issue
- The location of the affected source code (tag/branch/commit or direct URL)
- Any special configuration required to reproduce the issue
- Step-by-step instructions to reproduce the issue
- Proof-of-concept or exploit code (if possible)
- Impact of the issue, including how an attacker might exploit the issue
- We prefer all communications to be in English.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

TESTS_REQUIRE = [
"bandit",
"black>=22.12",
"black>=22.12,<24",
"dash[testing]",
"flask<2.3",
"pylint",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_color_scales.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ def test_colorscale(dash_duo):

dash_duo.start_server(app)

assert dash_duo.get_logs() == [], "browser console should contain no error"
assert dash_duo.get_logs() is None, "browser console should contain no error"
2 changes: 1 addition & 1 deletion tests/test_graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ def test_container_placeholder(dash_duo):

dash_duo.start_server(app)

assert dash_duo.get_logs() == [], "browser console should contain no error"
assert dash_duo.get_logs() is None, "browser console should contain no error"
2 changes: 1 addition & 1 deletion tests/test_plugin_placeholder.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ def test_plugin_placeholder(dash_duo):

dash_duo.start_server(app)

assert dash_duo.get_logs() == [], "browser console should contain no error"
assert dash_duo.get_logs() is None, "browser console should contain no error"

0 comments on commit ed488b7

Please sign in to comment.