Skip to content

Bump the pip-dependencies group across 1 directory with 2 updates #236

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.

Sign up for GitHub

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

Closed
dependabot wants to merge 2 commits into from
Closed

Bump the pip-dependencies group across 1 directory with 2 updates #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
136ecbb
pin branches for submodules, pin QsLog to our fork
iakov Feb 18, 2025
a254804
Bump the pip-dependencies group across 1 directory with 2 updates
dependabot[bot] Mar 3, 2025
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
11 changes: 9 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,39 @@
[submodule "plugins/robots/thirdparty/trikRuntime"]
path = plugins/robots/thirdparty/trikRuntime/trikRuntime
url = https://github.com/trikset/trikRuntime
branch = master
[submodule "qrtest/thirdparty/googletest/googletest"]
path = qrtest/thirdparty/googletest/googletest
url = https://github.com/google/googletest
branch = main
[submodule "qrgui/thirdparty/qt-solutions"]
path = qrgui/thirdparty/qt-solutions
url = https://github.com/trikset/qt-solutions
branch = master
[submodule "thirdparty/gamepad/gamepad"]
path = thirdparty/gamepad/gamepad
url = https://github.com/trikset/trik-desktop-gamepad
branch = master
[submodule "plugins/robots/thirdparty/hidapi"]
path = plugins/robots/thirdparty/hidapi
url = https://github.com/libusb/hidapi
[submodule "thirdparty/quazip/quazip"]
path = thirdparty/quazip/quazip
url = https://github.com/stachenov/quazip.git
branch = master
[submodule "plugins/robots/thirdparty/Box2D/Box2D"]
path = plugins/robots/thirdparty/Box2D/Box2D
url = https://github.com/iakov/Box2D
branch = "trik-studio"
[submodule "thirdparty/qslog/qslog"]
path = thirdparty/qslog/qslog
url = https://bitbucket.org/codeimproved/qslog.git
url = https://github.com/trikset/trik-qslog.git
branch = codeimproved-master
[submodule "installer/nxt-tools"]
path = installer/nxt-tools
url = https://github.com/trikset/nxt-tools.git
branch = main
branch = master
[submodule "trik-checkapp"]
path = thirdparty/checkapp/checkapp
url = https://github.com/trikset/trik-checkapp
branch = master
4 changes: 2 additions & 2 deletions installer/packages/trik-studio/ru.qreal.root.trik.core/meta/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pyinstaller==6.11.1
numpy==2.2.2; python_version >= "3.11"
pyinstaller==6.12.0
numpy==2.2.3; python_version >= "3.11"
numpy==2.0.1; python_version < "3.11"

2 changes: 1 addition & 1 deletion plugins/robots/thirdparty/trikRuntime/trikRuntime
Open in desktop
Submodule trikRuntime updated 2 files
+159 −0 .clang-format
+21 −0 run-clang-format.sh
2 changes: 1 addition & 1 deletion qrtest/thirdparty/googletest/googletest
Open in desktop
Submodule googletest updated 21 files
+2 −2 CMakeLists.txt
+2 −2 MODULE.bazel
+7 −4 README.md
+5 −6 WORKSPACE
+47 −29 ci/linux-presubmit.sh
+7 −4 ci/macos-presubmit.sh
+25 −13 ci/windows-presubmit.bat
+2 −1 docs/reference/actions.md
+5 −4 docs/reference/matchers.md
+17 −0 googlemock/include/gmock/gmock-actions.h
+4 −0 googlemock/include/gmock/gmock-matchers.h
+3 −3 googlemock/test/gmock-actions_test.cc
+39 −10 googlemock/test/gmock-more-actions_test.cc
+3 −4 googlemock/test/gmock-spec-builders_test.cc
+1 −1 googletest/README.md
+1 −1 googletest/cmake/internal_utils.cmake
+2 −2 googletest/include/gtest/internal/gtest-port.h
+0 −1 googletest/test/BUILD.bazel
+7 −1 googletest/test/googletest-printers-test.cc
+2 −2 googletest/test/googletest-setuptestsuite-test_.cc
+3 −3 googletest_deps.bzl
1 change: 1 addition & 0 deletions qrtest/thirdparty/googletest/googletest.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ TEMPLATE = lib

include(../../../global.pri)
LIBS -= -ltrikQsLog
CONFIG += c++17

# CONFIG += warn_off

Expand Down
5 changes: 5 additions & 0 deletions thirdparty/qslog/QsLogSharedLibrary.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@
DEFINES += QSLOG_IS_SHARED_LIBRARY

include(qslog/QsLogSharedLibrary.pro)
unset(VERSION)
unset(DESTDIR)
unset(MOC_DIR)
unset(OBJECTS_DIR)

TARGET=trikQsLog
VERSION=
#do not add a version major number to a name of dll
CONFIG += skip_target_version_ext
include(../../global.pri)
Expand Down
Loading