Merge pull request #19 from robotpy/kickoff

virtuald · web-flow · commit da9e8a6e5f96 · 2024-01-07T04:21:29.000-05:00
Update robotpy-meta for kickoff
diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
@@ -3,6 +3,10 @@ name: dist
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check:
     runs-on: ubuntu-latest
diff --git a/README.md b/README.md
@@ -26,6 +26,11 @@ pip3 install -U robotpy
 Install optional RobotPy components
 -----------------------------------
 
+> [!NOTE]
+> At the beginning of build season not all components are available because
+> vendors haven't made releases set. If you install one of those components,
+> it will try to install `error-NAME-not-available-yet`
+
 There are several categories of optional components that you can install. This
 uses the standard pip 'extras' installation functionality. The available
 categories are:
@@ -37,7 +42,6 @@ categories are:
 * pathplannerlib
 * phoenix5
 * phoenix6
-* photonvision
 * playingwithfusion
 * rev
 * sim
diff --git a/apriltag-requirements.txt b/apriltag-requirements.txt
@@ -1,4 +1,4 @@
-robotpy-apriltag==2024.0.0b4.post1
+robotpy-apriltag==2024.1.1.0
 
 # for other platforms there are a lot of ways to install numpy/OpenCV
 # and we shouldn't dictate it
diff --git a/commands2-requirements.txt b/commands2-requirements.txt
@@ -1 +1,2 @@
-robotpy-commands-v2==2024.0.0b3
+# robotpy-commands-v2==2024.0.0b3
+error-robotpy-commands-v2-not-available-yet
diff --git a/cscore-requirements.txt b/cscore-requirements.txt
@@ -1,4 +1,4 @@
-robotpy-cscore==2024.0.0b4.post1
+robotpy-cscore==2024.1.1.0
 
 # basic CameraServer works without NumPy/OpenCV installed, so only require
 # them on a RoboRIO -- for other platforms there are a lot of ways to
diff --git a/navx-requirements.txt b/navx-requirements.txt
@@ -1 +1,2 @@
-robotpy-navx<2025.0.0,>=2024.0.0b1
+#robotpy-navx<2025.0.0,>=2024.0.0b1
+error-robotpy-navx-not-available-yet
diff --git a/pathplannerlib-requirements.txt b/pathplannerlib-requirements.txt
@@ -1 +1,2 @@
 #robotpy-pathplannerlib<2024.0.0,>=2023.0.0
+error-robotpy-pathplannerlib-not-available-yet
diff --git a/phoenix5-requirements.txt b/phoenix5-requirements.txt
@@ -1,2 +1,4 @@
-robotpy-ctre<2025.0.0,>=2024.0.0b1; python_version >= '3.9' and platform_machine != "armv7l" and platform_machine != "aarch64"
-setuptools # phoenix6 implicit requirement
+#robotpy-ctre<2025.0.0,>=2024.0.0b1; python_version >= '3.9' and platform_machine != "armv7l" and platform_machine != "aarch64"
+#setuptools # phoenix6 implicit requirement
+
+error-robotpy-ctre-not-available-yet
diff --git a/phoenix6-requirements.txt b/phoenix6-requirements.txt
@@ -1,2 +1,4 @@
-phoenix6~=24.0.0b2; python_version >= '3.9' and platform_machine != "armv7l" and platform_machine != "aarch64"
-setuptools # phoenix6 implicit requirement
+#phoenix6~=24.0.0b2; python_version >= '3.9' and platform_machine != "armv7l" and platform_machine != "aarch64"
+#setuptools # phoenix6 implicit requirement
+
+error-phoenix6-not-available-yet
diff --git a/photonvision-requirements.txt b/photonvision-requirements.txt
diff --git a/playingwithfusion-requirements.txt b/playingwithfusion-requirements.txt
@@ -1 +1,2 @@
 #robotpy-playingwithfusion<2024.0.0,>=2023.0.0
+error-playingwithfusion-not-available-yet
diff --git a/requirements.txt b/requirements.txt
@@ -4,16 +4,16 @@
 
 # We now pin allwpilib based packages so that a specific install of robotpy-meta
 # is directly associated with a specific set of wpilib packages
-robotpy-wpiutil==2024.0.0b4.post1
-robotpy-wpinet==2024.0.0b4.post1
-robotpy-wpimath==2024.0.0b4.post1
-pyntcore==2024.0.0b4.post1
-robotpy-hal==2024.0.0b4.post1
-wpilib==2024.0.0b4.post1
+robotpy-wpiutil==2024.1.1.0
+robotpy-wpinet==2024.1.1.0
+robotpy-wpimath==2024.1.1.0
+pyntcore==2024.1.1.0
+robotpy-hal==2024.1.1.0
+wpilib==2024.1.1.0
 
