Skip to content

Commit

Permalink
Merge pull request #13 from robotpy/2024-beta
Browse files Browse the repository at this point in the history
Update for 2024-beta
  • Loading branch information
virtuald authored Nov 1, 2023
2 parents dcb5953 + e66995a commit 2129962
Show file tree
Hide file tree
Showing 13 changed files with 128 additions and 33 deletions.
109 changes: 102 additions & 7 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: psf/black@stable

build:
Expand All @@ -23,16 +23,113 @@ jobs:

- name: Build packages
run: python -m build

- name: Upload build artifacts
uses: actions/upload-artifact@v3
with:
name: dist
path: dist

- uses: actions/upload-artifact@v2
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
test:
needs: [build]
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-2022, macos-12, ubuntu-22.04]
python_version:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
architecture: [x64]

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python_version }}
architecture: ${{ matrix.architecture }}

- name: Download build artifacts
uses: actions/download-artifact@v3
with:
name: dist
path: dist

- name: Show installed packages
shell: bash
run: |
python -m pip list
- name: Install native wheel
shell: bash
run: |
cd dist
WHEEL=$(ls *.whl)
python -m pip --disable-pip-version-check install ${WHEEL}[all]
# Only need to test that the wheel installs

cross-test:
runs-on: ubuntu-latest
needs: [build]
strategy:
matrix:
os:
- container: wpilib/roborio-cross-ubuntu:2024-22.04-py312
name: roborio

- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py38
name: raspbian
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py39
name: raspbian
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py310
name: raspbian
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py311
name: raspbian
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py312
name: raspbian

- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py38
name: raspbian
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py39
name: raspbian
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py310
name: raspbian
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py311
name: raspbian
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py312
name: raspbian

container:
image: "${{ matrix.os.container }}"

steps:
- uses: actions/checkout@v4
if: (inputs.enable_raspbian && matrix.os.name == 'raspbian') || (inputs.enable_roborio && matrix.os.name == 'roborio')

- name: Show installed packages
shell: bash
run: |
/build/venv/bin/cross-python -m pip list
- uses: actions/download-artifact@v3
with:
name: dist
path: dist/

- name: Install
working-directory: dist
run: |
WHEEL=$(ls *.whl)
/build/venv/bin/cross-pip --disable-pip-version-check install ${WHEEL}[all]
publish:
runs-on: ubuntu-latest
needs: [check, build]
needs: [check, test, cross-test]
permissions:
id-token: write
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')

steps:
Expand All @@ -42,6 +139,4 @@ jobs:
path: dist/

- name: Publish to PyPI
uses: pypa/[email protected]
with:
password: ${{ secrets.pypi_password }}
uses: pypa/gh-action-pypi-publish@release/v1
6 changes: 3 additions & 3 deletions apriltag-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
robotpy-apriltag==2023.4.3.0
robotpy-apriltag==2024.0.0b2.post1

# for other platforms there are a lot of ways to install numpy/OpenCV
# and we shouldn't dictate it
numpy; platform_machine == "armv7l"
robotpy-opencv; platform_machine == "armv7l"
numpy==1.25.2; platform_machine == "roborio"
robotpy-opencv; platform_machine == "roborio"
2 changes: 1 addition & 1 deletion commands2-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
robotpy-commands-v2==2023.4.3.0
#robotpy-commands-v2==2023.4.3.0
6 changes: 3 additions & 3 deletions cscore-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
robotpy-cscore==2023.4.3.0
robotpy-cscore==2024.0.0b2.post1

# basic CameraServer works without NumPy/OpenCV installed, so only require
# them on a RoboRIO -- for other platforms there are a lot of ways to
# install OpenCV and we shouldn't dictate it
numpy; platform_machine == "armv7l"
robotpy-opencv; platform_machine == "armv7l"
numpy==1.25.2; platform_machine == "roborio"
robotpy-opencv; platform_machine == "roborio"
2 changes: 1 addition & 1 deletion ctre-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
robotpy-ctre<2024.0.0,>=2023.0.0
#robotpy-ctre<2024.0.0,>=2023.0.0
2 changes: 1 addition & 1 deletion navx-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
robotpy-navx<2024.0.0,>=2023.0.1
robotpy-navx<2025.0.0,>=2024.0.0b1
2 changes: 1 addition & 1 deletion pathplannerlib-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
robotpy-pathplannerlib<2024.0.0,>=2023.0.0
#robotpy-pathplannerlib<2024.0.0,>=2023.0.0
2 changes: 1 addition & 1 deletion photonvision-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
robotpy-photonvision<2024.0.0,>=2023.1.2
#robotpy-photonvision<2024.0.0,>=2023.1.2
2 changes: 1 addition & 1 deletion playingwithfusion-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
robotpy-playingwithfusion<2024.0.0,>=2023.0.0
#robotpy-playingwithfusion<2024.0.0,>=2023.0.0
18 changes: 9 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

# 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==2023.4.3.0
robotpy-wpimath==2023.4.3.0
pyntcore==2023.4.3.0
robotpy-hal==2023.4.3.0
wpilib==2023.4.3.0
robotpy-wpiutil==2024.0.0b2.post1
robotpy-wpimath==2024.0.0b2.post1
pyntcore==2024.0.0b2.post1
robotpy-hal==2024.0.0b2.post1
wpilib==2024.0.0b2.post1

robotpy-halsim-gui==2023.4.3.0; platform_machine != "armv7l" and platform_machine != "aarch64"
robotpy-halsim-gui==2024.0.0b2.post1; platform_machine != "roborio" and platform_machine != "armv7l" and platform_machine != "aarch64"

# These are not pinned
robotpy-wpilib-utilities<2024,>=2023.0.0
robotpy-installer<2024.0.0,>=2023.0.2; platform_machine != "armv7l" and platform_machine != "aarch64"
pyfrc<2024.0.0,>=2023.0.1; platform_machine != "armv7l" and platform_machine != "aarch64"
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.0b1; platform_machine != "roborio" and platform_machine != "armv7l" and platform_machine != "aarch64"
2 changes: 1 addition & 1 deletion rev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
robotpy-rev<2024.0.0,>=2023.1.1
robotpy-rev<2025.0.0,>=2024.0.0b1
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,18 @@ def get_reqs_from_path(path):
packages=find_packages(),
install_requires=install_requires,
extras_require=extras_require,
python_requires=">=3.7,<3.12",
python_requires=">=3.8,<3.13",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Intended Audience :: Education",
"License :: OSI Approved :: BSD License",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering",
"Topic :: Software Development",
"Topic :: Software Development :: Testing",
Expand Down
4 changes: 2 additions & 2 deletions sim-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
robotpy-halsim-ds-socket==2023.4.3.0; platform_machine != "armv7l"
robotpy-halsim-ws==2023.4.3.0; platform_machine != "armv7l"
robotpy-halsim-ds-socket==2024.0.0b2.post1; platform_machine != "roborio"
robotpy-halsim-ws==2024.0.0b2.post1; platform_machine != "roborio"

0 comments on commit 2129962

Please sign in to comment.