Hello community,
here is the log from the commit of package python-git-url-parse for
openSUSE:Factory checked in at 2019-03-11 11:15:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-git-url-parse (Old)
and /work/SRC/openSUSE:Factory/.python-git-url-parse.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-git-url-parse"
Mon Mar 11 11:15:28 2019 rev:2 rq:683057 version:1.2.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-git-url-parse/python-git-url-parse.changes
2019-02-14 14:32:22.451679578 +0100
+++
/work/SRC/openSUSE:Factory/.python-git-url-parse.new.28833/python-git-url-parse.changes
2019-03-11 11:15:46.817331416 +0100
@@ -1,0 +2,7 @@
+Sat Mar 9 20:13:06 UTC 2019 - John Vandenberg <[email protected]>
+
+- Remove unnecessary build dependency pytest-cov
+- Update to v1.2.1
+ * Corrected processing of URLs with a hyphen
+
+-------------------------------------------------------------------
Old:
----
git-url-parse-1.2.0.tar.gz
New:
----
git-url-parse-1.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-git-url-parse.spec ++++++
--- /var/tmp/diff_new_pack.cSaEwP/_old 2019-03-11 11:15:47.257331258 +0100
+++ /var/tmp/diff_new_pack.cSaEwP/_new 2019-03-11 11:15:47.261331257 +0100
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-git-url-parse
-Version: 1.2.0
+Version: 1.2.1
Release: 0
Summary: A GIT URL parser for Python
License: MIT
@@ -30,7 +30,6 @@
BuildRequires: python-rpm-macros
# SECTION test requirements
BuildRequires: %{python_module pbr}
-BuildRequires: %{python_module pytest-cov}
BuildRequires: %{python_module pytest-mock}
BuildRequires: %{python_module pytest}
# /SECTION
@@ -45,6 +44,7 @@
%prep
%setup -q -n git-url-parse-%{version}
+sed -i '/addopts/d' pytest.ini
%build
# Dont let pbr install yapf, which isnt a real test dependency
++++++ git-url-parse-1.2.0.tar.gz -> git-url-parse-1.2.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/CHANGELOG.rst
new/git-url-parse-1.2.1/CHANGELOG.rst
--- old/git-url-parse-1.2.0/CHANGELOG.rst 2019-01-25 00:18:13.000000000
+0100
+++ new/git-url-parse-1.2.1/CHANGELOG.rst 2019-03-09 08:04:33.000000000
+0100
@@ -2,6 +2,17 @@
History
*******
+1.2.1
+=====
+
+* Corrected processing of URLs with a hyphen.
+
+1.2
+===
+
+* Improved parsing speed by compiling regex on global context and reusing
+ named collection.
+
1.1
===
@@ -12,6 +23,7 @@
* Added to travis ci.
* Execute one regex at a time.
+
1.0.2
=====
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/PKG-INFO
new/git-url-parse-1.2.1/PKG-INFO
--- old/git-url-parse-1.2.0/PKG-INFO 2019-02-07 03:03:13.000000000 +0100
+++ new/git-url-parse-1.2.1/PKG-INFO 2019-03-09 08:07:38.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: git-url-parse
-Version: 1.2.0
+Version: 1.2.1
Summary: git-url-parse - A simple GIT URL parser.
Home-page: https://github.com/retr0h/git-url-parse
Author: John Dewey
@@ -12,6 +12,12 @@
.. image::
https://img.shields.io/codecov/c/github/retr0h/git-url-parse.svg?style=popout-square&logo=codecov
:target: https://codecov.io/gh/retr0h/git-url-parse
+ .. image::
https://img.shields.io/pypi/v/git-url-parse.svg?style=popout-square&logo=python
+ :target: https://pypi.org/project/git-url-parse/
+
+ .. image::
https://img.shields.io/readthedocs/git-url-parse.svg?style=popout-square&logo=Read%20the%20Docs
+ :target: https://git-url-parse.readthedocs.io/en/latest/
+
***********
giturlparse
***********
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/README.rst
new/git-url-parse-1.2.1/README.rst
--- old/git-url-parse-1.2.0/README.rst 2019-02-07 02:53:13.000000000 +0100
+++ new/git-url-parse-1.2.1/README.rst 2019-02-07 03:39:26.000000000 +0100
@@ -4,6 +4,12 @@
.. image::
https://img.shields.io/codecov/c/github/retr0h/git-url-parse.svg?style=popout-square&logo=codecov
:target: https://codecov.io/gh/retr0h/git-url-parse
+.. image::
https://img.shields.io/pypi/v/git-url-parse.svg?style=popout-square&logo=python
+ :target: https://pypi.org/project/git-url-parse/
+
+.. image::
https://img.shields.io/readthedocs/git-url-parse.svg?style=popout-square&logo=Read%20the%20Docs
+ :target: https://git-url-parse.readthedocs.io/en/latest/
+
***********
giturlparse
***********
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/doc-requirements.txt
new/git-url-parse-1.2.1/doc-requirements.txt
--- old/git-url-parse-1.2.0/doc-requirements.txt 2017-07-22
01:33:49.000000000 +0200
+++ new/git-url-parse-1.2.1/doc-requirements.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
--e .
-alabaster
-Sphinx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/git_url_parse.egg-info/PKG-INFO
new/git-url-parse-1.2.1/git_url_parse.egg-info/PKG-INFO
--- old/git-url-parse-1.2.0/git_url_parse.egg-info/PKG-INFO 2019-02-07
03:03:11.000000000 +0100
+++ new/git-url-parse-1.2.1/git_url_parse.egg-info/PKG-INFO 2019-03-09
08:07:34.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: git-url-parse
-Version: 1.2.0
+Version: 1.2.1
Summary: git-url-parse - A simple GIT URL parser.
Home-page: https://github.com/retr0h/git-url-parse
Author: John Dewey
@@ -12,6 +12,12 @@
.. image::
https://img.shields.io/codecov/c/github/retr0h/git-url-parse.svg?style=popout-square&logo=codecov
:target: https://codecov.io/gh/retr0h/git-url-parse
+ .. image::
https://img.shields.io/pypi/v/git-url-parse.svg?style=popout-square&logo=python
+ :target: https://pypi.org/project/git-url-parse/
+
+ .. image::
https://img.shields.io/readthedocs/git-url-parse.svg?style=popout-square&logo=Read%20the%20Docs
+ :target: https://git-url-parse.readthedocs.io/en/latest/
+
***********
giturlparse
***********
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/git-url-parse-1.2.0/git_url_parse.egg-info/SOURCES.txt
new/git-url-parse-1.2.1/git_url_parse.egg-info/SOURCES.txt
--- old/git-url-parse-1.2.0/git_url_parse.egg-info/SOURCES.txt 2019-02-07
03:03:13.000000000 +0100
+++ new/git-url-parse-1.2.1/git_url_parse.egg-info/SOURCES.txt 2019-03-09
08:07:38.000000000 +0100
@@ -6,12 +6,12 @@
CHANGELOG.rst
LICENSE
README.rst
-doc-requirements.txt
pytest.ini
+requirements-doc.txt
+requirements-test.txt
requirements.txt
setup.cfg
setup.py
-test-requirements.txt
tox.ini
doc/Makefile
doc/source/authors.rst
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/git_url_parse.egg-info/pbr.json
new/git-url-parse-1.2.1/git_url_parse.egg-info/pbr.json
--- old/git-url-parse-1.2.0/git_url_parse.egg-info/pbr.json 2019-02-07
03:03:11.000000000 +0100
+++ new/git-url-parse-1.2.1/git_url_parse.egg-info/pbr.json 2019-03-09
08:07:34.000000000 +0100
@@ -1 +1 @@
-{"git_version": "7b6c852", "is_release": false}
\ No newline at end of file
+{"git_version": "ba63452", "is_release": false}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/giturlparse/parser.py
new/git-url-parse-1.2.1/giturlparse/parser.py
--- old/git-url-parse-1.2.0/giturlparse/parser.py 2019-01-25
00:18:13.000000000 +0100
+++ new/git-url-parse-1.2.1/giturlparse/parser.py 2019-03-09
08:03:03.000000000 +0100
@@ -41,23 +41,24 @@
r'(?P<resource>[a-z0-9_.-]*)'
r'[:/]*'
r'(?P<port>[\d]+){0,1}'
- r'(?P<pathname>\/(?P<owner>.+)/(?P<name>.+).git)'),
+ r'(?P<pathname>\/((?P<owner>[\w\-]+)\/)?'
+ r'((?P<name>[\w\-]+)(\.git)?)?)$'),
re.compile(r'(git\+)?'
r'((?P<protocol>\w+)://)'
r'((?P<user>\w+)@)?'
r'((?P<resource>[\w\.\-]+))'
r'(:(?P<port>\d+))?'
r'(?P<pathname>(\/(?P<owner>\w+)/)?'
- r'(\/?(?P<name>[\w\-]+)(\.git)?)?)'),
+ r'(\/?(?P<name>[\w\-]+)(\.git)?)?)$'),
re.compile(r'^(?:(?P<user>.+)@)*'
r'(?P<resource>[a-z0-9_.-]*)[:/]*'
r'(?P<port>[\d]+){0,1}'
- r'[:](?P<pathname>\/?(?P<owner>.+)/(?P<name>.+).git)'),
+ r'[:](?P<pathname>\/?(?P<owner>.+)/(?P<name>.+).git)$'),
re.compile(r'((?P<user>\w+)@)?'
r'((?P<resource>[\w\.\-]+))'
r'[\:\/]{1,2}'
r'(?P<pathname>((?P<owner>\w+)/)?'
- r'((?P<name>[\w\-]+)(\.git)?)?)'),
+ r'((?P<name>[\w\-]+)(\.git)?)?)$'),
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/requirements-doc.txt
new/git-url-parse-1.2.1/requirements-doc.txt
--- old/git-url-parse-1.2.0/requirements-doc.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/git-url-parse-1.2.1/requirements-doc.txt 2019-02-07
03:53:31.000000000 +0100
@@ -0,0 +1,3 @@
+-e .
+alabaster
+Sphinx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/requirements-test.txt
new/git-url-parse-1.2.1/requirements-test.txt
--- old/git-url-parse-1.2.0/requirements-test.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/git-url-parse-1.2.1/requirements-test.txt 2019-02-07
03:58:31.000000000 +0100
@@ -0,0 +1,5 @@
+flake8
+pytest
+pytest-cov
+pytest-mock
+yapf==0.21.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/test/conftest.py
new/git-url-parse-1.2.1/test/conftest.py
--- old/git-url-parse-1.2.0/test/conftest.py 2019-01-25 00:18:13.000000000
+0100
+++ new/git-url-parse-1.2.1/test/conftest.py 2019-03-09 08:03:03.000000000
+0100
@@ -23,108 +23,140 @@
import pytest
-#
https://stackoverflow.com/questions/2514859/regular-expression-for-git-repository
@pytest.fixture()
-def git_urls():
+def first_match_urls():
return {
- 'ssh://[email protected]/owner/repo.git': {
+ 'http://example.com/owner/repo.git': {
'pathname': '/owner/repo.git',
- 'protocols': ['ssh'],
- 'protocol': 'ssh',
- 'href': 'ssh://[email protected]/owner/repo.git',
+ 'protocols': ['http'],
+ 'protocol': 'http',
+ 'href': 'http://example.com/owner/repo.git',
'resource': 'example.com',
- 'user': 'user',
+ 'user': None,
'port': None,
'name': 'repo',
'owner': 'owner',
},
- 'ssh://[email protected]:29418/owner/repo.git': {
- 'pathname': '/owner/repo.git',
- 'protocols': ['ssh'],
- 'protocol': 'ssh',
- 'href': 'ssh://[email protected]:29418/owner/repo.git',
+ 'http://example.com/owner/repo': {
+ 'pathname': '/owner/repo',
+ 'protocols': ['http'],
+ 'protocol': 'http',
+ 'href': 'http://example.com/owner/repo',
'resource': 'example.com',
- 'user': 'user',
- 'port': '29418',
+ 'user': None,
+ 'port': None,
'name': 'repo',
'owner': 'owner',
},
- 'ssh://example.com/owner/repo.git': {
- 'pathname': '/owner/repo.git',
- 'protocols': ['ssh'],
- 'protocol': 'ssh',
- 'href': 'ssh://example.com/owner/repo.git',
+ 'http://[email protected]/user/repo': {
+ 'pathname': '/user/repo',
+ 'protocols': ['http'],
+ 'protocol': 'http',
+ 'href': 'http://[email protected]/user/repo',
'resource': 'example.com',
- 'user': None,
+ 'user': 'user',
'port': None,
'name': 'repo',
- 'owner': 'owner',
+ 'owner': 'user',
},
- 'ssh://example.com:29418/owner/repo.git': {
+ 'http://example.com:29418/owner/repo.git': {
'pathname': '/owner/repo.git',
- 'protocols': ['ssh'],
- 'protocol': 'ssh',
- 'href': 'ssh://example.com:29418/owner/repo.git',
+ 'protocols': ['http'],
+ 'protocol': 'http',
+ 'href': 'http://example.com:29418/owner/repo.git',
'resource': 'example.com',
'user': None,
'port': '29418',
'name': 'repo',
'owner': 'owner',
},
- '[email protected]:/owner/repo.git': {
- 'pathname': '/owner/repo.git',
- 'protocols': [],
- 'protocol': 'ssh',
- 'href': '[email protected]:/owner/repo.git',
+ 'http://[email protected]:29418/user/repo': {
+ 'pathname': '/user/repo',
+ 'protocols': ['http'],
+ 'protocol': 'http',
+ 'href': 'http://[email protected]:29418/user/repo',
'resource': 'example.com',
'user': 'user',
+ 'port': '29418',
+ 'name': 'repo',
+ 'owner': 'user',
+ },
+ 'http://example.com/repo': {
+ 'pathname': '/repo',
+ 'protocols': ['http'],
+ 'protocol': 'http',
+ 'href': 'http://example.com/repo',
+ 'resource': 'example.com',
+ 'user': None,
'port': None,
'name': 'repo',
- 'owner': 'owner',
+ 'owner': None,
},
- 'example.com:/owner/repo.git': {
+ 'https://example.com/owner/repo.git': {
'pathname': '/owner/repo.git',
- 'protocols': [],
- 'protocol': 'ssh',
- 'href': 'example.com:/owner/repo.git',
+ 'protocols': ['https'],
+ 'protocol': 'https',
+ 'href': 'https://example.com/owner/repo.git',
'resource': 'example.com',
'user': None,
'port': None,
'name': 'repo',
'owner': 'owner',
},
- '[email protected]:owner/repo.git': {
- 'pathname': 'owner/repo.git',
- 'protocols': [],
- 'protocol': 'ssh',
- 'href': '[email protected]:owner/repo.git',
+ 'https://example.com/owner/repo': {
+ 'pathname': '/owner/repo',
+ 'protocols': ['https'],
+ 'protocol': 'https',
+ 'href': 'https://example.com/owner/repo',
'resource': 'example.com',
- 'user': 'user',
+ 'user': None,
'port': None,
'name': 'repo',
'owner': 'owner',
},
- '[email protected]:owner/repo.git': {
- 'pathname': 'owner/repo.git',
- 'protocols': [],
- 'protocol': 'ssh',
- 'href': '[email protected]:owner/repo.git',
- 'resource': 'foo-example.com',
+ 'https://[email protected]/user/repo': {
+ 'pathname': '/user/repo',
+ 'protocols': ['https'],
+ 'protocol': 'https',
+ 'href': 'https://[email protected]/user/repo',
+ 'resource': 'example.com',
'user': 'user',
'port': None,
'name': 'repo',
+ 'owner': 'user',
+ },
+ 'https://example.com:29418/owner/repo.git': {
+ 'pathname': '/owner/repo.git',
+ 'protocols': ['https'],
+ 'protocol': 'https',
+ 'href': 'https://example.com:29418/owner/repo.git',
+ 'resource': 'example.com',
+ 'user': None,
+ 'port': '29418',
+ 'name': 'repo',
'owner': 'owner',
},
- 'example.com:owner/repo.git': {
- 'pathname': 'owner/repo.git',
- 'protocols': [],
- 'protocol': 'ssh',
- 'href': 'example.com:owner/repo.git',
+ 'https://[email protected]:29418/user/repo': {
+ 'pathname': '/user/repo',
+ 'protocols': ['https'],
+ 'protocol': 'https',
+ 'href': 'https://[email protected]:29418/user/repo',
+ 'resource': 'example.com',
+ 'user': 'user',
+ 'port': '29418',
+ 'name': 'repo',
+ 'owner': 'user',
+ },
+ 'https://example.com/repo': {
+ 'pathname': '/repo',
+ 'protocols': ['https'],
+ 'protocol': 'https',
+ 'href': 'https://example.com/repo',
'resource': 'example.com',
'user': None,
'port': None,
'name': 'repo',
- 'owner': 'owner',
+ 'owner': None,
},
'rsync://example.com/owner/repo.git': {
'pathname': '/owner/repo.git',
@@ -148,72 +180,136 @@
'name': 'repo',
'owner': 'owner',
},
- 'http://example.com/owner/repo.git': {
+ 'ssh://[email protected]/owner/repo.git': {
'pathname': '/owner/repo.git',
- 'protocols': ['http'],
- 'protocol': 'http',
- 'href': 'http://example.com/owner/repo.git',
+ 'protocols': ['ssh'],
+ 'protocol': 'ssh',
+ 'href': 'ssh://[email protected]/owner/repo.git',
+ 'resource': 'example.com',
+ 'user': 'user',
+ 'port': None,
+ 'name': 'repo',
+ 'owner': 'owner',
+ },
+ 'ssh://[email protected]:29418/owner/repo.git': {
+ 'pathname': '/owner/repo.git',
+ 'protocols': ['ssh'],
+ 'protocol': 'ssh',
+ 'href': 'ssh://[email protected]:29418/owner/repo.git',
+ 'resource': 'example.com',
+ 'user': 'user',
+ 'port': '29418',
+ 'name': 'repo',
+ 'owner': 'owner',
+ },
+ 'ssh://example.com/owner/repo.git': {
+ 'pathname': '/owner/repo.git',
+ 'protocols': ['ssh'],
+ 'protocol': 'ssh',
+ 'href': 'ssh://example.com/owner/repo.git',
'resource': 'example.com',
'user': None,
'port': None,
'name': 'repo',
'owner': 'owner',
},
- 'https://example.com/owner/repo.git': {
+ 'ssh://example.com:29418/owner/repo.git': {
'pathname': '/owner/repo.git',
+ 'protocols': ['ssh'],
+ 'protocol': 'ssh',
+ 'href': 'ssh://example.com:29418/owner/repo.git',
+ 'resource': 'example.com',
+ 'user': None,
+ 'port': '29418',
+ 'name': 'repo',
+ 'owner': 'owner',
+ },
+ # https://github.com/retr0h/git-url-parse/issues/29
+ 'https://github.com/sphinx-doc/sphinx.git': {
+ 'pathname': '/sphinx-doc/sphinx.git',
'protocols': ['https'],
'protocol': 'https',
- 'href': 'https://example.com/owner/repo.git',
+ 'href': 'https://github.com/sphinx-doc/sphinx.git',
+ 'resource': 'github.com',
+ 'user': None,
+ 'port': None,
+ 'name': 'sphinx',
+ 'owner': 'sphinx-doc',
+ },
+ }
+
+
[email protected]()
+def second_match_urls():
+ return {
+ 'git+ssh://example.com/owner/repo.git': {
+ 'pathname': '/owner/repo.git',
+ 'protocols': ['git', 'ssh'],
+ 'protocol': 'ssh',
+ 'href': 'git+ssh://example.com/owner/repo.git',
'resource': 'example.com',
'user': None,
'port': None,
'name': 'repo',
'owner': 'owner',
},
- 'https://example.com/owner/repo': {
- 'pathname': '/owner/repo',
- 'protocols': ['https'],
+ 'git+https://example.com/owner/repo.git': {
+ 'pathname': '/owner/repo.git',
+ 'protocols': ['git', 'https'],
'protocol': 'https',
- 'href': 'https://example.com/owner/repo',
+ 'href': 'git+https://example.com/owner/repo.git',
'resource': 'example.com',
'user': None,
'port': None,
'name': 'repo',
'owner': 'owner',
},
- 'example.com:repo.git': {
- 'pathname': 'repo.git',
+ }
+
+
[email protected]()
+def third_match_urls():
+ return {
+ '[email protected]:/owner/repo.git': {
+ 'pathname': '/owner/repo.git',
'protocols': [],
'protocol': 'ssh',
- 'href': 'example.com:repo.git',
+ 'href': '[email protected]:/owner/repo.git',
'resource': 'example.com',
- 'user': None,
+ 'user': 'user',
'port': None,
'name': 'repo',
- 'owner': None,
+ 'owner': 'owner',
},
- 'https://example.com/repo': {
- 'pathname': '/repo',
- 'protocols': ['https'],
- 'protocol': 'https',
- 'href': 'https://example.com/repo',
+ '[email protected]:owner/repo.git': {
+ 'pathname': 'owner/repo.git',
+ 'protocols': [],
+ 'protocol': 'ssh',
+ 'href': '[email protected]:owner/repo.git',
'resource': 'example.com',
- 'user': None,
+ 'user': 'user',
'port': None,
'name': 'repo',
- 'owner': None,
+ 'owner': 'owner',
},
- 'https://example.in/repo': {
- 'pathname': '/repo',
- 'protocols': ['https'],
- 'protocol': 'https',
- 'href': 'https://example.in/repo',
- 'resource': 'example.in',
- 'user': None,
+ '[email protected]:owner/repo.git': {
+ 'pathname': 'owner/repo.git',
+ 'protocols': [],
+ 'protocol': 'ssh',
+ 'href': '[email protected]:owner/repo.git',
+ 'resource': 'foo-example.com',
+ 'user': 'user',
'port': None,
'name': 'repo',
- 'owner': None,
+ 'owner': 'owner',
},
+ }
+
+
[email protected]()
+def fourth_match_urls():
+ return {
+ # NOTE(retr0h): This should really be handled by regexp group 3
'[email protected]:repo.git': {
'pathname': 'repo.git',
'protocols': [],
@@ -225,38 +321,38 @@
'name': 'repo',
'owner': None,
},
- 'git+ssh://example.com/owner/repo.git': {
+ 'example.com:/owner/repo.git': {
'pathname': '/owner/repo.git',
- 'protocols': ['git', 'ssh'],
+ 'protocols': [],
'protocol': 'ssh',
- 'href': 'git+ssh://example.com/owner/repo.git',
+ 'href': 'example.com:/owner/repo.git',
'resource': 'example.com',
'user': None,
'port': None,
'name': 'repo',
'owner': 'owner',
},
- 'git+https://example.com/owner/repo.git': {
- 'pathname': '/owner/repo.git',
- 'protocols': ['git', 'https'],
- 'protocol': 'https',
- 'href': 'git+https://example.com/owner/repo.git',
+ 'example.com:owner/repo.git': {
+ 'pathname': 'owner/repo.git',
+ 'protocols': [],
+ 'protocol': 'ssh',
+ 'href': 'example.com:owner/repo.git',
'resource': 'example.com',
'user': None,
'port': None,
'name': 'repo',
'owner': 'owner',
},
- 'https://[email protected]/user/repo': {
- 'pathname': '/user/repo',
- 'protocols': ['https'],
- 'protocol': 'https',
- 'href': 'https://[email protected]/user/repo',
- 'resource': 'example.org',
- 'user': 'user',
+ 'example.com:repo.git': {
+ 'pathname': 'repo.git',
+ 'protocols': [],
+ 'protocol': 'ssh',
+ 'href': 'example.com:repo.git',
+ 'resource': 'example.com',
+ 'user': None,
'port': None,
'name': 'repo',
- 'owner': 'user',
+ 'owner': None,
},
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/test/test_parser.py
new/git-url-parse-1.2.1/test/test_parser.py
--- old/git-url-parse-1.2.0/test/test_parser.py 2019-01-25 00:18:13.000000000
+0100
+++ new/git-url-parse-1.2.1/test/test_parser.py 2019-03-09 08:03:03.000000000
+0100
@@ -25,8 +25,15 @@
from giturlparse import parser
-def test_parse(git_urls):
- for url, d in git_urls.items():
[email protected]("test_input", [
+ 'first_match_urls',
+ 'second_match_urls',
+ 'third_match_urls',
+ 'fourth_match_urls',
+])
+def test_parse(request, test_input):
+ url_data = request.getfixturevalue(test_input)
+ for url, d in url_data.items():
p = parser.Parser(url)
result = p.parse()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/test-requirements.txt
new/git-url-parse-1.2.1/test-requirements.txt
--- old/git-url-parse-1.2.0/test-requirements.txt 2019-02-07
01:06:52.000000000 +0100
+++ new/git-url-parse-1.2.1/test-requirements.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-flake8
-pytest
-pytest-cov
-pytest-mock
-yapf==0.21.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/git-url-parse-1.2.0/tox.ini
new/git-url-parse-1.2.1/tox.ini
--- old/git-url-parse-1.2.0/tox.ini 2019-02-07 01:06:52.000000000 +0100
+++ new/git-url-parse-1.2.1/tox.ini 2019-03-07 23:10:16.000000000 +0100
@@ -1,21 +1,31 @@
[tox]
minversion = 1.8
envlist =
- py{27,34,34,36}-unit
- py{27,34,35,36}-lint
+ py{27,34,35,36}-unit
+ lint
format-check
doc
skipsdist = true
+[travis]
+python =
+ 2.7: py27-unit, lint, format-check, bats
+ 3.4: py34-unit, lint, format-check, bats
+ 3.5: py35-unit, lint, format-check, bats
+ 3.6: py36-unit, lint, format-check, bats
+
[testenv]
passenv = *
setenv = COVERAGE_FILE={toxworkdir}/.coverage
deps =
-rrequirements.txt
- -rtest-requirements.txt
+ -rrequirements-test.txt
commands =
unit: py.test -vv
- lint: flake8
+
+[testenv:lint]
+commands =
+ flake8
[testenv:format]
commands =
@@ -28,6 +38,6 @@
[testenv:doc]
passenv = *
deps=
- -rdoc-requirements.txt
+ -rrequirements-doc.txt
commands=
python setup.py build_sphinx --builder=html
