Skip to content

Commit 174d32f

Browse files
Bastian-KrauseBastian-Krause
authored
make vmprof a soft dependency (#2035)
Since vmprof has trouble releasing a python 3.10 capable version [1] and it is only needed for profiling in crossbar, make it a soft dependency. All occurrences of vmprof in actual code are already guarded by try except constructs around imports and `_HAS_VMPROF` checks around vmprof use. So it should be safe to drop vmprof from the various reqirements/setup/Makefile files as well as corresponding licensing files. [1] vmprof/vmprof-python#240 Signed-off-by: Bastian Krause <[email protected]>
1 parent 42b8bf9 commit 174d32f

10 files changed

+1
-14
lines changed

‎LICENSES-OSS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
urllib3 1.26.9 MIT License Andrey Petrov
127127
validate-email 1.3 UNKNOWN Syrus Akbary
128128
varint 1.0.2 MIT License Peter Ruibal
129-
vmprof 0.4.15 MIT License vmprof team
130129
watchdog 2.1.9 Apache Software License Yesudeep Mangalapilly
131130
wcwidth 0.2.5 MIT License Jeff Quast
132131
web3 5.29.2 MIT License Piper Merriam

‎Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,9 @@ freeze:
7878
vers/bin/pip3 install hashin
7979
-rm requirements.txt
8080
# FIXME: we are using our own unpublished forks of "py-cid" and "py-multihash" for which hashin won't find version data on pypi
81-
-cat requirements-pinned.txt | grep -v "py-cid" | grep -v "py-multihash" | grep -v "vmprof" | xargs vers/bin/hashin > requirements.txt
81+
-cat requirements-pinned.txt | grep -v "py-cid" | grep -v "py-multihash" | xargs vers/bin/hashin > requirements.txt
8282
-cat requirements-pinned.txt | grep "py-cid" >> requirements.txt
8383
-cat requirements-pinned.txt | grep "py-multihash" >> requirements.txt
84-
-cat requirements-pinned.txt | grep "vmprof" >> requirements.txt
8584

8685
wheel:
8786
LMDB_FORCE_CFFI=1 SODIUM_INSTALL=bundled pip wheel --require-hashes --wheel-dir ./wheels -r requirements.txt

‎crossbar/LICENSES-OSS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113
urllib3 1.24.3 MIT License Andrey Petrov
114114
validate-email 1.3 UNKNOWN Syrus Akbary
115115
varint 1.0.2 MIT License Peter Ruibal
116-
vmprof 0.4.15 MIT License vmprof team
117116
watchdog 2.0.2 Apache Software License Yesudeep Mangalapilly
118117
wcwidth 0.2.5 MIT License Jeff Quast
119118
web3 5.17.0 MIT License Piper Merriam

‎docs/oss_licenses_table.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,6 @@ Used Open-Source Software
240240
+---------------------+-----------+-----------------------------------------------------------------------------------------------------+----------------------------------------------------------------+
241241
| varint | 1.0.2 | MIT License | Peter Ruibal |
242242
+---------------------+-----------+-----------------------------------------------------------------------------------------------------+----------------------------------------------------------------+
243-
| vmprof | 0.4.15 | MIT License | vmprof team |
244-
+---------------------+-----------+-----------------------------------------------------------------------------------------------------+----------------------------------------------------------------+
245243
| watchdog | 2.0.2 | Apache Software License | Yesudeep Mangalapilly |
246244
+---------------------+-----------+-----------------------------------------------------------------------------------------------------+----------------------------------------------------------------+
247245
| wcwidth | 0.2.5 | MIT License | Jeff Quast |

‎docs/soss_licenses_table.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,6 @@ OSS Licenses
258258
+----------------------+-----------+-----------------------------------------------------------------------------------------------------+----------------------------------------------------------------+
259259
| varint | 1.0.2 | MIT License | Peter Ruibal |
260260
+----------------------+-----------+-----------------------------------------------------------------------------------------------------+----------------------------------------------------------------+
261-
| vmprof | 0.4.15 | MIT License | vmprof team |
262-
+----------------------+-----------+-----------------------------------------------------------------------------------------------------+----------------------------------------------------------------+
263261
| watchdog | 2.1.9 | Apache Software License | Yesudeep Mangalapilly |
264262
+----------------------+-----------+-----------------------------------------------------------------------------------------------------+----------------------------------------------------------------+
265263
| wcwidth | 0.2.5 | MIT License | Jeff Quast |

‎requirements-latest.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ txtorcon>=20.0.0
7070
u-msgpack-python>=2.4.1
7171
urllib3>=1.21.1,<1.27
7272
validate-email>=1.3
73-
vmprof>=0.4.15
7473
watchdog>=0.8.3
7574
web3>=5.13.1
7675
# ImportError: cannot import name 'escape' from 'werkzeug.utils'

‎requirements-min.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ u-msgpack-python>=2.4.1
7171
ujson>=5.1.0
7272
urllib3>=1.26.8
7373
validate-email>=1.3
74-
# use vmprof master until https://github.com/vmprof/vmprof-python/issues/240 is fixed
75-
git+https://github.com/vmprof/vmprof-python.git#egg=vmprof
7674
watchdog>=0.8.3
7775
web3>=5.13.1
7876
# ImportError: cannot import name 'escape' from 'werkzeug.utils'

‎requirements-pinned.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ ujson==5.4.0
125125
urllib3==1.26.9
126126
validate-email==1.3
127127
varint==1.0.2
128-
vmprof @ git+https://github.com/vmprof/vmprof-python.git@0549883090c5537ea1acabb27ff065a3c7d7a45a
129128
watchdog==2.1.9
130129
wcwidth==0.2.5
131130
web3==5.29.2

‎requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1430,4 +1430,3 @@ zope.interface==5.4.0 \
14301430
--hash=sha256:f7ee479e96f7ee350db1cf24afa5685a5899e2b34992fb99e1f7c1b0b758d263
14311431
py-cid @ git+https://github.com/crossbario/py-cid.git@e1dc52a43ced53845679405f78d92fb18f093653
14321432
py-multihash @ git+https://github.com/crossbario/py-multihash.git@86b54b8f9f0cf14c7370f38ae32f2b4b14f5b5e0
1433-
vmprof @ git+https://github.com/vmprof/vmprof-python.git@0549883090c5537ea1acabb27ff065a3c7d7a45a

‎setup.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ universal=1
44
# https://stackoverflow.com/a/49501010/884770
55
[options]
66
install_requires =
7-
vmprof>=0.4.12; platform_machine=='x86_64' or platform_machine=='i386' or platform_machine=='arm'
87
wsaccel>=0.6.2; platform_python_implementation=='CPython'
98

109
[pycodestyle]

0 commit comments

Comments
 (0)