Skip to content

Commit e6e26a7

Browse files
collijkcollijk
authored
chore: update project structure to 6a159105
1 parent b75e25f commit e6e26a7

File tree

4 files changed

+134
-2
lines changed

4 files changed

+134
-2
lines changed

‎.cruft.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/collijk/python-package-cookiecutter",
3-
"commit": "cd59edc69d51f9485bca69eb940e0706bc65e9ba",
3+
"commit": "6a159105838fc80cba178d2fbcc6185fd3ef8df2",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {
@@ -12,7 +12,7 @@
1212
"package_name": "rra_tools",
1313
"project_short_description": "Common utilities for IHME Rapid Response team pipelines.",
1414
"_template": "https://github.com/collijk/python-package-cookiecutter",
15-
"_commit": "cd59edc69d51f9485bca69eb940e0706bc65e9ba"
15+
"_commit": "6a159105838fc80cba178d2fbcc6185fd3ef8df2"
1616
}
1717
},
1818
"directory": null

‎.github/workflows/cookiecutter.yml.rej‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
diff a/.github/workflows/cookiecutter.yml b/.github/workflows/cookiecutter.yml (rejected hunks)
2+
@@ -31,7 +31,7 @@ jobs:
3+
- name: apply additional changes and fixes
4+
if: steps.changes.outputs.changed > 0
5+
run: |
6+
- poetry lock --no-update # add new dependencies
7+
+ poetry lock # add new dependencies
8+
poetry install
9+
poetry run pre-commit run -a || true # we have to fix other issues manually
10+

‎.github/workflows/dependencies.yml.rej‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
diff a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml (rejected hunks)
2+
@@ -51,7 +51,7 @@ jobs:
3+
4+
- name: Update outdated packages
5+
if: ${{ steps.check_for_outdated_dependencies.outputs.body != 0 }}
6+
- run: poetry lock
7+
+ run: poetry lock --regenerate
8+
9+
# behaviour if PR already exists: https://github.com/marketplace/actions/create-pull-request#action-behaviour
10+
- name: Create Pull Request

‎pyproject.toml.rej‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
diff a/pyproject.toml b/pyproject.toml (rejected hunks)
2+
@@ -1,63 +1,61 @@
3+
-[tool.poetry]
4+
+[project]
5+
name = "rra-tools"
6+
version = "0.0.1"
7+
description = "Common utilities for IHME Rapid Response team pipelines."
8+
-authors = [
9+
- "James Collins <collijk@uw.edu>",
10+
-]
11+
license = "BSD-3-Clause"
12+
readme = "README.md"
13+
+authors = [
14+
+ {name = "James Collins", email = "collijk@uw.edu"},
15+
+]
16+
+requires-python = ">=3.12"
17+
+dependencies = [
18+
+ "click",
19+
+]
20+
21+
-documentation = "https://collijk.github.io/rra-tools"
22+
+[project.urls]
23+
homepage = "https://collijk.github.io/rra-tools"
24+
repository = "https://github.com/collijk/rra-tools"
25+
+documentation = "https://collijk.github.io/rra-tools"
26+
27+
-classifiers = [
28+
- "Development Status :: 4 - Beta",
29+
- "Intended Audience :: Developers",
30+
- "Operating System :: OS Independent",
31+
- "Programming Language :: Python",
32+
- "Programming Language :: Python :: 3",
33+
- "Programming Language :: Python :: 3.10",
34+
- "Programming Language :: Python :: 3.11",
35+
- "Programming Language :: Python :: 3.12",
36+
- "Topic :: Software Development :: Libraries :: Python Modules",
37+
- "Typing :: Typed",
38+
-]
39+
+[project.scripts]
40+
+my-cli = "rra_tools.cli:main"
41+
42+
+[tool.poetry]
43+
packages = [
44+
{ include = "rra_tools", from = "src" }
45+
]
46+
+requires-poetry = ">=2.0"
47+
48+
[tool.poetry.dependencies]
49+
-python = ">=3.10, <4.0"
50+
-click = "*"
51+
+python = ">=3.12, <4.0"
52+
53+
+# We keep the dev dependencies here instead of in the project optional dependencies
54+
+# so they're still installed by default with `poetry install`.
55+
+# They won't be installed or shipped with the package.
56+
[tool.poetry.group.dev.dependencies]
57+
-mkdocstrings = {version = "*", extras = ["python"]}
58+
-mkdocs-material = "*"
59+
+# Things we want to put a lower bound on
60+
+mypy = "^1.15.0"
61+
+mkdocs-material = "^9.6.0"
62+
+pre-commit = "^4.0.0"
63+
+pytest = "^8.3.0"
64+
+ruff = "^0.9.7"
65+
+# Things we don't care about the version
66+
+mkdocstrings = {extras = ["python"], version = "*"}
67+
mkdocs-table-reader-plugin = "*"
68+
mkdocs-gen-files = "*"
69+
mkdocs-literate-nav = "*"
70+
mkdocs-section-index = "*"
71+
-mypy = "*"
72+
-pre-commit = "*"
73+
pymdown-extensions = "*"
74+
-pytest = "*"
75+
pytest-github-actions-annotate-failures = "*"
76+
pytest-cov = "*"
77+
python-kacl = "*"
78+
-ruff = "*"
79+
80+
[build-system]
81+
-requires = ["poetry-core>=1.0.0"]
82+
+requires = ["poetry-core>=2.0.0"]
83+
build-backend = "poetry.core.masonry.api"
84+
85+
-[tool.poetry.scripts]
86+
-my-cli = "rra_tools.cli:main"
87+
-
88+
[tool.ruff]
89+
-target-version = "py310" # The lowest supported version
90+
+target-version = "py312" # The lowest supported version
91+
92+
[tool.ruff.lint]
93+
# By default, enable all the lint rules.
94+
@@ -117,7 +115,7 @@ exclude_lines = [
95+
# This is the global mypy configuration.
96+
# Avoid changing this!
97+
strict = true # See all the enabled flags `mypy --help | grep -A 10 'Strict mode'`
98+
-disallow_any_unimported = true
99+
+disallow_any_unimported = false
100+
101+
# If you need to ignore something for some specific module,
102+
# add overrides for them. Avoid changing the global config!
103+
@@ -128,9 +126,3 @@ disallow_any_unimported = true
104+
# "my_unpyted_dependency2.*"
105+
# ]
106+
# ignore_missing_imports = true
107+
-
108+
-# [[tool.mypy.overrides]]
109+
-# module = [
110+
-# "tests/my_thing/test_my_thing",
111+
-# ]
112+
-# disallow_untyped_defs = false

0 commit comments

Comments
 (0)