Merge pull request #220 from graingert/update-urls

update various URLs/copyrights to the new pycqa/modernize project

Author: graingert

.pre-commit-config.yaml

@@ -33,6 +33,7 @@ repos:
       - id: check-merge-conflict
       - id: check-toml
       - id: check-yaml
+      - id: mixed-line-ending
 
   - repo: https://github.com/prettier/prettier
     rev: 2.1.1

.pre-commit-hooks.yaml

@@ -1,7 +1,12 @@
-- id: python-modernize
-  name: python-modernize
+- &modernize
+  id: modernize
+  name: modernize
   description: Modernizes Python code for eventual Python 3 migration.
-  entry: python-modernize
+  entry: modernize
   args: [--write, --fix=default, --nobackups]
   language: python
   types: [python]
+- <<: *modernize
+  id: python-modernize
+  name: modernize (deprecated)
+  description: "Deprecated in favour of `id: modernize`"

.readthedocs.yml

@@ -1 +1,12 @@
 version: 2
+
+sphinx:
+  fail_on_warning: true
+
+python:
+  version: 3.8
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

CHANGELOG.rst

@@ -1,3 +1,11 @@
+Version 0.8rc2-dev
+==================
+
+Unreleased.
+
+* add ``modernize`` console_script
+* move project to https://github.com/PyCQA/modernize/
+
 Version 0.8rc1
 ==============
 
@@ -55,7 +63,7 @@ Released 2014-10-14.
   Python 2.6, such as the ``except ... as`` construct, but this was not
   documented.)
 
-.. _Documentation: http://python-modernize.readthedocs.org/en/latest/
+.. _Documentation: https://modernize.readthedocs.org/en/latest/
 
 
 Version 0.3
@@ -66,7 +74,7 @@ Released 2014-08-12.
 * New fixer for ``raise E, V, T``, changed to ``six.reraise(E, V, T)``.
 * New fixer for metaclasses, using ``six.with_metaclass``.
 * Avoid adding redundant parentheses to ``print(x)``.
-* python-modernize can now be installed and run on Python 3.
+* modernize can now be installed and run on Python 3.
 * Fixed a bug where ``__future__`` imports were added multiple times.
 * Fixed a bug where fixer for ``zip()`` was recognising ``map()``.
 * The default is now to leave Unicode literals unchanged.

README.rst

@@ -10,11 +10,12 @@ This library is a very thin wrapper around `fissix
 to make Python 2 code more modern with the intention of eventually
 porting it over to Python 3.
 
-The ``python-modernize`` command works like `2to3
-<https://docs.python.org/3/library/2to3.html>`_. Here's how you'd rewrite a
+The ``python -m modernize`` command works like
+``python -m fissix``, see `fissix <https://github.com/jreese/fissix>`_.
+Here's how you'd rewrite a
 single file::
 
-    python-modernize -w example.py
+    python -m modernize -w example.py
 
 It does not guarantee, but it attempts to spit out a codebase compatible
 with Python 2.6+ or Python 3. The code that it generates has a runtime
@@ -23,18 +24,18 @@ dependency on `six <https://pypi.python.org/pypi/six>`_, unless the
 recommended. Some of the fixers output code that is not compatible with
 Python 2.5 or lower.
 
-**Documentation:** `python-modernize.readthedocs.io
-<https://python-modernize.readthedocs.io/>`_.
+**Documentation:** `modernize.readthedocs.io
+<https://modernize.readthedocs.io/>`_.
 
-See the ``LICENSE`` file for the license of ``python-modernize``.
+See the ``LICENSE`` file for the license of ``modernize``.
 Using this tool does not affect licensing of the modernized code.
 
-.. image:: https://readthedocs.org/projects/python-modernize/badge/
-    :target: https://readthedocs.org/projects/python-modernize/?badge=latest
+.. image:: https://readthedocs.org/projects/modernize/badge/
+    :target: https://readthedocs.org/projects/modernize/?badge=latest
     :alt: Documentation Status
 
-.. image:: https://api.travis-ci.org/python-modernize/python-modernize.svg?branch=master
-    :target: https://travis-ci.org/python-modernize/python-modernize
+.. image:: https://api.travis-ci.org/pycqa/modernize.svg?branch=master
+    :target: https://travis-ci.org/pycqa/modernize
 
-.. image:: https://coveralls.io/repos/python-modernize/python-modernize/badge.png?branch=master
-    :target: https://coveralls.io/r/python-modernize/python-modernize?branch=master
+.. image:: https://coveralls.io/repos/pycqa/modernize/badge.png?branch=master
+    :target: https://coveralls.io/r/pycqa/modernize?branch=master

docs/Makefile

@@ -9,7 +9,7 @@ BUILDDIR      = _build
 
 # User-friendly check for sphinx-build
 ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from https://www.sphinx-doc.org/)
 endif
 
 # Internal variables.

docs/conf.py

@@ -13,14 +13,6 @@
 
 from __future__ import generator_stop
 
-import os
-import sys
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath("sphinxext"))
-
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -29,7 +21,7 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ["extra_types", "sphinx.ext.intersphinx"]
+extensions = ["sphinx.ext.intersphinx"]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]
@@ -45,7 +37,7 @@
 
 # General information about the project.
 project = "modernize"
-copyright = "2014, python-modernize team"
+copyright = "2014, python-modernize team; 2020 pycqa/modernize team"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -95,9 +87,10 @@
 # keep_warnings = False
 
 intersphinx_mapping = {
-    "python": ("http://docs.python.org/3", None),
-    "python2": ("http://docs.python.org/2", None),
-    "six": ("http://pythonhosted.org/six/", None),
+    "python": ("https://docs.python.org/3", None),
+    "python2": ("https://docs.python.org/2", None),
+    "six": ("https://six.readthedocs.io/", None),
+    "fissix": ("https://fissix.readthedocs.io/en/latest/", None),
 }
 
 
@@ -134,7 +127,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
+html_static_path = []
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -205,7 +198,7 @@
         "index",
         "modernize.tex",
         "modernize Documentation",
-        "python-modernize team",
+        "pycqa/modernize team",
         "manual",
     )
 ]
@@ -236,7 +229,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ("index", "modernize", "modernize Documentation", ["python-modernize team"], 1)
+    ("index", "modernize", "modernize Documentation", ["pycqa/modernize team"], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -253,7 +246,7 @@
         "index",
         "modernize",
         "modernize Documentation",
-        "python-modernize team",
+        "pycqa/modernize team",
         "modernize",
         "One line description of project.",
         "Miscellaneous",