Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	requirements.txt
#	tests/dev.requirements.txt
  • Loading branch information
awtkns committed Jan 27, 2023
2 parents b3a8612 + 17804bb commit de8379e
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.6'
python-version: '3.10'
- name: Bump Version
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10" ]
python-version: [ "3.7", "3.8", "3.9", "3.10" ]
services:
postgres:
image: postgres
Expand All @@ -33,13 +33,10 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install poetry
uses: snok/install-poetry@v1
with:
virtualenvs-create: true
virtualenvs-in-project: true
- name: Install dependencies
run: poetry install --no-interaction --no-root
run: |
python -m pip install --upgrade pip
pip install -r tests/dev.requirements.txt
- name: Test with pytest
env:
POSTGRES_DB: test
Expand All @@ -48,5 +45,4 @@ jobs:
POSTGRES_HOST: localhost
POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
run: |
source .venv/bin/activate
pytest
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@
<sub>A dynamic FastAPI router that automatically creates CRUD routes for your models</sub>
</p>
<p align="center">
<img alt="Tests" src="https://github.com/awtkns/fastapi-crudrouter/workflows/Python%20application/badge.svg" />
<img alt="Docs" src="https://github.com/awtkns/fastapi-crudrouter/workflows/docs/badge.svg" />
<img alt="Tests" src="https://img.shields.io/github/actions/workflow/status/awtkns/fastapi-crudrouter/.github/workflows/pytest.yml?color=%2334D058" />
<img alt="Downloads" src="https://img.shields.io/pypi/dm/fastapi-crudrouter?color=%2334D058" />
<a href="https://pypi.org/project/fastapi-crudrouter" target="_blank">
<img src="https://img.shields.io/pypi/v/fastapi-crudrouter?color=%2334D058&label=pypi%20package" alt="Package version">
</a>
<img alt="License" src="https://img.shields.io/github/license/awtkns/fastapi-crudrouter?color=%2334D058" />
</p>
<p align="center">
<img alt="PyPI - Python Version" src="https://img.shields.io/pypi/pyversions/fastapi-crudrouter">
</p>

---

Expand Down
14 changes: 0 additions & 14 deletions docs/en/docs/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,6 @@ on the feature and potential help on where to start implementation wise.

## Development

### Using [poetry](https://python-poetry.org/)

FastAPI-Crudrouter uses [poetry](https://python-poetry.org/) as depenency management system. To install all of the required dependecies simply run:

poetry install

Both dev-requirements and project-requirements will be installed with this command.

To enter the virtual-environment created with poetry use:

poetry shell

If you are not familiar with poetry, please read their [usage guide](https://python-poetry.org/docs/basic-usage/).

### Installing the Dev Requirements
FastAPI-Crudrouter requires as set of development requirements that can installed with `pip` be found in `tests/dev.requirements.txt`

Expand Down
12 changes: 9 additions & 3 deletions docs/en/docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,15 @@
<sub>A dynamic FastAPI router that automatically creates routes CRUD for your models</sub>
</p>
<p align="center">
<img alt="Tests" src="https://github.com/awtkns/fastapi-crudrouter/workflows/Python%20application/badge.svg" />
<img alt="Docs" src="https://github.com/awtkns/fastapi-crudrouter/workflows/docs/badge.svg" />
<img alt="PyPI - Python Version" src="https://img.shields.io/pypi/pyversions/fastapi" />
<img alt="Tests" src="https://img.shields.io/github/actions/workflow/status/awtkns/fastapi-crudrouter/.github/workflows/pytest.yml?color=%2334D058" />
<img alt="Downloads" src="https://img.shields.io/pypi/dm/fastapi-crudrouter?color=%2334D058" />
<a href="https://pypi.org/project/fastapi-crudrouter" target="_blank">
<img src="https://img.shields.io/pypi/v/fastapi-crudrouter?color=%2334D058&label=pypi%20package" alt="Package version">
</a>
<img alt="License" src="https://img.shields.io/github/license/awtkns/fastapi-crudrouter?color=%2334D058" />
</p>
<p align="center">
<img alt="PyPI - Python Version" src="https://img.shields.io/pypi/pyversions/fastapi-crudrouter">
</p>

---
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def get_version():
name="fastapi-crudrouter",
version=get_version(),
author="Adam Watkins",
author_email="cadamrun@gmail.com",
author_email="hello@awtkns.com",
packages=find_packages(exclude=("tests.*", "tests")),
url="https://github.com/awtkns/fastapi-crudrouter",
documentation="https://fastapi-crudrouter.awtkns.com/",
Expand Down
2 changes: 1 addition & 1 deletion tests/dev.requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ flake8-functions
flake8-expression-complexity

# Typing
mypy==0.910
mypy==0.910

1 comment on commit de8379e

@vercel
Copy link

@vercel vercel bot commented on de8379e Jan 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

fastapi-crudrouter – ./

fastapi-crudrouter-awtkns.vercel.app
fastapi-crudrouter-git-master-awtkns.vercel.app
fastapi-crudrouter.awtkns.com

Please sign in to comment.