Merge master into release/1

--HG--
branch : release

Author: kazssym

.gitignore

@@ -1,9 +1,7 @@
-**/nbproject/private
 dist
 build
-**/.eggs/
-**/*.egg-info/
-**/__pycache__/
+.eggs
+*.egg-info
 *.pyc
 *.rej
 *.orig

.hgignore

@@ -1,10 +1,8 @@
 syntax: regexp
-(^|/)nbproject/private$
 (^|/)dist$
 (^|/)build$
-(^|/)\.eggs/
-\.egg-info/
-(^|/)__pycache__/
+(^|/)\.eggs$
+\.egg-info$
 \.pyc$
 \.rej$
 \.orig$

.hgtags

@@ -0,0 +1 @@
+91d2ec54cf909ab56b0de299730171fbe1a18226 release/1a1

MANIFEST.in

@@ -0,0 +1 @@
+include COPYING

README.md

@@ -1,13 +1,26 @@
-This file documents the hgext3rd.convertprcs package for Python.
-
 # Introduction
 
-This directory contains the source code for the
-[PRCS](http://prcs.sourceforge.net/) source add-on for the [Convert
-extension](http://mercurial.selenic.com/wiki/ConvertExtension) of
-[Mercurial](http://mercurial.selenic.com/).
+The `hg-convert-prcs-extension` package adds the [PRCS][] source to the
+[convert extension][] for [Mercurial][].
+
+[PRCS]: http://prcs.sourceforge.net/
+[Mercurial]: https://www.mercurial-scm.org/
+[convert extension]: https://www.mercurial-scm.org/wiki/ConvertExtension
+
+[![(Issues)](https://img.shields.io/bitbucket/issues/kazssym/hg-convert-prcs-extension.svg)][open issues]
+
+[open issues]: https://bitbucket.org/kazssym/hg-convert-prcs-extension/issues?status=new&status=open
+
+# License
+
+This program is provided under the terms and conditions of the
+[GNU General Public License, version 3][GPL-3.0] or any later version.
+
+[![(License)](https://img.shields.io/badge/license-GPL--3.0--or--later-blue.svg)][GPL-3.0]
+
+[GPL-3.0]: https://opensource.org/licenses/GPL-3.0 "GNU General Public License, version 3"
 
-## Required software
+# Required software
 
 This extension requires the following software:
 

azure-pipelines.yml

@@ -5,51 +5,51 @@
 # permitted in any medium without royalty provided the copyright notice and
 # this notice are preserved.  This file is offered as-is, without any warranty.
 ---
-  trigger:
-    - master
-    - release/**
-    - feature/**
-  stages:
-    - stage: Default
-      jobs:
-        - job: Build
-          pool:
-            vmImage: ubuntu-latest
-          steps:
-            - task: UsePythonVersion@0
-            - bash: |
-                pip install "setuptools>=38.6" wheel
-              displayName: Install dependencies
-            - bash: |
-                python ./setup.py test
-              displayName: Test
-            - task: PublishTestResults@2
-            - bash: |
-                python ./setup.py sdist bdist_wheel
-              displayName: Create archives
-            - publish: dist
-              artifact: dist
-    - stage: Release
-      condition: >-
-        and(succeeded(),
-          startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))
-      jobs:
-        - job: Upload
-          displayName: Upload to PyPI
-          pool:
-            vmImage: ubuntu-latest
-          steps:
-            - checkout: none
-            - download: current
-              artifact: dist
-            - task: UsePythonVersion@0
-            - bash: |
-                pip install twine
-              displayName: Install dependencies
-            - task: TwineAuthenticate@1
-              inputs:
-                pythonUploadServiceConnection: pypi
-            - bash: |
-                twine upload -r pypi --config-file $(PYPIRC_PATH) \
-                    $(Pipeline.Workspace)/dist/*
-              displayName: Upload
+trigger:
+  - master
+  - release/*
+  - feature/*
+stages:
+  - stage: Default
+    jobs:
+      - job: Build
+        pool:
+          vmImage: ubuntu-latest
+        steps:
+          - task: UsePythonVersion@0
+          - bash: |
+              pip install "setuptools>=38.6" wheel
+            displayName: Install dependencies
+          - bash: |
+              python ./setup.py test
+            displayName: Test
+          - task: PublishTestResults@2
+          - bash: |
+              python ./setup.py sdist bdist_wheel
+            displayName: Create archives
+          - publish: dist
+            artifact: dist
+  - stage: Release
+    condition: >-
+      and(succeeded(),
+        startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))
+    jobs:
+      - job: Upload
+        displayName: Upload to PyPI
+        pool:
+          vmImage: ubuntu-latest
+        steps:
+          - checkout: none
+          - download: current
+            artifact: dist
+          - task: UsePythonVersion@0
+          - bash: |
+              pip install twine
+            displayName: Install dependencies
+          - task: TwineAuthenticate@1
+            inputs:
+              pythonUploadServiceConnection: pypi
+          - bash: |
+              twine upload -r pypi --config-file $(PYPIRC_PATH) \
+                  $(Pipeline.Workspace)/dist/*
+            displayName: Upload

setup.py

@@ -24,7 +24,7 @@
 from setuptools import setup
 
 # Package version.
-PACKAGE_VERSION = "1a1"
+PACKAGE_VERSION = "1a2"
 
 def long_description():
     """
@@ -56,8 +56,9 @@ def long_description():
         python_requires=">=2.7",
         install_requires=[
             "mercurial>=4.7",
-            "prcslib>=1.0b4"
+            "prcslib>=1.0"
         ],
+        zip_safe=True,
 
         packages=[
             "hgext3rd.convert_prcs"