Merge pull request #37 from MaxMustermann2/new-release-system

New release system

Makefile

@@ -1,6 +1,4 @@
-CURRENT_SIGN_SETTING := $(shell git config commit.gpgSign)
+.PHONY: clean clean-py clean-build
-
-.PHONY: clean-py clean-build
 
 help:
 	@echo "clean-build - remove build artifacts"
@@ -25,8 +23,7 @@ clean-py:
 	find . -name '*~' -exec rm -f {} +
 
 dev:
-	python3 -m pip install pytest
+	python3 -m pip install pyhmy[dev]
-	python3 -m pip install pytest-ordering
 
 test:
 	python3 -m pytest -r s -s tests
@@ -35,16 +32,9 @@ install:
 	python3 -m pip install -e .
 
 release: clean
-	python3 -m incremental.update pyhmy --patch --rc
+	python3 -m build
-	python3 -m incremental.update pyhmy
-	python3 setup.py sdist bdist_wheel
 	twine upload dist/*
 
 sdist: clean
-ifdef VERSION  # Argument for incremental, reference: https://pypi.org/project/incremental/ .
+	python3 -m build
-	python3 -m incremental.update pyhmy --$(VERSION)
-else
-	python3 -m incremental.update pyhmy --dev
-endif
-	python3 setup.py sdist bdist_wheel
 	ls -l dist

pyhmy/__init__.py

@@ -4,7 +4,7 @@
 import sys
 import warnings
 
-from ._version import __version__
+__version__ = "0.1.0"
 
 if sys.version_info.major < 3:
     warnings.simplefilter( "always", DeprecationWarning )

pyhmy/_version.py

@@ -1,11 +0,0 @@
-"""
-Provides pyhmy version information.
-"""
-
-# This file is auto-generated! Do not edit!
-# Use `python -m incremental.update pyhmy` to change this file.
-
-from incremental import Version
-
-__version__ = Version("pyhmy", 22, 8, 0, release_candidate=1)
-__all__ = ["__version__"]

pyproject.toml

@@ -0,0 +1,44 @@
+# pyproject.toml
+
+[build-system]
+requires      = ["setuptools>=61.0.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pyhmy"
+version = "0.1.0"
+description = "A library for interacting and working the Harmony blockchain and related codebases"
+readme = "README.md"
+license = { text = "MIT" }
+keywords = [ "Harmony", "blockchain", "protocol", "staking" ]
+dependencies = [
+    "pexpect",
+    "requests",
+    "eth-rlp",
+    "eth-account >= 0.5.5",
+    "eth-utils",
+    "hexbytes",
+    "cytoolz"
+]
+requires-python = ">=3.0"
+
+[project.optional-dependencies]
+dev = [ "black", "autopep8", "yapf", "twine", "build", "docformatter", "bumpver" ]
+
+[tool.bumpver]
+current_version = "0.1.0"
+version_pattern = "MAJOR.MINOR.PATCH"
+commit_message = "chore: bump version {old_version} -> {new_version}"
+# git commit --amend -S
+commit = true
+# git tag ${bumpver show -n | head -1 | awk '{print $3}'} -f -s
+tag = true
+push = false
+
+[tool.bumpver.file_patterns]
+"pyproject.toml" = [
+    'current_version = "{version}"',
+    'version = "{version}"'
+]
+"pyhmy/__init__.py" = ['__version__ = "{version}"']
+

setup.cfg

@@ -1,40 +0,0 @@
-[metadata]
-license = MIT
-name = pyhmy
-keywords = Harmony, blockchain, protocol
-description = A library for interacting and working the Harmony blockchain and related codebases.
-long_description = file: README.md
-long_description_content_type = text/markdown
-author = Daniel Van Der Maden
-author_email = daniel@harmony.one
-url = http://harmony.one/
-
-[options]
-packages = find:
-use_incremental = True
-
-classifiers =
-    Development Status :: 3 - Alpha
-    Intended Audience :: Developers
-    Topic :: Software Development :: Build Tools
-    License :: OSI Approved :: MIT License
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-
-install_requires =
-    pexpect
-    requests
-    incremental
-    eth-rlp
-    eth-account >= 0.5.5
-    eth-utils
-    hexbytes
-    cytoolz
-
-setup_requires =
-    incremental
-    pytest
-    pytest-ordering
-    click
-    Twisted~=21.7.0

setup.py

@@ -1,3 +0,0 @@
-from setuptools import setup
-
-setup()