Hello community,

here is the log from the commit of package python-dephell for openSUSE:Factory 
checked in at 2020-09-04 11:03:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-dephell (Old)
 and      /work/SRC/openSUSE:Factory/.python-dephell.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-dephell"

Fri Sep  4 11:03:54 2020 rev:16 rq:831466 version:0.8.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-dephell/python-dephell.changes    
2020-08-16 20:26:08.722060636 +0200
+++ /work/SRC/openSUSE:Factory/.python-dephell.new.3399/python-dephell.changes  
2020-09-04 11:05:00.438812859 +0200
@@ -1,0 +2,7 @@
+Wed Sep  2 13:04:24 UTC 2020 - Benjamin Greiner <c...@bnavigator.de>
+
+- Remove __pycache__ removal. Upstream fixed it
+- Add dephell-pytest6.patch to support pytest 6 entry points
+  Patch is part of gh#dephell/dephell#458
+
+-------------------------------------------------------------------

New:
----
  dephell-pytest6.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-dephell.spec ++++++
--- /var/tmp/diff_new_pack.qJ1IfN/_old  2020-09-04 11:05:02.374813896 +0200
+++ /var/tmp/diff_new_pack.qJ1IfN/_new  2020-09-04 11:05:02.378813898 +0200
@@ -36,7 +36,10 @@
 URL:            https://github.com/dephell/dephell
 Source:         
https://files.pythonhosted.org/packages/source/d/dephell/dephell-%{version}.tar.gz
 Source1:        macros.py-dephell
+# PATCH-FIX-OPENSUSE we don't pin package versions
 Patch0:         never-pin-deps.patch
+# PATCH-FIX-UPSTREAM support the pytest 6 entrypoints. Part of 
https://github.com/dephell/dephell/pull/458 
+Patch1:         
https://github.com/dephell/dephell/commit/b34011c04e49562b5afe3e946f01024ad5629ac1.patch#/dephell-pytest6.patch
 BuildRequires:  %{python_module base >= 3.5}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  bash
@@ -142,8 +145,8 @@
 %prep
 %setup -q -n dephell-%{version}
 %patch0 -p1
+%patch1 -p1
 
-find tests -type d -name __pycache__ | xargs rm -rf
 sed -i -e '1i #!/bin/sh' dephell/templates/docker_prepare.sh
 
 %package rpm-macros

++++++ dephell-pytest6.patch ++++++
>From b34011c04e49562b5afe3e946f01024ad5629ac1 Mon Sep 17 00:00:00 2001
From: Gram <master_f...@mail.ru>
Date: Mon, 24 Aug 2020 12:28:51 +0200
Subject: [PATCH] fix failing tests

---
 tests/test_actions/test_entrypoints.py | 3 ++-
 tests/test_repositories/test_conda.py  | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/test_actions/test_entrypoints.py 
b/tests/test_actions/test_entrypoints.py
index 0bef4490..0a4cd320 100644
--- a/tests/test_actions/test_entrypoints.py
+++ b/tests/test_actions/test_entrypoints.py
@@ -38,4 +38,5 @@ class FakeVenv:
     entrypoints = get_entrypoints(venv=FakeVenv, name='pytest')
     assert len(entrypoints) == 2
     assert {e.name for e in entrypoints} == {'pytest', 'py.test'}
-    assert {e.path for e in entrypoints} == {'pytest:main'}
+    exp = ({'pytest:main'}, {'pytest:console_main'})
+    assert {e.path for e in entrypoints} in exp
diff --git a/tests/test_repositories/test_conda.py 
b/tests/test_repositories/test_conda.py
index 2c4fb048..94aeeac0 100644
--- a/tests/test_repositories/test_conda.py
+++ b/tests/test_repositories/test_conda.py
@@ -10,6 +10,7 @@
 from dephell.repositories import CondaCloudRepo, CondaGitRepo, CondaRepo
 
 
+@pytest.mark.xfail(reason='conda.anaconda.org is dead')
 @pytest.mark.allow_hosts()
 @pytest.mark.parametrize('repo_class', [CondaRepo, CondaCloudRepo])
 def test_conda_get_releases(repo_class):
@@ -21,6 +22,7 @@ def test_conda_get_releases(repo_class):
     assert not {'3.0.3', '3.1.0', '4.0.0', '4.1.0'} - versions
 
 
+@pytest.mark.xfail(reason='conda.anaconda.org is dead')
 @pytest.mark.allow_hosts()
 @pytest.mark.skipif('TRAVIS_OS_NAME' in environ, reason='Travis CI usually out 
of rate for Github')
 def test_conda_get_releases_git():
@@ -32,6 +34,7 @@ def test_conda_get_releases_git():
     assert not {'3.0.3', '3.1.0', '4.0.0', '4.1.0'} - versions
 
 
+@pytest.mark.xfail(reason='conda.anaconda.org is dead')
 @pytest.mark.allow_hosts()
 @pytest.mark.parametrize('repo_class', [CondaRepo, CondaCloudRepo])
 def test_conda_deps(repo_class):
@@ -43,6 +46,7 @@ def test_conda_deps(repo_class):
     assert 'prodigal' in deps
 
 
+@pytest.mark.xfail(reason='conda.anaconda.org is dead')
 @pytest.mark.allow_hosts()
 @pytest.mark.skipif('TRAVIS_OS_NAME' in environ, reason='Travis CI usually out 
of rate for Github')
 def test_conda_deps_git():

Reply via email to