Skip to content

Commit

Permalink
Merge branch 'release/0.17.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
ri-gilfanov committed Jun 23, 2021
2 parents cd66dba + 1c6aa65 commit 4c989bf
Show file tree
Hide file tree
Showing 13 changed files with 153 additions and 105 deletions.
7 changes: 7 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[flake8]
count = True
exclude = .venv
max-complexity = 8
max-line-length = 88
show_source = True
statistics = True
43 changes: 43 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: CI

on:
push:
branches: [develop, master]
pull_request:
branches: [develop, master]

jobs:
build:

runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: [3.9]

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
pip install poetry
poetry install
poetry run pip install --upgrade pip
- name: Lint with flake8
run: |
poetry run flake8 .
- name: Type checking with MyPy
run: |
poetry run mypy --strict
- name: Test with pytest
run: |
poetry run pytest --cov-report term-missing --cov=aiohttp_sqlalchemy
poetry run coverage xml
- name: Upload coverage
uses: codecov/codecov-action@v1
with:
file: ./coverage.xml
flags: unit
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ dist
# Checkers
.coverage
.mypy_cache
coverage.xml


# Database (DB)
Expand Down
1 change: 0 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ formats: all
python:
version: 3.7
install:
- requirements: docs/requirements.txt
- method: pip
path: .
43 changes: 17 additions & 26 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,30 +1,21 @@
BSD 3-Clause License
The MIT License (MIT)

Copyright (c) 2021, Ruslan Ilyasovich Gilfanov
All rights reserved.
Copyright (c) 2021 Ruslan Ilyasovich Gilfanov and other contributors

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
42 changes: 23 additions & 19 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,35 +1,39 @@
==================
aiohttp-sqlalchemy
==================
|Release| |Python versions| |Downloads count| |Build status| |Test coverage| |Codacy Badge| |Documantation|
|Python versions| |PyPI release| |PyPI downloads| |License| |ReadTheDocs| |GitHub CI| |Codecov| |Codacy|

.. |Release| image:: https://badge.fury.io/py/aiohttp-sqlalchemy.svg
.. |Python versions| image:: https://img.shields.io/badge/Python-3.7%20%7C%203.8%20%7C%203.9-blue
:target: https://pypi.org/project/aiohttp-sqlalchemy/
:alt: Release
:alt: Python version support

.. |Python versions| image:: https://img.shields.io/badge/Python-3.7%20%7C%203.8%20%7C%203.9-blue
.. |PyPI release| image:: https://badge.fury.io/py/aiohttp-sqlalchemy.svg
:target: https://pypi.org/project/aiohttp-sqlalchemy/
:alt: Python versions
:alt: Release

.. |Downloads count| image:: https://img.shields.io/pypi/dm/aiohttp-sqlalchemy
.. |PyPI downloads| image:: https://img.shields.io/pypi/dm/aiohttp-sqlalchemy
:target: https://pypistats.org/packages/aiohttp-sqlalchemy
:alt: Downloads count
:alt: PyPI downloads count

.. |Build status| image:: https://travis-ci.com/ri-gilfanov/aiohttp-sqlalchemy.svg?branch=master
:target: https://travis-ci.com/ri-gilfanov/aiohttp-sqlalchemy
:alt: Build status
.. |License| image:: https://img.shields.io/badge/License-MIT-green
:target: https://github.com/ri-gilfanov/aiohttp-sqlalchemy/blob/master/LICENSE
:alt: MIT License

.. |Test coverage| image:: https://coveralls.io/repos/github/ri-gilfanov/aiohttp-sqlalchemy/badge.svg?branch=master
:target: https://coveralls.io/github/ri-gilfanov/aiohttp-sqlalchemy?branch=master
:alt: Test coverage
.. |ReadTheDocs| image:: https://readthedocs.org/projects/aiohttp-sqlalchemy/badge/?version=latest
:target: https://aiohttp-sqlalchemy.readthedocs.io/en/latest/?badge=latest
:alt: Read The Docs build

.. |Codacy Badge| image:: https://app.codacy.com/project/badge/Grade/19d5c531ed75435988ba8dc91031514c
:target: https://www.codacy.com/gh/ri-gilfanov/aiohttp-sqlalchemy/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ri-gilfanov/aiohttp-sqlalchemy&utm_campaign=Badge_Grade
:alt: Codacy Badge
.. |GitHub CI| image:: https://github.com/ri-gilfanov/aiohttp-sqlalchemy/actions/workflows/ci.yml/badge.svg?branch=master
:target: https://github.com/ri-gilfanov/aiohttp-sqlalchemy/actions/workflows/ci.yml
:alt: GitHub continuous integration

.. |Documantation| image:: https://readthedocs.org/projects/aiohttp-sqlalchemy/badge/?version=latest
:target: https://aiohttp-sqlalchemy.readthedocs.io/en/latest/?badge=latest
:alt: Documentation
.. |Codecov| image:: https://codecov.io/gh/ri-gilfanov/aiohttp-sqlalchemy/branch/master/graph/badge.svg
:target: https://codecov.io/gh/ri-gilfanov/aiohttp-sqlalchemy
:alt: codecov.io status for master branch

