Skip to content

Commit

Permalink
Merge pull request #171 from ESSS/fb-EDEN-ASIM-5423-merge-v23.1.0-to-…
Browse files Browse the repository at this point in the history
…master

[alfasim] Bring master into rb 23.1.0 after realease
  • Loading branch information
prusse-martin authored Oct 24, 2023
2 parents 1c5a9d1 + 30b2cba commit e205ce4
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 34 deletions.
19 changes: 8 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,38 +1,35 @@
default_language_version:
python: python3.7
repos:
- repo: https://github.com/psf/black
rev: 23.1.0
rev: 23.9.1
hooks:
- id: black
args: [--safe, --quiet]
language_version: python3
- repo: https://github.com/asottile/blacken-docs
rev: 1.13.0
rev: 1.16.0
hooks:
- id: blacken-docs
additional_dependencies: [black==23.1.0]
- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v3.0.0-alpha.4"
rev: "v3.0.3"
hooks:
- id: prettier
types_or: [css, javascript]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: debug-statements
- repo: https://github.com/PyCQA/autoflake
rev: v2.0.1
rev: v2.2.1
hooks:
- id: autoflake
name: autoflake
entry: autoflake --in-place --remove-all-unused-imports
language: python
files: \.py$
- repo: https://github.com/asottile/reorder_python_imports
rev: v3.9.0
- repo: https://github.com/asottile/reorder-python-imports
rev: v3.12.0
hooks:
- id: reorder-python-imports
args: ['--application-directories=.:src', --py36-plus]
Expand All @@ -45,7 +42,7 @@ repos:
language: python
additional_dependencies: [pygments, restructuredtext_lint]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.0.0
rev: v1.6.0
hooks:
- id: mypy
files: ^(src/|tests/)
Expand Down
15 changes: 6 additions & 9 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
version: 2

build:
image: latest
os: ubuntu-22.04
tools:
python: "3.11"

sphinx:
configuration: docs/conf.py
fail_on_warning: true

python:
version: 3.6
install:
- method: pip
path: .

conda:
environment: base_environment.yml
install:
- path: .
- requirements: docs/requirements.txt
14 changes: 1 addition & 13 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,11 @@ QmxGraph
.. image:: https://coveralls.io/repos/github/ESSS/qmxgraph/badge.svg?branch=master
:target: https://coveralls.io/github/ESSS/qmxgraph?branch=master

.. image:: https://api.codacy.com/project/badge/Grade/f99a187898984854a755232cb435cf40
:alt: Codacy Badge
:target: https://app.codacy.com/app/ESSS/qmxgraph?utm_source=github.com&utm_medium=referral&utm_content=ESSS/qmxgraph&utm_campaign=badger

.. image:: https://readthedocs.org/projects/qmxgraph/badge/?version=latest
:alt: Documentation Status
:target: https://qmxgraph.readthedocs.io/en/latest/?badge=latest


This a Qt widget that embeds a rich and powerful graph drawing tool
using JavaScript's mxGraph library.

It makes use of Qt web view features to make this possible. Since
current Qt version supported (<= 5.6) is still using WebKit_ as its web
browser engine, all of its limitations apply when developing new embedded web
features.
using JavaScript's mxGraph library, Qt WebEngine features from Qt 5.4.

Due to changes in mxgraph we are currently only supporting an old version of mxgraph (3.7.5).

.. _WebKit: https://webkit.org/
2 changes: 2 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sphinx
sphinx-rtd-theme
2 changes: 1 addition & 1 deletion esss_environment.devenv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies:
- attrs>=17
- colorama
- invoke>=1.0.0
- jinja2==2.10
- jinja2>=2.10
- pyqt=5.12.*
- six

Expand Down

0 comments on commit e205ce4

Please sign in to comment.