Skip to content

Resolving with upstream changes #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
AGeekInside wants to merge 65 commits into
base: main
Choose a base branch
from
Open

Resolving with upstream changes #5

AGeekInside wants to merge 65 commits into from

Conversation

@AGeekInside
Copy link
Owner

@AGeekInside AGeekInside commented May 8, 2021

No description provided.

mikeckennedy and others added 30 commits November 16, 2020 10:14
@mikeckennedy
Minor improvements to setup/version info.
6cc8244
@mikeckennedy
Remove redundant test for return type in template decorator. Improved…
bae0d90 
… error message.
@mikeckennedy
Add link over to fastapi-jinja
acab698
@mikeckennedy
Seems like we also need six to get the tests to run.
ab0639e
@mikeckennedy
Adds default template select (templates/module/method.pt) when not sp…
057ce4f 
…ecified.
@mikeckennedy
Fix bug in default template name detection.
82973fd
@mikeckennedy
Now guesses for *.html and then *.pt for convention naming convention.
fd34239
@mikeckennedy
Merge pull request #4 from mikeckennedy/both-.pt-and-.html-extensions-3
93814c0 
Now guesses for *.html and then *.pt for convention naming convention.
@mikeckennedy
Adds a little more testing around lack of calling global_init().
033ac16
@mikeckennedy
Adds a little more testing around lack of calling global_init().
81a7f12
@mikeckennedy
Fixes #7 - crash on empty template folder.
31d727a
@jmtaysom
Update README.md
4057d3f 
Added pipenv installation instructions
@mikeckennedy
Merge pull request #8 from jmtaysom/main
7c7f4ae
@fferegrino
Allow decorator without parentheses
22f04b2
@mikeckennedy
Merge pull request #9 from fferegrino/support-for-simple-decorator
a82e7b0 
Allow decorator without parentheses
@madeinoz67
Updates README with instructions to add via poetry
f8eb2d9
@mikeckennedy
Merge pull request #11 from madeinoz67/Add-poetry
648bd40 
Updates README with instructions to add via poetry
@fferegrino
Use fixtures to init the global path each test
216e07e
@fferegrino
Remove unused code
868fd8d
@mikeckennedy
Merge pull request #14 from fferegrino/use-fixtures-in-tests
deb8806 
Use fixtures in tests
@mikeckennedy
Fixes #15. Test on only Python 3.6+
08c5d3a
@jmtaysom
Merge pull request #1 from mikeckennedy/main
d726956 
upstream update
@jmtaysom
Updating to support only py3.6+
6e9aebd
@mikeckennedy
Merge pull request #16 from jmtaysom/main
b483049 
Update tox.ini for py3.6+ only
@jugmac00
drop the dot
7696844 
also see tox-dev/tox#484
@jugmac00
fix typo
5374bbf
@mikeckennedy
Merge pull request #18 from jugmac00/patch-2
354a13c 
fix typo
@mikeckennedy
Merge pull request #17 from jugmac00/patch-1
5392c5f 
drop the dot
@mikeckennedy
Get this ready to publish to PyPI
a4dfaab
@mikeckennedy
Fixes #10 - Releasing this to PiPy.
d76ea61
mikeckennedy and others added 30 commits October 12, 2021 13:38
@mikeckennedy
Add type info for a few more return types.
654446b
@mikeckennedy
Add response() to the all list of exports.
9deffab
@fariddarabi
Update README.md
8364695 
Feat(README.md): Use pathlib to find the base directory, instead of os module
@mikeckennedy
Merge pull request #22 from fariddarabi/fariddarabi-patch-1
8012037 
Update README.md
@mikeckennedy
updates to project settings
3b450a3
Added a more generic error reporting function: generic_error().
704dc1d
@mikeckennedy
Stop tracking these pycharm files
af81db0
@mikeckennedy
delete these pycharm files
c633bbf
@mikeckennedy
Ignore remaining pycharm files.
98895d8
@mikeckennedy
Merge pull request #24 from Prezu/patryk/generic_error/1
2a430bf 
Added a more generic error reporting function: generic_error().
@mikeckennedy
Fix error from adding generic_error (ironic I know ;) ).
2115234
@mikeckennedy
Bump version for latest release.
229a130
@mikeckennedy
Forgot to add generic_error for * imports.
3b136ca
@mikeckennedy
Build stopped locating the requirements file + add 3.11 support.
7ef7627
@mikeckennedy
Create FUNDING.yml
3c6e2c0
@VLPatton
Add data templating to generic_error. Bump version patch number.
26bb2e2 
Data templating is now possible with `generic_error` in a way that does
not break compatibility. May add a readme update in the future to
specify new behavior.

Signed-off-by: Ayzee Patton <vlpatton@vlpatton.gay>
@mikeckennedy
update classifiers for package
701abf9
@mikeckennedy
add ruff config file.
e853ce9
@mikeckennedy
Run Ruff --fix across the codebase.
a9f6b12
@mikeckennedy
Update tox python versions.
ae2a221
@VLPatton
Sync with upstream branch 'main'.
d462fbf 
Retained my changes. May need to rerun any linting that may have been
reverted in exceptions.py, but functionality should now be retained.

Signed-off-by: Ayzee Patton <vlpatton@vlpatton.gay>
@mikeckennedy
Merge pull request #27 from VLPatton/vlpatton/issue26
a05272a 
Add data templating to `generic_error`
@mikeckennedy
Minor tweak to fix tests related to PR #27
9622a17
@mikeckennedy
clean up setup.py
fb2e527
@mikeckennedy
Switch from setup to pyproject.toml and hatch.
7f76262
@mikeckennedy
Switch from setup to pyproject.toml and hatch.
6446c07
@mikeckennedy
Add example app using FastAPI and this project.
c6f9747
@mikeckennedy
update deprecated ruff settings.
64e99cf
@mikeckennedy
local pycharm updates.
4c1cd3c
@mikeckennedy
Update the template decorator to pass type information along better (…
29ef54f 
…e.g. pyright testing).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@AGeekInside @mikeckennedy @jmtaysom @fferegrino @madeinoz67 @jugmac00 @fariddarabi @VLPatton