.. |Codacy| image:: https://app.codacy.com/project/badge/Grade/19d5c531ed75435988ba8dc91031514c
:target: https://www.codacy.com/gh/ri-gilfanov/aiohttp-sqlalchemy/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ri-gilfanov/aiohttp-sqlalchemy&utm_campaign=Badge_Grade
:alt: Codacy code quality

`SQLAlchemy 1.4 / 2.0 <https://www.sqlalchemy.org/>`_ support for `AIOHTTP
<https://docs.aiohttp.org/>`_.
Expand Down
2 changes: 1 addition & 1 deletion aiohttp_sqlalchemy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
SAView,
)

__version__ = "0.17.2"
__version__ = "0.17.3"

__all__ = [
"SA_DEFAULT_KEY",
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import os
import sys

import toml
from aiohttp_sqlalchemy import __version__

sys.path.insert(0, os.path.abspath("."))

Expand All @@ -24,7 +24,7 @@
author = "Ruslan Ilyasovich Gilfanov"

# The full version, including alpha/beta/rc tags
release = toml.load("../pyproject.toml")["tool"]["poetry"]["version"]
release = __version__


# -- General configuration ---------------------------------------------------
Expand Down
42 changes: 23 additions & 19 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,35 +1,39 @@
==================================
aiohttp-sqlalchemy's documentation
==================================
|Release| |Python versions| |Downloads count| |Build status| |Test coverage| |Codacy Badge| |Documantation|
|Python versions| |PyPI release| |PyPI downloads| |License| |ReadTheDocs| |GitHub CI| |Codecov| |Codacy|

.. |Release| image:: https://badge.fury.io/py/aiohttp-sqlalchemy.svg
.. |Python versions| image:: https://img.shields.io/badge/Python-3.7%20%7C%203.8%20%7C%203.9-blue
:target: https://pypi.org/project/aiohttp-sqlalchemy/
:alt: Release
:alt: Python version support

.. |Python versions| image:: https://img.shields.io/badge/Python-3.7%20%7C%203.8%20%7C%203.9-blue
.. |PyPI release| image:: https://badge.fury.io/py/aiohttp-sqlalchemy.svg
:target: https://pypi.org/project/aiohttp-sqlalchemy/
:alt: Python versions
:alt: Release

.. |Downloads count| image:: https://img.shields.io/pypi/dm/aiohttp-sqlalchemy
.. |PyPI downloads| image:: https://img.shields.io/pypi/dm/aiohttp-sqlalchemy
:target: https://pypistats.org/packages/aiohttp-sqlalchemy
:alt: Downloads count
:alt: PyPI downloads count

.. |Build status| image:: https://travis-ci.com/ri-gilfanov/aiohttp-sqlalchemy.svg?branch=master
:target: https://travis-ci.com/ri-gilfanov/aiohttp-sqlalchemy
:alt: Build status
.. |License| image:: https://img.shields.io/badge/License-MIT-green
:target: https://github.com/ri-gilfanov/aiohttp-sqlalchemy/blob/master/LICENSE
:alt: MIT License

.. |Test coverage| image:: https://coveralls.io/repos/github/ri-gilfanov/aiohttp-sqlalchemy/badge.svg?branch=master
:target: https://coveralls.io/github/ri-gilfanov/aiohttp-sqlalchemy?branch=master
:alt: Test coverage
.. |ReadTheDocs| image:: https://readthedocs.org/projects/aiohttp-sqlalchemy/badge/?version=latest
:target: https://aiohttp-sqlalchemy.readthedocs.io/en/latest/?badge=latest
:alt: Read The Docs build

.. |Codacy Badge| image:: https://app.codacy.com/project/badge/Grade/19d5c531ed75435988ba8dc91031514c
:target: https://www.codacy.com/gh/ri-gilfanov/aiohttp-sqlalchemy/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=ri-gilfanov/aiohttp-sqlalchemy&amp;utm_campaign=Badge_Grade
:alt: Codacy Badge
.. |GitHub CI| image:: https://github.com/ri-gilfanov/aiohttp-sqlalchemy/actions/workflows/ci.yml/badge.svg?branch=master
:target: https://github.com/ri-gilfanov/aiohttp-sqlalchemy/actions/workflows/ci.yml
:alt: GitHub continuous integration

.. |Documantation| image:: https://readthedocs.org/projects/aiohttp-sqlalchemy/badge/?version=latest
:target: https://aiohttp-sqlalchemy.readthedocs.io/en/latest/?badge=latest
:alt: Documentation
.. |Codecov| image:: https://codecov.io/gh/ri-gilfanov/aiohttp-sqlalchemy/branch/master/graph/badge.svg
:target: https://codecov.io/gh/ri-gilfanov/aiohttp-sqlalchemy
:alt: codecov.io status for master branch

.. |Codacy| image:: https://app.codacy.com/project/badge/Grade/19d5c531ed75435988ba8dc91031514c
:target: https://www.codacy.com/gh/ri-gilfanov/aiohttp-sqlalchemy/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=ri-gilfanov/aiohttp-sqlalchemy&amp;utm_campaign=Badge_Grade
:alt: Codacy code quality

`SQLAlchemy 1.4 / 2.0 <https://www.sqlalchemy.org/>`_ support for `AIOHTTP
<https://docs.aiohttp.org/>`_.
Expand Down
1 change: 0 additions & 1 deletion docs/requirements.txt

This file was deleted.

0 comments on commit 4c989bf

Please sign in to comment.