From d620d9ca349d1b05e773b90c2bf3af34cb37c24a Mon Sep 17 00:00:00 2001 From: David Vo Date: Sat, 10 Feb 2024 15:11:19 +1100 Subject: [PATCH 1/2] Remove device sim libs These are all included in phoenix6 and don't have headers. --- phoenix5/_simcancoder/__init__.py | 0 phoenix5/_simpigeonimu/__init__.py | 0 phoenix5/_simprocancoder/__init__.py | 0 phoenix5/_simpropigeon2/__init__.py | 0 phoenix5/_simprotalonfx/__init__.py | 0 phoenix5/_simtalonfx/__init__.py | 0 phoenix5/_simtalonsrx/__init__.py | 0 phoenix5/_simvictorspx/__init__.py | 0 pyproject.toml | 144 --------------------------- 9 files changed, 144 deletions(-) delete mode 100644 phoenix5/_simcancoder/__init__.py delete mode 100644 phoenix5/_simpigeonimu/__init__.py delete mode 100644 phoenix5/_simprocancoder/__init__.py delete mode 100644 phoenix5/_simpropigeon2/__init__.py delete mode 100644 phoenix5/_simprotalonfx/__init__.py delete mode 100644 phoenix5/_simtalonfx/__init__.py delete mode 100644 phoenix5/_simtalonsrx/__init__.py delete mode 100644 phoenix5/_simvictorspx/__init__.py diff --git a/phoenix5/_simcancoder/__init__.py b/phoenix5/_simcancoder/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/phoenix5/_simpigeonimu/__init__.py b/phoenix5/_simpigeonimu/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/phoenix5/_simprocancoder/__init__.py b/phoenix5/_simprocancoder/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/phoenix5/_simpropigeon2/__init__.py b/phoenix5/_simpropigeon2/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/phoenix5/_simprotalonfx/__init__.py b/phoenix5/_simprotalonfx/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/phoenix5/_simtalonfx/__init__.py b/phoenix5/_simtalonfx/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/phoenix5/_simtalonsrx/__init__.py b/phoenix5/_simtalonsrx/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/phoenix5/_simvictorspx/__init__.py b/phoenix5/_simvictorspx/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/pyproject.toml b/pyproject.toml index a917d1d..1e677c2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -172,14 +172,6 @@ libs = [ [tool.robotpy-build.wrappers."phoenix5._tools_sim"] name = "ctre_tools_sim" depends = [ - "ctre_simpropigeon2", - "ctre_simprocancoder", - "ctre_simprotalonfx", - "ctre_simcancoder", - "ctre_simtalonfx", - "ctre_simpigeonimu", - "ctre_simtalonsrx", - "ctre_simvictorspx", ] [tool.robotpy-build.wrappers."phoenix5._tools_sim".override.arch_athena] @@ -195,134 +187,6 @@ libs = [] # "CTRE_PhoenixTools_Sim", # ] -[tool.robotpy-build.wrappers."phoenix5._simtalonsrx"] -name = "ctre_simtalonsrx" - -[tool.robotpy-build.wrappers."phoenix5._simtalonsrx".override.arch_athena] -ignore = true - -[tool.robotpy-build.wrappers."phoenix5._simtalonsrx".maven_lib_download] -artifact_id = "simTalonSRX" -group_id = "com.ctre.phoenix6.sim" -repo_url = "https://maven.ctr-electronics.com/release" -version = "24.1.0" -libs = [] -# libs = [ -# "CTRE_SimTalonSRX", -# ] - -[tool.robotpy-build.wrappers."phoenix5._simtalonfx"] -name = "ctre_simtalonfx" - -[tool.robotpy-build.wrappers."phoenix5._simtalonfx".override.arch_athena] -ignore = true - -[tool.robotpy-build.wrappers."phoenix5._simtalonfx".maven_lib_download] -artifact_id = "simTalonFX" -group_id = "com.ctre.phoenix6.sim" -repo_url = "https://maven.ctr-electronics.com/release" -version = "24.1.0" -libs = [] -# libs = [ -# "CTRE_SimTalonFX", -# ] - -[tool.robotpy-build.wrappers."phoenix5._simvictorspx"] -name = "ctre_simvictorspx" - -[tool.robotpy-build.wrappers."phoenix5._simvictorspx".override.arch_athena] -ignore = true - -[tool.robotpy-build.wrappers."phoenix5._simvictorspx".maven_lib_download] -artifact_id = "simVictorSPX" -group_id = "com.ctre.phoenix6.sim" -repo_url = "https://maven.ctr-electronics.com/release" -version = "24.1.0" -libs = [] -# libs = [ -# "CTRE_SimVictorSPX", -# ] - -[tool.robotpy-build.wrappers."phoenix5._simpigeonimu"] -name = "ctre_simpigeonimu" - -[tool.robotpy-build.wrappers."phoenix5._simpigeonimu".override.arch_athena] -ignore = true - -[tool.robotpy-build.wrappers."phoenix5._simpigeonimu".maven_lib_download] -artifact_id = "simPigeonIMU" -group_id = "com.ctre.phoenix6.sim" -repo_url = "https://maven.ctr-electronics.com/release" -version = "24.1.0" -libs = [] -# libs = [ -# "CTRE_SimPigeonIMU", -# ] - -[tool.robotpy-build.wrappers."phoenix5._simcancoder"] -name = "ctre_simcancoder" - -[tool.robotpy-build.wrappers."phoenix5._simcancoder".override.arch_athena] -ignore = true - -[tool.robotpy-build.wrappers."phoenix5._simcancoder".maven_lib_download] -artifact_id = "simCANCoder" -group_id = "com.ctre.phoenix6.sim" -repo_url = "https://maven.ctr-electronics.com/release" -version = "24.1.0" -libs = [] -# libs = [ -# "CTRE_SimCANCoder", -# ] - -[tool.robotpy-build.wrappers."phoenix5._simprotalonfx"] -name = "ctre_simprotalonfx" - -[tool.robotpy-build.wrappers."phoenix5._simprotalonfx".override.arch_athena] -ignore = true - -[tool.robotpy-build.wrappers."phoenix5._simprotalonfx".maven_lib_download] -artifact_id = "simProTalonFX" -group_id = "com.ctre.phoenix6.sim" -repo_url = "https://maven.ctr-electronics.com/release" -version = "24.1.0" -libs = [] -# libs = [ -# "CTRE_SimProTalonFX", -# ] - -[tool.robotpy-build.wrappers."phoenix5._simprocancoder"] -name = "ctre_simprocancoder" - -[tool.robotpy-build.wrappers."phoenix5._simprocancoder".override.arch_athena] -ignore = true - -[tool.robotpy-build.wrappers."phoenix5._simprocancoder".maven_lib_download] -artifact_id = "simProCANcoder" -group_id = "com.ctre.phoenix6.sim" -repo_url = "https://maven.ctr-electronics.com/release" -version = "24.1.0" -libs = [] -# libs = [ -# "CTRE_SimProCANcoder", -# ] - -[tool.robotpy-build.wrappers."phoenix5._simpropigeon2"] -name = "ctre_simpropigeon2" - -[tool.robotpy-build.wrappers."phoenix5._simpropigeon2".override.arch_athena] -ignore = true - -[tool.robotpy-build.wrappers."phoenix5._simpropigeon2".maven_lib_download] -artifact_id = "simProPigeon2" -group_id = "com.ctre.phoenix6.sim" -repo_url = "https://maven.ctr-electronics.com/release" -version = "24.1.0" -libs = [] -# libs = [ -# "CTRE_SimProPigeon2", -# ] - # End autogenerated TOML @@ -340,14 +204,6 @@ depends = [ "ctre_api_cpp_sim", "ctre_cci_sim", "ctre_tools_sim", - "ctre_simtalonsrx", - "ctre_simtalonfx", - "ctre_simvictorspx", - "ctre_simpigeonimu", - "ctre_simcancoder", - "ctre_simprotalonfx", - "ctre_simprocancoder", - "ctre_simpropigeon2", ] sources = [ From 58c201bb7376f1db07215961c459ac863f3c8cca Mon Sep 17 00:00:00 2001 From: David Vo Date: Sat, 10 Feb 2024 15:47:55 +1100 Subject: [PATCH 2/2] Update dependencies --- pyproject.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1e677c2..6b021fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,15 +6,15 @@ author_email = "robotpy@googlegroups.com" url = "https://github.com/robotpy/robotpy-ctre" license = "MIT" install_requires = [ - "wpilib<2025.0.0,>=2024.1.1", - "phoenix6~=24.1.0", + "wpilib<2025.0.0,>=2024.2.1", + "phoenix6~=24.2", ] [build-system] requires = [ "robotpy-build<2025.0.0,>=2024.0.0", - "wpilib<2025.0.0,>=2024.1.1", - "phoenix6~=24.1.0", + "wpilib<2025.0.0,>=2024.2.1", + "phoenix6~=24.2", ] [tool.robotpy-build] @@ -101,7 +101,7 @@ ignore = false artifact_id = "tools" group_id = "com.ctre.phoenix6" repo_url = "https://maven.ctr-electronics.com/release" -version = "24.1.0" +version = "24.2.0" libs = [] [tool.robotpy-build.wrappers."phoenix5._wpiapi_cpp_sim"] @@ -181,7 +181,7 @@ ignore = true artifact_id = "tools-sim" group_id = "com.ctre.phoenix6.sim" repo_url = "https://maven.ctr-electronics.com/release" -version = "24.1.0" +version = "24.2.0" libs = [] # libs = [ # "CTRE_PhoenixTools_Sim",