Merge branch 'maintenance-0.6' into master

kanghyojun · kanghyojun · commit c24b587539a1 · 2021-02-23T00:18:56.000+09:00
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -51,8 +51,8 @@ Released on February 11, 2018.
 - ``nirum.datastructures.List`` became to show its contents when it's passed
   to ``repr()``.  [`#103`__, `#108`__ by Chang-soo Han]
 
-__ https://github.com/spoqa/nirum-python/issues/103
-__ https://github.com/spoqa/nirum-python/pull/108
+__ https://github.com/nirum-lang/nirum-python/issues/103
+__ https://github.com/nirum-lang/nirum-python/pull/108
 
 
 Version 0.6.1
@@ -123,10 +123,10 @@ Released on July 11, 2017.
 
 - Fixed ``NameError`` raised from forward references.  [`compiler #138`_]
 
-.. _#79: https://github.com/spoqa/nirum-python/issues/79
-.. _compiler #138: https://github.com/spoqa/nirum/issues/138
-.. _nirum-python-http: https://github.com/spoqa/nirum-python-http
-.. _nirum-python-wsgi: https://github.com/spoqa/nirum-python-wsgi
+.. _#79: https://github.com/nirum-lang/nirum-python/issues/79
+.. _compiler #138: https://github.com/nirum-lang/nirum/issues/138
+.. _nirum-python-http: https://github.com/nirum-lang/nirum-python-http
+.. _nirum-python-wsgi: https://github.com/nirum-lang/nirum-python-wsgi
 
 
 Version 0.5.6
@@ -147,7 +147,7 @@ Released on April 5, 2018.
   function) to ``nirum.datastructures.Map`` and ``nirum.datastructures.List``.
   [`#110`_]
 
-.. _#110: https://github.com/spoqa/nirum-python/issues/110
+.. _#110: https://github.com/nirum-lang/nirum-python/issues/110
 
 
 Version 0.5.4
@@ -184,7 +184,7 @@ Released on June 23, 2017.
   it became a new-style class also on Python 2. (As Python 3 has only new-style
   class, there's no change on Python 3.)
 
-.. _#87: https://github.com/spoqa/nirum-python/pull/87
+.. _#87: https://github.com/nirum-lang/nirum-python/pull/87
 
 
 Version 0.5.1
@@ -211,9 +211,9 @@ Released on June 22, 2017.
 - Corrected a typo ``Accepts`` on request headers ``Client`` makes to
   ``Accept``.
 
-.. _#78: https://github.com/spoqa/nirum-python/pull/78
-.. _#83: https://github.com/spoqa/nirum-python/issues/83
-.. _#80: https://github.com/spoqa/nirum-python/pull/80
+.. _#78: https://github.com/nirum-lang/nirum-python/pull/78
+.. _#83: https://github.com/nirum-lang/nirum-python/issues/83
+.. _#80: https://github.com/nirum-lang/nirum-python/pull/80
 
 
 Version 0.5.0
@@ -224,7 +224,7 @@ Released on June 1, 2017.
 - Service methods became able to specify its error type. [`#71`_]
 - Added ``nirum-server`` command to run simply Nirum service.
 
-.. _#71: https://github.com/spoqa/nirum-python/issues/71
+.. _#71: https://github.com/nirum-lang/nirum-python/issues/71
 
 
 Version 0.4.3
@@ -273,6 +273,6 @@ Released on March 20, 2017.
   ``nirum.datastructures.List`` as ``list_type`` to avoid name
   conflict with user-defined types.
 
-__ https://github.com/spoqa/nirum/blob/f1629787f45fef17eeab8b4f030c34580e0446b8/docs/serialization.md
-.. _#66: https://github.com/spoqa/nirum-python/pull/66
-.. _#49: https://github.com/spoqa/nirum-python/issues/49
+__ https://github.com/nirum-lang/nirum/blob/f1629787f45fef17eeab8b4f030c34580e0446b8/docs/serialization.md
+.. _#66: https://github.com/nirum-lang/nirum-python/pull/66
+.. _#49: https://github.com/nirum-lang/nirum-python/issues/49
diff --git a/README.rst b/README.rst
@@ -5,15 +5,15 @@ nirum-python
    :target: https://pypi.org/project/nirum/
    :alt: Latest PyPI version
 
-.. image:: https://travis-ci.org/spoqa/nirum-python.svg
-   :target: https://travis-ci.org/spoqa/nirum-python
+.. image:: https://api.travis-ci.com/nirum-lang/nirum-python.svg
+   :target: https://travis-ci.com/nirum-lang/nirum-python
    :alt: Build status
 
 The Nirum_ runtime library for Python.  Distributed under MIT license.
 
 (You probably don't need to directly use this package.)
 
-.. _Nirum: https://github.com/spoqa/nirum
+.. _Nirum: https://github.com/nirum-lang/nirum
 
 
 .. include:: CHANGES.rst
diff --git a/nirum/transport.py b/nirum/transport.py
@@ -22,7 +22,7 @@ def call(self,
                             call.  See also `Nirum's serialization format
                             docs <serialization-format>`_.
         :type method_name: :class:`str`
-        :param paylaod: A mapping of parameter names to serialized argument
+        :param payload: A mapping of parameter names to serialized argument
                         values.  The keys have to be normalized behind names
                         of parameters.  The values have to be serialized
                         argument values.  See also `Nirum's serialization
@@ -68,7 +68,7 @@ def call(self,
            Every transport has to implement this method.
 
         .. _serialization-format: \
-https://github.com/spoqa/nirum/blob/master/docs/serialization.md
+https://github.com/nirum-lang/nirum/blob/master/docs/serialization.md
 
         """
         raise NotImplementedError('Transport has to implement call() method')
diff --git a/setup.py b/setup.py
@@ -35,7 +35,10 @@ def get_version():
     'six', 'iso8601',
 ]
 tests_require = [
-    'pycodestyle < 2.4.0',
+    # flake8 does not yet support pycodestyle 2.4.0.
+    # Can be remove after this issue is fixed:
+    # https://gitlab.com/pycqa/flake8/issues/415
+    'pycodestyle >= 2.0, < 2.4.0',
     'pytest >= 3.2.3, < 4.0.0',
     'pytest-flake8 >= 0.9.1, < 1.0.0',
     'flake8-import-order >= 0.12, < 1.0',
@@ -44,8 +47,7 @@ def get_version():
 docs_require = [
     'Sphinx',
 ]
-extras_require = {
-    'tests': tests_require,
+extras_require = { 'tests': tests_require,
     'docs': docs_require,
 }
 below35_requires = [
@@ -75,8 +77,8 @@ def get_version():
     version=get_version(),
     description='The Nirum runtime library for Python',
     long_description=readme(),
-    url='https://github.com/spoqa/nirum-python',
-    bugtrack_url='https://github.com/spoqa/nirum/issues',
+    url='https://github.com/nirum-lang/nirum-python',
+    bugtrack_url='https://github.com/nirum-lang/nirum/issues',
     author='Kang Hyojun',
     author_email='iam.kanghyojun' '@' 'gmail.com',
     license='MIT license',
