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

[alfasim] Bring master into rb 23.1.0 after realease #171

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
da18b2e
[pre-commit.ci] pre-commit autoupdate (#155)
pre-commit-ci[bot] Mar 14, 2023
0af1bf0
[pre-commit.ci] pre-commit autoupdate (#156)
pre-commit-ci[bot] Apr 4, 2023
1e2aa0b
[pre-commit.ci] pre-commit autoupdate (#157)
pre-commit-ci[bot] Apr 11, 2023
19c479c
Update README.rst
nicoddemus Apr 12, 2023
45a1363
Loose pin for Jinja2
arthursoprana Feb 3, 2023
15d0402
Merge pull request #153 from ESSS/fb-EDEN-2592-update-alfasim-to-pyth…
nicoddemus Apr 20, 2023
8a73283
[pre-commit.ci] pre-commit autoupdate (#158)
pre-commit-ci[bot] Apr 25, 2023
299970c
[pre-commit.ci] pre-commit autoupdate (#159)
pre-commit-ci[bot] May 16, 2023
85d9a68
[pre-commit.ci] pre-commit autoupdate (#160)
pre-commit-ci[bot] Jun 20, 2023
e22a435
[pre-commit.ci] pre-commit autoupdate (#161)
pre-commit-ci[bot] Jun 27, 2023
ca32012
[pre-commit.ci] pre-commit autoupdate (#162)
pre-commit-ci[bot] Jul 10, 2023
de12e8c
[pre-commit.ci] pre-commit autoupdate (#163)
pre-commit-ci[bot] Jul 18, 2023
e5dcf62
[pre-commit.ci] pre-commit autoupdate (#164)
pre-commit-ci[bot] Aug 7, 2023
3af2fff
[pre-commit.ci] pre-commit autoupdate (#165)
pre-commit-ci[bot] Sep 4, 2023
33b1057
[pre-commit.ci] pre-commit autoupdate (#167)
pre-commit-ci[bot] Sep 11, 2023
2687333
[pre-commit.ci] pre-commit autoupdate (#168)
pre-commit-ci[bot] Sep 19, 2023
658f55a
[pre-commit.ci] pre-commit autoupdate (#169)
pre-commit-ci[bot] Oct 9, 2023
1d2547b
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Oct 16, 2023
56357a3
Fix .readthedocs.yml
nicoddemus Oct 17, 2023
1709d14
Create requirements.txt
nicoddemus Oct 17, 2023
745f27d
Use docs/requirements.txt
nicoddemus Oct 17, 2023
30b2cba
Merge pull request #170 from ESSS/pre-commit-ci-update-config
nicoddemus Oct 17, 2023
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
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
Loading