openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
December 2019
- 1 participants
- 2204 discussions
Hello community,
here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at 2019-12-02 11:28:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/desktop-data-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "desktop-data-openSUSE"
Mon Dec 2 11:28:42 2019 rev:82 rq:750568 version:15.1.20191124
Changes:
--------
--- /work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-openSUSE.changes 2018-12-27 00:24:03.791924330 +0100
+++ /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new.4691/desktop-data-openSUSE.changes 2019-12-02 11:30:54.218572276 +0100
@@ -1,0 +2,15 @@
+Sun Nov 24 15:08:33 UTC 2019 - hellcp(a)mailbox.org
+
+- Update to version 15.1.20191124:
+ * Remove remaining wallpapers
+ * Remove unused icon directory
+ * Don't set cursor on empty input
+- No longer requires DMZ Cursors, as the fillup no longer contains
+ the theme by default
+
+-------------------------------------------------------------------
+Thu Oct 17 17:25:56 UTC 2019 - Richard Brown <rbrown(a)suse.com>
+
+- Remove obsolete Groups tag (fate#326485)
+
+-------------------------------------------------------------------
Old:
----
desktop-data-15.1.20181213.tar.xz
New:
----
desktop-data-15.1.20191124.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ desktop-data-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.3Gx6vX/_old 2019-12-02 11:30:56.022571441 +0100
+++ /var/tmp/diff_new_pack.3Gx6vX/_new 2019-12-02 11:30:56.026571440 +0100
@@ -1,7 +1,7 @@
#
# spec file for package desktop-data-openSUSE
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
# Copyright (c) 2018 Stasiek Michalski <hellcp(a)opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@@ -12,7 +12,7 @@
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-#
+
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -27,12 +27,11 @@
%endif
Name: desktop-data-openSUSE
-Version: 15.1.20181213
+Version: 15.1.20191124
Release: 0
Summary: Shared Desktop Files for openSUSE
-Url: https://github.com/openSUSE/desktop-data
License: GPL-2.0-or-later
-Group: System/GUI/Other
+URL: https://github.com/openSUSE/desktop-data
Source: desktop-data-%{version}.tar.xz
Source1: %name.fillup
@@ -44,36 +43,28 @@
BuildRequires: hicolor-icon-theme
BuildRequires: perl-RPC-XML
BuildRequires: update-desktop-files
+BuildRequires: wallpaper-branding
BuildRequires: xdg-menu
BuildRequires: xdg-utils
-BuildRequires: wallpaper-branding
%if 0%{?is_opensuse}
BuildRequires: branding-openSUSE
%endif
Requires: hicolor-icon-theme
Requires: xdg-utils
-# This is the default cursor theme we reference in /etc/sysconfig/windowmanager
-Requires: dmz-icon-theme-cursors
%if 0%{?is_opensuse}
Requires: wallpaper-branding = %{branding_version}
%endif
Provides: desktop-branding = %{version}
Provides: desktop-data
+Provides: desktop-data-openSUSE-extra
+
+Obsoletes: desktop-data-openSUSE-extra
%description
This package contains shared desktop files, like the default
-applications menu structure and the default wallpaper.
-
-%package extra
-Summary: Additional wallpapers
-Group: System/GUI/Other
-Requires: desktop-data-openSUSE
-Enhances: desktop-data-openSUSE
-
-%description extra
-This package contains additional wallpapers.
+applications menu structure.
%prep
%setup -n desktop-data-%{version}
@@ -86,7 +77,7 @@
mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
# Update all desktop files
-for i in %{buildroot}%{_datadir}/desktop-directories/*.directory %{buildroot}%{_datadir}/wallpapers/*.desktop
+for i in %{buildroot}%{_datadir}/desktop-directories/*.directory
do
%suse_update_desktop_file "$i"
done
@@ -101,9 +92,6 @@
ln -snf xdg-open %{buildroot}%{_bindir}/call-browser
ln -snf xdg-open %{buildroot}%{_bindir}/desktop-launch
-# Check duplicates
-%fdupes %{buildroot}%{_datadir}/icons
-
%check
# Check if it's a valid menu
export XDG_DATA_DIRS=%{buildroot}%{_datadir}/
@@ -119,13 +107,8 @@
%config(noreplace) %{_sysconfdir}/xdg/menus/*.menu
%config %{_sysconfdir}/profile.d/desktop-data.*
%{_datadir}/desktop-*
-%{_datadir}/icons/hicolor/*
%{_fillupdir}/sysconfig.windowmanager-%name
%{_bindir}/call-browser
%{_bindir}/desktop-launch
-%files extra
-%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra.xml
-%{_datadir}/wallpapers/
-
%changelog
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.3Gx6vX/_old 2019-12-02 11:30:56.070571419 +0100
+++ /var/tmp/diff_new_pack.3Gx6vX/_new 2019-12-02 11:30:56.070571419 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/openSUSE/desktop-data.git</param>
- <param name="changesrevision">0cff8f037295fb83d2e0f3a2e64290b66d2eb221</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">a76ecaa15b1359f5721eac23b9c184e1bccb2201</param></service></servicedata>
\ No newline at end of file
++++++ desktop-data-15.1.20181213.tar.xz -> desktop-data-15.1.20191124.tar.xz ++++++
/work/SRC/openSUSE:Factory/desktop-data-openSUSE/desktop-data-15.1.20181213.tar.xz /work/SRC/openSUSE:Factory/.desktop-data-openSUSE.new.4691/desktop-data-15.1.20191124.tar.xz differ: char 25, line 1
++++++ desktop-data-openSUSE.fillup ++++++
--- /var/tmp/diff_new_pack.3Gx6vX/_old 2019-12-02 11:30:56.106571402 +0100
+++ /var/tmp/diff_new_pack.3Gx6vX/_new 2019-12-02 11:30:56.106571402 +0100
@@ -1,9 +1,9 @@
## Type: string
-## Default: DMZ-Black
+## Default:
## Path: Desktop
## Description: default mouse cursor theme
#
# Name of mouse cursor theme for X11. Possible themes can be found
# in /usr/share/icons/
#
-X_MOUSE_CURSOR="DMZ-Black"
+X_MOUSE_CURSOR=""
1
0
Hello community,
here is the log from the commit of package python-docker for openSUSE:Factory checked in at 2019-12-02 11:28:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-docker (Old)
and /work/SRC/openSUSE:Factory/.python-docker.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-docker"
Mon Dec 2 11:28:31 2019 rev:16 rq:751832 version:4.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-docker/python-docker.changes 2019-07-29 17:31:29.762164671 +0200
+++ /work/SRC/openSUSE:Factory/.python-docker.new.4691/python-docker.changes 2019-12-02 11:30:41.282578263 +0100
@@ -1,0 +2,17 @@
+Sun Nov 24 17:15:38 UTC 2019 - Arun Persaud <arun(a)gmx.de>
+
+- specfile:
+ * updated pytest requirement
+
+- update to version 4.1.0:
+ * Bugfixes
+ + Correct INDEX_URL logic in build.py _set_auth_headers
+ + Fix for empty auth keys in config.json
+ * Features
+ + Add NetworkAttachmentConfig for service create/update
+ * Miscellaneous
+ + Bump pytest to 4.3.1
+ + Adjust --platform tests for changes in docker engine
+ + Update credentials-helpers to v0.6.3
+
+-------------------------------------------------------------------
Old:
----
4.0.2.tar.gz
New:
----
4.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-docker.spec ++++++
--- /var/tmp/diff_new_pack.57HdAI/_old 2019-12-02 11:30:45.406576354 +0100
+++ /var/tmp/diff_new_pack.57HdAI/_new 2019-12-02 11:30:45.430576343 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-docker
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define oldpython python
Name: python-docker
-Version: 4.0.2
+Version: 4.1.0
Release: 0
Summary: Docker API Client
License: Apache-2.0
@@ -30,7 +30,7 @@
BuildRequires: %{python_module mock}
BuildRequires: %{python_module paramiko >= 2.4.2}
BuildRequires: %{python_module pip}
-BuildRequires: %{python_module pytest >= 2.9.1}
+BuildRequires: %{python_module pytest >= 4.3.1}
BuildRequires: %{python_module pytest-cov >= 2.1.0}
BuildRequires: %{python_module pytest-timeout >= 1.2.1}
BuildRequires: %{python_module requests >= 2.20.0}
++++++ 4.0.2.tar.gz -> 4.1.0.tar.gz ++++++
++++ 2394 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libglvnd for openSUSE:Factory checked in at 2019-12-02 11:28:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libglvnd (Old)
and /work/SRC/openSUSE:Factory/.libglvnd.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libglvnd"
Mon Dec 2 11:28:30 2019 rev:15 rq:750546 version:1.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libglvnd/libglvnd.changes 2019-11-08 15:29:14.739227203 +0100
+++ /work/SRC/openSUSE:Factory/.libglvnd.new.4691/libglvnd.changes 2019-12-02 11:30:33.078582059 +0100
@@ -1,0 +2,6 @@
+Sun Nov 24 12:50:20 UTC 2019 - Stefan Dirsch <sndirsch(a)suse.com>
+
+- removed n_0001-GL-Bump-GL-version-to-9-2.patch, which is no
+ longer needed with xorg-server 1.20.6
+
+-------------------------------------------------------------------
Old:
----
n_0001-GL-Bump-GL-version-to-9-2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libglvnd.spec ++++++
--- /var/tmp/diff_new_pack.jA15Rp/_old 2019-12-02 11:30:35.334581015 +0100
+++ /var/tmp/diff_new_pack.jA15Rp/_new 2019-12-02 11:30:35.334581015 +0100
@@ -29,7 +29,6 @@
# Source is _service generated
Source: %name-%version.tar.gz
Source1: baselibs.conf
-Patch0: n_0001-GL-Bump-GL-version-to-9-2.patch
Patch1: 0001-include-install-GL-headers-when-GL-is-enabled.patch
Patch2: 0002-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch
Patch3: 0003-egl-Sync-with-Khronos.patch
@@ -64,7 +63,6 @@
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
1
0
Hello community,
here is the log from the commit of package git-pw for openSUSE:Factory checked in at 2019-12-02 11:28:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/git-pw (Old)
and /work/SRC/openSUSE:Factory/.git-pw.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git-pw"
Mon Dec 2 11:28:18 2019 rev:3 rq:751689 version:1.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/git-pw/git-pw.changes 2019-02-11 21:27:58.798996582 +0100
+++ /work/SRC/openSUSE:Factory/.git-pw.new.4691/git-pw.changes 2019-12-02 11:30:26.834584949 +0100
@@ -1,0 +2,5 @@
+Wed Nov 27 08:11:06 UTC 2019 - Johannes Thumshirn <jthumshirn(a)suse.com>
+
+- Update to v1.7.0
+
+-------------------------------------------------------------------
Old:
----
git-pw-1.5.1.tar.gz
New:
----
git-pw-1.7.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ git-pw.spec ++++++
--- /var/tmp/diff_new_pack.SQ5zJ7/_old 2019-12-02 11:30:27.630584581 +0100
+++ /var/tmp/diff_new_pack.SQ5zJ7/_new 2019-12-02 11:30:27.630584581 +0100
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: git-pw
-Version: 1.5.1
+Version: 1.7.0
Release: 0
Summary: A tool for integrating Git with Patchwork
License: MIT
++++++ git-pw-1.5.1.tar.gz -> git-pw-1.7.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/.travis.yml new/git-pw-1.7.0/.travis.yml
--- old/git-pw-1.5.1/.travis.yml 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/.travis.yml 2019-09-22 00:38:01.000000000 +0200
@@ -3,10 +3,9 @@
cache: pip
python:
- 2.7
-- 3.4
- 3.5
- 3.6
-- pypy
+- 3.7
install:
- pip install tox-travis
script:
@@ -17,7 +16,7 @@
jobs:
include:
- stage: deploy
- python: 3.6
+ python: 3.7
install: skip # no tests, no depedencies needed
script: skip # we're not running tests
deploy:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/AUTHORS new/git-pw-1.7.0/AUTHORS
--- old/git-pw-1.5.1/AUTHORS 2018-12-17 12:11:50.000000000 +0100
+++ new/git-pw-1.7.0/AUTHORS 2019-09-22 00:38:23.000000000 +0200
@@ -1,3 +1,4 @@
+Ezequiel Garcia <ezequiel(a)collabora.com>
Michael Ellerman <mpe(a)ellerman.id.au>
Stephen Finucane <stephen(a)that.guru>
Tom Tromey <tom(a)tromey.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/ChangeLog new/git-pw-1.7.0/ChangeLog
--- old/git-pw-1.5.1/ChangeLog 2018-12-17 12:11:50.000000000 +0100
+++ new/git-pw-1.7.0/ChangeLog 2019-09-22 00:38:23.000000000 +0200
@@ -1,6 +1,42 @@
CHANGES
=======
+1.7.0
+-----
+
+* Release version 1.7.0
+* requirements: Make requirements less strict (again)
+* Drop support for PyPy
+* utils: Simplify the unicodification of pager input
+* Handle integers too when printing CSV
+* setup.cfg: Minor tweaks
+* Resolves issues with CSV printing on Python 2
+* utils: Wrap CSV in quotes
+* Don't compare against 'sys.stdout'
+* Decode received mboxes
+* Store manpages in version control
+* tox: Use click-man executable instead
+* tox: Add code coverage
+* tox: Run flake8 on tests too
+* tox: Cleanup
+* tox: Remove 'release' target
+* tox: Remove py34, add py37
+
+1.6.0
+-----
+
+* Drop support for Python 3.4
+
+1.5.2
+-----
+
+* Download patches to temporary file
+* Add missing module docstrings
+* Decode output from 'subprocess.check\_output'
+* gitignore: Add autogenerated reno files
+* Print git-am output
+* README: Silly fix on install instructions
+
1.5.1
-----
@@ -42,35 +78,3 @@
* tests: Move to top-level directory
* Add swp files to .gitignore
* tests: Add 'bundle' tests
-* tests: Add 'patch' tests
-* tests: Add 'series' tests
-* bundle: 'api.download' returns a string
-* patch: Remove duplication
-* tests: Don't reuse the same name
-* Specify what ARGS argument for 'apply' commands means
-* Don't require escaping arguments
-* Add missing argument for \_echo\_via\_pager call
-* tests: Add tests for 'utils.git\_config'
-* Abide by git's pager settings
-
-1.2.0
------
-
-* Add initial unit tests
-* README: Replace backticks with asterisks
-* Resolve TODO
-* Take advantage of features from API v1.1
-* Prepare for required server version
-* Handle additional error codes
-* Allow users to show, download and apply bundles by name
-* docs: Modernize build process
-* docs: Use RTD theme locally
-* Save to file by default
-* Lower logging levels for some messages
-* Allow bulk updating
-* Fix type signatures
-
-1.1.2
------
-
-* Add missing release notes for last few bugfixes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/PKG-INFO new/git-pw-1.7.0/PKG-INFO
--- old/git-pw-1.5.1/PKG-INFO 2018-12-17 12:11:51.000000000 +0100
+++ new/git-pw-1.7.0/PKG-INFO 2019-09-22 00:38:23.000000000 +0200
@@ -1,11 +1,14 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: git-pw
-Version: 1.5.1
+Version: 1.7.0
Summary: Git-Patchwork integration tool
-Home-page: https://git-pw.readthedocs.io/
+Home-page: https://github.com/getpatchwork/git-pw
Author: Stephen Finucane
Author-email: stephen(a)that.guru
License: MIT License
+Project-URL: Bug Tracker, https://github.com/getpatchwork/git-pw/issues
+Project-URL: Source Code, https://github.com/getpatchwork/git-pw
+Project-URL: Documentation, https://git-pw.readthedocs.io
Description: ======
git-pw
======
@@ -71,7 +74,7 @@
$ git clone https://github.com/getpatchwork/git-pw
$ cd git-pw
- $ pip install --user . # or 'sudo python setup.py'
+ $ pip install --user . # or 'sudo python setup.py install'
Getting Started
---------------
@@ -150,6 +153,9 @@
Platform: UNKNOWN
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: Python
Classifier: Development Status :: 4 - Beta
Classifier: Environment :: Console
@@ -157,3 +163,4 @@
Classifier: Intended Audience :: Information Technology
Classifier: License :: OSI Approved :: MIT License
Classifier: Operating System :: OS Independent
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/README.rst new/git-pw-1.7.0/README.rst
--- old/git-pw-1.5.1/README.rst 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/README.rst 2019-09-22 00:38:01.000000000 +0200
@@ -63,7 +63,7 @@
$ git clone https://github.com/getpatchwork/git-pw
$ cd git-pw
- $ pip install --user . # or 'sudo python setup.py'
+ $ pip install --user . # or 'sudo python setup.py install'
Getting Started
---------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/docs/requirements.txt new/git-pw-1.7.0/docs/requirements.txt
--- old/git-pw-1.5.1/docs/requirements.txt 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/docs/requirements.txt 2019-09-22 00:38:01.000000000 +0200
@@ -1,6 +1,5 @@
-r ../requirements.txt
sphinx>=1.5,<2.0
sphinx-click>=1.0,<2.0
-click-man>=0.2,<0.3
reno>=2.0,<3.0
sphinx_rtd_theme==0.3.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/git_pw/__init__.py new/git-pw-1.7.0/git_pw/__init__.py
--- old/git-pw-1.5.1/git_pw/__init__.py 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/git_pw/__init__.py 2019-09-22 00:38:01.000000000 +0200
@@ -1,3 +1,8 @@
+"""
+git-pw -- A tool for integrating Git with Patchwork, the web-based patch
+tracking system.
+"""
+
import pkg_resources
__version__ = pkg_resources.get_distribution('git-pw').version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/git_pw/api.py new/git-pw-1.7.0/git_pw/api.py
--- old/git-pw-1.5.1/git_pw/api.py 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/git_pw/api.py 2019-09-22 00:38:01.000000000 +0200
@@ -4,8 +4,10 @@
from functools import update_wrapper
import logging
+import os.path
import re
import sys
+import tempfile
import click
import requests
@@ -195,7 +197,8 @@
LOG.error('Filename was expected but was not provided in response')
sys.exit(1)
- output_path = header.group(1)
+ output_path = os.path.join(tempfile.mkdtemp(prefix='git-pw'),
+ header.group(1))
with open(output_path, 'wb') as output_file:
LOG.debug('Saving to %s', output_path)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/git_pw/bundle.py new/git-pw-1.7.0/git_pw/bundle.py
--- old/git-pw-1.5.1/git_pw/bundle.py 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/git_pw/bundle.py 2019-09-22 00:38:01.000000000 +0200
@@ -3,6 +3,7 @@
"""
import logging
+import pty
import sys
import click
@@ -72,9 +73,11 @@
bundle = _get_bundle(bundle_id)
if output:
- output.write(api.get(bundle['mbox']).text)
+ content = api.get(bundle['mbox']).content
- if output != sys.stdout:
+ output.write(content)
+
+ if output.fileno() != pty.STDOUT_FILENO:
path = output.name
else:
path = api.download(bundle['mbox'])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/git_pw/patch.py new/git-pw-1.7.0/git_pw/patch.py
--- old/git-pw-1.5.1/git_pw/patch.py 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/git_pw/patch.py 2019-09-22 00:38:01.000000000 +0200
@@ -3,6 +3,7 @@
"""
import logging
+import pty
import sys
import arrow
@@ -72,11 +73,11 @@
if fmt == 'diff':
content = patch['diff']
else:
- content = api.get(patch['mbox']).text
+ content = api.get(patch['mbox']).content
output.write(content)
- if output != sys.stdout:
+ if output.fileno() != pty.STDOUT_FILENO:
path = output.name
else:
if fmt == 'diff':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/git_pw/series.py new/git-pw-1.7.0/git_pw/series.py
--- old/git-pw-1.5.1/git_pw/series.py 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/git_pw/series.py 2019-09-22 00:38:01.000000000 +0200
@@ -3,7 +3,7 @@
"""
import logging
-import sys
+import pty
import arrow
import click
@@ -52,9 +52,11 @@
series = api.detail('series', series_id)
if output:
- output.write(api.get(series['mbox']).text)
+ content = api.get(series['mbox']).content
- if output != sys.stdout:
+ output.write(content)
+
+ if output.fileno() != pty.STDOUT_FILENO:
path = output.name
else:
path = api.download(series['mbox'])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/git_pw/shell.py new/git-pw-1.7.0/git_pw/shell.py
--- old/git-pw-1.5.1/git_pw/shell.py 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/git_pw/shell.py 2019-09-22 00:38:01.000000000 +0200
@@ -1,5 +1,5 @@
"""
-TODO.
+Command-line interface to the Patchwork API.
"""
import click
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/git_pw/utils.py new/git-pw-1.7.0/git_pw/utils.py
--- old/git-pw-1.5.1/git_pw/utils.py 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/git_pw/utils.py 2019-09-22 00:38:01.000000000 +0200
@@ -2,19 +2,25 @@
Utility functions.
"""
-import codecs
+from __future__ import print_function
+
+import csv
import os
import subprocess
import sys
import click
+import six
from tabulate import tabulate
-if sys.version_info < (3, 0):
- _text = unicode # noqa
-else:
- _text = str # noqa
+def ensure_str(s):
+ if s is None:
+ s = ''
+ elif not isinstance(s, (six.text_type, six.binary_type)):
+ s = str(s)
+
+ return six.ensure_str(s)
def trim(string, length=70): # type: (str, int) -> str
@@ -46,10 +52,12 @@
cmd.append(mbox)
try:
- subprocess.check_output(cmd, stderr=subprocess.STDOUT)
+ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as exc:
- print(exc.output)
+ print(exc.output.decode('utf-8'))
sys.exit(exc.returncode)
+ else:
+ print(output.decode('utf-8'), end='')
def _tabulate(output, headers, fmt):
@@ -60,33 +68,18 @@
elif fmt == 'simple':
return tabulate(output, headers, tablefmt='simple')
elif fmt == 'csv':
- result = []
- result.append(','.join(headers))
+ result = six.StringIO()
+ writer = csv.writer(
+ result, quoting=csv.QUOTE_ALL, lineterminator=os.linesep)
+ writer.writerow([ensure_str(h) for h in headers])
for item in output:
- result.append(
- ','.join(_text(x if x is not None else '') for x in item))
- return '\n'.join(result)
+ writer.writerow([ensure_str(i) for i in item])
+ return result.getvalue()
print('pw.format must be one of: table, simple, csv')
sys.exit(1)
-def _is_ascii_encoding(encoding):
- """Checks if a given encoding is ascii."""
- try:
- return codecs.lookup(encoding).name == 'ascii'
- except LookupError:
- return False
-
-
-def _get_best_encoding(stream):
- """Returns the default stream encoding if not found."""
- rv = getattr(stream, 'encoding', None) or sys.getdefaultencoding()
- if _is_ascii_encoding(rv):
- return 'utf-8'
- return rv
-
-
def _echo_via_pager(pager, output):
env = dict(os.environ)
# When the LESS environment variable is unset, Git sets it to FRX (if
@@ -94,21 +87,20 @@
if 'LESS' not in env:
env['LESS'] = 'FRX'
- c = subprocess.Popen(pager, shell=True, stdin=subprocess.PIPE,
- env=env)
- encoding = _get_best_encoding(c.stdin)
+ pager = subprocess.Popen(pager.split(), stdin=subprocess.PIPE, env=env)
+
+ output = six.ensure_binary(output)
try:
- for line in output:
- c.stdin.write(line.encode(encoding, 'replace'))
+ pager.communicate(input=output)
except (IOError, KeyboardInterrupt):
pass
else:
- c.stdin.close()
+ pager.stdin.close()
while True:
try:
- c.wait()
+ pager.wait()
except KeyboardInterrupt:
pass
else:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/git_pw.egg-info/PKG-INFO new/git-pw-1.7.0/git_pw.egg-info/PKG-INFO
--- old/git-pw-1.5.1/git_pw.egg-info/PKG-INFO 2018-12-17 12:11:50.000000000 +0100
+++ new/git-pw-1.7.0/git_pw.egg-info/PKG-INFO 2019-09-22 00:38:23.000000000 +0200
@@ -1,11 +1,14 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
Name: git-pw
-Version: 1.5.1
+Version: 1.7.0
Summary: Git-Patchwork integration tool
-Home-page: https://git-pw.readthedocs.io/
+Home-page: https://github.com/getpatchwork/git-pw
Author: Stephen Finucane
Author-email: stephen(a)that.guru
License: MIT License
+Project-URL: Bug Tracker, https://github.com/getpatchwork/git-pw/issues
+Project-URL: Source Code, https://github.com/getpatchwork/git-pw
+Project-URL: Documentation, https://git-pw.readthedocs.io
Description: ======
git-pw
======
@@ -71,7 +74,7 @@
$ git clone https://github.com/getpatchwork/git-pw
$ cd git-pw
- $ pip install --user . # or 'sudo python setup.py'
+ $ pip install --user . # or 'sudo python setup.py install'
Getting Started
---------------
@@ -150,6 +153,9 @@
Platform: UNKNOWN
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: Python
Classifier: Development Status :: 4 - Beta
Classifier: Environment :: Console
@@ -157,3 +163,4 @@
Classifier: Intended Audience :: Information Technology
Classifier: License :: OSI Approved :: MIT License
Classifier: Operating System :: OS Independent
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/git_pw.egg-info/SOURCES.txt new/git-pw-1.7.0/git_pw.egg-info/SOURCES.txt
--- old/git-pw-1.5.1/git_pw.egg-info/SOURCES.txt 2018-12-17 12:11:50.000000000 +0100
+++ new/git-pw-1.7.0/git_pw.egg-info/SOURCES.txt 2019-09-22 00:38:23.000000000 +0200
@@ -32,7 +32,26 @@
git_pw.egg-info/pbr.json
git_pw.egg-info/requires.txt
git_pw.egg-info/top_level.txt
+man/git-pw-bundle-apply.1
+man/git-pw-bundle-download.1
+man/git-pw-bundle-list.1
+man/git-pw-bundle-show.1
+man/git-pw-bundle.1
+man/git-pw-patch-apply.1
+man/git-pw-patch-download.1
+man/git-pw-patch-list.1
+man/git-pw-patch-show.1
+man/git-pw-patch-update.1
+man/git-pw-patch.1
+man/git-pw-series-apply.1
+man/git-pw-series-download.1
+man/git-pw-series-list.1
+man/git-pw-series-show.1
+man/git-pw-series.1
+man/git-pw.1
releasenotes/notes/api-v1-1-5c804713ef435739.yaml
+releasenotes/notes/drop-pypy-support-f670deb05ef527fe.yaml
+releasenotes/notes/drop-python34-support-5e01360fff605972.yaml
releasenotes/notes/enforce-filtering-by-project-59ed29c4b7edc0a5.yaml
releasenotes/notes/filter-item-list-by-user-id-4f4e7d6dc402093b.yaml
releasenotes/notes/filter-multiple-matches-197ff839f6b578da.yaml
@@ -40,6 +59,12 @@
releasenotes/notes/initial-release-0aad09064615d023.yaml
releasenotes/notes/issue-24-60a9fa796f666f35.yaml
releasenotes/notes/issue-29-884269fdf35f64b2.yaml
+releasenotes/notes/issue-43-c2c166e1fa23fe76.yaml
+releasenotes/notes/issue-44-66b78577e9534f16.yaml
+releasenotes/notes/issue-46-50933643cd5c8db0.yaml
+releasenotes/notes/issue-47-a9ac87642050d289.yaml
+releasenotes/notes/issue-48-694495f722119fed.yaml
+releasenotes/notes/issue-49-865c4f1657b97fce.yaml
releasenotes/notes/passthrough-git-am-arguments-23cd0b292304d648.yaml
releasenotes/notes/random-fixes-3da473a63c253f2d.yaml
releasenotes/notes/remove-python-3-2-3-3-support-8987031bed2c0333.yaml
@@ -50,6 +75,7 @@
releasenotes/notes/use-bundle-names-b1b3ee5c2858c96b.yaml
releasenotes/notes/use-git-pager-settings-ec6555d8311a8bec.yaml
releasenotes/notes/warn-on-multiple-filters-a4e01fdb5cf6e459.yaml
+tests/__init__.py
tests/test_api.py
tests/test_bundle.py
tests/test_patch.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/git_pw.egg-info/pbr.json new/git-pw-1.7.0/git_pw.egg-info/pbr.json
--- old/git-pw-1.5.1/git_pw.egg-info/pbr.json 2018-12-17 12:11:50.000000000 +0100
+++ new/git-pw-1.7.0/git_pw.egg-info/pbr.json 2019-09-22 00:38:23.000000000 +0200
@@ -1 +1 @@
-{"git_version": "c22ac35", "is_release": true}
\ No newline at end of file
+{"git_version": "0562167", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/git_pw.egg-info/requires.txt new/git-pw-1.7.0/git_pw.egg-info/requires.txt
--- old/git-pw-1.5.1/git_pw.egg-info/requires.txt 2018-12-17 12:11:50.000000000 +0100
+++ new/git-pw-1.7.0/git_pw.egg-info/requires.txt 2019-09-22 00:38:23.000000000 +0200
@@ -2,3 +2,4 @@
requests<3.0,>2.0
tabulate>=0.8
arrow>=0.10
+six>=1.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-bundle-apply.1 new/git-pw-1.7.0/man/git-pw-bundle-apply.1
--- old/git-pw-1.5.1/man/git-pw-bundle-apply.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-bundle-apply.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,11 @@
+.TH "GIT-PW BUNDLE APPLY" "1" "21-Sep-2019" "1.7.0" "git-pw bundle apply Manual"
+.SH NAME
+git-pw\-bundle\-apply \- Apply bundle.
+.SH SYNOPSIS
+.B git-pw bundle apply
+[OPTIONS] BUNDLE_ID [ARGS]...
+.SH DESCRIPTION
+Apply bundle.
+.PP
+Apply a bundle locally using the 'git-am' command. Any additional ARGS
+provided will be passed to the 'git-am' command.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-bundle-download.1 new/git-pw-1.7.0/man/git-pw-bundle-download.1
--- old/git-pw-1.5.1/man/git-pw-bundle-download.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-bundle-download.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,12 @@
+.TH "GIT-PW BUNDLE DOWNLOAD" "1" "21-Sep-2019" "1.7.0" "git-pw bundle download Manual"
+.SH NAME
+git-pw\-bundle\-download \- Download bundle in mbox format.
+.SH SYNOPSIS
+.B git-pw bundle download
+[OPTIONS] BUNDLE_ID [OUTPUT]
+.SH DESCRIPTION
+Download bundle in mbox format.
+.PP
+Download a bundle but do not apply it. ``OUTPUT`` is optional and can be an
+output path or ``-`` to output to ``stdout``. If ``OUTPUT`` is not
+provided, the output path will be automatically chosen.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-bundle-list.1 new/git-pw-1.7.0/man/git-pw-bundle-list.1
--- old/git-pw-1.5.1/man/git-pw-bundle-list.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-bundle-list.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,29 @@
+.TH "GIT-PW BUNDLE LIST" "1" "21-Sep-2019" "1.7.0" "git-pw bundle list Manual"
+.SH NAME
+git-pw\-bundle\-list \- List bundles.
+.SH SYNOPSIS
+.B git-pw bundle list
+[OPTIONS] [NAME]
+.SH DESCRIPTION
+List bundles.
+.PP
+List bundles on the Patchwork instance.
+.SH OPTIONS
+.TP
+\fB\-\-owner\fP OWNER
+Show only bundles with these owners. Should be an email, name or ID. Private bundles of other users will not be shown.
+.TP
+\fB\-\-sort\fP FIELD
+Sort output on given field.
+.TP
+\fB\-\-page\fP PAGE
+Page to retrieve items from. This is influenced by the size of LIMIT.
+.TP
+\fB\-\-limit\fP LIMIT
+Maximum number of items to show.
+.TP
+\fB\-c,\fP \-\-column COLUMN
+Columns to be included in output.
+.TP
+\fB\-f,\fP \-\-format [simple|table|csv]
+Output format. Defaults to the value of 'git config pw.format' else 'table'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-bundle-show.1 new/git-pw-1.7.0/man/git-pw-bundle-show.1
--- old/git-pw-1.5.1/man/git-pw-bundle-show.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-bundle-show.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,14 @@
+.TH "GIT-PW BUNDLE SHOW" "1" "21-Sep-2019" "1.7.0" "git-pw bundle show Manual"
+.SH NAME
+git-pw\-bundle\-show \- Show information about bundle.
+.SH SYNOPSIS
+.B git-pw bundle show
+[OPTIONS] BUNDLE_ID
+.SH DESCRIPTION
+Show information about bundle.
+.PP
+Retrieve Patchwork metadata for a bundle.
+.SH OPTIONS
+.TP
+\fB\-f,\fP \-\-format [simple|table|csv]
+Output format. Defaults to the value of 'git config pw.format' else 'table'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-bundle.1 new/git-pw-1.7.0/man/git-pw-bundle.1
--- old/git-pw-1.5.1/man/git-pw-bundle.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-bundle.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,33 @@
+.TH "GIT-PW BUNDLE" "1" "21-Sep-2019" "1.7.0" "git-pw bundle Manual"
+.SH NAME
+git-pw\-bundle \- Interact with bundles.
+.SH SYNOPSIS
+.B git-pw bundle
+[OPTIONS] COMMAND [ARGS]...
+.SH DESCRIPTION
+Interact with bundles.
+.PP
+Bundles are custom, user-defined groups of patches. Bundles can be
+used to keep patch lists, preserving order, for future inclusion in
+a tree. There's no restriction of number of patches and they don't
+even need to be in the same project. A single patch also can be
+part of multiple bundles at the same time. An example of Bundle
+usage would be keeping track of the Patches that are ready for
+merge to the tree.
+.SH COMMANDS
+.PP
+\fBapply\fP
+ Apply bundle.
+ See \fBgit-pw bundle-apply(1)\fP for full documentation on the \fBapply\fP command.
+.PP
+\fBshow\fP
+ Show information about bundle.
+ See \fBgit-pw bundle-show(1)\fP for full documentation on the \fBshow\fP command.
+.PP
+\fBdownload\fP
+ Download bundle in mbox format.
+ See \fBgit-pw bundle-download(1)\fP for full documentation on the \fBdownload\fP command.
+.PP
+\fBlist\fP
+ List bundles.
+ See \fBgit-pw bundle-list(1)\fP for full documentation on the \fBlist\fP command.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-patch-apply.1 new/git-pw-1.7.0/man/git-pw-patch-apply.1
--- old/git-pw-1.5.1/man/git-pw-patch-apply.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-patch-apply.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,18 @@
+.TH "GIT-PW PATCH APPLY" "1" "21-Sep-2019" "1.7.0" "git-pw patch apply Manual"
+.SH NAME
+git-pw\-patch\-apply \- Apply patch.
+.SH SYNOPSIS
+.B git-pw patch apply
+[OPTIONS] PATCH_ID [ARGS]...
+.SH DESCRIPTION
+Apply patch.
+.PP
+Apply a patch locally using the 'git-am' command. Any additional ARGS
+provided will be passed to the 'git-am' command.
+.SH OPTIONS
+.TP
+\fB\-\-series\fP SERIES
+Series to include dependencies from. Defaults to latest.
+.TP
+\fB\-\-deps\fP / \-\-no\-deps
+When applying the patch, include dependencies if available. Defaults to using the most recent series.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-patch-download.1 new/git-pw-1.7.0/man/git-pw-patch-download.1
--- old/git-pw-1.5.1/man/git-pw-patch-download.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-patch-download.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,19 @@
+.TH "GIT-PW PATCH DOWNLOAD" "1" "21-Sep-2019" "1.7.0" "git-pw patch download Manual"
+.SH NAME
+git-pw\-patch\-download \- Download patch in diff or mbox format.
+.SH SYNOPSIS
+.B git-pw patch download
+[OPTIONS] PATCH_ID [OUTPUT]
+.SH DESCRIPTION
+Download patch in diff or mbox format.
+.PP
+Download a patch but do not apply it. ``OUTPUT`` is optional and can be an
+output path or ``-`` to output to ``stdout``. If ``OUTPUT`` is not
+provided, the output path will be automatically chosen.
+.SH OPTIONS
+.TP
+\fB\-\-diff\fP
+Show patch in diff format.
+.TP
+\fB\-\-mbox\fP
+Show patch in mbox format.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-patch-list.1 new/git-pw-1.7.0/man/git-pw-patch-list.1
--- old/git-pw-1.5.1/man/git-pw-patch-list.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-patch-list.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,38 @@
+.TH "GIT-PW PATCH LIST" "1" "21-Sep-2019" "1.7.0" "git-pw patch list Manual"
+.SH NAME
+git-pw\-patch\-list \- List patches.
+.SH SYNOPSIS
+.B git-pw patch list
+[OPTIONS] [NAME]
+.SH DESCRIPTION
+List patches.
+.PP
+List patches on the Patchwork instance.
+.SH OPTIONS
+.TP
+\fB\-\-state\fP STATE
+Show only patches matching these states. Should be slugified representations of states. The available states are instance dependant.
+.TP
+\fB\-\-submitter\fP SUBMITTER
+Show only patches by these submitters. Should be an email, name or ID.
+.TP
+\fB\-\-delegate\fP DELEGATE
+Show only patches by these delegates. Should be an email or username.
+.TP
+\fB\-\-archived\fP
+Include patches that are archived.
+.TP
+\fB\-\-sort\fP FIELD
+Sort output on given field.
+.TP
+\fB\-\-page\fP PAGE
+Page to retrieve items from. This is influenced by the size of LIMIT.
+.TP
+\fB\-\-limit\fP LIMIT
+Maximum number of items to show.
+.TP
+\fB\-c,\fP \-\-column COLUMN
+Columns to be included in output.
+.TP
+\fB\-f,\fP \-\-format [simple|table|csv]
+Output format. Defaults to the value of 'git config pw.format' else 'table'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-patch-show.1 new/git-pw-1.7.0/man/git-pw-patch-show.1
--- old/git-pw-1.5.1/man/git-pw-patch-show.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-patch-show.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,14 @@
+.TH "GIT-PW PATCH SHOW" "1" "21-Sep-2019" "1.7.0" "git-pw patch show Manual"
+.SH NAME
+git-pw\-patch\-show \- Show information about patch.
+.SH SYNOPSIS
+.B git-pw patch show
+[OPTIONS] PATCH_ID
+.SH DESCRIPTION
+Show information about patch.
+.PP
+Retrieve Patchwork metadata for a patch.
+.SH OPTIONS
+.TP
+\fB\-f,\fP \-\-format [simple|table|csv]
+Output format. Defaults to the value of 'git config pw.format' else 'table'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-patch-update.1 new/git-pw-1.7.0/man/git-pw-patch-update.1
--- old/git-pw-1.5.1/man/git-pw-patch-update.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-patch-update.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,27 @@
+.TH "GIT-PW PATCH UPDATE" "1" "21-Sep-2019" "1.7.0" "git-pw patch update Manual"
+.SH NAME
+git-pw\-patch\-update \- Update one or more patches.
+.SH SYNOPSIS
+.B git-pw patch update
+[OPTIONS] PATCH_IDS...
+.SH DESCRIPTION
+Update one or more patches.
+.PP
+Updates one or more Patches on the Patchwork instance. Some operations may
+require admin or maintainer permissions.
+.SH OPTIONS
+.TP
+\fB\-\-commit\-ref\fP COMMIT_REF
+Set the patch commit reference hash
+.TP
+\fB\-\-state\fP STATE
+Set the patch state. Should be a slugified representation of a state. The available states are instance dependant.
+.TP
+\fB\-\-delegate\fP DELEGATE
+Set the patch delegate. Should be unique user identifier: either a username or a user's email address.
+.TP
+\fB\-\-archived\fP ARCHIVED
+Set the patch archived state.
+.TP
+\fB\-f,\fP \-\-format [simple|table|csv]
+Output format. Defaults to the value of 'git config pw.format' else 'table'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-patch.1 new/git-pw-1.7.0/man/git-pw-patch.1
--- old/git-pw-1.5.1/man/git-pw-patch.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-patch.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,36 @@
+.TH "GIT-PW PATCH" "1" "21-Sep-2019" "1.7.0" "git-pw patch Manual"
+.SH NAME
+git-pw\-patch \- Interact with patches.
+.SH SYNOPSIS
+.B git-pw patch
+[OPTIONS] COMMAND [ARGS]...
+.SH DESCRIPTION
+Interact with patches.
+.PP
+Patches are the central object in Patchwork structure. A patch
+contains both a diff and some metadata, such as the name, the
+description, the author, the version of the patch etc. Patchwork
+stores not only the patch itself but also various metadata
+associated with the email that the patch was parsed from, such as
+the message headers or the date the message itself was received.
+.SH COMMANDS
+.PP
+\fBapply\fP
+ Apply patch.
+ See \fBgit-pw patch-apply(1)\fP for full documentation on the \fBapply\fP command.
+.PP
+\fBshow\fP
+ Show information about patch.
+ See \fBgit-pw patch-show(1)\fP for full documentation on the \fBshow\fP command.
+.PP
+\fBdownload\fP
+ Download patch in diff or mbox format.
+ See \fBgit-pw patch-download(1)\fP for full documentation on the \fBdownload\fP command.
+.PP
+\fBupdate\fP
+ Update one or more patches.
+ See \fBgit-pw patch-update(1)\fP for full documentation on the \fBupdate\fP command.
+.PP
+\fBlist\fP
+ List patches.
+ See \fBgit-pw patch-list(1)\fP for full documentation on the \fBlist\fP command.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-series-apply.1 new/git-pw-1.7.0/man/git-pw-series-apply.1
--- old/git-pw-1.5.1/man/git-pw-series-apply.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-series-apply.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,11 @@
+.TH "GIT-PW SERIES APPLY" "1" "21-Sep-2019" "1.7.0" "git-pw series apply Manual"
+.SH NAME
+git-pw\-series\-apply \- Apply series.
+.SH SYNOPSIS
+.B git-pw series apply
+[OPTIONS] SERIES_ID [ARGS]...
+.SH DESCRIPTION
+Apply series.
+.PP
+Apply a series locally using the 'git-am' command. Any additional ARGS
+provided will be passed to the 'git-am' command.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-series-download.1 new/git-pw-1.7.0/man/git-pw-series-download.1
--- old/git-pw-1.5.1/man/git-pw-series-download.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-series-download.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,12 @@
+.TH "GIT-PW SERIES DOWNLOAD" "1" "21-Sep-2019" "1.7.0" "git-pw series download Manual"
+.SH NAME
+git-pw\-series\-download \- Download series in mbox format.
+.SH SYNOPSIS
+.B git-pw series download
+[OPTIONS] SERIES_ID [OUTPUT]
+.SH DESCRIPTION
+Download series in mbox format.
+.PP
+Download a series but do not apply it. ``OUTPUT`` is optional and can be an
+output path or ``-`` to output to ``stdout``. If ``OUTPUT`` is not
+provided, the output path will be automatically chosen.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-series-list.1 new/git-pw-1.7.0/man/git-pw-series-list.1
--- old/git-pw-1.5.1/man/git-pw-series-list.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-series-list.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,29 @@
+.TH "GIT-PW SERIES LIST" "1" "21-Sep-2019" "1.7.0" "git-pw series list Manual"
+.SH NAME
+git-pw\-series\-list \- List series.
+.SH SYNOPSIS
+.B git-pw series list
+[OPTIONS] [NAME]
+.SH DESCRIPTION
+List series.
+.PP
+List series on the Patchwork instance.
+.SH OPTIONS
+.TP
+\fB\-\-submitter\fP SUBMITTER
+Show only series by these submitters. Should be an email, name or ID.
+.TP
+\fB\-\-sort\fP FIELD
+Sort output on given field.
+.TP
+\fB\-\-page\fP PAGE
+Page to retrieve items from. This is influenced by the size of LIMIT.
+.TP
+\fB\-\-limit\fP LIMIT
+Maximum number of items to show.
+.TP
+\fB\-c,\fP \-\-column COLUMN
+Columns to be included in output.
+.TP
+\fB\-f,\fP \-\-format [simple|table|csv]
+Output format. Defaults to the value of 'git config pw.format' else 'table'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-series-show.1 new/git-pw-1.7.0/man/git-pw-series-show.1
--- old/git-pw-1.5.1/man/git-pw-series-show.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-series-show.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,14 @@
+.TH "GIT-PW SERIES SHOW" "1" "21-Sep-2019" "1.7.0" "git-pw series show Manual"
+.SH NAME
+git-pw\-series\-show \- Show information about series.
+.SH SYNOPSIS
+.B git-pw series show
+[OPTIONS] SERIES_ID
+.SH DESCRIPTION
+Show information about series.
+.PP
+Retrieve Patchwork metadata for a series.
+.SH OPTIONS
+.TP
+\fB\-f,\fP \-\-format [simple|table|csv]
+Output format. Defaults to the value of 'git config pw.format' else 'table'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw-series.1 new/git-pw-1.7.0/man/git-pw-series.1
--- old/git-pw-1.5.1/man/git-pw-series.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw-series.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,31 @@
+.TH "GIT-PW SERIES" "1" "21-Sep-2019" "1.7.0" "git-pw series Manual"
+.SH NAME
+git-pw\-series \- Interact with series.
+.SH SYNOPSIS
+.B git-pw series
+[OPTIONS] COMMAND [ARGS]...
+.SH DESCRIPTION
+Interact with series.
+.PP
+Series are groups of patches, along with an optional cover letter.
+Series are mostly dumb containers, though they also contain some
+metadata themselves, such as a version (which is inherited by the
+patches and cover letter) and a count of the number of patches
+found in the series.
+.SH COMMANDS
+.PP
+\fBapply\fP
+ Apply series.
+ See \fBgit-pw series-apply(1)\fP for full documentation on the \fBapply\fP command.
+.PP
+\fBshow\fP
+ Show information about series.
+ See \fBgit-pw series-show(1)\fP for full documentation on the \fBshow\fP command.
+.PP
+\fBdownload\fP
+ Download series in mbox format.
+ See \fBgit-pw series-download(1)\fP for full documentation on the \fBdownload\fP command.
+.PP
+\fBlist\fP
+ List series.
+ See \fBgit-pw series-list(1)\fP for full documentation on the \fBlist\fP command.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/man/git-pw.1 new/git-pw-1.7.0/man/git-pw.1
--- old/git-pw-1.5.1/man/git-pw.1 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/man/git-pw.1 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,64 @@
+.TH "GIT-PW" "1" "21-Sep-2019" "1.7.0" "git-pw Manual"
+.SH NAME
+git-pw \- git-pw is a tool for integrating Git with...
+.SH SYNOPSIS
+.B git-pw
+[OPTIONS] COMMAND [ARGS]...
+.SH DESCRIPTION
+git-pw is a tool for integrating Git with Patchwork.
+.PP
+git-pw can interact with individual patches, complete patch series, and
+customized bundles. The three major subcommands are *patch*, *bundle*,
+and *series*.
+.PP
+The git-pw utility is a wrapper which makes REST calls to the Patchwork
+service. To use git-pw, you must set up your environment by configuring
+your Patchwork server URL and either an API token or a username and
+password. To configure the server URL, run::
+.PP
+ git config pw.server http://pw.server.com/path/to/patchwork
+.PP
+To configure the token, run::
+.PP
+ git config pw.token token
+.PP
+Alternatively, you can pass these options via command line parameters or
+environment variables.
+.PP
+For more information on any of the commands, simply pass ``--help`` to the
+appropriate command.
+.SH OPTIONS
+.TP
+\fB\-\-debug\fP
+Output more information about what's going on.
+.TP
+\fB\-\-token\fP TOKEN
+Authentication token. Defaults to the value of 'git config pw.token'.
+.TP
+\fB\-\-username\fP USERNAME
+Authentication username. Defaults to the value of 'git config pw.username'.
+.TP
+\fB\-\-password\fP PASSWORD
+Authentication password. Defaults to the value of 'git config pw.password'.
+.TP
+\fB\-\-server\fP SERVER
+Patchwork server address/hostname. Defaults to the value of 'git config pw.server'.
+.TP
+\fB\-\-project\fP PROJECT
+Patchwork project. Defaults the value of 'git config pw.project'.
+.TP
+\fB\-\-version\fP
+Show the version and exit.
+.SH COMMANDS
+.PP
+\fBpatch\fP
+ Interact with patches.
+ See \fBgit-pw-patch(1)\fP for full documentation on the \fBpatch\fP command.
+.PP
+\fBseries\fP
+ Interact with series.
+ See \fBgit-pw-series(1)\fP for full documentation on the \fBseries\fP command.
+.PP
+\fBbundle\fP
+ Interact with bundles.
+ See \fBgit-pw-bundle(1)\fP for full documentation on the \fBbundle\fP command.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/releasenotes/notes/drop-pypy-support-f670deb05ef527fe.yaml new/git-pw-1.7.0/releasenotes/notes/drop-pypy-support-f670deb05ef527fe.yaml
--- old/git-pw-1.5.1/releasenotes/notes/drop-pypy-support-f670deb05ef527fe.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/releasenotes/notes/drop-pypy-support-f670deb05ef527fe.yaml 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ *git-pw* no longer officially supports PyPy.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/releasenotes/notes/drop-python34-support-5e01360fff605972.yaml new/git-pw-1.7.0/releasenotes/notes/drop-python34-support-5e01360fff605972.yaml
--- old/git-pw-1.5.1/releasenotes/notes/drop-python34-support-5e01360fff605972.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/releasenotes/notes/drop-python34-support-5e01360fff605972.yaml 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ Support for Python 3.4 has been dropped.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/releasenotes/notes/issue-43-c2c166e1fa23fe76.yaml new/git-pw-1.7.0/releasenotes/notes/issue-43-c2c166e1fa23fe76.yaml
--- old/git-pw-1.5.1/releasenotes/notes/issue-43-c2c166e1fa23fe76.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/releasenotes/notes/issue-43-c2c166e1fa23fe76.yaml 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ An issue that resulted in invalid output on Python 3 when a patch or series
+ was not successfully applied has been resolved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/releasenotes/notes/issue-44-66b78577e9534f16.yaml new/git-pw-1.7.0/releasenotes/notes/issue-44-66b78577e9534f16.yaml
--- old/git-pw-1.5.1/releasenotes/notes/issue-44-66b78577e9534f16.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/releasenotes/notes/issue-44-66b78577e9534f16.yaml 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ Downloaded patches, series and bundles are now saved to a temporary
+ directory instead of the current directory.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/releasenotes/notes/issue-46-50933643cd5c8db0.yaml new/git-pw-1.7.0/releasenotes/notes/issue-46-50933643cd5c8db0.yaml
--- old/git-pw-1.5.1/releasenotes/notes/issue-46-50933643cd5c8db0.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/releasenotes/notes/issue-46-50933643cd5c8db0.yaml 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ CSV-formatted output is now quoted by default.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/releasenotes/notes/issue-47-a9ac87642050d289.yaml new/git-pw-1.7.0/releasenotes/notes/issue-47-a9ac87642050d289.yaml
--- old/git-pw-1.5.1/releasenotes/notes/issue-47-a9ac87642050d289.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/releasenotes/notes/issue-47-a9ac87642050d289.yaml 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Resolved an issue that prevented viewing patch diffs/mboxes in stdout on
+ Python 3.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/releasenotes/notes/issue-48-694495f722119fed.yaml new/git-pw-1.7.0/releasenotes/notes/issue-48-694495f722119fed.yaml
--- old/git-pw-1.5.1/releasenotes/notes/issue-48-694495f722119fed.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/releasenotes/notes/issue-48-694495f722119fed.yaml 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ An info-level log is now correctly skipped when downloading patches,
+ bundles or series to ``STDOUT`` on Python 3.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/releasenotes/notes/issue-49-865c4f1657b97fce.yaml new/git-pw-1.7.0/releasenotes/notes/issue-49-865c4f1657b97fce.yaml
--- old/git-pw-1.5.1/releasenotes/notes/issue-49-865c4f1657b97fce.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/git-pw-1.7.0/releasenotes/notes/issue-49-865c4f1657b97fce.yaml 2019-09-22 00:38:01.000000000 +0200
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ An issue with the unicode data when using the CSV format on Python 2.7 has
+ been resolved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/requirements.txt new/git-pw-1.7.0/requirements.txt
--- old/git-pw-1.5.1/requirements.txt 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/requirements.txt 2019-09-22 00:38:01.000000000 +0200
@@ -2,3 +2,4 @@
requests>2.0,<3.0
tabulate>=0.8
arrow>=0.10
+six>=1.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/setup.cfg new/git-pw-1.7.0/setup.cfg
--- old/git-pw-1.5.1/setup.cfg 2018-12-17 12:11:51.000000000 +0100
+++ new/git-pw-1.7.0/setup.cfg 2019-09-22 00:38:23.000000000 +0200
@@ -3,9 +3,13 @@
summary = Git-Patchwork integration tool
description-file = README.rst
license = MIT License
+license_file = LICENSE
classifiers =
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
+ Programming Language :: Python :: 3.5
+ Programming Language :: Python :: 3.6
+ Programming Language :: Python :: 3.7
Programming Language :: Python
Development Status :: 4 - Beta
Environment :: Console
@@ -15,9 +19,13 @@
Operating System :: OS Independent
keywords = git patchwork
author = Stephen Finucane
-author-email = stephen(a)that.guru
-home-page = https://git-pw.readthedocs.io/
-project-url = https://that.guru/
+author_email = stephen(a)that.guru
+url = https://github.com/getpatchwork/git-pw
+project_urls =
+ Bug Tracker = https://github.com/getpatchwork/git-pw/issues
+ Source Code = https://github.com/getpatchwork/git-pw
+ Documentation = https://git-pw.readthedocs.io
+python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
[files]
packages =
@@ -27,13 +35,7 @@
console_scripts =
git-pw = git_pw.shell:cli
-[build_sphinx]
-all-files = 1
-warning-is-error = 1
-source-dir = docs
-build-dir = docs/_build
-
-[wheel]
+[bist_wheel]
universal = 1
[egg_info]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/test-requirements.txt new/git-pw-1.7.0/test-requirements.txt
--- old/git-pw-1.5.1/test-requirements.txt 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/test-requirements.txt 2019-09-22 00:38:01.000000000 +0200
@@ -1,2 +1,4 @@
-mock==2.0.0
-pytest>3.6,<4.0
+mock~=3.0.0
+pytest>=3.0,<6.0;python_version>='3.5'
+pytest>=3.0,<5.0;python_version=='2.7'
+pytest-cov~=2.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/tests/test_bundle.py new/git-pw-1.7.0/tests/test_bundle.py
--- old/git-pw-1.5.1/tests/test_bundle.py 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/tests/test_bundle.py 2019-09-22 00:38:01.000000000 +0200
@@ -117,7 +117,7 @@
class MockResponse(object):
@property
- def text(self):
+ def content(self):
return b'alpha-beta'
rsp = {'mbox': 'http://example.com/api/patches/123/mbox/'}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/tests/test_patch.py new/git-pw-1.7.0/tests/test_patch.py
--- old/git-pw-1.5.1/tests/test_patch.py 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/tests/test_patch.py 2019-09-22 00:38:01.000000000 +0200
@@ -115,7 +115,7 @@
class MockResponse(object):
@property
- def text(self):
+ def content(self):
return b'alpha-beta'
rsp = {'mbox': 'hello, world', 'diff': 'test'}
@@ -392,7 +392,8 @@
assert mock_log.warning.called
@mock.patch('git_pw.api.LOG')
- def test_list_api_v1_1(self, mock_log, mock_echo, mock_index, mock_version):
+ def test_list_api_v1_1(self, mock_log, mock_echo, mock_index,
+ mock_version):
"""Validate behavior with API v1.1."""
mock_version.return_value = (1, 1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/tests/test_series.py new/git-pw-1.7.0/tests/test_series.py
--- old/git-pw-1.5.1/tests/test_series.py 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/tests/test_series.py 2019-09-22 00:38:01.000000000 +0200
@@ -68,7 +68,7 @@
class MockResponse(object):
@property
- def text(self):
+ def content(self):
return b'alpha-beta'
rsp = {'mbox': 'http://example.com/api/patches/123/mbox/'}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/tests/test_utils.py new/git-pw-1.7.0/tests/test_utils.py
--- old/git-pw-1.5.1/tests/test_utils.py 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/tests/test_utils.py 2019-09-22 00:38:01.000000000 +0200
@@ -1,6 +1,9 @@
+# -*- coding: utf-8 -*-
+
"""Unit tests for ``git_pw/utils.py``."""
import subprocess
+import textwrap
import os
import mock
@@ -78,3 +81,59 @@
mock_config.assert_called_once_with('core.parser')
mock_tabulate.assert_called_once_with('test', ('foo',), None)
mock_inner.assert_called_once_with('less', mock_tabulate.return_value)
+
+
+def _test_tabulate(fmt):
+ output = [(b'foo', 'bar', u'baz', '😀', None, 1)]
+ headers = ('col1', 'colb', 'colIII', 'colX', 'colY', 'colZ')
+
+ result = utils._tabulate(output, headers, fmt)
+
+ return output, headers, result
+
+
+(a)mock.patch.object(utils, 'tabulate')
+def test_tabulate_table(mock_tabulate):
+ output, headers, result = _test_tabulate('table')
+
+ mock_tabulate.assert_called_once_with(output, headers, tablefmt='psql')
+ assert result == mock_tabulate.return_value
+
+
+(a)mock.patch.object(utils, 'tabulate')
+def test_tabulate_simple(mock_tabulate):
+ output, headers, result = _test_tabulate('simple')
+
+ mock_tabulate.assert_called_once_with(output, headers, tablefmt='simple')
+ assert result == mock_tabulate.return_value
+
+
+(a)mock.patch.object(utils, 'tabulate')
+def test_tabulate_csv(mock_tabulate):
+ output, headers, result = _test_tabulate('csv')
+
+ mock_tabulate.assert_not_called()
+ assert result == textwrap.dedent("""\
+ "col1","colb","colIII","colX","colY","colZ"
+ "foo","bar","baz","😀","","1"
+ """)
+
+
+(a)mock.patch.object(utils, 'git_config', return_value='simple')
+(a)mock.patch.object(utils, 'tabulate')
+def test_tabulate_git_config(mock_tabulate, mock_git_config):
+ output, headers, result = _test_tabulate(None)
+
+ mock_git_config.assert_called_once_with('pw.format')
+ mock_tabulate.assert_called_once_with(output, headers, tablefmt='simple')
+ assert result == mock_tabulate.return_value
+
+
+(a)mock.patch.object(utils, 'git_config', return_value='')
+(a)mock.patch.object(utils, 'tabulate')
+def test_tabulate_default(mock_tabulate, mock_git_config):
+ output, headers, result = _test_tabulate(None)
+
+ mock_git_config.assert_called_once_with('pw.format')
+ mock_tabulate.assert_called_once_with(output, headers, tablefmt='psql')
+ assert result == mock_tabulate.return_value
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/git-pw-1.5.1/tox.ini new/git-pw-1.7.0/tox.ini
--- old/git-pw-1.5.1/tox.ini 2018-12-17 12:11:28.000000000 +0100
+++ new/git-pw-1.7.0/tox.ini 2019-09-22 00:38:01.000000000 +0200
@@ -1,49 +1,59 @@
[tox]
-minversion = 2.0
-envlist = pep8,mypy,py{27,34,35,36,py}
+minversion = 3.1
+envlist = pep8,mypy,clean,py{27,35,36,37},report
+ignore_basepython_conflict = true
[testenv]
+basepython = python3
deps =
- -r{toxinidir}/requirements.txt
- -r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/test-requirements.txt
commands =
- pytest -Wall {posargs}
+ pytest -Wall --cov=git_pw --cov-report term-missing {posargs}
[testenv:pep8]
+skip_install = true
deps =
- flake8
+ flake8
commands =
- flake8 {posargs} git_pw
+ flake8 {posargs:git_pw tests}
[testenv:mypy]
deps=
- mypy
+ mypy
commands=
- mypy {posargs:--ignore-missing-imports --follow-imports=skip} git_pw
+ mypy {posargs:--ignore-missing-imports --follow-imports=skip} git_pw
-[testenv:docs]
+[testenv:report]
+skip_install = true
deps =
- -r{toxinidir}/docs/requirements.txt
+ coverage
commands =
- sphinx-build {posargs:-E -W} docs docs/_build/html
+ coverage report
+ coverage html
-[testenv:man]
+[testenv:clean]
+envdir = {toxworkdir}/report
+skip_install = true
deps =
- -r{toxinidir}/docs/requirements.txt
+ {[testenv:report]deps}
commands =
- python setup.py --command-packages=click_man.commands man_pages
+ coverage erase
-[testenv:release]
+[testenv:docs]
+deps =
+ -r{toxinidir}/docs/requirements.txt
+commands =
+ sphinx-build {posargs:-E -W} docs docs/_build/html
+
+[testenv:man]
deps =
- -r{toxinidir}/requirements.txt
- twine
+ click-man~=0.3.0
commands =
- python setup.py -q bdist_wheel sdist
- twine upload --skip-existing {toxinidir}/dist/*
+ click-man git-pw
[flake8]
-show-source = True
+show-source = true
[travis]
python =
- 3.6: py36, pep8, mypy
+ 3.7: py37, pep8, mypy
1
0
Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2019-12-02 11:28:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11-server.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server"
Mon Dec 2 11:28:17 2019 rev:375 rq:750543 version:1.20.6+0
Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2019-10-25 18:38:30.503691951 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new.4691/xorg-x11-server.changes 2019-12-02 11:30:15.562590165 +0100
@@ -1,0 +2,16 @@
+Sat Nov 23 13:21:01 UTC 2019 - bjorn.lie(a)gmail.com
+
+- Update to version 1.20.6+0:
+ * xfree86: Test presence of isastream()
+ * present/wnmd: Relax assertion on CRTC on abort_vblank()
+ * os: Don't crash in AttendClient if the client is gone
+ * dix: Call SourceValidate before GetImage
+ * mi: Add a default no-op miSourceValidate
+ * compiler.h: Do not include sys/io.h on ARM with glibc
+ * xfree86: Call ScreenInit for protocol screens before GPU
+ screens
+ * modesetting:
+ - Implement ms_covering_randr_crtc() for ms_present_get_crtc()
+ - Fix ms_covering_crtc() segfault with non-xf86Crtc slave
+
+-------------------------------------------------------------------
Old:
----
xserver-1.20.5+24.tar.xz
New:
----
xserver-1.20.6+0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.xLGAx2/_old 2019-12-02 11:30:19.282588444 +0100
+++ /var/tmp/diff_new_pack.xLGAx2/_new 2019-12-02 11:30:19.286588442 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-server
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -46,9 +46,9 @@
%endif
Name: xorg-x11-server
-Version: 1.20.5+24
+Version: 1.20.6+0
Release: 0
-Url: http://xorg.freedesktop.org/
+URL: http://xorg.freedesktop.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: X
++++++ _service ++++++
--- /var/tmp/diff_new_pack.xLGAx2/_old 2019-12-02 11:30:19.390588394 +0100
+++ /var/tmp/diff_new_pack.xLGAx2/_new 2019-12-02 11:30:19.394588392 +0100
@@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="url">https://gitlab.freedesktop.org/xorg/xserver.git</param>
<param name="scm">git</param>
- <param name="revision">b6ee04e7</param>
+ <param name="revision">6b3fafa9</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">xorgserver(.*)</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.xLGAx2/_old 2019-12-02 11:30:19.406588386 +0100
+++ /var/tmp/diff_new_pack.xLGAx2/_new 2019-12-02 11:30:19.410588384 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.freedesktop.org/xorg/xserver.git</param>
- <param name="changesrevision">b6ee04e774af1fc2e2560583c95dfac688494c2a</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">6b3fafa9bfa94b9b04a1a44dc52afb7c4bc250ce</param></service></servicedata>
\ No newline at end of file
++++++ xserver-1.20.5+24.tar.xz -> xserver-1.20.6+0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/Xext/panoramiXprocs.c new/xserver-1.20.6+0/Xext/panoramiXprocs.c
--- old/xserver-1.20.5+24/Xext/panoramiXprocs.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/Xext/panoramiXprocs.c 2019-11-22 23:56:38.000000000 +0100
@@ -1105,6 +1105,10 @@
DixGetAttrAccess);
if (rc != Success)
return rc;
+ drawables[j]->pScreen->SourceValidate(drawables[j], 0, 0,
+ drawables[j]->width,
+ drawables[j]->height,
+ IncludeInferiors);
}
pitch = PixmapBytePad(width, drawables[0]->depth);
@@ -2007,6 +2011,12 @@
if (rc != Success)
return rc;
}
+ FOR_NSCREENS_FORWARD(i) {
+ drawables[i]->pScreen->SourceValidate(drawables[i], 0, 0,
+ drawables[i]->width,
+ drawables[i]->height,
+ IncludeInferiors);
+ }
xgi = (xGetImageReply) {
.type = X_Reply,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/Xext/shm.c new/xserver-1.20.6+0/Xext/shm.c
--- old/xserver-1.20.5+24/Xext/shm.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/Xext/shm.c 2019-11-22 23:56:38.000000000 +0100
@@ -35,6 +35,9 @@
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/shm.h>
+#ifdef HAVE_MEMFD_CREATE
+#include <sys/mman.h>
+#endif
#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -652,6 +655,9 @@
visual = wVisual(((WindowPtr) pDraw));
if (pDraw->type == DRAWABLE_WINDOW)
pVisibleRegion = &((WindowPtr) pDraw)->borderClip;
+ pDraw->pScreen->SourceValidate(pDraw, stuff->x, stuff->y,
+ stuff->width, stuff->height,
+ IncludeInferiors);
}
else {
if (stuff->x < 0 ||
@@ -860,6 +866,12 @@
return rc;
}
}
+ FOR_NSCREENS_FORWARD(i) {
+ drawables[i]->pScreen->SourceValidate(drawables[i], 0, 0,
+ drawables[i]->width,
+ drawables[i]->height,
+ IncludeInferiors);
+ }
xgi = (xShmGetImageReply) {
.type = X_Reply,
@@ -1194,36 +1206,55 @@
static int
shm_tmpfile(void)
{
-#ifdef SHMDIR
- int fd;
- char template[] = SHMDIR "/shmfd-XXXXXX";
+ const char *shmdirs[] = {
+ "/run/shm",
+ "/var/tmp",
+ "/tmp",
+ };
+ int fd;
+
+#ifdef HAVE_MEMFD_CREATE
+ fd = memfd_create("xorg", MFD_CLOEXEC|MFD_ALLOW_SEALING);
+ if (fd != -1) {
+ fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK);
+ DebugF ("Using memfd_create\n");
+ return fd;
+ }
+#endif
+
#ifdef O_TMPFILE
- fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
- if (fd >= 0) {
- DebugF ("Using O_TMPFILE\n");
- return fd;
- }
- ErrorF ("Not using O_TMPFILE\n");
+ for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) {
+ fd = open(shmdirs[i], O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
+ if (fd >= 0) {
+ DebugF ("Using O_TMPFILE\n");
+ return fd;
+ }
+ }
+ ErrorF ("Not using O_TMPFILE\n");
#endif
+
+ for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) {
+ char template[PATH_MAX];
+ snprintf(template, ARRAY_SIZE(template), "%s/shmfd-XXXXXX", shmdirs[i]);
#ifdef HAVE_MKOSTEMP
- fd = mkostemp(template, O_CLOEXEC);
+ fd = mkostemp(template, O_CLOEXEC);
#else
- fd = mkstemp(template);
+ fd = mkstemp(template);
#endif
- if (fd < 0)
- return -1;
- unlink(template);
+ if (fd < 0)
+ continue;
+ unlink(template);
#ifndef HAVE_MKOSTEMP
- int flags = fcntl(fd, F_GETFD);
- if (flags != -1) {
- flags |= FD_CLOEXEC;
- (void) fcntl(fd, F_SETFD, &flags);
- }
-#endif
- return fd;
-#else
- return -1;
+ int flags = fcntl(fd, F_GETFD);
+ if (flags != -1) {
+ flags |= FD_CLOEXEC;
+ (void) fcntl(fd, F_SETFD, &flags);
+ }
#endif
+ return fd;
+ }
+
+ return -1;
}
static int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/Xext/sleepuntil.c new/xserver-1.20.6+0/Xext/sleepuntil.c
--- old/xserver-1.20.5+24/Xext/sleepuntil.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/Xext/sleepuntil.c 2019-11-22 23:56:38.000000000 +0100
@@ -125,8 +125,7 @@
static void
ClientAwaken(ClientPtr client, void *closure)
{
- if (!client->clientGone)
- AttendClient(client);
+ AttendClient(client);
}
static int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/configure.ac new/xserver-1.20.6+0/configure.ac
--- old/xserver-1.20.5+24/configure.ac 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/configure.ac 2019-11-22 23:56:38.000000000 +0100
@@ -26,9 +26,9 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.20.5, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
-RELEASE_DATE="2019-05-30"
-RELEASE_NAME="Red Lentil Dal"
+AC_INIT([xorg-server], 1.20.6, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server)
+RELEASE_DATE="2019-11-22"
+RELEASE_NAME="Enchiladas de Queso"
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
@@ -159,7 +159,7 @@
AC_CHECK_FUNCS([backtrace geteuid getuid issetugid getresuid \
getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \
mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \
- walkcontext setitimer poll epoll_create1 mkostemp])
+ walkcontext setitimer poll epoll_create1 mkostemp memfd_create isastream])
AC_CONFIG_LIBOBJ_DIR([os])
AC_REPLACE_FUNCS([reallocarray strcasecmp strcasestr strlcat strlcpy strndup\
timingsafe_memcmp])
@@ -765,7 +765,7 @@
LIBDRM="libdrm >= 2.4.89"
LIBEGL="egl"
LIBGBM="gbm >= 10.2.0"
-LIBGL="gl >= 7.1.0"
+LIBGL="gl >= 1.2"
LIBXEXT="xext >= 1.0.99.4"
LIBXFONT="xfont2 >= 2.0.0"
LIBXI="xi >= 1.2.99.1"
@@ -1116,55 +1116,12 @@
yes,yes | auto,yes)
AC_DEFINE(DRI2, 1, [Build DRI2 extension])
DRI2=yes
- LIBGL="gl >= 9.2.0"
+ LIBGL="gl >= 1.2"
SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
;;
esac
AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
-dnl
-dnl Locate a suitable tmp file system for creating shared memeory files
-dnl
-
-AC_ARG_WITH(shared-memory-dir, AS_HELP_STRING([--with-shared-memory-dir=PATH], [Path to directory in a world-writable temporary directory for anonymous shared memory (default: auto)]),
-[],
-[with_shared_memory_dir=yes])
-
-shmdirs="/run/shm /var/tmp /tmp"
-
-case x"$with_shared_memory_dir" in
-xyes)
- for dir in $shmdirs; do
- case x"$with_shared_memory_dir" in
- xyes)
- echo Checking temp dir "$dir"
- if test -d "$dir"; then
- with_shared_memory_dir="$dir"
- fi
- ;;
- esac
- done
- ;;
-x/*)
- ;;
-xno)
- ;;
-*)
- AC_MSG_ERROR([Invalid directory specified for --with-shared-memory-dir: $with_shared_memory_dir])
- ;;
-esac
-
-case x"$with_shared_memory_dir" in
-xyes)
- AC_MSG_ERROR([No directory found for shared memory temp files.])
- ;;
-xno)
- ;;
-*)
- AC_DEFINE_UNQUOTED(SHMDIR, ["$with_shared_memory_dir"], [Directory for shared memory temp files])
- ;;
-esac
-
AC_ARG_ENABLE(xtrans-send-fds, AS_HELP_STRING([--disable-xtrans-send-fds], [Use Xtrans support for fd passing (default: auto)]), [XTRANS_SEND_FDS=$enableval], [XTRANS_SEND_FDS=auto])
case "x$XTRANS_SEND_FDS" in
@@ -1281,7 +1238,7 @@
AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes)
-if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then
+if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$XORG" = xyes; then
if test "x$DRM" = xyes; then
AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support])
PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/dix/dispatch.c new/xserver-1.20.6+0/dix/dispatch.c
--- old/xserver-1.20.5+24/dix/dispatch.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/dix/dispatch.c 2019-11-22 23:56:38.000000000 +0100
@@ -2196,8 +2196,11 @@
return BadAlloc;
WriteReplyToClient(client, sizeof(xGetImageReply), &xgi);
- if (pDraw->type == DRAWABLE_WINDOW)
+ if (pDraw->type == DRAWABLE_WINDOW) {
pVisibleRegion = &((WindowPtr) pDraw)->borderClip;
+ pDraw->pScreen->SourceValidate(pDraw, x, y, width, height,
+ IncludeInferiors);
+ }
if (linesPerBuf == 0) {
/* nothing to do */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/dix/dixutils.c new/xserver-1.20.6+0/dix/dixutils.c
--- old/xserver-1.20.5+24/dix/dixutils.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/dix/dixutils.c 2019-11-22 23:56:38.000000000 +0100
@@ -662,14 +662,7 @@
if (q->client == client) {
*prev = q->next;
free(q);
- if (client->clientGone)
- /* Oops -- new zombie cleanup code ensures this only
- * happens from inside CloseDownClient; don't want to
- * recurse here...
- */
- /* CloseDownClient(client) */ ;
- else
- AttendClient(client);
+ AttendClient(client);
break;
}
prev = &q->next;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/dix/events.c new/xserver-1.20.6+0/dix/events.c
--- old/xserver-1.20.5+24/dix/events.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/dix/events.c 2019-11-22 23:56:38.000000000 +0100
@@ -597,6 +597,8 @@
int x, y, off_x, off_y, i;
+ assert(!noPanoramiXExtension);
+
if (!XineramaSetWindowPntrs(pDev, pWin))
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/dix/pixmap.c new/xserver-1.20.6+0/dix/pixmap.c
--- old/xserver-1.20.5+24/dix/pixmap.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/dix/pixmap.c 2019-11-22 23:56:38.000000000 +0100
@@ -32,6 +32,7 @@
#include <X11/X.h>
#include "scrnintstr.h"
+#include "mi.h"
#include "misc.h"
#include "os.h"
#include "windowstr.h"
@@ -395,7 +396,7 @@
* leaves the software cursor in place
*/
SourceValidate = pScreen->SourceValidate;
- pScreen->SourceValidate = NULL;
+ pScreen->SourceValidate = miSourceValidate;
RegionTranslate(&pixregion, dirty->x, dirty->y);
RegionIntersect(&pixregion, &pixregion, region);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/doc/Xserver-spec.xml new/xserver-1.20.6+0/doc/Xserver-spec.xml
--- old/xserver-1.20.5+24/doc/Xserver-spec.xml 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/doc/Xserver-spec.xml 2019-11-22 23:56:38.000000000 +0100
@@ -2930,8 +2930,8 @@
unsigned int subWindowMode;
</programlisting></blockquote>
-SourceValidate should be called by CopyArea/CopyPlane primitives when
-the SourceValidate function pointer in the screen is non-null. If you know that
+SourceValidate should be called by any primitive that reads from pDrawable.
+If you know that
you will never need SourceValidate, you can avoid this check. Currently,
SourceValidate is used by the mi software cursor code to remove the cursor
from the screen when the source rectangle overlaps the cursor position.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/glamor/glamor_egl.h new/xserver-1.20.6+0/glamor/glamor_egl.h
--- old/xserver-1.20.5+24/glamor/glamor_egl.h 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/glamor/glamor_egl.h 2019-11-22 23:56:38.000000000 +0100
@@ -28,6 +28,7 @@
#define GLAMOR_EGL_H
#define MESA_EGL_NO_X11_HEADERS
+#define EGL_NO_X11
#include <epoxy/gl.h>
#include <epoxy/egl.h>
#include <glamor_egl_ext.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/glamor/glamor_priv.h new/xserver-1.20.6+0/glamor/glamor_priv.h
--- old/xserver-1.20.5+24/glamor/glamor_priv.h 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/glamor/glamor_priv.h 2019-11-22 23:56:38.000000000 +0100
@@ -40,6 +40,7 @@
#include <epoxy/gl.h>
#ifdef GLAMOR_HAS_GBM
#define MESA_EGL_NO_X11_HEADERS
+#define EGL_NO_X11
#include <epoxy/egl.h>
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/glx/glxdriswrast.c new/xserver-1.20.6+0/glx/glxdriswrast.c
--- old/xserver-1.20.5+24/glx/glxdriswrast.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/glx/glxdriswrast.c 2019-11-22 23:56:38.000000000 +0100
@@ -324,6 +324,7 @@
ScreenPtr pScreen = pDraw->pScreen;
__GLXcontext *cx = lastGLContext;
+ pScreen->SourceValidate(pDraw, x, y, w, h, IncludeInferiors);
pScreen->GetImage(pDraw, x, y, w, h, ZPixmap, ~0L, data);
if (cx != lastGLContext) {
lastGLContext = cx;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/glx/meson.build new/xserver-1.20.6+0/glx/meson.build
--- old/xserver-1.20.5+24/glx/meson.build 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/glx/meson.build 2019-11-22 23:56:38.000000000 +0100
@@ -39,7 +39,7 @@
common_dep,
dl_dep,
dependency('glproto', version: '>= 1.4.17'),
- dependency('gl', version: '>= 9.2.0'),
+ dependency('gl', version: '>= 1.2'),
],
c_args: [
glx_align64,
@@ -74,7 +74,7 @@
common_dep,
dl_dep,
dependency('glproto', version: '>= 1.4.17'),
- dependency('gl', version: '>= 9.2.0'),
+ dependency('gl', version: '>= 1.2'),
],
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xfree86/common/compiler.h new/xserver-1.20.6+0/hw/xfree86/common/compiler.h
--- old/xserver-1.20.5+24/hw/xfree86/common/compiler.h 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xfree86/common/compiler.h 2019-11-22 23:56:38.000000000 +0100
@@ -758,36 +758,6 @@
return xf86ReadMmio32Le((void *) ioBase, port);
}
-#elif defined(__arm__) && defined(__linux__)
-
-/* for Linux on ARM, we use the LIBC inx/outx routines */
-/* note that the appropriate setup via "ioperm" needs to be done */
-/* *before* any inx/outx is done. */
-
-#include <sys/io.h>
-
-static __inline__ void
-xf_outb(unsigned short port, unsigned char val)
-{
- outb(val, port);
-}
-
-static __inline__ void
-xf_outw(unsigned short port, unsigned short val)
-{
- outw(val, port);
-}
-
-static __inline__ void
-xf_outl(unsigned short port, unsigned int val)
-{
- outl(val, port);
-}
-
-#define outb xf_outb
-#define outw xf_outw
-#define outl xf_outl
-
#elif defined(__nds32__)
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xfree86/common/xf86Init.c new/xserver-1.20.6+0/hw/xfree86/common/xf86Init.c
--- old/xserver-1.20.5+24/hw/xfree86/common/xf86Init.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xfree86/common/xf86Init.c 2019-11-22 23:56:38.000000000 +0100
@@ -682,36 +682,6 @@
if (!dixRegisterPrivateKey(&xf86ScreenKeyRec, PRIVATE_SCREEN, 0))
FatalError("Cannot register DDX private keys");
- for (i = 0; i < xf86NumGPUScreens; i++) {
- ScrnInfoPtr pScrn = xf86GPUScreens[i];
- xf86VGAarbiterLock(pScrn);
-
- /*
- * Almost everything uses these defaults, and many of those that
- * don't, will wrap them.
- */
- pScrn->EnableDisableFBAccess = xf86EnableDisableFBAccess;
-#ifdef XFreeXDGA
- pScrn->SetDGAMode = xf86SetDGAMode;
-#endif
- pScrn->DPMSSet = NULL;
- pScrn->LoadPalette = NULL;
- pScrn->SetOverscan = NULL;
- pScrn->DriverFunc = NULL;
- pScrn->pScreen = NULL;
- scr_index = AddGPUScreen(xf86ScreenInit, argc, argv);
- xf86VGAarbiterUnlock(pScrn);
- if (scr_index == i) {
- dixSetPrivate(&screenInfo.gpuscreens[scr_index]->devPrivates,
- xf86ScreenKey, xf86GPUScreens[i]);
- pScrn->pScreen = screenInfo.gpuscreens[scr_index];
- /* The driver should set this, but make sure it is set anyway */
- pScrn->vtSema = TRUE;
- } else {
- FatalError("AddScreen/ScreenInit failed for gpu driver %d %d\n", i, scr_index);
- }
- }
-
for (i = 0; i < xf86NumScreens; i++) {
xf86VGAarbiterLock(xf86Screens[i]);
/*
@@ -767,6 +737,36 @@
xf86EnsureRANDR(xf86Screens[i]->pScreen);
}
+ for (i = 0; i < xf86NumGPUScreens; i++) {
+ ScrnInfoPtr pScrn = xf86GPUScreens[i];
+ xf86VGAarbiterLock(pScrn);
+
+ /*
+ * Almost everything uses these defaults, and many of those that
+ * don't, will wrap them.
+ */
+ pScrn->EnableDisableFBAccess = xf86EnableDisableFBAccess;
+#ifdef XFreeXDGA
+ pScrn->SetDGAMode = xf86SetDGAMode;
+#endif
+ pScrn->DPMSSet = NULL;
+ pScrn->LoadPalette = NULL;
+ pScrn->SetOverscan = NULL;
+ pScrn->DriverFunc = NULL;
+ pScrn->pScreen = NULL;
+ scr_index = AddGPUScreen(xf86ScreenInit, argc, argv);
+ xf86VGAarbiterUnlock(pScrn);
+ if (scr_index == i) {
+ dixSetPrivate(&screenInfo.gpuscreens[scr_index]->devPrivates,
+ xf86ScreenKey, xf86GPUScreens[i]);
+ pScrn->pScreen = screenInfo.gpuscreens[scr_index];
+ /* The driver should set this, but make sure it is set anyway */
+ pScrn->vtSema = TRUE;
+ } else {
+ FatalError("AddScreen/ScreenInit failed for gpu driver %d %d\n", i, scr_index);
+ }
+ }
+
for (i = 0; i < xf86NumGPUScreens; i++)
AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xfree86/drivers/modesetting/Makefile.am new/xserver-1.20.6+0/hw/xfree86/drivers/modesetting/Makefile.am
--- old/xserver-1.20.5+24/hw/xfree86/drivers/modesetting/Makefile.am 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xfree86/drivers/modesetting/Makefile.am 2019-11-22 23:56:38.000000000 +0100
@@ -24,6 +24,8 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+include $(top_srcdir)/manpages.am
+
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(LIBDRM_CFLAGS) $(UDEV_CFLAGS) $(CWARNFLAGS)
AM_CPPFLAGS = \
@@ -62,9 +64,3 @@
EXTRA_DIST = modesetting.man
CLEANFILES = $(driverman_DATA)
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
-
-.man.$(DRIVER_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xfree86/drivers/modesetting/driver.h new/xserver-1.20.6+0/hw/xfree86/drivers/modesetting/driver.h
--- old/xserver-1.20.5+24/hw/xfree86/drivers/modesetting/driver.h 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xfree86/drivers/modesetting/driver.h 2019-11-22 23:56:38.000000000 +0100
@@ -147,6 +147,7 @@
Bool ms_crtc_on(xf86CrtcPtr crtc);
xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr pDraw);
+RRCrtcPtr ms_randr_crtc_covering_drawable(DrawablePtr pDraw);
int ms_get_crtc_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xfree86/drivers/modesetting/present.c new/xserver-1.20.6+0/hw/xfree86/drivers/modesetting/present.c
--- old/xserver-1.20.5+24/hw/xfree86/drivers/modesetting/present.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xfree86/drivers/modesetting/present.c 2019-11-22 23:56:38.000000000 +0100
@@ -59,8 +59,7 @@
static RRCrtcPtr
ms_present_get_crtc(WindowPtr window)
{
- xf86CrtcPtr xf86_crtc = ms_dri2_crtc_covering_drawable(&window->drawable);
- return xf86_crtc ? xf86_crtc->randr_crtc : NULL;
+ return ms_randr_crtc_covering_drawable(&window->drawable);
}
static int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xfree86/drivers/modesetting/vblank.c new/xserver-1.20.6+0/hw/xfree86/drivers/modesetting/vblank.c
--- old/xserver-1.20.5+24/hw/xfree86/drivers/modesetting/vblank.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xfree86/drivers/modesetting/vblank.c 2019-11-22 23:56:38.000000000 +0100
@@ -77,6 +77,28 @@
crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0;
}
+static void ms_randr_crtc_box(RRCrtcPtr crtc, BoxPtr crtc_box)
+{
+ if (crtc->mode) {
+ crtc_box->x1 = crtc->x;
+ crtc_box->y1 = crtc->y;
+ switch (crtc->rotation) {
+ case RR_Rotate_0:
+ case RR_Rotate_180:
+ default:
+ crtc_box->x2 = crtc->x + crtc->mode->mode.width;
+ crtc_box->y2 = crtc->y + crtc->mode->mode.height;
+ break;
+ case RR_Rotate_90:
+ case RR_Rotate_270:
+ crtc_box->x2 = crtc->x + crtc->mode->mode.height;
+ crtc_box->y2 = crtc->y + crtc->mode->mode.width;
+ break;
+ }
+ } else
+ crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0;
+}
+
static int ms_box_area(BoxPtr box)
{
return (int)(box->x2 - box->x1) * (int)(box->y2 - box->y1);
@@ -91,12 +113,45 @@
}
/*
+ * Return the first output which is connected to an active CRTC on this screen.
+ *
+ * RRFirstOutput() will return an output from a slave screen if it is primary,
+ * which is not the behavior that ms_covering_crtc() wants.
+ */
+
+static RROutputPtr ms_first_output(ScreenPtr pScreen)
+{
+ rrScrPriv(pScreen);
+ RROutputPtr output;
+ int i, j;
+
+ if (!pScrPriv)
+ return NULL;
+
+ if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc &&
+ (pScrPriv->primaryOutput->pScreen == pScreen)) {
+ return pScrPriv->primaryOutput;
+ }
+
+ for (i = 0; i < pScrPriv->numCrtcs; i++) {
+ RRCrtcPtr crtc = pScrPriv->crtcs[i];
+
+ for (j = 0; j < pScrPriv->numOutputs; j++) {
+ output = pScrPriv->outputs[j];
+ if (output->crtc == crtc)
+ return output;
+ }
+ }
+ return NULL;
+}
+
+/*
* Return the crtc covering 'box'. If two crtcs cover a portion of
* 'box', then prefer the crtc with greater coverage.
*/
static xf86CrtcPtr
-ms_covering_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms)
+ms_covering_xf86_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
@@ -108,6 +163,10 @@
best_crtc = NULL;
best_coverage = 0;
+
+ if (!xf86_config)
+ return NULL;
+
for (c = 0; c < xf86_config->num_crtc; c++) {
crtc = xf86_config->crtc[c];
@@ -135,7 +194,7 @@
ScreenPtr slave;
if (dixPrivateKeyRegistered(rrPrivKey))
- primary_output = RRFirstOutput(scrn->pScreen);
+ primary_output = ms_first_output(scrn->pScreen);
if (!primary_output || !primary_output->crtc)
return NULL;
@@ -147,7 +206,74 @@
if (!slave->is_output_slave)
continue;
- if (ms_covering_crtc(slave, box, FALSE)) {
+ if (ms_covering_xf86_crtc(slave, box, FALSE)) {
+ /* The drawable is on a slave output, return primary crtc */
+ return crtc;
+ }
+ }
+ }
+
+ return best_crtc;
+}
+
+static RRCrtcPtr
+ms_covering_randr_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms)
+{
+ ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
+ rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen);
+ RRCrtcPtr crtc, best_crtc;
+ int coverage, best_coverage;
+ int c;
+ BoxRec crtc_box, cover_box;
+ Bool crtc_on;
+
+ best_crtc = NULL;
+ best_coverage = 0;
+
+ if (!pScrPriv)
+ return NULL;
+
+ for (c = 0; c < pScrPriv->numCrtcs; c++) {
+ crtc = pScrPriv->crtcs[c];
+
+ if (screen_is_ms) {
+ crtc_on = ms_crtc_on((xf86CrtcPtr) crtc->devPrivate);
+ } else {
+ crtc_on = !!crtc->mode;
+ }
+
+ /* If the CRTC is off, treat it as not covering */
+ if (!crtc_on)
+ continue;
+
+ ms_randr_crtc_box(crtc, &crtc_box);
+ ms_box_intersect(&cover_box, &crtc_box, box);
+ coverage = ms_box_area(&cover_box);
+ if (coverage > best_coverage) {
+ best_crtc = crtc;
+ best_coverage = coverage;
+ }
+ }
+
+ /* Fallback to primary crtc for drawable's on slave outputs */
+ if (best_crtc == NULL && !pScreen->isGPU) {
+ RROutputPtr primary_output = NULL;
+ ScreenPtr slave;
+
+ if (dixPrivateKeyRegistered(rrPrivKey))
+ primary_output = ms_first_output(scrn->pScreen);
+ if (!primary_output || !primary_output->crtc)
+ return NULL;
+
+ crtc = primary_output->crtc;
+ if (!ms_crtc_on((xf86CrtcPtr) crtc->devPrivate))
+ return NULL;
+
+ xorg_list_for_each_entry(slave, &pScreen->slave_list, slave_head) {
+ if (!slave->is_output_slave)
+ continue;
+
+ if (ms_covering_randr_crtc(slave, box, FALSE)) {
/* The drawable is on a slave output, return primary crtc */
return crtc;
}
@@ -168,7 +294,21 @@
box.x2 = box.x1 + pDraw->width;
box.y2 = box.y1 + pDraw->height;
- return ms_covering_crtc(pScreen, &box, TRUE);
+ return ms_covering_xf86_crtc(pScreen, &box, TRUE);
+}
+
+RRCrtcPtr
+ms_randr_crtc_covering_drawable(DrawablePtr pDraw)
+{
+ ScreenPtr pScreen = pDraw->pScreen;
+ BoxRec box;
+
+ box.x1 = pDraw->x;
+ box.y1 = pDraw->y;
+ box.x2 = box.x1 + pDraw->width;
+ box.y2 = box.y1 + pDraw->height;
+
+ return ms_covering_randr_crtc(pScreen, &box, TRUE);
}
static Bool
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xfree86/modes/xf86Rotate.c new/xserver-1.20.6+0/hw/xfree86/modes/xf86Rotate.c
--- old/xserver-1.20.5+24/hw/xfree86/modes/xf86Rotate.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xfree86/modes/xf86Rotate.c 2019-11-22 23:56:38.000000000 +0100
@@ -28,7 +28,7 @@
#include <stddef.h>
#include <string.h>
#include <stdio.h>
-
+#include "mi.h"
#include "xf86.h"
#include "xf86DDC.h"
#include "windowstr.h"
@@ -191,7 +191,7 @@
* leaves the software cursor in place
*/
SourceValidate = pScreen->SourceValidate;
- pScreen->SourceValidate = NULL;
+ pScreen->SourceValidate = miSourceValidate;
for (c = 0; c < xf86_config->num_crtc; c++) {
xf86CrtcPtr crtc = xf86_config->crtc[c];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xfree86/os-support/shared/sigio.c new/xserver-1.20.6+0/hw/xfree86/os-support/shared/sigio.c
--- old/xserver-1.20.5+24/hw/xfree86/os-support/shared/sigio.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xfree86/os-support/shared/sigio.c 2019-11-22 23:56:38.000000000 +0100
@@ -208,7 +208,8 @@
}
}
#endif
-#ifdef I_SETSIG /* System V Streams - used on Solaris for input devices */
+#if defined(I_SETSIG) && defined(HAVE_ISASTREAM)
+ /* System V Streams - used on Solaris for input devices */
if (!installed && isastream(fd)) {
if (ioctl(fd, I_SETSIG, S_INPUT | S_ERROR | S_HANGUP) == -1) {
xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG): %s\n",
@@ -279,7 +280,7 @@
#ifdef O_ASYNC
fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~O_ASYNC);
#endif
-#ifdef I_SETSIG
+#if defined(I_SETSIG) && defined(HAVE_ISASTREAM)
if (isastream(fd)) {
if (ioctl(fd, I_SETSIG, 0) == -1) {
xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG, 0): %s\n",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xnest/Screen.c new/xserver-1.20.6+0/hw/xnest/Screen.c
--- old/xserver-1.20.5+24/hw/xnest/Screen.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xnest/Screen.c 2019-11-22 23:56:38.000000000 +0100
@@ -263,7 +263,6 @@
pScreen->SaveScreen = xnestSaveScreen;
pScreen->GetImage = xnestGetImage;
pScreen->GetSpans = xnestGetSpans;
- pScreen->SourceValidate = NULL;
/* Window Procedures */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xwayland/xwayland-glamor-eglstream.c new/xserver-1.20.6+0/hw/xwayland/xwayland-glamor-eglstream.c
--- old/xserver-1.20.5+24/hw/xwayland/xwayland-glamor-eglstream.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xwayland/xwayland-glamor-eglstream.c 2019-11-22 23:56:38.000000000 +0100
@@ -33,6 +33,7 @@
#include "wayland-eglstream-controller-client-protocol.h"
#define MESA_EGL_NO_X11_HEADERS
+#define EGL_NO_X11
#include <glamor_egl.h>
#include <glamor.h>
#include <glamor_transform.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xwayland/xwayland-glamor-gbm.c new/xserver-1.20.6+0/hw/xwayland/xwayland-glamor-gbm.c
--- old/xserver-1.20.5+24/hw/xwayland/xwayland-glamor-gbm.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xwayland/xwayland-glamor-gbm.c 2019-11-22 23:56:38.000000000 +0100
@@ -36,6 +36,7 @@
#include <drm_fourcc.h>
#define MESA_EGL_NO_X11_HEADERS
+#define EGL_NO_X11
#include <gbm.h>
#include <glamor_egl.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/hw/xwayland/xwayland-glamor.c new/xserver-1.20.6+0/hw/xwayland/xwayland-glamor.c
--- old/xserver-1.20.5+24/hw/xwayland/xwayland-glamor.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/hw/xwayland/xwayland-glamor.c 2019-11-22 23:56:38.000000000 +0100
@@ -26,6 +26,7 @@
#include "xwayland.h"
#define MESA_EGL_NO_X11_HEADERS
+#define EGL_NO_X11
#include <glamor_egl.h>
#include <glamor.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/include/dix-config.h.in new/xserver-1.20.6+0/include/dix-config.h.in
--- old/xserver-1.20.5+24/include/dix-config.h.in 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/include/dix-config.h.in 2019-11-22 23:56:38.000000000 +0100
@@ -134,6 +134,9 @@
/* Define to 1 if you have the <linux/fb.h> header file. */
#undef HAVE_LINUX_FB_H
+/* Define to 1 if you have the `memfd_create' function. */
+#undef HAVE_MEMFD_CREATE
+
/* Define to 1 if you have the `mkostemp' function. */
#undef HAVE_MKOSTEMP
@@ -458,9 +461,6 @@
/* Wrap SIGBUS to catch MIT-SHM faults */
#undef BUSFAULT
-/* Directory for shared memory temp files */
-#undef SHMDIR
-
/* Don't let Xdefs.h define 'pointer' */
#define _XTYPEDEF_POINTER 1
@@ -515,4 +515,7 @@
/* Have epoll_create1() */
#undef HAVE_EPOLL_CREATE1
+/* Have isastream */
+#undef HAVE_ISASTREAM
+
#endif /* _DIX_CONFIG_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/include/meson.build new/xserver-1.20.6+0/include/meson.build
--- old/xserver-1.20.5+24/include/meson.build 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/include/meson.build 2019-11-22 23:56:38.000000000 +0100
@@ -70,11 +70,6 @@
conf_data.set('NEED_DBUS', build_systemd_logind or build_hal)
conf_data.set('CONFIG_WSCONS', host_machine.system() == 'openbsd')
-# XXX: SHMDIR is weird in autoconf, probing the build system for
-# various tmp directories. Could we replace it with C code at runtime
-# that just uses whatever directory works?
-conf_data.set_quoted('SHMDIR', '/tmp')
-
conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found())
conf_data.set('WITH_LIBDRM', libdrm_dep.found())
conf_data.set('GLAMOR_HAS_EGL_QUERY_DMABUF',
@@ -119,12 +114,14 @@
conf_data.set('HAVE_EPOLL_CREATE1', cc.has_function('epoll_create1'))
conf_data.set('HAVE_GETUID', cc.has_function('getuid'))
conf_data.set('HAVE_GETEUID', cc.has_function('geteuid'))
+conf_data.set('HAVE_ISASTREAM', cc.has_function('isastream'))
conf_data.set('HAVE_ISSETUGID', cc.has_function('issetugid'))
conf_data.set('HAVE_GETIFADDRS', cc.has_function('getifaddrs'))
conf_data.set('HAVE_GETPEEREID', cc.has_function('getpeereid'))
conf_data.set('HAVE_GETPEERUCRED', cc.has_function('getpeerucred'))
conf_data.set('HAVE_GETPROGNAME', cc.has_function('getprogname'))
conf_data.set('HAVE_GETZONEID', cc.has_function('getzoneid'))
+conf_data.set('HAVE_MEMFD_CREATE', cc.has_function('memfd_create'))
conf_data.set('HAVE_MKOSTEMP', cc.has_function('mkostemp'))
conf_data.set('HAVE_MMAP', cc.has_function('mmap'))
conf_data.set('HAVE_POLL', cc.has_function('poll'))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/meson.build new/xserver-1.20.6+0/meson.build
--- old/xserver-1.20.5+24/meson.build 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/meson.build 2019-11-22 23:56:38.000000000 +0100
@@ -3,7 +3,7 @@
'buildtype=debugoptimized',
'c_std=gnu99',
],
- version: '1.20.5',
+ version: '1.20.6',
meson_version: '>= 0.42.0',
)
add_project_arguments('-DHAVE_DIX_CONFIG_H', language: 'c')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/mi/mi.h new/xserver-1.20.6+0/mi/mi.h
--- old/xserver-1.20.5+24/mi/mi.h 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/mi/mi.h 2019-11-22 23:56:38.000000000 +0100
@@ -360,6 +360,10 @@
/* miscrinit.c */
+extern _X_EXPORT void
+miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h,
+ unsigned int subWindowMode);
+
extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr pPixmap,
int width,
int height,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/mi/miscrinit.c new/xserver-1.20.6+0/mi/miscrinit.c
--- old/xserver-1.20.5+24/mi/miscrinit.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/mi/miscrinit.c 2019-11-22 23:56:38.000000000 +0100
@@ -124,6 +124,12 @@
return ((*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate));
}
+void
+miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h,
+ unsigned int subWindowMode)
+{
+}
+
/* With the introduction of pixmap privates, the "screen pixmap" can no
* longer be created in miScreenInit, since all the modules that could
* possibly ask for pixmap private space have not been initialized at
@@ -243,7 +249,7 @@
}
/* else CloseScreen */
/* QueryBestSize, SaveScreen, GetImage, GetSpans */
- pScreen->SourceValidate = (SourceValidateProcPtr) 0;
+ pScreen->SourceValidate = miSourceValidate;
/* CreateWindow, DestroyWindow, PositionWindow, ChangeWindowAttributes */
/* RealizeWindow, UnrealizeWindow */
pScreen->ValidateTree = miValidateTree;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/os/connection.c new/xserver-1.20.6+0/os/connection.c
--- old/xserver-1.20.5+24/os/connection.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/os/connection.c 2019-11-22 23:56:38.000000000 +0100
@@ -935,6 +935,14 @@
{
OsCommPtr oc = (OsCommPtr) client->osPrivate;
+ if (client->clientGone) {
+ /*
+ * client is gone, so any pending requests will be dropped and its
+ * ignore count doesn't matter.
+ */
+ return;
+ }
+
client->ignoreCount--;
if (client->ignoreCount)
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/present/present_wnmd.c new/xserver-1.20.6+0/present/present_wnmd.c
--- old/xserver-1.20.5+24/present/present_wnmd.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/present/present_wnmd.c 2019-11-22 23:56:38.000000000 +0100
@@ -649,8 +649,6 @@
present_window_priv_ptr window_priv = present_window_priv(window);
present_vblank_ptr vblank;
- assert(crtc);
-
(*screen_priv->wnmd_info->abort_vblank) (window, crtc, event_id, msc);
xorg_list_for_each_entry(vblank, &window_priv->exec_queue, event_queue) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/randr/rrcrtc.c new/xserver-1.20.6+0/randr/rrcrtc.c
--- old/xserver-1.20.5+24/randr/rrcrtc.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/randr/rrcrtc.c 2019-11-22 23:56:38.000000000 +0100
@@ -401,17 +401,22 @@
if (crtc->scanout_pixmap_back) {
pScrPriv->rrDisableSharedPixmapFlipping(crtc);
- master->StopFlippingPixmapTracking(mrootdraw,
- crtc->scanout_pixmap,
- crtc->scanout_pixmap_back);
+ if (mrootdraw) {
+ master->StopFlippingPixmapTracking(mrootdraw,
+ crtc->scanout_pixmap,
+ crtc->scanout_pixmap_back);
+ }
rrDestroySharedPixmap(crtc, crtc->scanout_pixmap_back);
crtc->scanout_pixmap_back = NULL;
}
else {
pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL);
- master->StopPixmapTracking(mrootdraw,
- crtc->scanout_pixmap);
+
+ if (mrootdraw) {
+ master->StopPixmapTracking(mrootdraw,
+ crtc->scanout_pixmap);
+ }
}
rrDestroySharedPixmap(crtc, crtc->scanout_pixmap);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/record/record.c new/xserver-1.20.6+0/record/record.c
--- old/xserver-1.20.5+24/record/record.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/record/record.c 2019-11-22 23:56:38.000000000 +0100
@@ -2362,9 +2362,9 @@
if (!pContext->pRecordingClient->clientGone) {
RecordAProtocolElement(pContext, NULL, XRecordEndOfData, NULL, 0, 0, 0);
RecordFlushReplyBuffer(pContext, NULL, 0, NULL, 0);
- /* Re-enable request processing on this connection. */
- AttendClient(pContext->pRecordingClient);
}
+ /* Re-enable request processing on this connection. */
+ AttendClient(pContext->pRecordingClient);
for (pRCAP = pContext->pListOfRCAP; pRCAP; pRCAP = pRCAP->pNextRCAP) {
RecordUninstallHooks(pRCAP, 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xserver-1.20.5+24/render/render.c new/xserver-1.20.6+0/render/render.c
--- old/xserver-1.20.5+24/render/render.c 2019-10-14 07:36:17.000000000 +0200
+++ new/xserver-1.20.6+0/render/render.c 2019-11-22 23:56:38.000000000 +0100
@@ -1492,6 +1492,11 @@
return BadAlloc;
}
+ /* what kind of maniac creates a cursor from a window picture though */
+ if (pSrc->pDrawable->type == DRAWABLE_WINDOW)
+ pScreen->SourceValidate(pSrc->pDrawable, 0, 0, width, height,
+ IncludeInferiors);
+
if (pSrc->format == PICT_a8r8g8b8) {
(*pScreen->GetImage) (pSrc->pDrawable,
0, 0, width, height, ZPixmap,
1
0
Hello community,
here is the log from the commit of package eric for openSUSE:Factory checked in at 2019-12-02 11:28:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eric (Old)
and /work/SRC/openSUSE:Factory/.eric.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eric"
Mon Dec 2 11:28:09 2019 rev:13 rq:751688 version:19.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/eric/eric.changes 2019-11-14 23:49:25.500603572 +0100
+++ /work/SRC/openSUSE:Factory/.eric.new.4691/eric.changes 2019-12-02 11:29:58.138598229 +0100
@@ -1,0 +2,6 @@
+Thu Nov 28 10:35:36 UTC 2019 - Hans-Peter Jansen <hpj(a)urpla.net>
+
+- Add python-Markdown recommendation (for *.md files preview)
+- Fix a small glitch with sed
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eric.spec ++++++
--- /var/tmp/diff_new_pack.sgjctl/_old 2019-12-02 11:30:07.710593799 +0100
+++ /var/tmp/diff_new_pack.sgjctl/_new 2019-12-02 11:30:07.714593798 +0100
@@ -1,7 +1,7 @@
#
# spec file for package eric
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -39,6 +39,7 @@
Requires: python3-qtwebengine-qt5
Requires: python3-xml
Recommends: %{name}-api = %{version}
+Recommends: python3-Markdown
Recommends: python3-cx_Freeze
Recommends: python3-doc
Recommends: python3-enchant >= 1.5.3
@@ -82,6 +83,9 @@
find . -name \*.py -exec sed -i -e '/^#!\/usr\/bin.*python/d' '{}' \;
+# fix a small glitch and remove, when fixed upstream
+sed -i 's/.__checkSpellLanguage(language)/.__checkSpellLanguage()/g' eric/eric6/QScintilla/Editor.py
+
%build
# nothing here
1
0
Hello community,
here is the log from the commit of package mozilla-nspr for openSUSE:Factory checked in at 2019-12-02 11:28:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mozilla-nspr (Old)
and /work/SRC/openSUSE:Factory/.mozilla-nspr.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozilla-nspr"
Mon Dec 2 11:28:08 2019 rev:72 rq:750434 version:4.23
Changes:
--------
--- /work/SRC/openSUSE:Factory/mozilla-nspr/mozilla-nspr.changes 2019-11-04 17:01:13.567928601 +0100
+++ /work/SRC/openSUSE:Factory/.mozilla-nspr.new.4691/mozilla-nspr.changes 2019-12-02 11:29:42.406605510 +0100
@@ -1,0 +2,9 @@
+Fri Nov 15 23:22:52 UTC 2019 - Stasiek Michalski <hellcp(a)mailbox.org>
+
+- update to version 4.23
+ * fixed a build failure that was introduced in 4.22
+ * correctness fix for Win64 socket polling
+ * whitespace in C files was cleaned up and no longer uses
+ tab characters for indenting
+
+-------------------------------------------------------------------
Old:
----
nspr-4.22.tar.gz
New:
----
nspr-4.23.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-nspr.spec ++++++
--- /var/tmp/diff_new_pack.VpylVq/_old 2019-12-02 11:29:45.386604131 +0100
+++ /var/tmp/diff_new_pack.VpylVq/_new 2019-12-02 11:29:45.390604129 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mozilla-nspr
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
# 2006-2019 Wolfgang Rosenauer
#
# All modifications and additions to the file contributed by third parties
@@ -18,12 +18,12 @@
Name: mozilla-nspr
-Version: 4.22
+Version: 4.23
Release: 0
Summary: Netscape Portable Runtime
License: MPL-2.0
Group: System/Libraries
-Url: http://www.mozilla.org/projects/nspr/
+URL: http://www.mozilla.org/projects/nspr/
BuildRequires: gcc-c++
BuildRequires: pkg-config
# bug437293
++++++ nspr-4.22.tar.gz -> nspr-4.23.tar.gz ++++++
++++ 122401 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package azure-cli for openSUSE:Factory checked in at 2019-12-02 11:27:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/azure-cli (Old)
and /work/SRC/openSUSE:Factory/.azure-cli.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "azure-cli"
Mon Dec 2 11:27:59 2019 rev:10 rq:751659 version:2.0.77
Changes:
--------
--- /work/SRC/openSUSE:Factory/azure-cli/azure-cli.changes 2019-10-31 18:14:51.953986328 +0100
+++ /work/SRC/openSUSE:Factory/.azure-cli.new.4691/azure-cli.changes 2019-12-02 11:29:29.638611419 +0100
@@ -1,0 +2,13 @@
+Thu Nov 28 14:45:49 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- New upstream release
+ + Version 2.0.77
+ + For detailed information about changes see the
+ HISTORY.rst file provided with this package
+- Consolidate azure-cli command module packages into single
+ azure-cli package
+ + Add Provides and Obsoletes for consolidated packages
+ + Stop deleting command modules from build tree in %install section
+- Update BuildRequires and Requires from setup.py
+
+-------------------------------------------------------------------
Old:
----
azure-cli-2.0.75.tar.gz
New:
----
azure-cli-2.0.77.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ azure-cli.spec ++++++
--- /var/tmp/diff_new_pack.kDiQlH/_old 2019-12-02 11:29:30.946610813 +0100
+++ /var/tmp/diff_new_pack.kDiQlH/_new 2019-12-02 11:29:30.954610809 +0100
@@ -1,7 +1,7 @@
#
# spec file for package azure-cli
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,82 +32,329 @@
Name: azure-cli%{?name_ext}
%endif
%define short_name azure-cli
-Version: 2.0.75
+Version: 2.0.77
Release: 0
Summary: Microsoft Azure CLI 2.0
License: MIT
Group: System/Management
-Url: https://github.com/Azure/azure-cli
+URL: https://github.com/Azure/azure-cli
Source: https://files.pythonhosted.org/packages/source/a/azure-cli/azure-cli-%{vers…
Source1: LICENSE.txt
Patch1: ac_use-python3-by-default.patch
%if 0%{?_test}
BuildRequires: %{short_name} = %{version}
%else
+BuildRequires: azure-cli-command-modules-nspkg >= 2.0
+BuildRequires: azure-cli-core >= 2.0.77
+BuildRequires: azure-cli-nspkg >= 3.0
+BuildRequires: azure-cli-telemetry >= 1.0.2
BuildRequires: fdupes
+BuildRequires: python3-Fabric >= 2.4
+BuildRequires: python3-PyYAML >= 5.1
+BuildRequires: python3-azure-batch >= 8.0
+BuildRequires: python3-azure-cosmos >= 3.0
+BuildRequires: python3-azure-datalake-store >= 0.0.45
+BuildRequires: python3-azure-functions-devops-build >= 0.0.22
+BuildRequires: python3-azure-graphrbac >= 0.60.0
+BuildRequires: python3-azure-keyvault >= 1.1
+BuildRequires: python3-azure-loganalytics >= 0.1.0
+BuildRequires: python3-azure-mgmt-advisor >= 2.0.1
+BuildRequires: python3-azure-mgmt-apimanagement >= 0.1.0
+BuildRequires: python3-azure-mgmt-appconfiguration >= 0.3.0
+BuildRequires: python3-azure-mgmt-applicationinsights >= 0.1.1
+BuildRequires: python3-azure-mgmt-authorization >= 0.52.0
+BuildRequires: python3-azure-mgmt-batch >= 7.0
+BuildRequires: python3-azure-mgmt-batchai >= 2.0
+BuildRequires: python3-azure-mgmt-billing >= 0.2
+BuildRequires: python3-azure-mgmt-botservice >= 0.2.0
+BuildRequires: python3-azure-mgmt-cdn >= 3.1
+BuildRequires: python3-azure-mgmt-cognitiveservices >= 5.0.0
+BuildRequires: python3-azure-mgmt-compute >= 10.0
+BuildRequires: python3-azure-mgmt-consumption >= 2.0
+BuildRequires: python3-azure-mgmt-containerinstance >= 1.4
+BuildRequires: python3-azure-mgmt-containerregistry >= 3.0.0rc7
+BuildRequires: python3-azure-mgmt-containerservice >= 8.0.0
+BuildRequires: python3-azure-mgmt-cosmosdb >= 0.8.0
+BuildRequires: python3-azure-mgmt-datalake-analytics >= 0.2.1
+BuildRequires: python3-azure-mgmt-datalake-store >= 0.5.0
+BuildRequires: python3-azure-mgmt-datamigration >= 0.1.0
+BuildRequires: python3-azure-mgmt-deploymentmanager >= 0.1.0
+BuildRequires: python3-azure-mgmt-devtestlabs >= 2.2
+BuildRequires: python3-azure-mgmt-dns >= 2.1
+BuildRequires: python3-azure-mgmt-eventgrid >= 2.2
+BuildRequires: python3-azure-mgmt-eventhub >= 2.6
+BuildRequires: python3-azure-mgmt-hdinsight >= 1.1.0
+BuildRequires: python3-azure-mgmt-imagebuilder >= 0.2.1
+BuildRequires: python3-azure-mgmt-iotcentral >= 1.0
+BuildRequires: python3-azure-mgmt-iothub >= 0.8.2
+BuildRequires: python3-azure-mgmt-iothubprovisioningservices >= 0.2.0
+BuildRequires: python3-azure-mgmt-keyvault >= 1.1
+BuildRequires: python3-azure-mgmt-kusto >= 0.3.0
+BuildRequires: python3-azure-mgmt-loganalytics >= 0.2
+BuildRequires: python3-azure-mgmt-managedservices >= 1.0
+BuildRequires: python3-azure-mgmt-managementgroups >= 0.1
+BuildRequires: python3-azure-mgmt-maps >= 0.1.0
+BuildRequires: python3-azure-mgmt-marketplaceordering >= 0.1
+BuildRequires: python3-azure-mgmt-media >= 1.1
+BuildRequires: python3-azure-mgmt-monitor >= 0.7.0
+BuildRequires: python3-azure-mgmt-msi >= 0.2
+BuildRequires: python3-azure-mgmt-netapp >= 0.7.0
+BuildRequires: python3-azure-mgmt-network >= 7.0.0
+BuildRequires: python3-azure-mgmt-policyinsights >= 0.3.1
+BuildRequires: python3-azure-mgmt-privatedns >= 0.1.0
+BuildRequires: python3-azure-mgmt-rdbms >= 1.8
+BuildRequires: python3-azure-mgmt-recoveryservices >= 0.4.0
+BuildRequires: python3-azure-mgmt-recoveryservicesbackup >= 0.4.0
+BuildRequires: python3-azure-mgmt-redis >= 6.0
+BuildRequires: python3-azure-mgmt-relay >= 0.1.0
+BuildRequires: python3-azure-mgmt-reservations >= 0.6.0
+BuildRequires: python3-azure-mgmt-resource >= 4.0
+BuildRequires: python3-azure-mgmt-search >= 2.0
+BuildRequires: python3-azure-mgmt-security >= 0.1.0
+BuildRequires: python3-azure-mgmt-servicebus >= 0.6.0
+BuildRequires: python3-azure-mgmt-servicefabric >= 0.2.0
+BuildRequires: python3-azure-mgmt-signalr >= 0.3.0
+BuildRequires: python3-azure-mgmt-sql >= 0.15
+BuildRequires: python3-azure-mgmt-sqlvirtualmachine >= 0.4.0
+BuildRequires: python3-azure-mgmt-storage >= 5.0.0
+BuildRequires: python3-azure-mgmt-trafficmanager >= 0.51.0
+BuildRequires: python3-azure-mgmt-web >= 0.42.0
+BuildRequires: python3-azure-multiapi-storage >= 0.2.4
BuildRequires: python3-azure-nspkg >= 3.0.0
+BuildRequires: python3-azure-storage-blob >= 1.3.1
+BuildRequires: python3-colorama >= 0.4.1
+BuildRequires: python3-cryptography >= 2.3.1
+BuildRequires: python3-devel
+BuildRequires: python3-javaproperties >= 0.5.1
+BuildRequires: python3-jsmin >= 2.2.2
+BuildRequires: python3-jsondiff >= 1.2.0
+BuildRequires: python3-knack >= 0.6
+BuildRequires: python3-mock >= 2.0
+BuildRequires: python3-paramiko >= 2.0.8
+BuildRequires: python3-psutil >= 5.6
+BuildRequires: python3-pyOpenSSL >= 17.1.0
+BuildRequires: python3-pydocumentdb >= 2.0.1
+BuildRequires: python3-pygments >= 2.4
+BuildRequires: python3-pytz >= 2019.1
+BuildRequires: python3-requests >= 2.22
+BuildRequires: python3-scp >= 0.13.2
BuildRequires: python3-setuptools
-Requires: azure-cli-acr >= 2.2.9
-Requires: azure-cli-acs >= 2.4.4
-Requires: azure-cli-advisor >= 2.0.1
-Requires: azure-cli-ams >= 0.4.7
-Requires: azure-cli-appservice >= 0.2.21
-Requires: azure-cli-backup >= 1.2.5
-Requires: azure-cli-batch >= 4.0.3
-Requires: azure-cli-batchai >= 0.4.10
-Requires: azure-cli-billing >= 0.2.2
-Requires: azure-cli-botservice >= 0.2.2
-Requires: azure-cli-cdn >= 0.2.4
-Requires: azure-cli-cloud >= 2.1.1
-Requires: azure-cli-cognitiveservices >= 0.2.6
-Requires: azure-cli-command-modules-nspkg >= 2.0.3
-Requires: azure-cli-component >= 2.0.8
-Requires: azure-cli-configure >= 2.0.24
-Requires: azure-cli-consumption >= 0.4.4
-Requires: azure-cli-container >= 0.3.18
-Requires: azure-cli-core >= 2.0.75
-Requires: azure-cli-cosmosdb >= 0.2.11
-Requires: azure-cli-deploymentmanager >= 0.1.1
-Requires: azure-cli-dla >= 0.2.6
-Requires: azure-cli-dls >= 0.1.10
-Requires: azure-cli-dms >= 0.1.4
-Requires: azure-cli-eventgrid >= 0.2.4
-Requires: azure-cli-eventhubs >= 0.3.7
-Requires: azure-cli-extension >= 0.2.5
-Requires: azure-cli-feedback >= 2.2.1
-Requires: azure-cli-find >= 0.3.4
-Requires: azure-cli-hdinsight >= 0.3.5
-Requires: azure-cli-interactive >= 0.4.5
-Requires: azure-cli-iot >= 0.3.11
-Requires: azure-cli-iotcentral >= 0.1.7
-Requires: azure-cli-keyvault >= 2.2.16
-Requires: azure-cli-kusto >= 0.2.3
-Requires: azure-cli-lab >= 0.1.8
-Requires: azure-cli-maps >= 0.3.5
-Requires: azure-cli-monitor >= 0.2.15
-Requires: azure-cli-natgateway >= 0.1.1
-Requires: azure-cli-network >= 2.5.2
-Requires: azure-cli-nspkg >= 3.0.4
-Requires: azure-cli-policyinsights >= 0.1.4
-Requires: azure-cli-privatedns >= 1.0.2
-Requires: azure-cli-profile >= 2.1.5
-Requires: azure-cli-rdbms >= 0.3.12
-Requires: azure-cli-redis >= 0.4.4
-Requires: azure-cli-relay >= 0.1.5
-Requires: azure-cli-reservations >= 0.4.3
-Requires: azure-cli-resource >= 2.1.16
-Requires: azure-cli-role >= 2.6.4
-Requires: azure-cli-search >= 0.1.2
-Requires: azure-cli-security >= 0.1.2
-Requires: azure-cli-servicebus >= 0.3.6
-Requires: azure-cli-servicefabric >= 0.1.20
-Requires: azure-cli-signalr >= 1.0.1
-Requires: azure-cli-sql >= 2.2.5
-Requires: azure-cli-sqlvm >= 0.2.0
-Requires: azure-cli-storage >= 2.4.3
-Requires: azure-cli-telemetry >= 1.0.4
-Requires: azure-cli-vm >= 2.2.23
-Requires: python3-azure-nspkg >= 3.0.0
+BuildRequires: python3-setuptools
+BuildRequires: python3-six >= 1.12
+BuildRequires: python3-sshtunnel >= 0.1.4
+BuildRequires: python3-urllib3 >= 1.18
+BuildRequires: python3-vsts-cd-manager >= 1.0.0
+BuildRequires: python3-websocket-client >= 0.56.0
+BuildRequires: python3-xmltodict >= 0.12
+Requires: azure-cli-command-modules-nspkg >= 2.0
+Requires: azure-cli-core >= 2.0.77
+Requires: azure-cli-nspkg >= 3.0
+Requires: azure-cli-telemetry >= 1.0.2
+Requires: python3-Fabric >= 2.4
+Requires: python3-PyYAML >= 5.1
+Requires: python3-azure-batch >= 8.0
+Requires: python3-azure-cosmos >= 3.0
+Requires: python3-azure-datalake-store >= 0.0.45
+Requires: python3-azure-functions-devops-build >= 0.0.22
+Requires: python3-azure-graphrbac >= 0.60.0
+Requires: python3-azure-keyvault >= 1.1
+Requires: python3-azure-loganalytics >= 0.1.0
+Requires: python3-azure-mgmt-advisor >= 2.0.1
+Requires: python3-azure-mgmt-apimanagement >= 0.1.0
+Requires: python3-azure-mgmt-appconfiguration >= 0.3.0
+Requires: python3-azure-mgmt-applicationinsights >= 0.1.1
+Requires: python3-azure-mgmt-authorization >= 0.52.0
+Requires: python3-azure-mgmt-batch >= 7.0
+Requires: python3-azure-mgmt-batchai >= 2.0
+Requires: python3-azure-mgmt-billing >= 0.2
+Requires: python3-azure-mgmt-botservice >= 0.2.0
+Requires: python3-azure-mgmt-cdn >= 3.1
+Requires: python3-azure-mgmt-cognitiveservices >= 5.0.0
+Requires: python3-azure-mgmt-compute >= 10.0
+Requires: python3-azure-mgmt-consumption >= 2.0
+Requires: python3-azure-mgmt-containerinstance >= 1.4
+Requires: python3-azure-mgmt-containerregistry >= 3.0.0rc7
+Requires: python3-azure-mgmt-containerservice >= 8.0.0
+Requires: python3-azure-mgmt-cosmosdb >= 0.8.0
+Requires: python3-azure-mgmt-datalake-analytics >= 0.2.1
+Requires: python3-azure-mgmt-datalake-store >= 0.5.0
+Requires: python3-azure-mgmt-datamigration >= 0.1.0
+Requires: python3-azure-mgmt-deploymentmanager >= 0.1.0
+Requires: python3-azure-mgmt-devtestlabs >= 2.2
+Requires: python3-azure-mgmt-dns >= 2.1
+Requires: python3-azure-mgmt-eventgrid >= 2.2
+Requires: python3-azure-mgmt-eventhub >= 2.6
+Requires: python3-azure-mgmt-hdinsight >= 1.1.0
+Requires: python3-azure-mgmt-imagebuilder >= 0.2.1
+Requires: python3-azure-mgmt-iotcentral >= 1.0
+Requires: python3-azure-mgmt-iothub >= 0.8.2
+Requires: python3-azure-mgmt-iothubprovisioningservices >= 0.2.0
+Requires: python3-azure-mgmt-keyvault >= 1.1
+Requires: python3-azure-mgmt-kusto >= 0.3.0
+Requires: python3-azure-mgmt-loganalytics >= 0.2
+Requires: python3-azure-mgmt-managedservices >= 1.0
+Requires: python3-azure-mgmt-managementgroups >= 0.1
+Requires: python3-azure-mgmt-maps >= 0.1.0
+Requires: python3-azure-mgmt-marketplaceordering >= 0.1
+Requires: python3-azure-mgmt-media >= 1.1
+Requires: python3-azure-mgmt-monitor >= 0.7.0
+Requires: python3-azure-mgmt-msi >= 0.2
+Requires: python3-azure-mgmt-netapp >= 0.7.0
+Requires: python3-azure-mgmt-network >= 7.0.0
+Requires: python3-azure-mgmt-policyinsights >= 0.3.1
+Requires: python3-azure-mgmt-privatedns >= 0.1.0
+Requires: python3-azure-mgmt-rdbms >= 1.8
+Requires: python3-azure-mgmt-recoveryservices >= 0.4.0
+Requires: python3-azure-mgmt-recoveryservicesbackup >= 0.4.0
+Requires: python3-azure-mgmt-redis >= 6.0
+Requires: python3-azure-mgmt-relay >= 0.1.0
+Requires: python3-azure-mgmt-reservations == 0.6.0
+Requires: python3-azure-mgmt-resource >= 4.0
+Requires: python3-azure-mgmt-search >= 2.0
+Requires: python3-azure-mgmt-security >= 0.1.0
+Requires: python3-azure-mgmt-servicebus >= 0.6.0
+Requires: python3-azure-mgmt-servicefabric >= 0.2.0
+Requires: python3-azure-mgmt-signalr >= 0.3.0
+Requires: python3-azure-mgmt-sql >= 0.15
+Requires: python3-azure-mgmt-sqlvirtualmachine >= 0.4.0
+Requires: python3-azure-mgmt-storage >= 5.0.0
+Requires: python3-azure-mgmt-trafficmanager >= 0.51.0
+Requires: python3-azure-mgmt-web >= 0.42.0
+Requires: python3-azure-multiapi-storage >= 0.2.4
+Requires: python3-azure-storage-blob >= 1.3.1
+Requires: python3-colorama >= 0.4.1
+Requires: python3-cryptography >= 2.3.1
+Requires: python3-javaproperties >= 0.5.1
+Requires: python3-jsmin >= 2.2.2
+Requires: python3-jsondiff >= 1.2.0
+Requires: python3-knack >= 0.6
+Requires: python3-mock >= 2.0
+Requires: python3-paramiko >= 2.0.8
+Requires: python3-psutil >= 5.6
+Requires: python3-pyOpenSSL >= 17.1.0
+Requires: python3-pydocumentdb >= 2.0.1
+Requires: python3-pygments >= 2.4
+Requires: python3-pytz >= 2019.1
+Requires: python3-requests >= 2.22
+Requires: python3-scp >= 0.13.2
+Requires: python3-six >= 1.12
+Requires: python3-sshtunnel >= 0.1.4
+Requires: python3-urllib3 >= 1.18
+Requires: python3-vsts-cd-manager >= 1.0.0
+Requires: python3-websocket-client >= 0.56.0
+Requires: python3-xmltodict >= 0.12
+Provides: azure-cli-acr = 2.2.9
+Obsoletes: azure-cli-acr < 2.2.9
+Provides: azure-cli-acs = 2.4.4
+Obsoletes: azure-cli-acs < 2.4.4
+Provides: azure-cli-advisor = 2.0.1
+Obsoletes: azure-cli-advisor < 2.0.1
+Provides: azure-cli-ams = 0.4.7
+Obsoletes: azure-cli-ams < 0.4.7
+Provides: azure-cli-appservice = 0.2.21
+Obsoletes: azure-cli-appservice < 0.2.21
+Provides: azure-cli-backup = 1.2.5
+Obsoletes: azure-cli-backup < 1.2.5
+Provides: azure-cli-batch = 4.0.3
+Obsoletes: azure-cli-batch < 4.0.3
+Provides: azure-cli-batchai = 0.4.10
+Obsoletes: azure-cli-batchai < 0.4.10
+Provides: azure-cli-billing = 0.2.2
+Obsoletes: azure-cli-billing < 0.2.2
+Provides: azure-cli-botservice = 0.2.2
+Obsoletes: azure-cli-botservice < 0.2.2
+Provides: azure-cli-cdn = 0.2.4
+Obsoletes: azure-cli-cdn < 0.2.4
+Provides: azure-cli-cloud = 2.1.1
+Obsoletes: azure-cli-cloud < 2.1.1
+Provides: azure-cli-cognitiveservices = 0.2.6
+Obsoletes: azure-cli-cognitiveservices < 0.2.6
+Provides: azure-cli-component = 2.0.8
+Obsoletes: azure-cli-component < 2.0.8
+Provides: azure-cli-configure = 2.0.24
+Obsoletes: azure-cli-configure < 2.0.24
+Provides: azure-cli-consumption = 0.4.4
+Obsoletes: azure-cli-consumption < 0.4.4
+Provides: azure-cli-container = 0.3.18
+Obsoletes: azure-cli-container < 0.3.18
+Provides: azure-cli-cosmosdb = 0.2.11
+Obsoletes: azure-cli-cosmosdb < 0.2.11
+Provides: azure-cli-deploymentmanager = 0.1.1
+Obsoletes: azure-cli-deploymentmanager < 0.1.1
+Provides: azure-cli-dla = 0.2.6
+Obsoletes: azure-cli-dla < 0.2.6
+Provides: azure-cli-dls = 0.1.10
+Obsoletes: azure-cli-dls < 0.1.10
+Provides: azure-cli-dms = 0.1.4
+Obsoletes: azure-cli-dms < 0.1.4
+Provides: azure-cli-eventgrid = 0.2.4
+Obsoletes: azure-cli-eventgrid < 0.2.4
+Provides: azure-cli-eventhubs = 0.3.7
+Obsoletes: azure-cli-eventhubs < 0.3.7
+Provides: azure-cli-extension = 0.2.5
+Obsoletes: azure-cli-extension < 0.2.5
+Provides: azure-cli-feedback = 2.2.1
+Obsoletes: azure-cli-feedback < 2.2.1
+Provides: azure-cli-find = 0.3.4
+Obsoletes: azure-cli-find < 0.3.4
+Provides: azure-cli-hdinsight = 0.3.5
+Obsoletes: azure-cli-hdinsight < 0.3.5
+Provides: azure-cli-interactive = 0.4.5
+Obsoletes: azure-cli-interactive < 0.4.5
+Provides: azure-cli-iot = 0.3.11
+Obsoletes: azure-cli-iot < 0.3.11
+Provides: azure-cli-iotcentral = 0.1.7
+Obsoletes: azure-cli-iotcentral < 0.1.7
+Provides: azure-cli-keyvault = 2.2.16
+Obsoletes: azure-cli-keyvault < 2.2.16
+Provides: azure-cli-kusto = 0.2.3
+Obsoletes: azure-cli-kusto < 0.2.3
+Provides: azure-cli-lab = 0.1.8
+Obsoletes: azure-cli-lab < 0.1.8
+Provides: azure-cli-maps = 0.3.5
+Obsoletes: azure-cli-maps < 0.3.5
+Provides: azure-cli-monitor = 0.2.15
+Obsoletes: azure-cli-monitor < 0.2.15
+Provides: azure-cli-natgateway = 0.1.1
+Obsoletes: azure-cli-natgateway < 0.1.1
+Provides: azure-cli-network = 2.5.2
+Obsoletes: azure-cli-network < 2.5.2
+Provides: azure-cli-policyinsights = 0.1.4
+Obsoletes: azure-cli-policyinsights < 0.1.4
+Provides: azure-cli-privatedns = 1.0.2
+Obsoletes: azure-cli-privatedns < 1.0.2
+Provides: azure-cli-profile = 2.1.5
+Obsoletes: azure-cli-profile < 2.1.5
+Provides: azure-cli-rdbms = 0.3.12
+Obsoletes: azure-cli-rdbms < 0.3.12
+Provides: azure-cli-redis = 0.4.4
+Obsoletes: azure-cli-redis < 0.4.4
+Provides: azure-cli-relay = 0.1.5
+Obsoletes: azure-cli-relay < 0.1.5
+Provides: azure-cli-reservations = 0.4.3
+Obsoletes: azure-cli-reservations < 0.4.3
+Provides: azure-cli-resource = 2.1.16
+Obsoletes: azure-cli-resource < 2.1.16
+Provides: azure-cli-role = 2.6.4
+Obsoletes: azure-cli-role < 2.6.4
+Provides: azure-cli-search = 0.1.2
+Obsoletes: azure-cli-search < 0.1.2
+Provides: azure-cli-security = 0.1.2
+Obsoletes: azure-cli-security < 0.1.2
+Provides: azure-cli-servicebus = 0.3.6
+Obsoletes: azure-cli-servicebus < 0.3.6
+Provides: azure-cli-servicefabric = 0.1.20
+Obsoletes: azure-cli-servicefabric < 0.1.20
+Provides: azure-cli-signalr = 1.0.1
+Obsoletes: azure-cli-signalr < 1.0.1
+Provides: azure-cli-sql = 2.2.5
+Obsoletes: azure-cli-sql < 2.2.5
+Provides: azure-cli-sqlvm = 0.2.0
+Obsoletes: azure-cli-sqlvm < 0.2.0
+Provides: azure-cli-storage = 2.4.3
+Obsoletes: azure-cli-storage < 2.4.3
+Provides: azure-cli-vm = 2.2.23
+Obsoletes: azure-cli-vm < 2.2.23
Conflicts: azure-cli < 2.0.0
BuildArch: noarch
@@ -142,7 +389,6 @@
python3 setup.py install --root=%{buildroot} --prefix=%{_prefix} --install-lib=%{python3_sitelib}
install -DTm644 %{buildroot}%{_bindir}/az.completion.sh %{buildroot}%{_datadir}/bash-completion/completions/az.completion.sh
%fdupes %{buildroot}%{python3_sitelib}
-rm -rf %{buildroot}%{python3_sitelib}/azure/cli/command_modules
rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__init__.*
rm -rf %{buildroot}%{python3_sitelib}/azure/cli/__pycache__
rm -rf %{buildroot}%{python3_sitelib}/azure/__init__.*
++++++ ac_use-python3-by-default.patch ++++++
--- /var/tmp/diff_new_pack.kDiQlH/_old 2019-12-02 11:29:31.010610783 +0100
+++ /var/tmp/diff_new_pack.kDiQlH/_new 2019-12-02 11:29:31.010610783 +0100
@@ -1,10 +1,9 @@
-diff -Nru azure-cli-2.0.15.orig/az azure-cli-2.0.15/az
---- azure-cli-2.0.15.orig/az 2017-08-28 22:11:38.000000000 +0200
-+++ azure-cli-2.0.15/az 2017-09-18 13:18:43.389216387 +0200
-@@ -10,5 +10,5 @@
-
- export PYTHONPATH="${DIR}/src:${PYTHONPATH}"
-
--python -m azure.cli "$@"
-+python3 -m azure.cli "$@"
+diff -Nru azure-cli-2.0.77.orig/az azure-cli-2.0.77/az
+--- azure-cli-2.0.77.orig/az 2019-11-22 06:26:37.000000000 +0100
++++ azure-cli-2.0.77/az 2019-11-26 11:55:29.693046152 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ import sys
+ import os
++++++ azure-cli-2.0.75.tar.gz -> azure-cli-2.0.77.tar.gz ++++++
++++ 21737 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package po4a for openSUSE:Factory checked in at 2019-12-02 11:27:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/po4a (Old)
and /work/SRC/openSUSE:Factory/.po4a.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "po4a"
Mon Dec 2 11:27:52 2019 rev:18 rq:750391 version:0.57
Changes:
--------
--- /work/SRC/openSUSE:Factory/po4a/po4a.changes 2019-06-24 21:48:34.847883572 +0200
+++ /work/SRC/openSUSE:Factory/.po4a.new.4691/po4a.changes 2019-12-02 11:29:22.894614539 +0100
@@ -1,0 +2,21 @@
+Fri Nov 22 12:18:01 UTC 2019 - Luiz Fernando Ranghetti <elchevive68(a)gmail.com>
+
+- updated to version 0.57
+
+AsciiDoc:
+
+ * Introduce option tablecells to process cells in tables.
+ * Widen accepted characters in the term part of definition list
+
+po4a tool:
+
+ * Don't use single quotes to protect command line arguments, as it fails on
+ Windows
+
+Translations:
+
+New translation: Arabic
+Updated: Dutch, French, Italian, Japanese, Norwegian Bokmål,
+Portuguese (Brazil) and Ukrainian
+
+-------------------------------------------------------------------
Old:
----
po4a-0.56.tar.gz
New:
----
po4a-0.57.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ po4a.spec ++++++
--- /var/tmp/diff_new_pack.pitkM1/_old 2019-12-02 11:29:23.706614164 +0100
+++ /var/tmp/diff_new_pack.pitkM1/_new 2019-12-02 11:29:23.710614162 +0100
@@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: po4a
-Version: 0.56
+Version: 0.57
Release: 0
Summary: Framework to translate documentation and other materials
License: GPL-2.0
@@ -72,9 +72,8 @@
./Build
%install
-./Build install destdir=%{buildroot}
+./Build install destdir=%{buildroot} create_packlist=0
%find_lang %{name} --with-man --all-name
-rm -f %{buildroot}%{perl_vendorarch}/auto/po4a/.packlist
%check
# requires texlive, which is too heavy for the package
@@ -88,7 +87,8 @@
%files
%defattr(644,root,root,755)
-%doc COPYING NEWS README* TODO
+%doc NEWS README* TODO
+%license COPYING
%attr(755,root,root) %{_bindir}/*
%dir %{perl_vendorlib}/Locale/
%{perl_vendorlib}/Locale/Po4a
++++++ po4a-0.56.tar.gz -> po4a-0.57.tar.gz ++++++
++++ 17315 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package azure-cli-core for openSUSE:Factory checked in at 2019-12-02 11:27:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/azure-cli-core (Old)
and /work/SRC/openSUSE:Factory/.azure-cli-core.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "azure-cli-core"
Mon Dec 2 11:27:36 2019 rev:8 rq:751656 version:2.0.77
Changes:
--------
--- /work/SRC/openSUSE:Factory/azure-cli-core/azure-cli-core.changes 2019-10-31 18:15:43.554039745 +0100
+++ /work/SRC/openSUSE:Factory/.azure-cli-core.new.4691/azure-cli-core.changes 2019-12-02 11:29:19.770615985 +0100
@@ -1,0 +2,9 @@
+Thu Nov 28 14:47:20 UTC 2019 - John Paul Adrian Glaubitz <adrian.glaubitz(a)suse.com>
+
+- New upstream release
+ + Version 2.0.77
+ + For detailed information about changes see the
+ HISTORY.txt file provided with this package
+- Update Requires from setup.py
+
+-------------------------------------------------------------------
Old:
----
azure-cli-core-2.0.75.tar.gz
New:
----
azure-cli-core-2.0.77.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ azure-cli-core.spec ++++++
--- /var/tmp/diff_new_pack.zET1y7/_old 2019-12-02 11:29:20.618615593 +0100
+++ /var/tmp/diff_new_pack.zET1y7/_new 2019-12-02 11:29:20.618615593 +0100
@@ -1,7 +1,7 @@
#
# spec file for package azure-cli-core
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,12 @@
Name: azure-cli-core
-Version: 2.0.75
+Version: 2.0.77
Release: 0
Summary: Microsoft Azure CLI Core Module
License: MIT
Group: System/Management
-Url: https://github.com/Azure/azure-cli
+URL: https://github.com/Azure/azure-cli
Source: https://files.pythonhosted.org/packages/source/a/azure-cli-core/azure-cli-c…
Source1: LICENSE.txt
BuildRequires: azure-cli-nspkg
@@ -54,7 +54,8 @@
Requires: python3-pip
Requires: python3-pyOpenSSL >= 17.1.0
Requires: python3-requests >= 2.20.0
-Requires: python3-six
+Requires: python3-six < 2.0.0
+Requires: python3-six >= 1.12
Requires: python3-wheel >= 0.30.0
%if %{python3_version_nodots} < 34
Requires: python-enum34 >= 1.0.4
++++++ azure-cli-core-2.0.75.tar.gz -> azure-cli-core-2.0.77.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/HISTORY.rst new/azure-cli-core-2.0.77/HISTORY.rst
--- old/azure-cli-core-2.0.75/HISTORY.rst 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/HISTORY.rst 2019-11-22 06:26:37.000000000 +0100
@@ -3,9 +3,19 @@
Release History
===============
+2.0.77
+++++++
+* Add deprecate message for Python 2.7
+* Refine the help and error messages for `--ids`
+
+2.0.76
+++++++
+* no changes
+
2.0.75
++++++
* Add syntax check for --set parameter in generic update command.
+* Fix #10760: `az login` fails if subscription name is None
* Minor change in DeploymentOutputLongRunningOperation
2.0.74
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/PKG-INFO new/azure-cli-core-2.0.77/PKG-INFO
--- old/azure-cli-core-2.0.75/PKG-INFO 2019-10-11 10:59:57.000000000 +0200
+++ new/azure-cli-core-2.0.77/PKG-INFO 2019-11-22 06:26:47.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: azure-cli-core
-Version: 2.0.75
+Version: 2.0.77
Summary: Microsoft Azure Command-Line Tools Core Module
Home-page: https://github.com/Azure/azure-cli
Author: Microsoft Corporation
@@ -15,9 +15,19 @@
Release History
===============
+ 2.0.77
+ ++++++
+ * Add deprecate message for Python 2.7
+ * Refine the help and error messages for `--ids`
+
+ 2.0.76
+ ++++++
+ * no changes
+
2.0.75
++++++
* Add syntax check for --set parameter in generic update command.
+ * Fix #10760: `az login` fails if subscription name is None
* Minor change in DeploymentOutputLongRunningOperation
2.0.74
@@ -475,5 +485,6 @@
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: License :: OSI Approved :: MIT License
Provides-Extra: test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure/cli/core/__init__.py new/azure-cli-core-2.0.77/azure/cli/core/__init__.py
--- old/azure-cli-core-2.0.75/azure/cli/core/__init__.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure/cli/core/__init__.py 2019-11-22 06:26:37.000000000 +0100
@@ -4,7 +4,7 @@
# --------------------------------------------------------------------------------------------
from __future__ import print_function
-__version__ = "2.0.75"
+__version__ = "2.0.77"
import os
import sys
@@ -90,7 +90,9 @@
if updates_available == -1:
logger.warning('Unable to check if your CLI is up-to-date. Check your internet connection.')
elif updates_available:
- logger.warning('You have %i updates available. Consider updating your CLI installation.', updates_available)
+ logger.warning('You have %i updates available. Consider updating your CLI installation. '
+ 'Instructions can be found at https://docs.microsoft.com/en-us/cli/azure/install-azure-cli',
+ updates_available)
else:
print('Your CLI is up-to-date.')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure/cli/core/_help.py new/azure-cli-core-2.0.77/azure/cli/core/_help.py
--- old/azure-cli-core-2.0.75/azure/cli/core/_help.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure/cli/core/_help.py 2019-11-22 06:26:37.000000000 +0100
@@ -74,6 +74,7 @@
@staticmethod
def _print_examples(help_file):
+ from colorama import Style
indent = 0
_print_indent('Examples', indent)
for e in help_file.examples:
@@ -84,6 +85,9 @@
_print_indent(u'{0}'.format(e.long_summary), indent)
_print_indent(u'{0}'.format(e.command), indent)
print('')
+ indent = 0
+ message = 'For more specific examples, use: az find "az {}"'.format(help_file.command)
+ _print_indent(Style.BRIGHT + message + Style.RESET_ALL + '\n', indent)
@staticmethod
def _process_value_sources(p):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure/cli/core/_profile.py new/azure-cli-core-2.0.77/azure/cli/core/_profile.py
--- old/azure-cli-core-2.0.75/azure/cli/core/_profile.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure/cli/core/_profile.py 2019-11-22 06:26:37.000000000 +0100
@@ -18,7 +18,8 @@
from azure.cli.core._environment import get_config_dir
from azure.cli.core._session import ACCOUNT
-from azure.cli.core.util import get_file_json, in_cloud_console, open_page_in_browser, can_launch_browser
+from azure.cli.core.util import get_file_json, in_cloud_console, open_page_in_browser, can_launch_browser,\
+ is_windows, is_wsl
from azure.cli.core.cloud import get_active_cloud, set_cloud_subscription
from knack.log import get_logger
@@ -209,7 +210,7 @@
if not allow_no_subscriptions and not subscriptions:
raise CLIError("No subscriptions were found for '{}'. If this is expected, use "
- "'--allow-no-subscriptions' to have tenant level accesses".format(
+ "'--allow-no-subscriptions' to have tenant level access".format(
username))
if is_service_principal:
@@ -222,7 +223,8 @@
t_list = [s.tenant_id for s in subscriptions]
bare_tenants = [t for t in subscription_finder.tenants if t not in t_list]
profile = Profile(cli_ctx=self.cli_ctx)
- subscriptions = profile._build_tenant_level_accounts(bare_tenants) # pylint: disable=protected-access
+ tenant_accounts = profile._build_tenant_level_accounts(bare_tenants) # pylint: disable=protected-access
+ subscriptions.extend(tenant_accounts)
if not subscriptions:
return []
@@ -239,8 +241,10 @@
consolidated = []
for s in subscriptions:
display_name = s.display_name
+ if display_name is None:
+ display_name = ''
try:
- s.display_name.encode(sys.getdefaultencoding())
+ display_name.encode(sys.getdefaultencoding())
except (UnicodeEncodeError, UnicodeDecodeError): # mainly for Python 2.7 with ascii as the default encoding
display_name = re.sub(r'[^\x00-\x7f]', lambda x: '?', display_name)
@@ -339,13 +343,12 @@
if allow_no_subscriptions:
subscriptions = self._build_tenant_level_accounts([tenant])
else:
- raise CLIError('No access was configured for the VM, hence no subscriptions were found')
+ raise CLIError('No access was configured for the VM, hence no subscriptions were found. '
+ "If this is expected, use '--allow-no-subscriptions' to have tenant level access.")
consolidated = self._normalize_properties(user, subscriptions, is_service_principal=True,
user_assigned_identity_id=base_name)
-
- # key-off subscription name to allow accounts with same id(but under different identities)
- self._set_subscriptions(consolidated, secondary_key_name=_SUBSCRIPTION_NAME)
+ self._set_subscriptions(consolidated)
return deepcopy(consolidated)
def find_subscriptions_in_cloud_console(self):
@@ -1087,6 +1090,16 @@
import random
reply_url = None
+
+ # On Windows, HTTPServer by default doesn't throw error if the port is in-use
+ # https://github.com/Azure/azure-cli/issues/10578
+ if is_windows():
+ logger.debug('Windows is detected. Set HTTPServer.allow_reuse_address to False')
+ ClientRedirectServer.allow_reuse_address = False
+ elif is_wsl():
+ logger.debug('WSL is detected. Set HTTPServer.allow_reuse_address to False')
+ ClientRedirectServer.allow_reuse_address = False
+
for port in range(8400, 9000):
try:
web_server = ClientRedirectServer(('localhost', port), ClientRedirectHandler)
@@ -1115,10 +1128,6 @@
results['no_browser'] = True
return
- # emit a warning for transitioning to the new experience
- logger.warning('Note, we have launched a browser for you to login. For old experience'
- ' with device code, use "az login --use-device-code"')
-
# wait for callback from browser.
while True:
web_server.handle_request()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure/cli/core/_session.py new/azure-cli-core-2.0.77/azure/cli/core/_session.py
--- old/azure-cli-core-2.0.75/azure/cli/core/_session.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure/cli/core/_session.py 2019-11-22 06:26:37.000000000 +0100
@@ -43,7 +43,7 @@
try:
if max_age > 0:
st = os.stat(self.filename)
- if st.st_mtime + max_age < time.clock():
+ if st.st_mtime + max_age < time.time():
self.save()
with codecs_open(self.filename, 'r', encoding=self._encoding) as f:
self.data = json.load(f)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure/cli/core/adal_authentication.py new/azure-cli-core-2.0.77/azure/cli/core/adal_authentication.py
--- old/azure-cli-core-2.0.75/azure/cli/core/adal_authentication.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure/cli/core/adal_authentication.py 2019-11-22 06:26:37.000000000 +0100
@@ -49,6 +49,9 @@
if not in_cloud_console() else ''))
raise CLIError(err)
+ except requests.exceptions.SSLError as err:
+ from .util import SSLERROR_TEMPLATE
+ raise CLIError(SSLERROR_TEMPLATE.format(str(err)))
except requests.exceptions.ConnectionError as err:
raise CLIError('Please ensure you have network connection. Error detail: ' + str(err))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure/cli/core/cloud.py new/azure-cli-core-2.0.77/azure/cli/core/cloud.py
--- old/azure-cli-core-2.0.75/azure/cli/core/cloud.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure/cli/core/cloud.py 2019-11-22 06:26:37.000000000 +0100
@@ -4,11 +4,13 @@
# --------------------------------------------------------------------------------------------
import os
+import json
from pprint import pformat
from six.moves import configparser
from azure.cli.core.profiles import API_PROFILES
from azure.cli.core._config import GLOBAL_CONFIG_DIR
+from azure.cli.core.util import urlretrieve
from knack.log import get_logger
from knack.util import CLIError
@@ -127,6 +129,59 @@
return val
+def _get_ossrdbms_resource_id(cloud_name):
+ ossrdbms_mapper = {
+ 'AzureCloud': 'https://ossrdbms-aad.database.windows.net',
+ 'AzureChinaCloud': 'https://ossrdbms-aad.database.chinacloudapi.cn',
+ 'AzureUSGovernment': 'https://ossrdbms-aad.database.usgovcloudapi.net',
+ 'AzureGermanCloud': 'https://ossrdbms-aad.database.cloudapi.de'
+ }
+ return ossrdbms_mapper.get(cloud_name, None)
+
+
+def _get_microsoft_graph_resource_id(cloud_name):
+ graph_endpoint_mapper = {
+ 'AzureCloud': 'https://graph.microsoft.com/',
+ 'AzureChinaCloud': 'https://microsoftgraph.chinacloudapi.cn/',
+ 'AzureUSGovernment': 'https://graph.microsoft.us/',
+ 'AzureGermanCloud': 'https://graph.microsoft.de/'
+ }
+ return graph_endpoint_mapper.get(cloud_name, None)
+
+
+def _convert_arm_to_cli(arm_cloud_metadata_dict):
+ cli_cloud_metadata_dict = {}
+ for cloud in arm_cloud_metadata_dict:
+ cli_cloud_metadata_dict[cloud['name']] = _arm_to_cli_mapper(cloud)
+ return cli_cloud_metadata_dict
+
+
+def _arm_to_cli_mapper(arm_dict):
+ return Cloud(
+ arm_dict['name'],
+ endpoints=CloudEndpoints(
+ management=arm_dict['authentication']['audiences'][0],
+ resource_manager=arm_dict['resourceManager'],
+ sql_management=arm_dict['sqlManagement'],
+ batch_resource_id=arm_dict['batch'],
+ gallery=arm_dict['gallery'],
+ active_directory=arm_dict['authentication']['loginEndpoint'],
+ active_directory_resource_id=arm_dict['authentication']['audiences'][0],
+ active_directory_graph_resource_id=arm_dict['graphAudience'],
+ microsoft_graph_resource_id=_get_microsoft_graph_resource_id(arm_dict['name']), # pylint: disable=line-too-long # change once microsoft_graph_resource_id is fixed in ARM
+ vm_image_alias_doc=arm_dict['vmImageAliasDoc'], # pylint: disable=line-too-long
+ media_resource_id=arm_dict['media'],
+ ossrdbms_resource_id=_get_ossrdbms_resource_id(arm_dict['name']), # pylint: disable=line-too-long # change once ossrdbms_resource_id is available via ARM
+ active_directory_data_lake_resource_id=arm_dict['activeDirectoryDataLake'] if 'activeDirectoryDataLake' in arm_dict else None), # pylint: disable=line-too-long
+ suffixes=CloudSuffixes(
+ storage_endpoint=arm_dict['suffixes']['storage'],
+ keyvault_dns=arm_dict['suffixes']['keyVaultDns'],
+ sql_server_hostname=arm_dict['suffixes']['sqlServerHostname'],
+ azure_datalake_store_file_system_endpoint=arm_dict['suffixes']['azureDataLakeStoreFileSystem'] if 'azureDataLakeStoreFileSystem' in arm_dict['suffixes'] else None, # pylint: disable=line-too-long
+ azure_datalake_analytics_catalog_and_job_endpoint=arm_dict['suffixes']['azureDataLakeAnalyticsCatalogAndJob'] if 'azureDataLakeAnalyticsCatalogAndJob' in arm_dict['suffixes'] else None, # pylint: disable=line-too-long
+ acr_login_server_endpoint=arm_dict['suffixes']['acrLoginServer'] if 'acrLoginServer' in arm_dict['suffixes'] else None)) # pylint: disable=line-too-long
+
+
class Cloud(object): # pylint: disable=too-few-public-methods
""" Represents an Azure Cloud instance """
@@ -239,9 +294,19 @@
keyvault_dns='.vault.microsoftazure.de',
sql_server_hostname='.database.cloudapi.de'))
-
KNOWN_CLOUDS = [AZURE_PUBLIC_CLOUD, AZURE_CHINA_CLOUD, AZURE_US_GOV_CLOUD, AZURE_GERMAN_CLOUD]
+if 'ARM_CLOUD_METADATA_URL' in os.environ:
+ try:
+ arm_cloud_dict = json.loads(urlretrieve(os.getenv('ARM_CLOUD_METADATA_URL')))
+ cli_cloud_dict = _convert_arm_to_cli(arm_cloud_dict)
+ if 'AzureCloud' in cli_cloud_dict:
+ cli_cloud_dict['AzureCloud'].endpoints.active_directory = 'https://login.microsoftonline.com' # pylint: disable=line-too-long # change once active_directory is fixed in ARM for the public cloud
+ KNOWN_CLOUDS = list(cli_cloud_dict.values())
+ except Exception as ex: # pylint: disable=broad-except
+ logger.warning('Failed to load cloud metadata from the url specified by ARM_CLOUD_METADATA_URL')
+ raise ex
+
def _set_active_cloud(cli_ctx, cloud_name):
cli_ctx.config.set_value('cloud', 'name', cloud_name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure/cli/core/commands/__init__.py new/azure-cli-core-2.0.77/azure/cli/core/commands/__init__.py
--- old/azure-cli-core-2.0.75/azure/cli/core/commands/__init__.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure/cli/core/commands/__init__.py 2019-11-22 06:26:37.000000000 +0100
@@ -92,7 +92,7 @@
try:
return _load_file(poss_file)
except IOError:
- logger.debug("Failed to load @'%s', assume not a file", arg)
+ logger.debug("Failed to load '%s', assume not a file", arg)
return arg
# if @ not at the start it can't be a file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure/cli/core/commands/arm.py new/azure-cli-core-2.0.77/azure/cli/core/commands/arm.py
--- old/azure-cli-core-2.0.75/azure/cli/core/commands/arm.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure/cli/core/commands/arm.py 2019-11-22 06:26:37.000000000 +0100
@@ -218,8 +218,9 @@
deprecate_info = id_arg.settings.get('deprecate_info', None) if id_arg else None
id_kwargs = {
'metavar': 'ID',
- 'help': "One or more resource IDs (space-delimited). If provided, "
- "no other 'Resource Id' arguments should be specified.",
+ 'help': "One or more resource IDs (space-delimited). "
+ "It should be a complete resource ID containing all information of '{gname}' arguments. "
+ "If provided, no other '{gname}' arguments should be specified.".format(gname=group_name),
'dest': 'ids' if id_arg else '_ids',
'deprecate_info': deprecate_info,
'is_preview': id_arg.settings.get('is_preview', None) if id_arg else None,
@@ -309,7 +310,17 @@
# place the ID parts into the correct property lists
parts = parse_resource_id(val)
for arg in combined_args:
- getattr(namespace, arg.name).append(parts[arg.type.settings['id_part']])
+ id_part = arg.type.settings.get('id_part')
+ id_value = parts.get(id_part, None)
+ if id_value is None:
+ argument_name = arg.type.settings.get('options_list')[0]
+ raise CLIError("Argument {arg_name} cannot be derived from ID {id}. "
+ "Please provide a complete resource ID "
+ "containing all information of '{group_name}' "
+ "arguments. ".format(id=val,
+ arg_name=argument_name,
+ group_name=arg.arg_group))
+ getattr(namespace, arg.name).append(id_value)
# support deprecating --ids
deprecate_info = cmd.arguments['ids'].type.settings.get('deprecate_info')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure/cli/core/commands/template_create.py new/azure-cli-core-2.0.77/azure/cli/core/commands/template_create.py
--- old/azure-cli-core-2.0.75/azure/cli/core/commands/template_create.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure/cli/core/commands/template_create.py 2019-11-22 06:26:37.000000000 +0100
@@ -42,7 +42,10 @@
# add parent name option string (if applicable)
if other_required_option:
- help_text = '{} If name specified, also specify {}'.format(help_text, other_required_option)
+ help_text = '{} If name specified, also specify {}.'.format(help_text, other_required_option)
+ help_text = '{} If you want to use an existing {display_name} in other resource group or subscription, ' \
+ 'please provide the ID instead of the name of the {display_name}'.format(help_text,
+ display_name=display_name)
return help_text
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure/cli/core/profiles/_shared.py new/azure-cli-core-2.0.77/azure/cli/core/profiles/_shared.py
--- old/azure-cli-core-2.0.75/azure/cli/core/profiles/_shared.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure/cli/core/profiles/_shared.py 2019-11-22 06:26:37.000000000 +0100
@@ -47,6 +47,7 @@
MGMT_RESOURCE_POLICY = ('azure.mgmt.resource.policy', 'PolicyClient')
MGMT_RESOURCE_RESOURCES = ('azure.mgmt.resource.resources', 'ResourceManagementClient')
MGMT_RESOURCE_SUBSCRIPTIONS = ('azure.mgmt.resource.subscriptions', 'SubscriptionClient')
+ MGMT_MONITOR = ('azure.mgmt.monitor', 'MonitorManagementClient')
DATA_KEYVAULT = ('azure.keyvault', 'KeyVaultClient')
MGMT_EVENTHUB = ('azure.mgmt.eventhub', 'EventHubManagementClient')
# the "None" below will stay till a command module fills in the type so "get_mgmt_service_client"
@@ -76,7 +77,6 @@
MGMT_IOTCENTRAL = ('azure.mgmt.iotcentral', None)
MGMT_DEVTESTLABS = ('azure.mgmt.devtestlabs', None)
MGMT_MAPS = ('azure.mgmt.maps', None)
- MGMT_MONITOR = ('azure.mgmt.monitor', None)
MGMT_POLICYINSIGHTS = ('azure.mgmt.policyinsights', None)
MGMT_RDBMS = ('azure.mgmt.rdbms', None)
MGMT_REDIS = ('azure.mgmt.redis', None)
@@ -124,18 +124,18 @@
AZURE_API_PROFILES = {
'latest': {
ResourceType.MGMT_STORAGE: '2019-04-01',
- ResourceType.MGMT_NETWORK: '2019-04-01',
- ResourceType.MGMT_COMPUTE: SDKProfile('2019-03-01', {
+ ResourceType.MGMT_NETWORK: '2019-09-01',
+ ResourceType.MGMT_COMPUTE: SDKProfile('2019-07-01', {
'resource_skus': '2019-04-01',
- 'disks': '2019-03-01',
- 'snapshots': '2019-03-01',
+ 'disks': '2019-07-01',
+ 'snapshots': '2019-07-01',
'galleries': '2019-07-01'
}),
ResourceType.MGMT_RESOURCE_FEATURES: '2015-12-01',
ResourceType.MGMT_RESOURCE_LINKS: '2016-09-01',
ResourceType.MGMT_RESOURCE_LOCKS: '2016-09-01',
ResourceType.MGMT_RESOURCE_POLICY: '2019-06-01',
- ResourceType.MGMT_RESOURCE_RESOURCES: '2019-05-10',
+ ResourceType.MGMT_RESOURCE_RESOURCES: '2019-07-01',
ResourceType.MGMT_RESOURCE_SUBSCRIPTIONS: '2016-06-01',
ResourceType.MGMT_NETWORK_DNS: '2018-05-01',
ResourceType.MGMT_KEYVAULT: '2018-02-14',
@@ -148,7 +148,33 @@
ResourceType.DATA_KEYVAULT: '7.0',
ResourceType.DATA_STORAGE: '2018-11-09',
ResourceType.DATA_COSMOS_TABLE: '2017-04-17',
- ResourceType.MGMT_EVENTHUB: '2017-04-01'
+ ResourceType.MGMT_EVENTHUB: '2017-04-01',
+ ResourceType.MGMT_MONITOR: SDKProfile('2019-06-01', {
+ 'activity_log_alerts': '2017-04-01',
+ 'activity_logs': '2015-04-01',
+ 'alert_rule_incidents': '2016-03-01',
+ 'alert_rules': '2016-03-01',
+ 'autoscale_settings': '2015-04-01',
+ 'baseline': '2018-09-01',
+ 'baselines': '2019-03-01',
+ 'diagnostic_settings': '2017-05-01-preview',
+ 'diagnostic_settings_category': '2017-05-01-preview',
+ 'event_categories': '2015-04-01',
+ 'guest_diagnostics_settings': '2018-06-01-preview',
+ 'guest_diagnostics_settings_association': '2018-06-01-preview',
+ 'log_profiles': '2016-03-01',
+ 'metric_alerts': '2018-03-01',
+ 'metric_alerts_status': '2018-03-01',
+ 'metric_baseline': '2018-09-01',
+ 'metric_definitions': '2018-01-01',
+ 'metric_namespaces': '2017-12-01-preview',
+ 'metrics': '2018-01-01',
+ 'operations': '2015-04-01',
+ 'scheduled_query_rules': '2018-04-16',
+ 'service_diagnostic_settings': '2016-09-01',
+ 'tenant_activity_logs': '2015-04-01',
+ 'vm_insights': '2018-11-27-preview'
+ })
},
'2019-03-01-hybrid': {
ResourceType.MGMT_STORAGE: '2017-10-01',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure/cli/core/util.py new/azure-cli-core-2.0.77/azure/cli/core/util.py
--- old/azure-cli-core-2.0.75/azure/cli/core/util.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure/cli/core/util.py 2019-11-22 06:26:37.000000000 +0100
@@ -9,16 +9,26 @@
import getpass
import base64
import binascii
+import platform
+import ssl
import six
+from six.moves.urllib.request import urlopen # pylint: disable=import-error
from knack.log import get_logger
from knack.util import CLIError, to_snake_case
+from azure.common import AzureException
logger = get_logger(__name__)
CLI_PACKAGE_NAME = 'azure-cli'
COMPONENT_PREFIX = 'azure-cli-'
+SSLERROR_TEMPLATE = ('Certificate verification failed. This typically happens when using Azure CLI behind a proxy '
+ 'that intercepts traffic with a self-signed certificate. '
+ # pylint: disable=line-too-long
+ 'Please add this certificate to the trusted CA bundle: https://github.com/Azure/azure-cli/blob/dev/doc/use_cli_effectively.md#work…. '
+ 'Error detail: {}')
+
def handle_exception(ex): # pylint: disable=too-many-return-statements
# For error code, follow guidelines at https://docs.python.org/2/library/sys.html#sys.exit,
@@ -33,14 +43,18 @@
logger.error("To learn more about --query, please visit: "
"https://docs.microsoft.com/cli/azure/query-azure-cli?view=azure-cli-latest")
return 1
- if isinstance(ex, (CLIError, CloudError)):
+ if isinstance(ex, (CLIError, CloudError, AzureException)):
logger.error(ex.args[0])
return ex.args[1] if len(ex.args) >= 2 else 1
if isinstance(ex, ValidationError):
logger.error('validation error: %s', ex)
return 1
if isinstance(ex, ClientRequestError):
- logger.error("request failed: %s", ex)
+ msg = str(ex)
+ if 'SSLError' in msg:
+ logger.error("request failed: %s", SSLERROR_TEMPLATE.format(msg))
+ else:
+ logger.error("request failed: %s", ex)
return 1
if isinstance(ex, KeyboardInterrupt):
return 1
@@ -119,7 +133,6 @@
def get_az_version_string():
- import platform
from azure.cli.core.extension import get_extensions, EXTENSIONS_DIR, DEV_EXTENSION_SOURCES
output = six.StringIO()
@@ -179,6 +192,9 @@
_print()
_print('Legal docs and information: aka.ms/AzureCliLegal')
_print()
+ if sys.version.startswith('2.7'):
+ _print("* DEPRECATION: Python 2.7 will reach the end of its life on January 1st, 2020. \nA future version of Azure CLI will drop support for Python 2.7.")
+ _print()
version_string = output.getvalue()
# if unable to query PyPI, use sentinel value to flag that
@@ -357,9 +373,9 @@
def open_page_in_browser(url):
import subprocess
import webbrowser
- platform_name, release = _get_platform_info()
+ platform_name, _ = _get_platform_info()
- if _is_wsl(platform_name, release): # windows 10 linux subsystem
+ if is_wsl(): # windows 10 linux subsystem
try:
return subprocess.call(['cmd.exe', '/c', "start {}".format(url.replace('&', '^&'))])
except OSError: # WSL might be too old # FileNotFoundError introduced in Python 3
@@ -377,7 +393,6 @@
def _get_platform_info():
- import platform
uname = platform.uname()
# python 2, `platform.uname()` returns: tuple(system, node, release, version, machine, processor)
platform_name = getattr(uname, 'system', None) or uname[0]
@@ -385,16 +400,21 @@
return platform_name.lower(), release.lower()
-def _is_wsl(platform_name, release):
+def is_wsl():
platform_name, release = _get_platform_info()
return platform_name == 'linux' and release.split('-')[-1] == 'microsoft'
+def is_windows():
+ platform_name, _ = _get_platform_info()
+ return platform_name == 'windows'
+
+
def can_launch_browser():
import os
import webbrowser
- platform_name, release = _get_platform_info()
- if _is_wsl(platform_name, release) or platform_name != 'linux':
+ platform_name, _ = _get_platform_info()
+ if is_wsl() or platform_name != 'linux':
return True
# per https://unix.stackexchange.com/questions/46305/is-there-a-way-to-retrieve-t…
# and https://unix.stackexchange.com/questions/193827/what-is-display-0
@@ -601,3 +621,18 @@
def __exit__(self, exc_type, exc_val, exc_tb):
setattr(self.cli_config, 'use_local_config', self.original_use_local_config)
+
+
+def _ssl_context():
+ if sys.version_info < (3, 4) or (in_cloud_console() and platform.system() == 'Windows'):
+ try:
+ return ssl.SSLContext(ssl.PROTOCOL_TLS) # added in python 2.7.13 and 3.6
+ except AttributeError:
+ return ssl.SSLContext(ssl.PROTOCOL_TLSv1)
+
+ return ssl.create_default_context()
+
+
+def urlretrieve(url):
+ req = urlopen(url, context=_ssl_context())
+ return req.read()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure_cli_core.egg-info/PKG-INFO new/azure-cli-core-2.0.77/azure_cli_core.egg-info/PKG-INFO
--- old/azure-cli-core-2.0.75/azure_cli_core.egg-info/PKG-INFO 2019-10-11 10:59:57.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure_cli_core.egg-info/PKG-INFO 2019-11-22 06:26:47.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: azure-cli-core
-Version: 2.0.75
+Version: 2.0.77
Summary: Microsoft Azure Command-Line Tools Core Module
Home-page: https://github.com/Azure/azure-cli
Author: Microsoft Corporation
@@ -15,9 +15,19 @@
Release History
===============
+ 2.0.77
+ ++++++
+ * Add deprecate message for Python 2.7
+ * Refine the help and error messages for `--ids`
+
+ 2.0.76
+ ++++++
+ * no changes
+
2.0.75
++++++
* Add syntax check for --set parameter in generic update command.
+ * Fix #10760: `az login` fails if subscription name is None
* Minor change in DeploymentOutputLongRunningOperation
2.0.74
@@ -475,5 +485,6 @@
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
Classifier: License :: OSI Approved :: MIT License
Provides-Extra: test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/azure_cli_core.egg-info/requires.txt new/azure-cli-core-2.0.77/azure_cli_core.egg-info/requires.txt
--- old/azure-cli-core-2.0.75/azure_cli_core.egg-info/requires.txt 2019-10-11 10:59:57.000000000 +0200
+++ new/azure-cli-core-2.0.77/azure_cli_core.egg-info/requires.txt 2019-11-22 06:26:47.000000000 +0100
@@ -12,7 +12,7 @@
pyopenssl>=17.1.0
pyyaml
requests~=2.20
-six
+six~=1.12
wheel==0.30.0
azure-mgmt-resource~=4.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/azure-cli-core-2.0.75/setup.py new/azure-cli-core-2.0.77/setup.py
--- old/azure-cli-core-2.0.75/setup.py 2019-10-11 10:59:52.000000000 +0200
+++ new/azure-cli-core-2.0.77/setup.py 2019-11-22 06:26:37.000000000 +0100
@@ -17,7 +17,7 @@
logger.warn("Wheel is not available, disabling bdist_wheel hook")
cmdclass = {}
-VERSION = "2.0.75"
+VERSION = "2.0.77"
# If we have source, validate that our version numbers match
# This should prevent uploading releases with mismatched versions.
try:
@@ -49,6 +49,7 @@
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
'License :: OSI Approved :: MIT License',
]
@@ -67,7 +68,7 @@
'pyopenssl>=17.1.0', # https://github.com/pyca/pyopenssl/pull/612
'pyyaml',
'requests~=2.20',
- 'six',
+ 'six~=1.12',
'wheel==0.30.0',
'azure-mgmt-resource~=4.0',
]
1
0