From 5fa5f226c1f138a31dae2a1a36822f47884fbad1 Mon Sep 17 00:00:00 2001 From: Dmitry Vasilishin Date: Wed, 31 Mar 2021 16:19:02 +0300 Subject: [PATCH] Update package supports (#21) * Update package supports * Preparation for release 1.2.0 --- .travis.yml | 32 ++++++++------------------------ CHANGELOG.md | 6 ++++++ Makefile | 18 ------------------ easy_profile/__init__.py | 4 ++-- setup.cfg | 8 -------- setup.py | 6 +++--- tests/test_profiler.py | 3 +-- tox.ini | 8 +++----- 8 files changed, 23 insertions(+), 62 deletions(-) delete mode 100644 Makefile diff --git a/.travis.yml b/.travis.yml index 625baf8..38f26b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,37 +1,21 @@ sudo: false - language: python - dist: xenial - python: -- '3.6' -- '3.7' -- '3.8' - + - "3.7" + - "3.8" + - "3.9" matrix: include: - name: "PEP8" python: 3.7 env: TOXENV=pep8 - -install: pip install tox-travis codecov - -script: tox - +install: + - pip install tox-travis codecov +script: + - tox after_success: -- codecov - + - codecov branches: only: - master - -deploy: - provider: pypi - user: kandziu - distributions: sdist bdist_wheel - password: - secure: XbJqC7gLEaa9bvgdymFWZ16VH28w7Cs4FiBJVFfertjCNV+MlaP6ivbnJA80tZbFJplLQN23Gpn1T2/AV+4PiquejdY3gPMkJpMEqdVZZdGUqIgE05vB05tcCRy7+jkZT+vbBR7H5iDQcydJ1RtpDY1vYw1jKvV62Po5d72d1e7jGjTKhq0kl1scb+oqE1xSjo7dYmgTsmHKXjEJsSLtcxRHhJBq89Az3IWNc4UFj0A+BVD7GbD+RBNInoEO38VPkTJujhWjHCepgoKEaA9QML2JmwThI6jkQXC3LVxUYkXWvj4DKrG+e51byNi7xm2tCdxhvJ5yPJJv6ajDtMdLIIed2HvrRFh28sd/F23I3fIrH9/XcADn+bitUQLmW849wIcmPVzimB5CiRj7LN6FEBDs6NkcuZUeSwJf9GuyDUNgwz7NmLFUtdV/wv6HStQhQzt9B1nQmpfWNdwGIXbOJjMIZMrqTq6O6A/dPqV69wdzPIT82UXye98HSNRuX54F9v4r/opegXekCq3MqJmRjUEhQq0lZ2xubMunAnAdIVulABSfb00SgCTfcElYGCQJO5c99bgGejOi9Gb1/iQMpzrD7cNdjd6tBq2Q8smgVLRSGwPWb4BF44kJ1Ky+2vcMsAWnSz0veBG3vE1QTV1uEQZPEa25AbQXq/Dp7mbsieE= - on: - tags: true - python: '3.7' diff --git a/CHANGELOG.md b/CHANGELOG.md index 90450c4..0656003 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [1.2.0] - 2021-03-31 +- Added support of python 3.9 +- Added support of SQLAlchemy 1.4 +- Removed support of python 3.6 +- Removed support of SQLAlchemy 1.1, 1.2 + ## [1.1.2] - 2020-10-21 - Fixed queries for UNIX platforms [issue-18] diff --git a/Makefile b/Makefile deleted file mode 100644 index 31cb434..0000000 --- a/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: release clean - - -PROJECT_DIR=easy_profile - -PYTHON ?= python - - -release: clean - $(PYTHON) setup.py sdist bdist_wheel - twine upload dist/* - - -clean: - rm -rf dist/ - rm -rf build/ - rm -rf $(PROJECT_DIR)/__pycache__ - rm -f $(PROJECT_DIR)/*.pyc diff --git a/easy_profile/__init__.py b/easy_profile/__init__.py index 0cc90c7..4a1b8c5 100644 --- a/easy_profile/__init__.py +++ b/easy_profile/__init__.py @@ -8,5 +8,5 @@ from .reporters import StreamReporter __all__ = ["EasyProfileMiddleware", "SessionProfiler", "StreamReporter"] -__author__ = "Dmitri Vasilishin" -__version__ = "1.1.0" +__author__ = "Dmitry Vasilishin" +__version__ = "1.2.0" diff --git a/setup.cfg b/setup.cfg index d157cdd..37fbdba 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,3 @@ -[bumpversion] -current_version = 1.1.0 -commit = True -tag = True -message = "version {new_version}" - -[bumpversion:file:easy_profile/__init__.py] - [flake8] max-complexity = 10 exclude = .eggs,.tox,.venv*,build,dist diff --git a/setup.py b/setup.py index 8198982..06f2697 100644 --- a/setup.py +++ b/setup.py @@ -41,14 +41,14 @@ def read(fname): "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", ], keywords=["sqlalchemy", "easy", "profile", "profiler", "profiling"], - install_requires=["sqlalchemy>=1.1,<1.5", "sqlparse>=0.3.0"], + install_requires=["sqlalchemy<=1.4", "sqlparse>=0.3.0"], tests_require=["coverage"], - extras_require={"dev": ["tox", "bumpversion"]} + extras_require={"dev": ["tox"]} ) diff --git a/tests/test_profiler.py b/tests/test_profiler.py index 1a64f49..12ecca1 100644 --- a/tests/test_profiler.py +++ b/tests/test_profiler.py @@ -48,8 +48,7 @@ def test_initialization_default(self): self.assertIsNone(profiler.queries) def test_initialization_custom(self): - engine = create_engine("sqlite://") - engine.url.database = "test" + engine = create_engine("sqlite:///test") profiler = SessionProfiler(engine) self.assertIs(profiler.engine, engine) self.assertEqual(profiler.db_name, "test") diff --git a/tox.ini b/tox.ini index b556f8e..2d220e1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,17 +1,15 @@ [tox] envlist = - sa11-py{36,37,38} - sa12-py{36,37,38} - sa13-py{36,37,38} + sa13-py{37,38,39} + sa14-py{37,38,39} pep8 [testenv] passenv = CI TRAVIS TRAVIS_* deps = codecov - sa11: SQLAlchemy>=1.1,<1.2 - sa12: SQLAlchemy>=1.2,<1.3 sa13: SQLAlchemy>=1.3,<1.4 + sa14: SQLAlchemy>=1.4,<1.5 commands = coverage run setup.py test