Skip to content

Commit

Permalink
feat(arcor2_ur): integration of UR robots
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZdenekM
ZdenekM authored and ZdenekM committed Sep 12, 2024
1 parent 8b3b5b1 commit aa09eb1
Show file tree
Hide file tree
Showing 89 changed files with 3,748 additions and 871 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/pants.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
org-check:
name: Check GitHub Organization
if: ${{ github.repository_owner == 'robofit' }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Noop
run: "true"
build:
env:
PANTS_CONFIG_FILES: pants.ci.toml
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: org-check
strategy:
matrix:
Expand All @@ -44,6 +44,9 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: ros-tooling/[email protected]
with:
required-ros-distributions: jazzy
- uses: pantsbuild/actions/init-pants@v5-scie-pants
with:
pants-python-version: ${{ matrix.python-version }}
Expand All @@ -57,6 +60,9 @@ jobs:
- name: install system dependencies
run: | # cargo is required to build fastuuid (no wheels for Python 3.11)
sudo apt install jq cargo
- name: install ROS 2 dependencies
run: | # copied from arcor2_ur Dockerfile TODO move it into some bash script to have it in one place
sudo apt install ros-jazzy-ros-base=0.11.0-1noble.20240731.172749 ros-jazzy-ur=2.4.9-1noble.20240820.020145 ros-jazzy-moveit-py=2.10.0-1noble.20240731.183757
- name: Lint
run: |
pants --changed-since=origin/master lint
Expand All @@ -65,6 +71,7 @@ jobs:
pants check --changed-since=origin/master --changed-dependees=transitive
- name: Test
run: |
source /opt/ros/jazzy/setup.bash
pants --changed-since=origin/master --changed-dependees=transitive test
- name: Build Docker images
run: | # filter out non-essential docker images (there was a problem with full storage on github)
Expand Down
6 changes: 6 additions & 0 deletions 3rdparty/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,10 @@ python_requirements(
name="flake8",
source="flake8-requirements.txt",
resolve="flake8",
)

python_requirements(
name="setuptools",
source="setuptools-requirements.txt",
resolve="setuptools",
)
2,263 changes: 1,636 additions & 627 deletions 3rdparty/constraints.txt
View file

Large diffs are not rendered by default.

93 changes: 56 additions & 37 deletions 3rdparty/flake8_lockfile.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// {
// "version": 3,
// "valid_for_interpreter_constraints": [
// "CPython==3.11.*"
// "CPython<3.13,>=3.11"
// ],
// "generated_with_requirements": [
// "flake8-absolute-import",
Expand Down Expand Up @@ -37,64 +37,83 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1",
"url": "https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl"
"hash": "81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2",
"url": "https://files.pythonhosted.org/packages/6a/21/5b6702a7f963e95456c0de2d495f67bf5fd62840ac655dc451586d23d39a/attrs-24.2.0-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30",
"url": "https://files.pythonhosted.org/packages/e3/fc/f800d51204003fa8ae392c4e8278f256206e7a919b708eef054f5f4b650d/attrs-23.2.0.tar.gz"
"hash": "5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346",
"url": "https://files.pythonhosted.org/packages/fc/0f/aafca9af9315aee06a89ffde799a10a582fe8de76c563ee80bbcdc08b3fb/attrs-24.2.0.tar.gz"
}
],
"project_name": "attrs",
"requires_dists": [
"attrs[tests-mypy]; extra == \"tests-no-zope\"",
"attrs[tests-no-zope]; extra == \"tests\"",
"attrs[tests]; extra == \"cov\"",
"attrs[tests]; extra == \"dev\"",
"cloudpickle; platform_python_implementation == \"CPython\" and extra == \"tests-no-zope\"",
"cloudpickle; platform_python_implementation == \"CPython\" and extra == \"benchmark\"",
"cloudpickle; platform_python_implementation == \"CPython\" and extra == \"cov\"",
"cloudpickle; platform_python_implementation == \"CPython\" and extra == \"dev\"",
"cloudpickle; platform_python_implementation == \"CPython\" and extra == \"tests\"",
"cogapp; extra == \"docs\"",
"coverage[toml]>=5.3; extra == \"cov\"",
"furo; extra == \"docs\"",
"hypothesis; extra == \"tests-no-zope\"",
"hypothesis; extra == \"benchmark\"",
"hypothesis; extra == \"cov\"",
"hypothesis; extra == \"dev\"",
"hypothesis; extra == \"tests\"",
"importlib-metadata; python_version < \"3.8\"",
"mypy>=1.6; (platform_python_implementation == \"CPython\" and python_version >= \"3.8\") and extra == \"tests-mypy\"",
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\") and extra == \"benchmark\"",
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\") and extra == \"cov\"",
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\") and extra == \"dev\"",
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\") and extra == \"tests\"",
"mypy>=1.11.1; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\") and extra == \"tests-mypy\"",
"myst-parser; extra == \"docs\"",
"pre-commit; extra == \"dev\"",
"pympler; extra == \"tests-no-zope\"",
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.8\") and extra == \"tests-mypy\"",
"pytest-xdist[psutil]; extra == \"tests-no-zope\"",
"pytest>=4.3.0; extra == \"tests-no-zope\"",
"pympler; extra == \"benchmark\"",
"pympler; extra == \"cov\"",
"pympler; extra == \"dev\"",
"pympler; extra == \"tests\"",
"pytest-codspeed; extra == \"benchmark\"",
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\") and extra == \"benchmark\"",
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\") and extra == \"cov\"",
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\") and extra == \"dev\"",
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\") and extra == \"tests\"",
"pytest-mypy-plugins; (platform_python_implementation == \"CPython\" and python_version >= \"3.9\" and python_version < \"3.13\") and extra == \"tests-mypy\"",
"pytest-xdist[psutil]; extra == \"benchmark\"",
"pytest-xdist[psutil]; extra == \"cov\"",
"pytest-xdist[psutil]; extra == \"dev\"",
"pytest-xdist[psutil]; extra == \"tests\"",
"pytest>=4.3.0; extra == \"benchmark\"",
"pytest>=4.3.0; extra == \"cov\"",
"pytest>=4.3.0; extra == \"dev\"",
"pytest>=4.3.0; extra == \"tests\"",
"sphinx-notfound-page; extra == \"docs\"",
"sphinx; extra == \"docs\"",
"sphinxcontrib-towncrier; extra == \"docs\"",
"towncrier; extra == \"docs\"",
"zope-interface; extra == \"docs\"",
"zope-interface; extra == \"tests\""
"towncrier<24.7; extra == \"docs\""
],
"requires_python": ">=3.7",
"version": "23.2.0"
"version": "24.2.0"
},
{
"artifacts": [
{
"algorithm": "sha256",
"hash": "a6dfbb75e03252917f2473ea9653f7cd799c3064e54d4c8140044c5c065f53c3",
"url": "https://files.pythonhosted.org/packages/e3/01/cc8cdec7b61db0315c2ab62d80677a138ef06832ec17f04d87e6ef858f7f/flake8-7.0.0-py2.py3-none-any.whl"
"hash": "597477df7860daa5aa0fdd84bf5208a043ab96b8e96ab708770ae0364dd03213",
"url": "https://files.pythonhosted.org/packages/d9/42/65004373ac4617464f35ed15931b30d764f53cdd30cc78d5aea349c8c050/flake8-7.1.1-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "33f96621059e65eec474169085dc92bf26e7b2d47366b70be2f67ab80dc25132",
"url": "https://files.pythonhosted.org/packages/40/3c/3464b567aa367b221fa610bbbcce8015bf953977d21e52f2d711b526fb48/flake8-7.0.0.tar.gz"
"hash": "049d058491e228e03e67b390f311bbf88fce2dbaa8fa673e7aea87b7198b8d38",
"url": "https://files.pythonhosted.org/packages/37/72/e8d66150c4fcace3c0a450466aa3480506ba2cae7b61e100a2613afc3907/flake8-7.1.1.tar.gz"
}
],
"project_name": "flake8",
"requires_dists": [
"mccabe<0.8.0,>=0.7.0",
"pycodestyle<2.12.0,>=2.11.0",
"pycodestyle<2.13.0,>=2.12.0",
"pyflakes<3.3.0,>=3.2.0"
],
"requires_python": ">=3.8.1",
"version": "7.0.0"
"version": "7.1.1"
},
{
"artifacts": [
Expand Down Expand Up @@ -140,13 +159,13 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "cb430dd86bc821d79ccc0b030789a9c87a47a369667f12ba06e80f11305e8258",
"url": "https://files.pythonhosted.org/packages/23/f2/ea73077346e396fcfad4e546b3a15f686509287a51449e74fdf1fb0bd28c/flake8_bugbear-24.4.26-py3-none-any.whl"
"hash": "25bc3867f7338ee3b3e0916bf8b8a0b743f53a9a5175782ddc4325ed4f386b89",
"url": "https://files.pythonhosted.org/packages/2b/3c/8885a79ae7bebfab19716969de9810722ff45354e4ccc974a090bc478eaa/flake8_bugbear-24.8.19-py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "ff8d4ba5719019ebf98e754624c30c05cef0dadcf18a65d91c7567300e52a130",
"url": "https://files.pythonhosted.org/packages/d8/a5/08b0ccb03fc75ba422e2d44b3d74a483814ba3e07ab84bfa7b463d9568f5/flake8_bugbear-24.4.26.tar.gz"
"hash": "9b77627eceda28c51c27af94560a72b5b2c97c016651bdce45d8f56c180d2d32",
"url": "https://files.pythonhosted.org/packages/00/b3/80043856ed90ceef0e95c01ed12d6bb7d4d76356e526450f0a9aeeb0a7b7/flake8_bugbear-24.8.19.tar.gz"
}
],
"project_name": "flake8-bugbear",
Expand All @@ -161,7 +180,7 @@
"tox; extra == \"dev\""
],
"requires_python": ">=3.8.1",
"version": "24.4.26"
"version": "24.8.19"
},
{
"artifacts": [
Expand Down Expand Up @@ -264,19 +283,19 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67",
"url": "https://files.pythonhosted.org/packages/b1/90/a998c550d0ddd07e38605bb5c455d00fcc177a800ff9cc3dafdcb3dd7b56/pycodestyle-2.11.1-py2.py3-none-any.whl"
"hash": "46f0fb92069a7c28ab7bb558f05bfc0110dac69a0cd23c61ea0040283a9d78b3",
"url": "https://files.pythonhosted.org/packages/3a/d8/a211b3f85e99a0daa2ddec96c949cac6824bd305b040571b82a03dd62636/pycodestyle-2.12.1-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f",
"url": "https://files.pythonhosted.org/packages/34/8f/fa09ae2acc737b9507b5734a9aec9a2b35fa73409982f57db1b42f8c3c65/pycodestyle-2.11.1.tar.gz"
"hash": "6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521",
"url": "https://files.pythonhosted.org/packages/43/aa/210b2c9aedd8c1cbeea31a50e42050ad56187754b34eb214c46709445801/pycodestyle-2.12.1.tar.gz"
}
],
"project_name": "pycodestyle",
"requires_dists": [],
"requires_python": ">=3.8",
"version": "2.11.1"
"version": "2.12.1"
},
{
"artifacts": [
Expand Down Expand Up @@ -336,7 +355,7 @@
"vulture"
],
"requires_python": [
"==3.11.*"
"<3.13,>=3.11"
],
"resolver_version": "pip-2020-resolver",
"style": "universal",
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/mypy-requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mypy==1.9.0
numpy~=1.23.5
numpy~=1.26.4
Loading

0 comments on commit aa09eb1

Please sign in to comment.