Skip to content

Commit

Permalink
Merge pull request #224 from robotpy/2024-beta
Browse files Browse the repository at this point in the history
Updates for 2024
  • Loading branch information
virtuald authored Nov 1, 2023
2 parents 78f0926 + afc1d14 commit b8472df
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
ci:
uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2023
uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2024
with:
enable_sphinx_check: false
secrets:
Expand Down
12 changes: 4 additions & 8 deletions pyfrc/mains/cli_sim.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
import inspect
import logging
import pathlib
from pkg_resources import iter_entry_points

try:
from importlib.metadata import metadata
except ImportError:
from importlib_metadata import metadata
from importlib.metadata import metadata, entry_points

logger = logging.getLogger("pyfrc.sim")

Expand All @@ -29,8 +25,8 @@ def __init__(self, parser: argparse.ArgumentParser):

self.simexts = {}

for entry_point in iter_entry_points(group="robotpysimext", name=None):
if entry_point.module_name == "halsim_gui":
for entry_point in entry_points(group="robotpysimext"):
if entry_point.module == "halsim_gui":
continue
try:
sim_ext_module = entry_point.load()
Expand All @@ -44,7 +40,7 @@ def __init__(self, parser: argparse.ArgumentParser):
f"--{entry_point.name}",
default=False,
action="store_true",
help=metadata(entry_point.dist.project_name)["summary"],
help=metadata(entry_point.dist.name)["summary"],
)

def run(self, options, robot_class, **static_options):
Expand Down
16 changes: 3 additions & 13 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ classifiers =
Intended Audience :: Developers
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
Topic :: Software Development
Topic :: Software Development :: Testing

Expand All @@ -32,17 +27,12 @@ install_requires =
pytest-reraise
pynetconsole~=2.0.2
pint>=0.11.0
importlib-metadata; python_version < '3.8'

robotpy-wpiutil>=2023.1.1.0,<2024
pyntcore>=2023.1.1.0,<2024
robotpy-hal>=2023.1.1.0,<2024
wpilib>=2023.1.1.0,<2024

robotpy-installer>=2023.0.0,<2024
wpilib>=2024.0.0b2.post1,<2025
robotpy-installer>=2024.0.0b1,<2025
setup_requires =
setuptools_scm > 6
python_requires = >=3.7
python_requires = >=3.8

[options.entry_points]
robotpy =
Expand Down

0 comments on commit b8472df

Please sign in to comment.