Skip to content

Commit b8472df

Browse files
authored
Merge pull request #224 from robotpy/2024-beta
Updates for 2024
2 parents 78f0926 + afc1d14 commit b8472df

File tree

3 files changed

+8
-22
lines changed

3 files changed

+8
-22
lines changed

.github/workflows/dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
ci:
14-
uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2023
14+
uses: robotpy/build-actions/.github/workflows/package-pure.yml@v2024
1515
with:
1616
enable_sphinx_check: false
1717
secrets:

pyfrc/mains/cli_sim.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
import inspect
55
import logging
66
import pathlib
7-
from pkg_resources import iter_entry_points
87

9-
try:
10-
from importlib.metadata import metadata
11-
except ImportError:
12-
from importlib_metadata import metadata
8+
from importlib.metadata import metadata, entry_points
139

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

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

3026
self.simexts = {}
3127

32-
for entry_point in iter_entry_points(group="robotpysimext", name=None):
33-
if entry_point.module_name == "halsim_gui":
28+
for entry_point in entry_points(group="robotpysimext"):
29+
if entry_point.module == "halsim_gui":
3430
continue
3531
try:
3632
sim_ext_module = entry_point.load()
@@ -44,7 +40,7 @@ def __init__(self, parser: argparse.ArgumentParser):
4440
f"--{entry_point.name}",
4541
default=False,
4642
action="store_true",
47-
help=metadata(entry_point.dist.project_name)["summary"],
43+
help=metadata(entry_point.dist.name)["summary"],
4844
)
4945

5046
def run(self, options, robot_class, **static_options):

setup.cfg

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ classifiers =
1515
Intended Audience :: Developers
1616
License :: OSI Approved :: BSD License
1717
Programming Language :: Python :: 3 :: Only
18-
Programming Language :: Python :: 3.7
19-
Programming Language :: Python :: 3.8
20-
Programming Language :: Python :: 3.9
21-
Programming Language :: Python :: 3.10
22-
Programming Language :: Python :: 3.11
2318
Topic :: Software Development
2419
Topic :: Software Development :: Testing
2520

@@ -32,17 +27,12 @@ install_requires =
3227
pytest-reraise
3328
pynetconsole~=2.0.2
3429
pint>=0.11.0
35-
importlib-metadata; python_version < '3.8'
3630

37-
robotpy-wpiutil>=2023.1.1.0,<2024
38-
pyntcore>=2023.1.1.0,<2024
39-
robotpy-hal>=2023.1.1.0,<2024
40-
wpilib>=2023.1.1.0,<2024
41-
42-
robotpy-installer>=2023.0.0,<2024
31+
wpilib>=2024.0.0b2.post1,<2025
32+
robotpy-installer>=2024.0.0b1,<2025
4333
setup_requires =
4434
setuptools_scm > 6
45-
python_requires = >=3.7
35+
python_requires = >=3.8
4636

4737
[options.entry_points]
4838
robotpy =

0 commit comments

Comments
 (0)