From cb7fb883511954eea7068d665d61bcee08d08e27 Mon Sep 17 00:00:00 2001 From: ri0t Date: Tue, 19 Oct 2021 18:44:44 +0200 Subject: [PATCH] fixes wrong (renamed) repository owner for cookiecutter-pypackage --- HISTORY.md | 10 +++++----- docs/advanced/calling_from_python.rst | 2 +- docs/advanced/user_config.rst | 2 +- docs/overview.rst | 2 +- docs/tutorials/tutorial1.rst | 16 ++++++++-------- docs/usage.rst | 10 +++++----- tests/repository/test_is_repo_url.py | 6 +++--- tests/vcs/test_identify_repo.py | 8 ++++---- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 5f647aa3a..5f8626cb7 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -226,7 +226,7 @@ Other Changes: * Tests update: use sys.executable when invoking python in python 3 only environment thanks to [@vincentbernat](https://github.com/vincentbernat) (#1221) * Prevent `click` API v7.0 from showing choices when already shown, thanks to [@rly](https://github.com/rly) and [@luzfcb](https://github.com/luzfcb) (#1168) * Test the codebase with python3.8 beta on tox and travis-ci (#1206), thanks to [@mihrab34](https://github.com/mihrab34) -* Add a [CODE\_OF\_CONDUCT.md](https://github.com/audreyr/cookiecutter/blob/master/CODE_OF_CONDUCT.md) file to the project, thanks to [@andreagrandi](https://github.com/andreagrandi) (#1009) +* Add a [CODE\_OF\_CONDUCT.md](https://github.com/audreyfeldroy/cookiecutter/blob/master/CODE_OF_CONDUCT.md) file to the project, thanks to [@andreagrandi](https://github.com/andreagrandi) (#1009) * Update docstrings in `cookiecutter/main.py`, `cookiecutter/__init__.py`, and `cookiecutter/log.py` to follow the PEP 257 style guide, thanks to [@meahow](https://github.com/meahow) (#998, #999, #1000) * Update docstrings in `cookiecutter/utils.py` to follow the PEP 257 style guide, thanks to [@dornheimer](https://github.com/dornheimer)(#1026) * Fix grammar in *Choice Variables* documentation, thanks to [@jubrilissa](https://github.com/jubrilissa) (#1011) @@ -548,7 +548,7 @@ Other Changes: * Enable py35 support on Travis by using Python 3.5 as base Python ([@maiksensi](https://github.com/maiksensi) / #540) * If a filename is empty, do not generate. Log instead ([@iljabauer](https://github.com/iljabauer) / #444) -* Fix tests as per last changes in [cookiecutter-pypackage](https://github.com/audreyr/cookiecutter-pypackage), thanks to [@eliasdorneles](https://github.com/eliasdorneles)(#555). +* Fix tests as per last changes in [cookiecutter-pypackage](https://github.com/audreyfeldroy/cookiecutter-pypackage), thanks to [@eliasdorneles](https://github.com/eliasdorneles)(#555). * Removed deprecated cookiecutter-pylibrary-minimal from the list, thanks to [@ionelmc](https://github.com/ionelmc) (#556) * Moved to using rualmel.yaml instead of PyYAML, except for Windows users on Python 2.7, thanks to [@pydanny](https://github.com/pydanny) (#557) @@ -823,8 +823,8 @@ Other changes: # Create project from the cookiecutter-pypackage/ template $ cookiecutter cookiecutter-pypackage/ # Create project from the cookiecutter-pypackage.git repo template - $ cookiecutter https://github.com/audreyr/cookiecutter-pypackage.git -``` + $ cookiecutter https://github.com/audreyfeldroy/cookiecutter-pypackage.git +``` * Can now use Cookiecutter from Python as a package: @@ -835,7 +835,7 @@ Other changes: cookiecutter('cookiecutter-pypackage/') # Create project from the cookiecutter-pypackage.git repo template - cookiecutter('https://github.com/audreyr/cookiecutter-pypackage.git') + cookiecutter('https://github.com/audreyfeldroy/cookiecutter-pypackage.git') ``` * Internal refactor to remove any code that changes the working diff --git a/docs/advanced/calling_from_python.rst b/docs/advanced/calling_from_python.rst index b497b6bf0..c51b09f0b 100644 --- a/docs/advanced/calling_from_python.rst +++ b/docs/advanced/calling_from_python.rst @@ -13,7 +13,7 @@ You can use Cookiecutter from Python: cookiecutter('cookiecutter-pypackage/') # Create project from the cookiecutter-pypackage.git repo template - cookiecutter('https://github.com/audreyr/cookiecutter-pypackage.git') + cookiecutter('https://github.com/audreyfeldroy/cookiecutter-pypackage.git') This is useful if, for example, you're writing a web framework and need to provide developers with a tool similar to `django-admin.py startproject` or `npm init`. diff --git a/docs/advanced/user_config.rst b/docs/advanced/user_config.rst index c7a8e9826..59063b291 100644 --- a/docs/advanced/user_config.rst +++ b/docs/advanced/user_config.rst @@ -36,7 +36,7 @@ Example user config: cookiecutters_dir: "/home/audreyr/my-custom-cookiecutters-dir/" replay_dir: "/home/audreyr/my-custom-replay-dir/" abbreviations: - pp: https://github.com/audreyr/cookiecutter-pypackage.git + pp: https://github.com/audreyfeldroy/cookiecutter-pypackage.git gh: https://github.com/{0}.git bb: https://bitbucket.org/{0} diff --git a/docs/overview.rst b/docs/overview.rst index dd06999ef..6c75f77fe 100644 --- a/docs/overview.rst +++ b/docs/overview.rst @@ -32,7 +32,7 @@ You must have: Beyond that, you can have whatever files/directories you want. -See https://github.com/audreyr/cookiecutter-pypackage for a real-world example +See https://github.com/audreyfeldroy/cookiecutter-pypackage for a real-world example of this. Output diff --git a/docs/tutorials/tutorial1.rst b/docs/tutorials/tutorial1.rst index 0871ca696..e7133fe91 100644 --- a/docs/tutorials/tutorial1.rst +++ b/docs/tutorials/tutorial1.rst @@ -14,9 +14,8 @@ Case Study: cookiecutter-pypackage *cookiecutter-pypackage* is a cookiecutter template that creates the starter boilerplate for a Python package. -.. note:: - There are several variations of it. - For this tutorial we'll use the original version at https://github.com/audreyr/cookiecutter-pypackage/. +.. note:: There are several variations of it, but for this tutorial we'll use + the original version at https://github.com/audreyfeldroy/cookiecutter-pypackage/. Step 1: Generate a Python Package Project ------------------------------------------ @@ -27,7 +26,7 @@ At the command line, run the cookiecutter command, passing in the link to cookie .. code-block:: bash - $ cookiecutter https://github.com/audreyr/cookiecutter-pypackage.git + $ cookiecutter https://github.com/audreyfeldroy/cookiecutter-pypackage.git Local Cloning of Project Template ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -95,8 +94,7 @@ How did that work? Step 3: Observe How It Was Generated ------------------------------------ -Let's take a look at cookiecutter-pypackage together. -Open https://github.com/audreyr/cookiecutter-pypackage in a new browser window. +Let's take a look at cookiecutter-pypackage together. Open https://github.com/audreyfeldroy/cookiecutter-pypackage in a new browser window. {{ cookiecutter.project_slug }} ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -111,7 +109,8 @@ This happens in `find.py`, where the `find_template()` method looks for the firs AUTHORS.rst ~~~~~~~~~~~ -Look at the raw version of `{{ cookiecutter.project_slug }}/AUTHORS.rst`, at https://raw.github.com/audreyr/cookiecutter-pypackage/master/%7B%7Bcookiecutter.project_slug%7D%7D/AUTHORS.rst. +Look at the raw version of `{{ cookiecutter.project_slug }}/AUTHORS.rst`, at +https://raw.github.com/audreyfeldroy/cookiecutter-pypackage/master/%7B%7Bcookiecutter.project_slug%7D%7D/AUTHORS.rst. Observe how it corresponds to the `AUTHORS.rst` file that you generated. @@ -142,7 +141,8 @@ You should see JSON that corresponds to the prompts and default values shown ear Questions? ---------- -If anything needs better explanation, please take a moment to file an issue at https://github.com/audreyr/cookiecutter/issues with what could be improved about this tutorial. +If anything needs better explanation, please take a moment to file an issue at https://github.com/audreyfeldroy/cookiecutter/issues with what could be improved +about this tutorial. Summary ------- diff --git a/docs/usage.rst b/docs/usage.rst index 9b7b95fe5..872cbe2b7 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -7,7 +7,7 @@ Grab a Cookiecutter template First, clone a Cookiecutter project template:: - $ git clone git@github.com:audreyr/cookiecutter-pypackage.git + $ git clone https://github.com/audreyfeldroy/cookiecutter-pypackage.git Make your changes ----------------- @@ -40,14 +40,14 @@ Works directly with git and hg (mercurial) repos too To create a project from the cookiecutter-pypackage.git repo template:: - $ cookiecutter gh:audreyr/cookiecutter-pypackage + $ cookiecutter gh:audreyfeldroy/cookiecutter-pypackage Cookiecutter knows abbreviations for Github (``gh``), Bitbucket (``bb``), and GitLab (``gl``) projects, but you can also give it the full URL to any repository:: - $ cookiecutter https://github.com/audreyr/cookiecutter-pypackage.git - $ cookiecutter git+ssh://git@github.com/audreyr/cookiecutter-pypackage.git + $ cookiecutter https://github.com/audreyfeldroy/cookiecutter-pypackage.git + $ cookiecutter git+ssh://git@github.com/audreyfeldroy/cookiecutter-pypackage.git $ cookiecutter hg+ssh://hg@bitbucket.org/audreyr/cookiecutter-pypackage You will be prompted to enter a bunch of project config values. (These are @@ -58,7 +58,7 @@ that you entered. It will be placed in your current directory. And if you want to specify a branch you can do that with:: - $ cookiecutter https://github.com/audreyr/cookiecutter-pypackage.git --checkout develop + $ cookiecutter https://github.com/audreyfeldroy/cookiecutter-pypackage.git --checkout develop Works with private repos ------------------------ diff --git a/tests/repository/test_is_repo_url.py b/tests/repository/test_is_repo_url.py index 64238e02e..5591be0fc 100644 --- a/tests/repository/test_is_repo_url.py +++ b/tests/repository/test_is_repo_url.py @@ -25,8 +25,8 @@ def test_is_zip_file(zipfile): @pytest.fixture( params=[ 'gitolite@server:team/repo', - 'git@github.com:audreyr/cookiecutter.git', - 'https://github.com/audreyr/cookiecutter.git', + 'git@github.com:audreyfeldroy/cookiecutter.git', + 'https://github.com/cookiecutter/cookiecutter.git', 'git+https://private.com/gitrepo', 'hg+https://private.com/mercurialrepo', 'https://bitbucket.org/pokoli/cookiecutter.hg', @@ -65,7 +65,7 @@ def test_is_repo_url_for_local_urls(local_repo_url): def test_expand_abbreviations(): """Validate `repository.expand_abbreviations` correctly translate url.""" - template = 'gh:audreyr/cookiecutter-pypackage' + template = 'gh:audreyfeldroy/cookiecutter-pypackage' # This is not a valid repo url just yet! # First `repository.expand_abbreviations` needs to translate it diff --git a/tests/vcs/test_identify_repo.py b/tests/vcs/test_identify_repo.py index fe264edcd..bfb3d56a2 100644 --- a/tests/vcs/test_identify_repo.py +++ b/tests/vcs/test_identify_repo.py @@ -24,14 +24,14 @@ ), ('https://bitbucket.org/foo/bar.hg', 'hg', 'https://bitbucket.org/foo/bar.hg'), ( - 'https://github.com/audreyr/cookiecutter-pypackage.git', + 'https://github.com/audreyfeldroy/cookiecutter-pypackage.git', 'git', - 'https://github.com/audreyr/cookiecutter-pypackage.git', + 'https://github.com/audreyfeldroy/cookiecutter-pypackage.git', ), ( - 'https://github.com/audreyr/cookiecutter-pypackage', + 'https://github.com/audreyfeldroy/cookiecutter-pypackage', 'git', - 'https://github.com/audreyr/cookiecutter-pypackage', + 'https://github.com/audreyfeldroy/cookiecutter-pypackage', ), ( 'git@gitorious.org:cookiecutter-gitorious/cookiecutter-gitorious.git',