Merge branch 'develop' of https://github.com/piotrmaslanka/satella into develop

.circleci/config.yml

@@ -12,8 +12,8 @@ commands:
       - run:
           command: |
             pip install -r requirements.txt
-            pip install -U pytest-xdist pytest-cov pytest pytest-forked pluggy py opentracing
-            python setup.py install
+            pip install -U pytest-xdist pytest-cov pytest pytest-forked pluggy py
+            pip install .
   unit_test:
     description: Run the unit tests
     steps:

.coveragerc

-[run]
-branch=1
-source=
-  satella
-concurrency=thread
-omit=
-  tests/*
-  .eggs/*
-  setup.py
-  satella/__init__.py
-  satella/os/signals.py
-
-[report]
-include=
-    satella/*
-

.gitignore

@@ -3,6 +3,7 @@
 #################
 test*.json
 test*.txt
+.pytest_cache
 .eggs
 satella.sublime*
 hs_err_pid*.log

.pylintrc

-[MASTER]
-disable=
-    C0114, # missing-module-docstring
-    C0116, # missing-function-docstring
-    W0603,  # global-statement
-    C0103,   # invalid-name
-    R0913  # too-many-arguments
-
-[FORMAT]
-max-line-length=110

CHANGELOG.md

 # v2.24.3
-

pyproject.toml

+[project]
+name = "satella"
+dynamic = ["version"]
+description = "Utilities for writing servers in Python"
+readme = {file = "README.md", content-type="text/markdown"}
+authors = [
+  {name = "Piotr Maślanka", email = "pmaslanka@smok.co"}
+]
+requires-python = ">= 3.5"
+license = {text="MIT License"}
+keywords = ["ha", "high availability", "scalable", "scalability", "server", "metrics", "tracing", "instrumentation"]
+classifiers = [
+   "Programming Language :: Python",
+   "Programming Language :: Python :: 3.5",
+   "Programming Language :: Python :: 3.6",
+   "Programming Language :: Python :: 3.7",
+   "Programming Language :: Python :: 3.8",
+   "Programming Language :: Python :: 3.9",
+   "Programming Language :: Python :: Implementation :: CPython",
+   "Programming Language :: Python :: Implementation :: PyPy",
+   "Operating System :: OS Independent",
+   "Development Status :: 5 - Production/Stable",
+   "License :: OSI Approved :: MIT License",
+   "Topic :: Software Development :: Libraries"
+]
+dependencies = ["psutil"]
+
+[tool.setuptools.dynamic]
+version = {attr = "satella.__version__"}
+
+[project.optional-dependencies]
+HTTPJSONSource = ["requests"]
+YAMLSource = ["pyyaml"]
+TOMLSource = ["toml"]
+FasterJSON = ["ujson"]
+cassandra = ["cassandra-driver"]
+opentracing = ["opentracing"]
+
+[build-system]
+requires = ["setuptools", "setuptools-scm"]
+build-backend = "setuptools.build_meta"
+
+
+[project.urls]
+Homepage = "https://github.com/piotrmaslanka/satella"
+Documentation = "https://satella.readthedocs.io/"
+Issues = "https://github.com/piotrmaslanka/satella/issues"
+Repository = "https://github.com/piotrmaslanka/satella"
+Changelog = "https://github.com/piotrmaslanka/satella/blob/develop/CHANGELOG.md"
+
+[tool.setuptools]
+packages = ["satella",
+            "satella.cassandra",
+            "satella.coding",
+            "satella.coding.concurrent",
+            "satella.coding.concurrent.futures",
+            "satella.coding.decorators",
+            "satella.coding.resources",
+            "satella.coding.sequences",
+            "satella.coding.structures",
+            "satella.coding.structures.dictionaries",
+            "satella.coding.structures.heaps",
+            "satella.coding.structures.mixins",
+            "satella.coding.transforms",
+            "satella.configuration",
+            "satella.configuration.schema",
+            "satella.configuration.sources",
+            "satella.debug",
+            "satella.debug.tainting",
+            "satella.exception_handling",
+            "satella.instrumentation",
+            "satella.instrumentation.cpu_time",
+            "satella.instrumentation.memory",
+            "satella.instrumentation.metrics",
+            "satella.instrumentation.metrics.exporters",
+            "satella.instrumentation.metrics.metric_types",
+            "satella.instrumentation.metrics.structures",
+            "satella.instrumentation.trace_back",
+            "satella.opentracing",
+            "satella.os",
+            "satella.time"]
+
+[tool.pytest]
+log_cli = true
+
+[tool.pylint.format]
+max-line-length = 120
+
+[tool.pylint.MASTER]
+disable = '''
+    missing-module-docstring,
+    missing-class-docstring,
+    missing-function-docstring,
+    global-statement,
+    invalid-name,
+    too-many-arguments
+'''
+
+[tool.coverage.run]
+branch = true
+source = ["satella"]
+concurrency = ["thread"]
+omit= [
+  "tests/*",
+  ".eggs/*",
+  "setup.py",
+  "satella/__init__.py",
+  "satella/os/signals.py"
+]
+
+[tool.coverage.report]
+include=[
+    "satella/*"
+]
+
+

pytest.ini

-[pytest]
-log_cli = true
-

requirements.txt

@@ -2,3 +2,4 @@ psutil
 pyyaml
 toml
 requests
+opentracing

setup.cfg

-# coding: utf-8
-[metadata]
-name = satella
-keywords = ha, high availability, scalable, scalability, server, metrics, tracing
-long-description = file: README.md
-long-description-content-type = text/markdown; charset=UTF-8
-license_files = LICENSE
-author = Piotr Maślanka
-author_email = piotr.maslanka@henrietta.com.pl
-description = Utilities for writing servers in Python
-url = https://github.com/piotrmaslanka/satella
-project-urls =
-    Documentation = https://satella.readthedocs.io/
-	Code = https://github.com/piotrmaslanka/satella
-	Issue tracker = https://github.com/piotrmaslanka/satella/issues
-classifier =
-    Programming Language :: Python
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: Implementation :: CPython
-    Programming Language :: Python :: Implementation :: PyPy
-    Operating System :: OS Independent
-    Development Status :: 5 - Production/Stable
-    License :: OSI Approved :: MIT License
-    Topic :: Software Development :: Libraries
-
-[options]
-install_requires =
-    psutil
-python_requires = !=2.7.*,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
-packages = find:
-
-[options.packages.find]
-exclude =
-    docs
-    tests
-
-[options.extras_require]
-HTTPJSONSource = requests
-YAMLSource = pyyaml
-TOMLSource = toml
-FasterJSON = ujson
-cassandra = cassandra-driver
-opentracing = opentracing
-
-[pycodestyle]
-max-line-length = 100
-
-[pep8]
-max-line-length = 100
-
-[bdist_wheel]
-universal = 0

setup.py

 from setuptools import setup
-from satella import __version__
 
-
-setup(version=__version__)
+setup()