Skip to content

Commit

Permalink
[copier] Updating template to version 0.0.14 (dfm#205)
Browse files Browse the repository at this point in the history
* Updating template to 0.0.14

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

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* removing rej files

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
dfm and pre-commit-ci[bot] authored Aug 23, 2022
1 parent 350ca9d commit 4e82ed3
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
_commit: v0.0.10
_commit: v0.0.14
_src_path: gh:dfm/copier-python
author_email: foreman.mackey@gmail.com
author_fullname: Dan Foreman-Mackey
Expand Down
36 changes: 0 additions & 36 deletions .github/workflows/update-template.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ _skbuild
.coverage
.coverage*
dist
result_images
build
result_images
1 change: 0 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

BSD 2-Clause License

Copyright (c) 2013-2022 Dan Foreman-Mackey
Expand Down
6 changes: 5 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ known_first_party = ["corner"]
parallel = true
branch = true
source = ["corner"]
omit = ["docs/*", "tests/*", "*/corner/corner_version.py"]
omit = [
"docs/*",
"tests/*",
"*/corner/version.py",
]

[tool.coverage.paths]
source = ["src", "*/site-packages"]
Expand Down
8 changes: 6 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
from setuptools import setup
from setuptools import find_packages, setup

setup()
setup(
name="corner",
packages=find_packages(where="src"),
package_dir={"": "src"},
)

0 comments on commit 4e82ed3

Please sign in to comment.