1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
From 5d9fd7a54169f770d69b1931ddbbe1020a8355e2 Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Fri, 1 Dec 2023 12:44:59 +0100
Subject: [PATCH 1/3] Update maturin build requirement to >=1,<2
Signed-off-by: David Runge <dave@sleepmap.de>
---
pyproject.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index 20898079b..348237db1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[build-system]
requires = [
- "maturin>=0.13,<0.15",
+ "maturin>=1,<2",
"cffi",
]
build-backend = "maturin"
From 01d911c729adb2a0e8c73aa3ed49ace91ff68acb Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Fri, 1 Dec 2023 12:49:28 +0100
Subject: [PATCH 2/3] Add pytest configuration options to pyproject.toml
Signed-off-by: David Runge <dave@sleepmap.de>
---
pyproject.toml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pyproject.toml b/pyproject.toml
index 348237db1..d5e801067 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -60,3 +60,6 @@ Changelog = "https://github.com/pyocd/cmsis-pack-manager/releases"
[tool.maturin]
bindings = "cffi"
+
+[tool.pytest.ini_options]
+python_files = "tests/*.py"
From 74600aa37ab421bcb78ddacb690019080170b2d5 Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Fri, 1 Dec 2023 12:51:06 +0100
Subject: [PATCH 3/3] Remove unneeded setup.cfg file
All configuration is done in pyproject.toml
Signed-off-by: David Runge <dave@sleepmap.de>
---
setup.cfg | 56 -------------------------------------------------------
1 file changed, 56 deletions(-)
delete mode 100644 setup.cfg
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 0b054b5cd..000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,56 +0,0 @@
-[metadata]
-name = cmsis-pack-manager
-description = Python manager for CMSIS-Pack index and cache with fast Rust backend
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://github.com/pyocd/cmsis-pack-manager
-maintainer = Mathias Brossard, Chris Reed
-maintainer_email = mathias.brossard@arm.com, flit@me.com
-license = Apache 2.0
-license_file = LICENSE
-classifiers =
- Development Status :: 4 - Beta
- Intended Audience :: Developers
- License :: OSI Approved :: Apache Software License
- Operating System :: MacOS
- Operating System :: Microsoft :: Windows
- Operating System :: POSIX
- Operating System :: Unix
- Programming Language :: Python
- Programming Language :: Python :: 3.6
- 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 :: Debuggers
- Topic :: Software Development :: Embedded Systems
- Topic :: Utilities
-project_urls =
- Documentation = https://github.com/pyocd/cmsis-pack-manager/
- Bug Tracker = https://github.com/pyocd/cmsis-pack-manager/issues
- Discussions = https://github.com/pyocd/cmsis-pack-manager/discussions
- Changelog = https://github.com/pyocd/cmsis-pack-manager/releases
-
-[options]
-packages = find:
-install_requires =
- appdirs>=1.4,<2.0
- pyyaml>=6.0,<7.0
-python_requires = >=3.6
-include_package_data = True
-zip_safe = False
-
-[options.extras_require]
-test =
- pytest>=6.0
- hypothesis
- jinja2
-
-[options.entry_points]
-console_scripts =
- pack-manager = cmsis_pack_manager.pack_manager:main
-
-[tool:pytest]
-python_files = tests/*.py
|