Skip to content

Conversation

gpotter2
Copy link
Member

@gpotter2 gpotter2 commented Jan 23, 2023

Followup to #3664

Closes #3664 + fixes codecov

@guedou
Copy link
Member

guedou commented Jan 24, 2023

Nice! Do you remember why we are not using the whole content of the README.md? That could helps us remove setup.my =)

Also, there are several things to check before merging such as the page on PyPi, the size of the tarball, manual installation with pip and a tarball. Otherwise, we might encounters issue later on.

@guedou
Copy link
Member

guedou commented Jan 24, 2023

And also update references to git grep setup.py

@gpotter2
Copy link
Member Author

Do you remember why we are not using the whole content of the README.md?

That was to remove CI badges from displaying on PyPi (PyPi capture images on push.. and we don't want to have a red badge set in stone)

@gpotter2 gpotter2 force-pushed the pyproject.toml branch 2 times, most recently from f68d103 to 6dc4c9a Compare January 28, 2023 00:52
gpotter2 and others added 2 commits February 13, 2023 18:58
Otherwise we suffer from the bug described in pypa/setuptools, secdev#3244
@gpotter2
Copy link
Member Author

Hi @polybassa, sorry for bothering. If you have the time there's a small bug

Traceback (most recent call last):
  File "/opt/hostedtoolcache/PyPy/3.9.16/x64/lib/pypy3.9/threading.py", line 980, in _bootstrap_inner
    self.run()
  File "/opt/hostedtoolcache/PyPy/3.9.16/x64/lib/pypy3.9/threading.py", line 917, in run
    self._target(*self._args, **self._kwargs)
  File "<input>", line 25, in answering_machine_thread
  File "/home/runner/work/scapy/scapy/scapy/ansmachine.py", line 210, in __call__
    self.sniff()
  File "/home/runner/work/scapy/scapy/scapy/ansmachine.py", line 216, in sniff
    sniff(**self.optsniff)
  File "/home/runner/work/scapy/scapy/scapy/sendrecv.py", line 1310, in sniff
    sniffer._run(*args, **kwargs)
  File "/home/runner/work/scapy/scapy/scapy/sendrecv.py", line 1253, in _run
    session.on_packet_received(p)
  File "/home/runner/work/scapy/scapy/scapy/sessions.py", line 109, in on_packet_received
    result = self.prn(pkt)
  File "/home/runner/work/scapy/scapy/scapy/ansmachine.py", line 172, in reply
    reply = self.make_reply(pkt)
  File "/home/runner/work/scapy/scapy/scapy/contrib/automotive/ecu.py", line 681, in make_reply
    if not resp.supports_state(self._ecu_state):
  File "/home/runner/work/scapy/scapy/scapy/contrib/automotive/ecu.py", line 544, in supports_state
    return any(s == state or state in s for s in self.__states)
  File "/home/runner/work/scapy/scapy/scapy/contrib/automotive/ecu.py", line 544, in <genexpr>
    return any(s == state or state in s for s in self.__states)
  File "/home/runner/work/scapy/scapy/scapy/contrib/automotive/ecu.py", line 119, in __contains__
    return all(s in self._expand() for s in item._expand())
  File "/home/runner/work/scapy/scapy/scapy/contrib/automotive/ecu.py", line 54, in _expand
    *[self._flatten(v) for v in self.__dict__.values()]):
  File "/home/runner/work/scapy/scapy/scapy/contrib/automotive/ecu.py", line 54, in <listcomp>
    *[self._flatten(v) for v in self.__dict__.values()]):
RuntimeError: dictionary changed size during iteration
Transition for edge (session1, session2tp1) failed
Error entering path [session1, session2tp1, security_level2session2tp1]

@codecov
Copy link

codecov bot commented Feb 17, 2023

Codecov Report

Merging #3869 (35d9e64) into master (967564e) will increase coverage by 36.06%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           master    #3869       +/-   ##
===========================================
+ Coverage   50.45%   86.52%   +36.06%     
===========================================
  Files         227      310       +83     
  Lines       52757    70599    +17842     
===========================================
+ Hits        26621    61083    +34462     
+ Misses      26136     9516    -16620     
Impacted Files Coverage Δ
scapy/libs/six.py 54.47% <0.00%> (-0.11%) ⬇️
scapy/arch/windows/__init__.py
scapy/arch/windows/structures.py
scapy/arch/windows/native.py
scapy/contrib/automotive/obd/tid/__init__.py 100.00% <0.00%> (ø)
scapy/contrib/automotive/xcp/__init__.py 100.00% <0.00%> (ø)
scapy/arch/bpf/__init__.py 100.00% <0.00%> (ø)
scapy/contrib/automotive/scanner/executor.py 88.10% <0.00%> (ø)
scapy/arch/common.py 67.39% <0.00%> (ø)
test/testsocket.py 95.74% <0.00%> (ø)
... and 259 more

@gpotter2 gpotter2 merged commit 669506b into secdev:master Feb 17, 2023
@gpotter2 gpotter2 deleted the pyproject.toml branch February 17, 2023 13:53
evverx added a commit to evverx/scapy that referenced this pull request Feb 19, 2023
tox is too old on Fedora 36

It's a follow-up to secdev#3869
muttiopenbts pushed a commit to muttiopenbts/scapy that referenced this pull request Feb 21, 2023
* Migrate to `pyproject.toml`

Co-authored-by: KOLANICH <[email protected]>

* Bump setuptools to 62.0.0

Otherwise we suffer from the bug described in pypa/setuptools, secdev#3244

* Codecov: xml upload

---------

Co-authored-by: KOLANICH <[email protected]>
evverx added a commit to evverx/scapy that referenced this pull request Mar 7, 2023
just to make sure that without this the test suite no longer
times out with pypy on the CI.

This reverts commit 669506b.
@gpotter2 gpotter2 added this to the 2.6.0 milestone Nov 28, 2023
abajk added a commit to abajk/scapy that referenced this pull request Feb 27, 2025
Building scapy with setup.py has been broken for some time.
At least it does not work on FreeBSD. This commit fixes it.

Fixes: 669506b ("Migrate to pyproject.toml (secdev#3869)")
abajk added a commit to abajk/scapy that referenced this pull request Feb 27, 2025
Building scapy with setup.py has been broken for some time.
At least it does not work on FreeBSD. This commit fixes it.

Fixes: 669506b ("Migrate to pyproject.toml (secdev#3869)")
Signed-off-by: Aleksander Jan Bajkowski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants