Merge pull request #288 from ificiana/master

Transform package management

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        python: [3.7, 3.8, 3.9, "3.10"]
+        python: [3.7, 3.8, 3.9, "3.10", "3.11"]
 
     steps:
       - name: Checkout repo

Makefile

@@ -1,27 +1,30 @@
-deploy-patch: clean bumpversion-patch upload clean
+deploy-patch: clean version-patch git-push-on-deploy upload clean
 
-deploy-minor: clean bumpversion-minor upload clean
+deploy-minor: clean version-minor git-push-on-deploy upload clean
 
-deploy-major: clean bumpversion-major upload clean
+deploy-major: clean version-major git-push-on-deploy upload clean
 
-bumpversion-patch:
-	bumpversion patch
-	git push
-	git push --tags
+# Version prior to update
+VERSION := ${shell poetry version -s}
 
-bumpversion-minor:
-	bumpversion minor
-	git push
-	git push --tags
+version-patch:
+	poetry version patch
 
-bumpversion-major:
-	bumpversion major
+version-minor:
+	poetry version minor
+
+version-major:
+	poetry version major
+
+git-push-on-deploy:
+	git commit -m 'Bump version: $(VERSION) → $(shell poetry version -s)' pyproject.toml
 	git push
+	git tag v${shell poetry version -s}
 	git push --tags
 
 upload:
-	python setup.py sdist bdist_wheel
-	twine upload dist/*
+	poetry build
+	poetry publish
 
 help:
 	@echo "clean - remove all build, test, coverage and Python artifacts"
@@ -58,4 +61,4 @@ clean-pyc:
 	find . -name '__pycache__' -exec rm -fr {} +
 
 install: clean
-	python setup.py install
+	poetry install

humps/__init__.py

@@ -3,25 +3,23 @@
 """
 Underscore-to-camelCase converter (and vice versa) for strings and dict keys in Python.
 """
+import sys
+
+from humps.main import (camelize, decamelize, dekebabize, depascalize,
+                        is_camelcase, is_kebabcase, is_pascalcase,
+                        is_snakecase, kebabize, pascalize)
+
+if sys.version_info >= (3, 8):  # pragma: no cover
+    from importlib.metadata import metadata as _importlib_metadata
+else:
+    from importlib_metadata import metadata as _importlib_metadata  # pragma: no cover
+
 __title__ = "pyhumps"
-__version__ = "3.8.0"
+__version__ = _importlib_metadata(__title__)["version"]
 __author__ = "Nick Ficano"
 __license__ = "Unlicense License"
 __copyright__ = "Copyright 2019 Nick Ficano"
 
-from humps.main import (
-    camelize,
-    decamelize,
-    kebabize,
-    dekebabize,
-    pascalize,
-    depascalize,
-    is_camelcase,
-    is_kebabcase,
-    is_pascalcase,
-    is_snakecase,
-)
-
 __all__ = (
     "camelize",
     "decamelize",

humps/main.py

@@ -3,7 +3,7 @@
 """
 import re
 
-from collections.abc import Mapping
+from collections.abc import Mapping  # pylint: disable-msg=E0611
 
 ACRONYM_RE = re.compile(r"([A-Z\d]+)(?=[A-Z\d]|$)")
 PASCAL_RE = re.compile(r"([^\-_]+)")