Skip to content

Commit 3d07f3e

Browse files
author
ZdenekM
committed
chore: update of dependencies, python 3.12 only
1 parent 26e666f commit 3d07f3e

112 files changed

Lines changed: 1441 additions & 2561 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[flake8]
22
max-line-length = 120
33
application-import-names = arcor2,arcor2_arserver,arcor2_arserver_data,arcor2_build,arcor2_build_data,arcor2_calibration,arcor2_execution,arcor2_execution_data,arcor2_fit_demo,arcor2_kinali,arcor2_mocks
4-
ignore = B306, E203, E231, W503
4+
ignore = B306, E203, E231, W503, E226, E704
55
known-modules = numpy-quaternion:[quaternion],lru-dict:[lru]

.github/workflows/pants-cache.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-22.04
1616
strategy:
1717
matrix:
18-
python-version: ['3.11']
18+
python-version: ['3.12']
1919
steps:
2020
- uses: actions/checkout@v4
2121
with:

.github/workflows/pants.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
needs: org-check
2424
strategy:
2525
matrix:
26-
python-version: ['3.11']
26+
python-version: ['3.12']
2727
steps:
2828
- name: Maximize build space
2929
uses: easimon/maximize-build-space@v10
@@ -47,7 +47,7 @@ jobs:
4747
- uses: ros-tooling/setup-ros@v0.7
4848
with:
4949
required-ros-distributions: jazzy
50-
- uses: pantsbuild/actions/init-pants@v5-scie-pants
50+
- uses: pantsbuild/actions/init-pants@v6-scie-pants
5151
with:
5252
pants-python-version: ${{ matrix.python-version }}
5353
gha-cache-key: cache0-py${{ matrix.python-version }}
@@ -62,19 +62,23 @@ jobs:
6262
sudo apt update
6363
sudo apt install jq cargo
6464
sudo ./build-support/install_ur_dependencies.sh
65+
- name: Test int
66+
run: |
67+
source /opt/ros/jazzy/setup.bash
68+
pants test --debug src/python/arcor2_ur/tests/test_interaction.py -- -s -vv
6569
- name: Lint
6670
run: |
6771
pants --changed-since=origin/master lint
6872
- name: Typecheck
6973
run: |
70-
pants check --changed-since=origin/master --changed-dependees=transitive
74+
pants check --changed-since=origin/master --changed-dependents=transitive
7175
- name: Test
7276
run: |
7377
source /opt/ros/jazzy/setup.bash
74-
pants --changed-since=origin/master --changed-dependees=transitive test
78+
pants --changed-since=origin/master --changed-dependents=transitive test
7579
- name: Build Docker images
7680
run: | # filter out non-essential docker images (there was a problem with full storage on github)
77-
pants filter --target-type=docker_image --changed-since=origin/master --changed-dependees=transitive | grep -v arcor2_3d_mouse | grep -v arcor2_fanuc arcor2_fanuc_upload_object_types | xargs pants package
81+
pants filter --target-type=docker_image --changed-since=origin/master --changed-dependents=transitive | grep -v arcor2_3d_mouse | grep -v arcor2_fanuc arcor2_fanuc_upload_object_types | xargs pants package
7882
- name: Build Python packages
7983
run: |
8084
pants filter --target-type=python_distribution :: | xargs pants package

3rdparty/BUILD

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ python_requirements(
3535
resolve="flake8",
3636
)
3737

