Skip to content

Commit 41170c8

Browse files
authored
chore: update project structure to 45f4b1f9
1 parent b75e25f commit 41170c8

File tree

4 files changed

+141
-2
lines changed

4 files changed

+141
-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": "45f4b1f9471d442bebcfcbc67c53bc3488de2beb",
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": "45f4b1f9471d442bebcfcbc67c53bc3488de2beb"
1616
}
1717
},
1818
"directory": null
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+
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: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
diff a/pyproject.toml b/pyproject.toml (rejected hunks)
2+
@@ -1,63 +1,58 @@
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.optional-dependencies]
23+
+dev = [
24+
+ "mkdocstrings[python]",
25+
+ "mkdocs-material",
26+
+ "mkdocs-table-reader-plugin",
27+
+ "mkdocs-gen-files",
28+
+ "mkdocs-literate-nav",
29+
+ "mkdocs-section-index",
30+
+ "mypy",
31+
+ "pre-commit",
32+
+ "pymdown-extensions",
33+
+ "pytest",
34+
+ "pytest-github-actions-annotate-failures",
35+
+ "pytest-cov",
36+
+ "python-kacl",
37+
+ "ruff"
38+
+]
39+
+
40+
+[project.urls]
41+
homepage = "https://collijk.github.io/rra-tools"
42+
repository = "https://github.com/collijk/rra-tools"
43+
+documentation = "https://collijk.github.io/rra-tools"
44+
45+
-classifiers = [
46+
- "Development Status :: 4 - Beta",
47+
- "Intended Audience :: Developers",
48+
- "Operating System :: OS Independent",
49+
- "Programming Language :: Python",
50+
- "Programming Language :: Python :: 3",
51+
- "Programming Language :: Python :: 3.10",
52+
- "Programming Language :: Python :: 3.11",
53+
- "Programming Language :: Python :: 3.12",
54+
- "Topic :: Software Development :: Libraries :: Python Modules",
55+
- "Typing :: Typed",
56+
-]
57+
+[project.scripts]
58+
+my-cli = "rra_tools.cli:main"
59+
60+
+[tool.poetry]
61+
packages = [
62+
{ include = "rra_tools", from = "src" }
63+
]
64+
+requires-poetry = ">=2.0"
65+
66+
[tool.poetry.dependencies]
67+
-python = ">=3.10, <4.0"
68+
-click = "*"
69+
-
70+
-[tool.poetry.group.dev.dependencies]
71+
-mkdocstrings = {version = "*", extras = ["python"]}
72+
-mkdocs-material = "*"
73+
-mkdocs-table-reader-plugin = "*"
74+
-mkdocs-gen-files = "*"
75+
-mkdocs-literate-nav = "*"
76+
-mkdocs-section-index = "*"
77+
-mypy = "*"
78+
-pre-commit = "*"
79+
-pymdown-extensions = "*"
80+
-pytest = "*"
81+
-pytest-github-actions-annotate-failures = "*"
82+
-pytest-cov = "*"
83+
-python-kacl = "*"
84+
-ruff = "*"
85+
+python = ">=3.12, <4.0"
86+
87+
[build-system]
88+
-requires = ["poetry-core>=1.0.0"]
89+
+requires = ["poetry-core>=2.0.0"]
90+
build-backend = "poetry.core.masonry.api"
91+
92+
-[tool.poetry.scripts]
93+
-my-cli = "rra_tools.cli:main"
94+
-
95+
[tool.ruff]
96+
-target-version = "py310" # The lowest supported version
97+
+target-version = "py312" # The lowest supported version
98+
99+
[tool.ruff.lint]
100+
# By default, enable all the lint rules.
101+
@@ -117,7 +112,7 @@ exclude_lines = [
102+
# This is the global mypy configuration.
103+
# Avoid changing this!
104+
strict = true # See all the enabled flags `mypy --help | grep -A 10 'Strict mode'`
105+
-disallow_any_unimported = true
106+
+disallow_any_unimported = false
107+
108+
# If you need to ignore something for some specific module,
109+
# add overrides for them. Avoid changing the global config!
110+
@@ -128,9 +123,3 @@ disallow_any_unimported = true
111+
# "my_unpyted_dependency2.*"
112+
# ]
113+
# ignore_missing_imports = true
114+
-
115+
-# [[tool.mypy.overrides]]
116+
-# module = [
117+
-# "tests/my_thing/test_my_thing",
118+
-# ]
119+
-# disallow_untyped_defs = false

0 commit comments

Comments
 (0)