-robotpy-halsim-gui==2024.0.0b4.post1; platform_machine != "roborio" and platform_machine != "armv7l" and platform_machine != "aarch64"
+robotpy-halsim-gui==2024.1.1.0; platform_machine != "roborio" and platform_machine != "armv7l" and platform_machine != "aarch64"
 
 # These are not pinned
-robotpy-wpilib-utilities<2025,>=2024.0.0b1
-robotpy-installer<2025,>=2024.0.0b1; platform_machine != "roborio" and platform_machine != "armv7l" and platform_machine != "aarch64"
-pyfrc<2025,>=2024.0.0b3; platform_machine != "roborio" and platform_machine != "armv7l" and platform_machine != "aarch64"
+robotpy-wpilib-utilities<2025,>=2024.0.0
+robotpy-installer<2025,>=2024.0.2; platform_machine != "roborio" and platform_machine != "armv7l" and platform_machine != "aarch64"
+pyfrc<2025,>=2024.0.0; platform_machine != "roborio" and platform_machine != "armv7l" and platform_machine != "aarch64"
diff --git a/rev-requirements.txt b/rev-requirements.txt
@@ -1 +1,2 @@
-robotpy-rev<2025.0.0,>=2024.0.0b1
+#robotpy-rev<2025.0.0,>=2024.0.0b1
+error-robotpy-rev-not-available-yet
diff --git a/romi-requirements.txt b/romi-requirements.txt
@@ -1,2 +1,3 @@
 # Not updated for 2023 yet?
 # robotpy-romi<2024.0.0,>=2022.2.1.0; platform_machine != "armv7l"
+error-robotpy-romi-not-available-yet
diff --git a/setup.py b/setup.py
@@ -2,30 +2,34 @@
 
 from setuptools import find_packages, setup
 from pathlib import Path
+import re
 
 setup_dir = Path(__file__).parent
 
 
 def get_reqs_from_path(path):
+    content = Path(path).read_text()
+
+    # Do not include in all requirements if this special package is in there
+    in_all = bool(re.match(r"^error-(.*)-not-available-yet$", content, re.MULTILINE))
     return [
-        req
-        for req in Path(path).read_text().splitlines()
-        if req and not req.startswith("#")
-    ]
+        req for req in content.splitlines() if req and not req.startswith("#")
+    ], in_all
 
 
-install_requires = get_reqs_from_path(setup_dir / "requirements.txt")
+install_requires, _ = get_reqs_from_path(setup_dir / "requirements.txt")
 all_reqs = set(install_requires)
 
 extras_require = {}
 
 for fpath in setup_dir.glob("*-requirements.txt"):
     key = fpath.stem[:-13]  # stem doesn't have .txt
 
-    reqs = get_reqs_from_path(fpath)
+    reqs, in_all = get_reqs_from_path(fpath)
     if reqs:
         extras_require[key] = reqs
-        all_reqs |= set(reqs)
+        if in_all:
+            all_reqs |= set(reqs)
 
 extras_require["all"] = all_reqs
 
diff --git a/sim-requirements.txt b/sim-requirements.txt
@@ -1,2 +1,2 @@
-robotpy-halsim-ds-socket==2024.0.0b4.post1; platform_machine != "roborio"
-robotpy-halsim-ws==2024.0.0b4.post1; platform_machine != "roborio"
+robotpy-halsim-ds-socket==2024.1.1.0; platform_machine != "roborio"
+robotpy-halsim-ws==2024.1.1.0; platform_machine != "roborio"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-robotpy-apriltag==2024.0.0b4.post1`
	`1`	`+robotpy-apriltag==2024.1.1.0`
`2`	`2`
`3`	`3`	`# for other platforms there are a lot of ways to install numpy/OpenCV`
`4`	`4`	`# and we shouldn't dictate it`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-robotpy-commands-v2==2024.0.0b3`
	`1`	`+# robotpy-commands-v2==2024.0.0b3`
	`2`	`+error-robotpy-commands-v2-not-available-yet`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-robotpy-cscore==2024.0.0b4.post1`
	`1`	`+robotpy-cscore==2024.1.1.0`
`2`	`2`
`3`	`3`	`# basic CameraServer works without NumPy/OpenCV installed, so only require`
`4`	`4`	`# them on a RoboRIO -- for other platforms there are a lot of ways to`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-robotpy-navx<2025.0.0,>=2024.0.0b1`
	`1`	`+#robotpy-navx<2025.0.0,>=2024.0.0b1`
	`2`	`+error-robotpy-navx-not-available-yet`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`#robotpy-pathplannerlib<2024.0.0,>=2023.0.0`
	`2`	`+error-robotpy-pathplannerlib-not-available-yet`