Skip to content

[copier] Updating template to version 0.0.14#205

Merged
dfm merged 3 commits intomainfrom
copier/0.0.14
Aug 23, 2022
Merged

[copier] Updating template to version 0.0.14#205
dfm merged 3 commits intomainfrom
copier/0.0.14

Conversation

@dfm
Copy link
Copy Markdown
Owner

@dfm dfm commented Aug 23, 2022

This is an automated PR from https://github.com/dfm/copier-python

This updates the template to version 0.0.14. If there are merge conflicts,
they will be indicated with *.rej files that will be committed to this branch.
In this case, the lint workflow will fail, and you will need to resolve these
conflicts manually:

git checkout -b copier/0.0.14 origin/copier/0.0.14
# Fix the conflicts and commit
git push origin copier/0.0.14

Full update log below:

Copier log
Updating to template version 0.0.14
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint: 
hint: 	git config --global init.defaultBranch <name>
hint: 
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint: 
hint: 	git branch -m <name>

Copying from template version 0.0.14
 identical  .
  conflict  setup.py
 overwrite  setup.py
  conflict  .copier-answers.yml
 overwrite  .copier-answers.yml
 identical  .github
 identical  .github/workflows
 identical  .github/workflows/tests.yml
 identical  CODE_OF_CONDUCT.md
 identical  noxfile.py
 identical  tests
  conflict  tests/test_corner.py
      skip  tests/test_corner.py
  conflict  LICENSE
 overwrite  LICENSE
  conflict  README.md
      skip  README.md
 identical  readthedocs.yaml
  conflict  pyproject.toml
 overwrite  pyproject.toml
  conflict  .gitignore
 overwrite  .gitignore
 identical  .pre-commit-config.yaml
 identical  src
 identical  src/corner
  conflict  src/corner/__init__.py
      skip  src/corner/__init__.py
 identical  CONTRIBUTING.md
 > Running task 1 of 3: git init
 > Running task 2 of 3: git add .
 > Running task 3 of 3: pre-commit run --all-files || pre-commit run --all-files

dfm and others added 3 commits August 23, 2022 15:04
Updating to template version 0.0.14
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: 	git config --global init.defaultBranch <name>
hint:
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint:
hint: 	git branch -m <name>

Copying from template version 0.0.14
 identical  .
  conflict  setup.py
 overwrite  setup.py
  conflict  .copier-answers.yml
 overwrite  .copier-answers.yml
 identical  .github
 identical  .github/workflows
 identical  .github/workflows/tests.yml
 identical  CODE_OF_CONDUCT.md
 identical  noxfile.py
 identical  tests
  conflict  tests/test_corner.py
      skip  tests/test_corner.py
  conflict  LICENSE
 overwrite  LICENSE
  conflict  README.md
      skip  README.md
 identical  readthedocs.yaml
  conflict  pyproject.toml
 overwrite  pyproject.toml
  conflict  .gitignore
 overwrite  .gitignore
 identical  .pre-commit-config.yaml
 identical  src
 identical  src/corner
  conflict  src/corner/__init__.py
      skip  src/corner/__init__.py
 identical  CONTRIBUTING.md
 > Running task 1 of 3: git init
 > Running task 2 of 3: git add .
 > Running task 3 of 3: pre-commit run --all-files || pre-commit run --all-files
@dfm dfm merged commit 4e82ed3 into main Aug 23, 2022
@dfm dfm deleted the copier/0.0.14 branch August 23, 2022 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant