Skip to content

Commit 2f9eada

Browse files
nzloshnzlosh
authored
Updates 3.10 (#277)
2 parents 544940d + bbebf0d commit 2f9eada

7 files changed

Lines changed: 93 additions & 59 deletions

File tree

‎.github/workflows/check-build-publish.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Check-Build-Publish
2+
3+
on:
4+
push:
5+
branches: ['*']
6+
pull_request:
7+
branches:
8+
- master
9+
schedule:
10+
# run every Monday at 6am
11+
- cron: '0 6 * * 1'
12+
13+
jobs:
14+
tests:
15+
runs-on: ubuntu-22.04
16+
strategy:
17+
matrix:
18+
python-version: ["3.10", "3.11", "3.12"]
19+
steps:
20+
- name: Checkout repository
21+
uses: actions/checkout@v4
22+
- name: "Set up Python ${{ matrix.python-version }}"
23+
uses: actions/setup-python@v4
24+
with:
25+
python-version: "${{ matrix.python-version }}"
26+
- name: Install dependencies
27+
run: |
28+
python -m pip install --upgrade pip
29+
pip install -r requirements-ci.txt
30+
make clean reqs schemas
31+
- name: "Run tox for ${{ matrix.python-version }}"
32+
run: make check
33+
34+
build:
35+
runs-on: ubuntu-22.04
36+
strategy:
37+
matrix:
38+
python-version: ["3.10"]
39+
needs:
40+
- tests
41+
steps:
42+
- name: Checkout repository
43+
uses: actions/checkout@v4
44+
- name: "Set up Python ${{ matrix.python-version }}"
45+
uses: actions/setup-python@v4
46+
with:
47+
python-version: "${{ matrix.python-version }}"
48+
- name: Build wheel
49+
run: echo todo
50+
51+
publish:
52+
runs-on: ubuntu-22.04
53+
strategy:
54+
matrix:
55+
python-version: ["3.10"]
56+
needs:
57+
- build
58+
steps:
59+
- name: Checkout repository
60+
uses: actions/checkout@v4
61+
- name: "Set up Python ${{ matrix.python-version }}"
62+
uses: actions/setup-python@v4
63+
with:
64+
python-version: "${{ matrix.python-version }}"
65+
- name: Publish wheel
66+
run: echo todo

‎.github/workflows/tox.yml‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎Makefile‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2020-2024 StackStorm contributors.
1+
# Copyright 2020-2026 StackStorm contributors.
22
# Copyright 2019 Extreme Networks, Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,8 @@
1515

1616
PY3 := python3
1717
SYS_PY3 := $(shell which $(PY3))
18-
PIP_VERSION = 24.0
18+
PIP_VERSION ?= 25.3
19+
SETUPTOOLS_VERSION ?= 80.10.2
1920

2021
# Virtual Environment
2122
VENV_DIR ?= .venv
@@ -56,47 +57,47 @@ venv:
5657
.PHONY: reqs
5758
reqs: venv check_virtualenv
5859
echo Install pip version $(PIP_VERSION) to match st2 core.
59-
$(VENV_DIR)/bin/pip install --upgrade "pip==$(PIP_VERSION)"
60-
$(VENV_DIR)/bin/pip install -r requirements.txt
61-
$(VENV_DIR)/bin/pip install -r requirements-test.txt
62-
$(VENV_DIR)/bin/pip install -r requirements-docs.txt
63-
$(VENV_DIR)/bin/pip install -r requirements-ci.txt
64-
$(VENV_DIR)/bin/python setup.py develop
60+
$(VENV_DIR)/bin/python -m pip install --upgrade "pip==$(PIP_VERSION)"
61+
$(VENV_DIR)/bin/python -m pip install -r requirements.txt
62+
$(VENV_DIR)/bin/python -m pip install -r requirements-test.txt
63+
$(VENV_DIR)/bin/python -m pip install -r requirements-docs.txt
64+
$(VENV_DIR)/bin/python -m pip install -r requirements-ci.txt
65+
$(VENV_DIR)/bin/python -m pip install --editable .
6566
echo
6667

6768
.PHONY: check_virtualenv
6869
check_virtualenv:
69-
test -d $(VENV_DIR) || exit 1
70+
test -d "$(VENV_DIR)" || exit 1
7071

7172
.PHONY: schemas
7273
schemas: check_virtualenv
73-
$(VENV_DIR)/bin/$(PY3) bin/orquesta-generate-schemas
74+
"$(VENV_DIR)/bin/$(PY3)" bin/orquesta-generate-schemas
7475

7576
.PHONY: format
7677
format: check_virtualenv
77-
$(VENV_DIR)/bin/black orquesta bin setup.py -l 100
78+
"$(VENV_DIR)/bin/black" orquesta bin setup.py -l 100
7879

7980
.PHONY: check
8081
check: check_virtualenv
81-
$(VENV_DIR)/bin/tox
82+
"$(VENV_DIR)/bin/tox"
8283

8384
.PHONY: docs
8485
docs: reqs
85-
rm -rf $(BUILDDIR)
86-
. $(VENV_DIR)/bin/activate; $(SPHINXBUILD) -W -b html $(SOURCEDIR) $(BUILDDIR)/html
86+
rm -rf "$(BUILDDIR)"
87+
. "$(VENV_DIR)/bin/activate"; "$(SPHINXBUILD)" -W -b html "$(SOURCEDIR)" "$(BUILDDIR)/html"
8788

8889
.PHONY: livedocs
8990
livedocs: reqs
90-
rm -rf $(BUILDDIR)
91-
. $(VENV_DIR)/bin/activate; $(SPHINXAUTO) -H 0.0.0.0 -b html $(SOURCEDIR) $(BUILDDIR)/html
91+
rm -rf "$(BUILDDIR)"
92+
. "$(VENV_DIR)/bin/activate"; "$(SPHINXAUTO)" -H 0.0.0.0 -b html "$(SOURCEDIR)" "$(BUILDDIR)/html"
9293

9394
.PHONY: package
9495
package: check_virtualenv
95-
rm -rf $(PKGDISTDIR)
96-
rm -rf $(PKGBUILDDIR)
97-
$(VENV_DIR)/bin/$(PY3) setup.py sdist bdist_wheel
96+
rm -rf "$(PKGDISTDIR)"
97+
rm -rf "$(PKGBUILDDIR)"
98+
"$(VENV_DIR)/bin/$(PY3)" -m build --outdir "${PKGDISTDIR}"
9899

99100
.PHONY: publish
100101
publish: package
101-
$(VENV_DIR)/bin/$(PY3) -m twine upload dist/*
102+
"$(VENV_DIR)/bin/$(PY3)" -m twine upload dist/*
102103

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ the overall workflow state and result.
4444

4545
## Copyright, License, and Contributors Agreement
4646

47-
Copyright 2019-2021 The StackStorm Authors.
47+
Copyright 2019-2026 The StackStorm Authors.
4848
Copyright 2014-2018 StackStorm, Inc.
4949

5050
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except

‎orquesta/tests/unit/specs/native/test_workflow_spec_validate.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2021 The StackStorm Authors.
1+
# Copyright 2021-2026 The StackStorm Authors.
22
# Copyright 2019 Extreme Networks, Inc.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -234,7 +234,7 @@ def test_empty_task_list(self):
234234
expected_errors = {
235235
"syntax": [
236236
{
237-
"message": "{} does not have enough properties",
237+
"message": "{} should be non-empty",
238238
"schema_path": "properties.tasks.minProperties",
239239
"spec_path": "tasks",
240240
}

‎requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
chardet>=3.0.2
55
eventlet
66
jinja2>=2.11 # BSD License (3 clause)
7-
jsonschema>=3,<4 # MIT
7+
jsonschema>=4.18.5 # MIT
88
# networkx v3.2 and greater does not support Python3.8.
99
networkx>=2.6,<3.2
1010
python-dateutil
1111
pyyaml>=5.3.1 # MIT
1212
six>=1.14.0
1313
stevedore>=1.3.0 # Apache-2.0
1414
ujson>=1.35 # BSD License
15-
yaql>=1.1.0 # Apache-2.0
15+
yaql>=3.2.0 # Apache-2.0

‎setup.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ def get_requirements():
6262
"Operating System :: POSIX :: Linux",
6363
"Programming Language :: Python",
6464
"Programming Language :: Python :: 3",
65-
"Programming Language :: Python :: 3.8",
66-
"Programming Language :: Python :: 3.9",
6765
"Programming Language :: Python :: 3.10",
6866
"Programming Language :: Python :: 3.11",
67+
"Programming Language :: Python :: 3.12",
6968
],
7069
entry_points={
7170
"orquesta.composers": [

0 commit comments

Comments
 (0)