From ce934c57b1d0a906e74e27a64c9f687c9b9918f4 Mon Sep 17 00:00:00 2001 From: James Hogarth Date: Apr 18 2018 00:13:50 +0000 Subject: Update to 1.1.0 --- diff --git a/.gitignore b/.gitignore index 54c51da..14b53e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /requests-ntlm-0.3.0.tar.gz +/requests-ntlm-1.1.0.tar.gz diff --git a/python-requests_ntlm.spec b/python-requests_ntlm.spec index 7496333..74fbcbd 100644 --- a/python-requests_ntlm.spec +++ b/python-requests_ntlm.spec @@ -16,33 +16,36 @@ %endif Name: python-%{srcname} -Version: 0.3.0 -Release: 6%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: NTLM module for python requests License: ISC URL: https://pypi.python.org/pypi/%{srcname} -Source0: https://github.com/%{gh_owner}/%{gh_name}/archive/%{version}.tar.gz#/%{gh_name}-%{version}.tar.gz +Source0: https://github.com/%{gh_owner}/%{gh_name}/archive/v%{version}.tar.gz#/%{gh_name}-%{version}.tar.gz BuildArch: noarch - + BuildRequires: python2-setuptools BuildRequires: python2-devel - +BuildRequires: python2-ntlm-auth +BuildRequires: python2-cryptography + %if 0%{?with_python3} BuildRequires: python3-setuptools BuildRequires: python3-devel +BuildRequires: python3-ntlm-auth %endif # For tests %if 0%{?fedora} BuildRequires: python2-pytest BuildRequires: python2-requests +BuildRequires: python2-flask %else BuildRequires: pytest BuildRequires: python-requests +BuildRequires: python-flask %endif -BuildRequires: python2-ntlm3 -BuildRequires: python2-flask %if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: python-jinja2 %endif @@ -50,7 +53,6 @@ BuildRequires: python-jinja2 %if 0%{?with_python3} BuildRequires: python3-pytest BuildRequires: python3-requests -BuildRequires: python3-ntlm3 BuildRequires: python3-flask %endif BuildRequires: /usr/bin/pkill @@ -60,6 +62,7 @@ BuildRequires: /usr/bin/pkill NTLM authentication to a supporting server. %package -n python2-%{srcname} +Requires: python2-cryptography Summary: Python 3 compatible NTLM library %{?python_provide:%python_provide python2-%{srcname}} Requires: python2-ntlm3 @@ -70,10 +73,11 @@ NTLM authentication to a supporting server. %if 0%{?with_python3} %package -n python3-%{srcname} +Requires: python3-cryptography Summary: Python 3 compatible NTLM library %{?python_provide:%python_provide python3-%{srcname}} Requires: python3-ntlm3 - + %description -n python3-%{srcname} This package allows Python clients running on any operating system to provide NTLM authentication to a supporting server. @@ -100,17 +104,13 @@ rm -rf %{srcname}.egg-info %py2_install %check -%{__python} tests/test_server.py & -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{__python} -m pytest --assert=reinterp tests/test_requests_ntlm.py -%else -%{__python} -m pytest tests/test_requests_ntlm.py -%endif -pkill -f test_server.py +%{__python2} -m tests.test_server & +%{__python2} -m pytest --ignore=tests/functional/test_functional.py --ignore=tests/test_server.py tests +pkill -f 'python2 -m tests.test_server' %if 0%{?with_python3} -%{__python3} tests/test_server.py & -%{__python3} -m pytest tests/test_requests_ntlm.py -pkill -f test_server.py +%{__python3} -m tests.test_server & +%{__python3} -m pytest --ignore=tests/functional/test_functional.py --ignore=tests/test_server.py tests +pkill -f 'python3 -m tests.test_server' %endif %files -n python2-%{srcname} @@ -128,6 +128,9 @@ pkill -f test_server.py %endif %changelog +* Tue Apr 17 2018 James Hogarth - 1.1.0-1 +- Upstream release 1.1.0 + * Wed Feb 28 2018 Iryna Shcherbina - 0.3.0-6 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/sources b/sources index b1c1795..82aeb1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2791d647dae1cd1a58716e56ae8e960c requests-ntlm-0.3.0.tar.gz +SHA512 (requests-ntlm-1.1.0.tar.gz) = 8b914d4eed2e90042bc816e29e44ed75d00f1eae494602d174193cd0a0e50dcecffc8fd0eca6b37a828c59e479bb715724e12e8657b92f1531bd0688b94b759e