38+
python_requirements(
39+
name="black",
40+
source="black-requirements.txt",
41+
resolve="black",
42+
)
43+
3844
python_requirements(
3945
name="setuptools",
4046
source="setuptools-requirements.txt",

3rdparty/black-requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
black==24.10.0
2+
typing-extensions==4.12.2
3+
tomli==2.2.1

3rdparty/black_lockfile.txt

Lines changed: 124 additions & 66 deletions
Large diffs are not rendered by default.

3rdparty/constraints.txt

Lines changed: 641 additions & 1743 deletions
Large diffs are not rendered by default.

3rdparty/flake8_lockfile.txt

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// {
77
// "version": 3,
88
// "valid_for_interpreter_constraints": [
9-
// "CPython<3.13,>=3.11"
9+
// "CPython<3.13,>=3.12"
1010
// ],
1111
// "generated_with_requirements": [
1212
// "flake8-absolute-import",
@@ -30,20 +30,21 @@
3030
"allow_wheels": true,
3131
"build_isolation": true,
3232
"constraints": [],
33+
"excluded": [],
3334
"locked_resolves": [
3435
{
3536
"locked_requirements": [
3637
{
3738
"artifacts": [
3839
{
3940
"algorithm": "sha256",
40-
"hash": "81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2",
41-
"url": "https://files.pythonhosted.org/packages/6a/21/5b6702a7f963e95456c0de2d495f67bf5fd62840ac655dc451586d23d39a/attrs-24.2.0-py3-none-any.whl"
41+
"hash": "ac96cd038792094f438ad1f6ff80837353805ac950cd2aa0e0625ef19850c308",
42+
"url": "https://files.pythonhosted.org/packages/89/aa/ab0f7891a01eeb2d2e338ae8fecbe57fcebea1a24dbb64d45801bfab481d/attrs-24.3.0-py3-none-any.whl"
4243
},
4344
{
4445
"algorithm": "sha256",
45-
"hash": "5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346",
46-
"url": "https://files.pythonhosted.org/packages/fc/0f/aafca9af9315aee06a89ffde799a10a582fe8de76c563ee80bbcdc08b3fb/attrs-24.2.0.tar.gz"
46+
"hash": "8f5c07333d543103541ba7be0e2ce16eeee8130cb0b3f9238ab904ce1e85baff",
47+
"url": "https://files.pythonhosted.org/packages/48/c8/6260f8ccc11f0917360fc0da435c5c9c7504e3db174d5a12a1494887b045/attrs-24.3.0.tar.gz"
4748
}
4849
],
4950
"project_name": "attrs",
@@ -59,24 +60,23 @@
5960
"hypothesis; extra == \"cov\"",
6061
"hypothesis; extra == \"dev\"",
6162
"hypothesis; extra == \"tests\"",
62-
"importlib-metadata; python_version < \"3.8\"",
63-
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\") and extra == \"benchmark\"",
64-
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\") and extra == \"cov\"",
65-
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\") and extra == \"dev\"",
66-
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\") and extra == \"tests\"",
67-
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\") and extra == \"tests-mypy\"",
63+
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.10\") and extra == \"benchmark\"",
64+
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.10\") and extra == \"cov\"",
65+
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.10\") and extra == \"dev\"",
66+
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.10\") and extra == \"tests\"",
67+
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.10\") and extra == \"tests-mypy\"",
6868
"myst-parser; extra == \"docs\"",
69-
"pre-commit; extra == \"dev\"",
69+
"pre-commit-uv; extra == \"dev\"",
7070
"pympler; extra == \"benchmark\"",
7171
"pympler; extra == \"cov\"",
7272
"pympler; extra == \"dev\"",
7373
"pympler; extra == \"tests\"",
7474
"pytest-codspeed; extra == \"benchmark\"",
75-
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\") and extra == \"benchmark\"",
76-
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\") and extra == \"cov\"",
77-
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\") and extra == \"dev\"",
78-
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\") and extra == \"tests\"",
79-
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\") and extra == \"tests-mypy\"",
75+
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.10\") and extra == \"benchmark\"",
76+
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.10\") and extra == \"cov\"",
77+
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.10\") and extra == \"dev\"",
78+
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.10\") and extra == \"tests\"",
79+
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.10\") and extra == \"tests-mypy\"",
8080
"pytest-xdist[psutil]; extra == \"benchmark\"",
8181
"pytest-xdist[psutil]; extra == \"cov\"",
8282
"pytest-xdist[psutil]; extra == \"dev\"",
@@ -90,8 +90,8 @@
9090
"sphinxcontrib-towncrier; extra == \"docs\"",
9191
"towncrier<24.7; extra == \"docs\""
9292
],
93-
"requires_python": ">=3.7",
94-
"version": "24.2.0"
93+
"requires_python": ">=3.8",
94+
"version": "24.3.0"
9595
},
9696
{
9797
"artifacts": [
@@ -159,18 +159,18 @@
159159
"artifacts": [
160160
{
161161
"algorithm": "sha256",
162-
"hash": "25bc3867f7338ee3b3e0916bf8b8a0b743f53a9a5175782ddc4325ed4f386b89",
163-
"url": "https://files.pythonhosted.org/packages/2b/3c/8885a79ae7bebfab19716969de9810722ff45354e4ccc974a090bc478eaa/flake8_bugbear-24.8.19-py3-none-any.whl"
162+
"hash": "1b6967436f65ca22a42e5373aaa6f2d87966ade9aa38d4baf2a1be550767545e",
163+
"url": "https://files.pythonhosted.org/packages/b9/21/0a875f75fbe4008bd171e2fefa413536258fe6b4cfaaa087986de74588f4/flake8_bugbear-24.12.12-py3-none-any.whl"
164164
},
165165
{
166166
"algorithm": "sha256",
167-
"hash": "9b77627eceda28c51c27af94560a72b5b2c97c016651bdce45d8f56c180d2d32",
168-
"url": "https://files.pythonhosted.org/packages/00/b3/80043856ed90ceef0e95c01ed12d6bb7d4d76356e526450f0a9aeeb0a7b7/flake8_bugbear-24.8.19.tar.gz"
167+
"hash": "46273cef0a6b6ff48ca2d69e472f41420a42a46e24b2a8972e4f0d6733d12a64",
168+
"url": "https://files.pythonhosted.org/packages/c7/25/48ba712ff589b0149f21135234f9bb45c14d6689acc6151b5e2ff8ac2ae9/flake8_bugbear-24.12.12.tar.gz"
169169
}
170170
],
171171
"project_name": "flake8-bugbear",
172172
"requires_dists": [
173-
"attrs>=19.2.0",
173+
"attrs>=22.2.0",
174174
"coverage; extra == \"dev\"",
175175
"flake8>=6.0.0",
176176
"hypothesis; extra == \"dev\"",
@@ -180,7 +180,7 @@
180180
"tox; extra == \"dev\""
181181
],
182182
"requires_python": ">=3.8.1",
183-
"version": "24.8.19"
183+
"version": "24.12.12"
184184
},
185185
{
186186
"artifacts": [
@@ -245,21 +245,21 @@
245245
"artifacts": [
246246
{
247247
"algorithm": "sha256",
248-
"hash": "b0387fb2ea200441bd142309e716fb7b8f4b0937bdf5f8b7c0c118a5f5e2b8ed",
249-
"url": "https://files.pythonhosted.org/packages/32/46/ba219b0e774b68993008afe963fd809d2ba28de45ad2f4c8acc345f15249/flake8_tidy_imports-4.10.0-py3-none-any.whl"
248+
"hash": "607a76a7c2a9dec682e214f0692d4e7876862a618b766cef8f16979efac1ce22",
249+
"url": "https://files.pythonhosted.org/packages/06/3b/d3c1b7f47a20c41b4811e15a783d29b1e83921422152a9770c66dea1017e/flake8_tidy_imports-4.11.0-py3-none-any.whl"
250250
},
251251
{
252252
"algorithm": "sha256",
253-
"hash": "bd6cf86465402d2b86903009b748d85a628e599e17b76e810c9857e3a2815173",
254-
"url": "https://files.pythonhosted.org/packages/76/7e/e4b9e42a5434e7f819f50f47b1bd1c04b71539d22f06e917e0d0846e412c/flake8_tidy_imports-4.10.0.tar.gz"
253+
"hash": "fcd57e275a9f4f8163db2ecb17c9c942d311750e2315cf9ae931f22f7043d496",
254+
"url": "https://files.pythonhosted.org/packages/d7/03/9ea93e3ab6e26a6c5da23c95318101491b92f5a0777d1e80cf2e39d11d02/flake8_tidy_imports-4.11.0.tar.gz"
255255
}
256256
],
257257
"project_name": "flake8-tidy-imports",
258258
"requires_dists": [
259-
"flake8>=3.8.0"
259+
"flake8>=3.8"
260260
],
261-
"requires_python": ">=3.8",
262-
"version": "4.10.0"
261+
"requires_python": ">=3.9",
262+
"version": "4.11.0"
263263
},
264264
{
265265
"artifacts": [
@@ -319,30 +319,31 @@
319319
"artifacts": [
320320
{
321321
"algorithm": "sha256",
322-
"hash": "34793ba60488e7cccbecdef3a7fe151656372ef94fdac9fe004c52a4000a6d44",
323-
"url": "https://files.pythonhosted.org/packages/fd/1b/bc096603b79edbac62899cbe852bd5ccdf0f8e8a7faa9f7390ee1995cedb/vulture-2.13-py2.py3-none-any.whl"
322+
"hash": "d9a90dba89607489548a49d557f8bac8112bd25d3cbc8aeef23e860811bd5ed9",
323+
"url": "https://files.pythonhosted.org/packages/a0/56/0cc15b8ff2613c1d5c3dc1f3f576ede1c43868c1bc2e5ccaa2d4bcd7974d/vulture-2.14-py2.py3-none-any.whl"
324324
},
325325
{
326326
"algorithm": "sha256",
327-
"hash": "78248bf58f5eaffcc2ade306141ead73f437339950f80045dce7f8b078e5a1aa",
328-
"url": "https://files.pythonhosted.org/packages/1d/7d/e78586863119fe28741c347988f892301319ce05edd11dbe0b45b18cc3b9/vulture-2.13.tar.gz"
327+
"hash": "cb8277902a1138deeab796ec5bef7076a6e0248ca3607a3f3dee0b6d9e9b8415",
328+
"url": "https://files.pythonhosted.org/packages/8e/25/925f35db758a0f9199113aaf61d703de891676b082bd7cf73ea01d6000f7/vulture-2.14.tar.gz"
329329
}
330330
],
331331
"project_name": "vulture",
332332
"requires_dists": [
333333
"tomli>=1.1.0; python_version < \"3.11\""
334334
],
335335
"requires_python": ">=3.8",
336-
"version": "2.13"
336+
"version": "2.14"
337337
}
338338
],
339339
"platform_tag": null
340340
}
341341
],
342342
"only_builds": [],
343343
"only_wheels": [],
344+
"overridden": [],
344345
"path_mappings": {},
345-
"pex_version": "2.3.1",
346+
"pex_version": "2.16.2",
346347
"pip_version": "24.0",
347348
"prefer_older_binary": false,
348349
"requirements": [
@@ -355,7 +356,7 @@
355356
"vulture"
356357
],
357358
"requires_python": [
358-
"<3.13,>=3.11"
359+
"<3.13,>=3.12"
359360
],
360361
"resolver_version": "pip-2020-resolver",
361362
"style": "universal",

3rdparty/mypy-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
mypy==1.11.2
1+
mypy==1.14.1
22
numpy~=1.26.4

0 commit comments

Comments
 (0)