Hello community,
here is the log from the commit of package python-asdf for openSUSE:Factory
checked in at 2020-12-09 22:21:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-asdf (Old)
and /work/SRC/openSUSE:Factory/.python-asdf.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-asdf"
Wed Dec 9 22:21:44 2020 rev:9 rq:854163 version:2.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-asdf/python-asdf.changes 2020-09-15
16:30:31.298724973 +0200
+++ /work/SRC/openSUSE:Factory/.python-asdf.new.2328/python-asdf.changes
2020-12-09 22:21:45.339695722 +0100
@@ -1,0 +2,6 @@
+Tue Dec 8 22:37:37 UTC 2020 - Benjamin Greiner <c...@bnavigator.de>
+
+- Fix pytest collection error by importing from source dir
+- Fix rpmlint shebang errors
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-asdf.spec ++++++
--- /var/tmp/diff_new_pack.FGY7ll/_old 2020-12-09 22:21:45.991696383 +0100
+++ /var/tmp/diff_new_pack.FGY7ll/_new 2020-12-09 22:21:45.995696387 +0100
@@ -18,12 +18,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
+# current astropy in TW requires python >= 3.7
+%define skip_python36 1
Name: python-asdf
Version: 2.7.1
Release: 0
Summary: Python tools to handle ASDF files
License: BSD-3-Clause AND BSD-2-Clause
-URL: https://github.com/spacetelescope/asdf
+URL: https://github.com/asdf-format/asdf
Source0:
https://files.pythonhosted.org/packages/source/a/asdf/asdf-%{version}.tar.gz
BuildRequires: %{python_module setuptools >= 30.3.0}
BuildRequires: %{python_module setuptools_scm}
@@ -60,6 +62,7 @@
%prep
%setup -q -n asdf-%{version}
sed -i -e '/^#!\//, 1d' asdf/extern/RangeHTTPServer.py
+chmod a-x asdf/extern/RangeHTTPServer.py
sed -i 's/\r$//' asdf/tests/data/example_schema.json
chmod a-x asdf/tests/data/example_schema.json
@@ -69,10 +72,15 @@
%install
%python_install
%python_clone -a %{buildroot}%{_bindir}/asdftool
-%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%{python_expand #
+sed -i -e 's|^#!/usr/bin/env python|#!%{__$python}|'
%{buildroot}%{$python_sitelib}/asdf/reference_files/generate/generate
+%fdupes %{buildroot}%{$python_sitelib}
+}
%check
export LANG=en_US.UTF-8
+# import everything from the source directory because of collection conflicts
with buildroot
+export PYTHONPATH=":x"
%pytest
%post
@@ -85,6 +93,8 @@
%doc CHANGES.rst README.rst
%license licenses/*
%python_alternative %{_bindir}/asdftool
-%{python_sitelib}/*
+%{python_sitelib}/asdf
+%{python_sitelib}/asdf-%{version}*-info
+%{python_sitelib}/pytest_asdf
%changelog
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
