From 6423633c91aa649461a89ffe687e0be41b455c02 Mon Sep 17 00:00:00 2001 From: burnettk Date: Wed, 19 Oct 2022 10:31:39 -0400 Subject: [PATCH] Squashed 'flask-bpmn/' changes from 42cebab51..5edb83f66 5edb83f66 require spiffworkflow git main for dev w/ burnettk git-subtree-dir: flask-bpmn git-subtree-split: 5edb83f662a6da2c8ce0dea8992ef8602218828f --- poetry.lock | 45 +++++++++++++++++++++++++-------------------- pyproject.toml | 14 +++++++++++++- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/poetry.lock b/poetry.lock index 0b4fb7937..635b081db 100644 --- a/poetry.lock +++ b/poetry.lock @@ -80,7 +80,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "six", "sphinx", "sphinx-notfound-page", "zope.interface"] docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"] tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "six", "zope.interface"] -tests_no_zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "six"] +tests-no-zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "six"] [[package]] name = "babel" @@ -288,7 +288,7 @@ optional = false python-versions = ">=3.5.0" [package.extras] -unicode_backport = ["unicodedata2"] +unicode-backport = ["unicodedata2"] [[package]] name = "classify-imports" @@ -1258,7 +1258,7 @@ urllib3 = ">=1.21.1,<1.27" [package.extras] socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] -use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] +use-chardet-on-py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "restructuredtext-lint" @@ -1333,7 +1333,7 @@ falcon = ["falcon (>=1.4)"] fastapi = ["fastapi (>=0.79.0)"] flask = ["blinker (>=1.1)", "flask (>=0.11)"] httpx = ["httpx (>=0.16.0)"] -pure_eval = ["asttokens", "executing", "pure-eval"] +pure-eval = ["asttokens", "executing", "pure-eval"] pyspark = ["pyspark (>=2.4.4)"] quart = ["blinker (>=1.1)", "quart (>=0.16.1)"] rq = ["rq (>=0.6)"] @@ -1554,20 +1554,28 @@ lint = ["docutils-stubs", "flake8", "mypy"] test = ["pytest"] [[package]] -name = "spiffworkflow" -version = "1.1.7" -description = "A workflow framework and BPMN/DMN Processor" +name = "SpiffWorkflow" +version = "1.2.0" +description = "" category = "main" optional = false python-versions = "*" +develop = false [package.dependencies] celery = "*" configparser = "*" dateparser = "*" +importlib-metadata = {version = "<5.0", markers = "python_version <= \"3.7\""} lxml = "*" pytz = "*" +[package.source] +type = "git" +url = "https://github.com/sartography/SpiffWorkflow" +reference = "main" +resolved_reference = "b9e3dd80e00cfa23d558cca9b09ea10a639536c3" + [[package]] name = "sqlalchemy" version = "1.4.36" @@ -1585,19 +1593,19 @@ aiomysql = ["aiomysql", "greenlet (!=0.4.17)"] aiosqlite = ["aiosqlite", "greenlet (!=0.4.17)", "typing_extensions (!=3.10.0.1)"] asyncio = ["greenlet (!=0.4.17)"] asyncmy = ["asyncmy (>=0.2.3,!=0.2.4)", "greenlet (!=0.4.17)"] -mariadb_connector = ["mariadb (>=1.0.1)"] +mariadb-connector = ["mariadb (>=1.0.1)"] mssql = ["pyodbc"] -mssql_pymssql = ["pymssql"] -mssql_pyodbc = ["pyodbc"] +mssql-pymssql = ["pymssql"] +mssql-pyodbc = ["pyodbc"] mypy = ["mypy (>=0.910)", "sqlalchemy2-stubs"] mysql = ["mysqlclient (>=1.4.0)", "mysqlclient (>=1.4.0,<2)"] -mysql_connector = ["mysql-connector-python"] +mysql-connector = ["mysql-connector-python"] oracle = ["cx_oracle (>=7)", "cx_oracle (>=7,<8)"] postgresql = ["psycopg2 (>=2.7)"] -postgresql_asyncpg = ["asyncpg", "greenlet (!=0.4.17)"] -postgresql_pg8000 = ["pg8000 (>=1.16.6)"] -postgresql_psycopg2binary = ["psycopg2-binary"] -postgresql_psycopg2cffi = ["psycopg2cffi"] +postgresql-asyncpg = ["asyncpg", "greenlet (!=0.4.17)"] +postgresql-pg8000 = ["pg8000 (>=1.16.6)"] +postgresql-psycopg2binary = ["psycopg2-binary"] +postgresql-psycopg2cffi = ["psycopg2cffi"] pymysql = ["pymysql", "pymysql (<1)"] sqlcipher = ["sqlcipher3_binary"] @@ -1841,7 +1849,7 @@ testing = ["func-timeout", "jaraco.itertools", "pytest (>=6)", "pytest-black (>= [metadata] lock-version = "1.1" python-versions = "^3.7" -content-hash = "59095026da09a450d5755b5952ad45f35a454630d8968904a9695f7b1895f74e" +content-hash = "7b855f0776c64981dc6997da388e9628de111941eef9fe7d297a5a7f8f0be48d" [metadata.files] alabaster = [ @@ -2837,10 +2845,7 @@ sphinxcontrib-serializinghtml = [ {file = "sphinxcontrib-serializinghtml-1.1.5.tar.gz", hash = "sha256:aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"}, {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] -spiffworkflow = [ - {file = "SpiffWorkflow-1.1.7-py3-none-any.whl", hash = "sha256:0333f0883a24bc40bd2345cde98ddff8335f67827de382bc91abb43af61f1da0"}, - {file = "SpiffWorkflow-1.1.7.tar.gz", hash = "sha256:2349c064ec3b4920d3889111798fac6831491109aa3dad34f6d0688ad9070983"}, -] +SpiffWorkflow = [] sqlalchemy = [ {file = "SQLAlchemy-1.4.36-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:81e53bd383c2c33de9d578bfcc243f559bd3801a0e57f2bcc9a943c790662e0c"}, {file = "SQLAlchemy-1.4.36-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6e1fe00ee85c768807f2a139b83469c1e52a9ffd58a6eb51aa7aeb524325ab18"}, diff --git a/pyproject.toml b/pyproject.toml index db5c61e2f..3784bc639 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,6 @@ flask-marshmallow = "*" flask-migrate = "*" flask-restful = "*" werkzeug = "*" -# spiffworkflow = {git = "https://github.com/sartography/SpiffWorkflow", rev = "feature/spiff_properties"} spiffworkflow = "*" sentry-sdk = "*" sphinx-autoapi = "^1.9.0" @@ -47,6 +46,9 @@ flake8 = "^4.0.1" black = ">=21.10b0" flake8-bandit = "^2.1.2" +# require git version here to avoid importlib but do not require this version for other apps +spiffworkflow = {git = "https://github.com/sartography/SpiffWorkflow", rev = "main"} + # 1.7.3 broke us. https://github.com/PyCQA/bandit/issues/841 bandit = "1.7.2" @@ -78,6 +80,16 @@ source = ["flask_bpmn", "tests"] show_missing = true fail_under = 50 +[tool.pytest.ini_options] +# ignore deprecation warnings from various packages that we don't control +filterwarnings = [ + # note the use of single quote below to denote "raw" strings in TOML + # kombu/utils/compat.py:82 + 'ignore:SelectableGroups dict interface is deprecated. Use select.', + # flask_sqlalchemy/__init__.py:14 + "ignore:'_app_ctx_stack' is deprecated and will be removed in Flask 2.3", +] + [tool.mypy] strict = true disallow_any_generics = false