Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Reproducible Builds
diffoscope
Compare revisions
c341b63a4c8cfe56be883b43b4e4faff71fc060e...fcad751d6f32f385efa0bcff049a913812a78f8b
Commits (4)
use extras_require.json instead of pep517 + pip [closes
#325
]
· d5d616ae
FC Stegerman
authored
Jan 20, 2023
d5d616ae
Comment and tidy extras_require.json handling.
· 7129af15
Chris Lamb
authored
Jan 20, 2023
7129af15
No need for "from __future__ import print_function" import anymore.
· 7a1dc409
Chris Lamb
authored
Jan 20, 2023
7a1dc409
releasing package diffoscope version 233
· fcad751d
Chris Lamb
authored
Jan 20, 2023
fcad751d
Hide whitespace changes
Inline
Side-by-side
MANIFEST.in
View file @
fcad751d
include COPYING
include README.rst
include CONTRIBUTING.md
include extras_require.json
include pyproject.toml
graft tests
debian/changelog
View file @
fcad751d
diffoscope (233)
UNRELEASED
; urgency=medium
diffoscope (233)
unstable
; urgency=medium
* WIP (generated upon release).
[ FC Stegerman ]
* Split packaging metadata into an extras_require.json file instead of using
the pep517 and the pip modules directly. This was causing build failures if
not using a virtualenv and/or building without internet access.
(Closes: #1029066, reproducible-builds/diffoscope#325)
[ Vagrant Cascadian ]
* Add an external tool reference for GNU Guix (lzip).
* Drop an external tool reference for GNU Guix (pedump).
[ Chris Lamb ]
* Split inline Python code in shell script to generate test dependencies to a
separate Python script.
* No need for "from __future__ import print_function" import in setup.py
anymore.
* Comment and tidy the new extras_require.json handling.
-- Chris Lamb
<lamby
@
debian.org
>
Fri,
13
Jan 2023 0
7:06:45 +00
00
-- Chris Lamb
<lamby
@
debian.org
>
Fri,
20
Jan 2023 0
8:56:22 -08
00
diffoscope (232) unstable; urgency=medium
...
...
debian/control
View file @
fcad751d
...
...
@@ -73,8 +73,6 @@ Build-Depends:
python3-libarchive-c,
python3-magic,
python3-pdfminer <!nocheck>,
python3-pep517,
python3-pip,
python3-progressbar <!nocheck>,
python3-pypdf2 <!nocheck>,
python3-pytest <!nocheck>,
...
...
debian/tests/generate-recommends.py
View file @
fcad751d
#!/usr/bin/env python3
from
pep517
import
meta
import
json
from
pip._internal.req.constructors
import
install_req_from_req_string
# Load extras_require dict from external JSON file. This allows it to be easily
# shared by the main setup.py script.
with
open
(
"extras_require.json"
)
as
f
:
extras_require
=
json
.
load
(
f
)
dist
=
meta
.
load
(
"."
)
xs
=
set
(
f
"python3-
{
install_req_from_req_string
(
x
).
name
}
"
for
x
in
dist
.
requires
if
install_req_from_req_string
(
x
).
markers
)
xs
=
set
(
f
"python3-
{
x
}
"
for
reqs
in
extras_require
.
values
()
for
x
in
reqs
)
print
(
", "
.
join
(
sorted
(
xs
)))
diffoscope/__init__.py
View file @
fcad751d
...
...
@@ -17,4 +17,4 @@
# You should have received a copy of the GNU General Public License
# along with diffoscope. If not, see <https://www.gnu.org/licenses/>.
VERSION
=
"23
2
"
VERSION
=
"23
3
"
extras_require.json
0 → 100644
View file @
fcad751d
{
"distro_detection"
:
[
"distro"
],
"cmdline"
:
[
"argcomplete"
,
"progressbar"
],
"comparators"
:
[
"androguard"
,
"binwalk"
,
"defusedxml"
,
"guestfs"
,
"jsondiff"
,
"python-debian"
,
"pypdf"
,
"pyxattr"
,
"rpm-python"
,
"tlsh"
]
}
setup.py
View file @
fcad751d
#!/usr/bin/env python3
from
__future__
import
print_function
import
sys
import
diffoscope
import
json
import
sys
from
setuptools
import
setup
,
find_packages
from
setuptools.command.test
import
test
as
TestCommand
...
...
@@ -34,6 +33,11 @@ class PyTest(TestCommand):
sys
.
exit
(
errno
)
# Load extras_require dict from external JSON file. This allows it to be easily
# shared by the debian/tests/generate-recommends.py script.
with
open
(
"extras_require.json"
)
as
f
:
extras_require
=
json
.
load
(
f
)
setup
(
name
=
"diffoscope"
,
version
=
diffoscope
.
VERSION
,
...
...
@@ -56,22 +60,7 @@ setup(
"python-magic"
,
"libarchive-c"
,
],
extras_require
=
{
"distro_detection"
:
[
"distro"
],
"cmdline"
:
[
"argcomplete"
,
"progressbar"
],
"comparators"
:
[
"androguard"
,
"binwalk"
,
"defusedxml"
,
"guestfs"
,
"jsondiff"
,
"python-debian"
,
"pypdf"
,
"pyxattr"
,
"rpm-python"
,
"tlsh"
,
],
},
extras_require
=
extras_require
,
python_requires
=
">=3.7"
,
classifiers
=
[
"Development Status :: 3 - Alpha"
,
...
...