Skip to content

Commit 922c783

Browse files
committed
fix: remove duplicate entries from rebase errors
Signed-off-by: Carl Flottmann <[email protected]>
1 parent 77f61a9 commit 922c783

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

pyproject.toml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,26 +120,14 @@ Issues = "https://github.com/oracle/macaron/issues"
120120
[tool.bandit]
121121
tests = []
122122
skips = ["B101"]
123-
<<<<<<< HEAD
124-
<<<<<<< HEAD
125-
=======
126123
exclude_dirs = ['tests/malware_analyzer/pypi/resources/sourcecode_samples']
127-
>>>>>>> ea5a5f74 (test: setup test environment for source code analyzer)
128-
=======
129-
>>>>>>> e4058949 (test: tests for exfiltration and fixes to semgrep rules)
130124

131125
# https://github.com/psf/black#configuration
132126
[tool.black]
133127
line-length = 120
134-
<<<<<<< HEAD
135-
<<<<<<< HEAD
136-
=======
137128
force-exclude = '''
138129
tests/malware_analyzer/pypi/resources/sourcecode_samples/
139130
'''
140-
>>>>>>> ea5a5f74 (test: setup test environment for source code analyzer)
141-
=======
142-
>>>>>>> e4058949 (test: tests for exfiltration and fixes to semgrep rules)
143131

144132
# https://github.com/commitizen-tools/commitizen
145133
# https://commitizen-tools.github.io/commitizen/bump/

src/macaron/slsa_analyzer/package_registry/pypi_registry.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,6 @@ def download_package_sourcecode(self, url: str) -> str:
179179
str
180180
The temp directory with the source code.
181181
182-
Raises
183-
------
184-
InvalidHTTPResponseError
185-
If the HTTP request to the registry fails or an unexpected response is returned.
186-
187182
Raises
188183
------
189184
InvalidHTTPResponseError
@@ -429,9 +424,6 @@ class PyPIPackageJsonAsset:
429424
#: the source code temporary location name
430425
package_sourcecode_path: str
431426

432-
#: the source code temporary location name
433-
package_sourcecode_path: str
434-
435427
#: The size of the asset (in bytes). This attribute is added to match the AssetLocator
436428
#: protocol and is not used because pypi API registry does not provide it.
437429
@property

0 commit comments

Comments
 (0)