tests: fix cov

.drone.yml

@@ -4,57 +4,26 @@
 ################
 
 kind: pipeline
-name: default
+name: run_tests
-type: docker
 
 steps:
+
   # Run tests against Python with pytest
   - name: test
     image: python:3.7.2
     commands:
       # Install dependencies
-      - pip install poetry
+      - pip install -r test_requirements.txt
-      - poetry install
+      - bash ./tests/run_tests.sh
-      - poetry run pylint cic_utils
-      - poetry run pytest
     environment:
       LOGLEVEL: info
 
     volumes:
-      - name: poetry_cache
+      # Mount pip cache from host
-        path: /root/.cache/pypoetry
       - name: pip_cache
         path: /root/.cache/pip
-  - name: publish
-    image: python:3.7.2
-    commands:
-      # Install dependencies
-      - pip install poetry
-      - poetry install
-      - poetry run semantic-release publish
-    depends_on:
-      - test
-    when:
-      branch:
-        - main
-    environment:
-      LOGLEVEL: info
-      GIT_SSL_NO_VERIFY: 1
-      REPOSITORY_USERNAME: __token__
-      REPOSITORY_PASSWORD:
-        from_secret: pypi_token
-      GITEA_TOKEN:
-        from_secret: gitea_token
 
 volumes:
-      - name: poetry_cache
-        path: /root/.cache/pypoetry
-      - name: pip_cache
-        path: /root/.cache/pip
-volumes:
-  - name: poetry_cache
-    host:
-      path: /tmp/cache/drone/pypoetry
   - name: pip_cache
     host:
       path: /tmp/cache/drone/pip

.gitignore

@@ -1,10 +1,8 @@
-# Editor Configs
-.vscode/
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
 *$py.class
+
 # C extensions
 *.so
 .envrc

.pylintrc

@@ -1,402 +0,0 @@
-[MASTER]
-
-# Specify a configuration file.
-#rcfile=
-
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
-
-# Add files or directories to the blacklist. They should be base names, not
-# paths.
-ignore=third_party
-
-# Add files or directories matching the regex patterns to the blacklist. The
-# regex matches against base names, not paths.
-ignore-patterns=object_detection_grpc_client.py,prediction_pb2.py,prediction_pb2_grpc.py
-
-# Pickle collected data for later comparisons.
-persistent=no
-
-# List of plugins (as comma separated values of python modules names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-# Use multiple processes to speed up Pylint.
-jobs=4
-
-# Allow loading of arbitrary C extensions. Extensions are imported into the
-# active Python interpreter and may run arbitrary code.
-unsafe-load-any-extension=no
-
-# A comma-separated list of package or module names from where C extensions may
-# be loaded. Extensions are loading into the active Python interpreter and may
-# run arbitrary code
-extension-pkg-whitelist=
-
-
-[MESSAGES CONTROL]
-
-# Only show warnings with the listed confidence levels. Leave empty to show
-# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
-confidence=
-
-# Enable the message, report, category or checker with the given id(s). You can
-# either give multiple identifier separated by comma (,) or put this option
-# multiple time (only on the command line, not in the configuration file where
-# it should appear only once). See also the "--disable" option for examples.
-#enable=
-
-# Disable the message, report, category or checker with the given id(s). You
-# can either give multiple identifiers separated by comma (,) or put this
-# option multiple times (only on the command line, not in the configuration
-# file where it should appear only once).You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
-# you want to run only the similarities checker, you can use "--disable=all
-# --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use"--disable=all --enable=classes
-# --disable=W"
-#
-# Kubeflow disables string-interpolation because we are starting to use f
-# style strings
-disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,missing-docstring,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating,relative-import,invalid-name,bad-continuation,no-member,locally-disabled,fixme,import-error,too-many-locals,no-name-in-module,too-many-instance-attributes,no-self-use,logging-fstring-interpolation
-
-
-[REPORTS]
-
-# Set the output format. Available formats are text, parseable, colorized, msvs
-# (visual studio) and html. You can also give a reporter class, eg
-# mypackage.mymodule.MyReporterClass.
-output-format=text
-
-# Put messages in a separate file for each module / package specified on the
-# command line instead of printing them on stdout. Reports (if any) will be
-# written in a file name "pylint_global.[txt|html]". This option is deprecated
-# and it will be removed in Pylint 2.0.
-files-output=no
-
-# Tells whether to display a full report or only the messages
-reports=no
-
-# Python expression which should return a note less than 10 (10 is the highest
-# note). You have access to the variables errors warning, statement which
-# respectively contain the number of errors / warnings messages and the total
-# number of statements analyzed. This is used by the global evaluation report
-# (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Template used to display messages. This is a python new-style format string
-# used to format the message information. See doc for all details
-#msg-template=
-
-
-[BASIC]
-
-# Good variable names which should always be accepted, separated by a comma
-good-names=i,j,k,ex,Run,_
-
-# Bad variable names which should always be refused, separated by a comma
-bad-names=foo,bar,baz,toto,tutu,tata
-
-# Colon-delimited sets of names that determine each other's naming style when
-# the name regexes allow several styles.
-name-group=
-
-# Include a hint for the correct naming format with invalid-name
-include-naming-hint=no
-
-# List of decorators that produce properties, such as abc.abstractproperty. Add
-# to this list to register other decorators that produce valid properties.
-property-classes=abc.abstractproperty
-
-# Regular expression matching correct function names
-function-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Naming hint for function names
-function-name-hint=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression matching correct variable names
-variable-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Naming hint for variable names
-variable-name-hint=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression matching correct constant names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Naming hint for constant names
-const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
-
-# Regular expression matching correct attribute names
-attr-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Naming hint for attribute names
-attr-name-hint=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression matching correct argument names
-argument-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Naming hint for argument names
-argument-name-hint=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression matching correct class attribute names
-class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
-
-# Naming hint for class attribute names
-class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
-
-# Regular expression matching correct inline iteration names
-inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
-
-# Naming hint for inline iteration names
-inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
-
-# Regular expression matching correct class names
-class-rgx=[A-Z_][a-zA-Z0-9]+$
-
-# Naming hint for class names
-class-name-hint=[A-Z_][a-zA-Z0-9]+$
-
-# Regular expression matching correct module names
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Naming hint for module names
-module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
-
-# Regular expression matching correct method names
-method-rgx=[a-z_][a-z0-9_]{2,30}$
-
-# Naming hint for method names
-method-name-hint=[a-z_][a-z0-9_]{2,30}$
-
-# Regular expression which should only match function or class names that do
-# not require a docstring.
-no-docstring-rgx=^_
-
-# Minimum line length for functions/classes that require docstrings, shorter
-# ones are exempt.
-docstring-min-length=-1
-
-
-[ELIF]
-
-# Maximum number of nested blocks for function / method body
-max-nested-blocks=5
-
-
-[TYPECHECK]
-
-# Tells whether missing members accessed in mixin class should be ignored. A
-# mixin class is detected if its name ends with "mixin" (case insensitive).
-ignore-mixin-members=yes
-
-# List of module names for which member attributes should not be checked
-# (useful for modules/projects where namespaces are manipulated during runtime
-# and thus existing member attributes cannot be deduced by static analysis. It
-# supports qualified module names, as well as Unix pattern matching.
-ignored-modules=
-
-# List of class names for which member attributes should not be checked (useful
-# for classes with dynamically set attributes). This supports the use of
-# qualified names.
-ignored-classes=optparse.Values,thread._local,_thread._local
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E1101 when accessed. Python regular
-# expressions are accepted.
-generated-members=
-
-# List of decorators that produce context managers, such as
-# contextlib.contextmanager. Add to this list to register other decorators that
-# produce valid context managers.
-contextmanager-decorators=contextlib.contextmanager
-
-
-[FORMAT]
-
-# Maximum number of characters on a single line.
-max-line-length=100
-
-# Regexp for a line that is allowed to be longer than the limit.
-ignore-long-lines=^\s*(# )?<?https?://\S+>?$
-
-# Allow the body of an if to be on the same line as the test if there is no
-# else.
-single-line-if-stmt=no
-
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,dict-separator
-
-# Maximum number of lines in a module
-max-module-lines=1000
-
-# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
-# tab).
-# Use 2 spaces consistent with TensorFlow style.
-indent-string='    '
-
-# Number of spaces of indent required inside a hanging  or continued line.
-indent-after-paren=4
-
-# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
-expected-line-ending-format=
-
-
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-notes=FIXME,XXX,TODO
-
-
-[VARIABLES]
-
-# Tells whether we should check for unused import in __init__ files.
-init-import=no
-
-# A regular expression matching the name of dummy variables (i.e. expectedly
-# not used).
-dummy-variables-rgx=(_+[a-zA-Z0-9]*?$)|dummy
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid to define new builtins when possible.
-additional-builtins=
-
-# List of strings which can identify a callback function by name. A callback
-# name must start or end with one of those strings.
-callbacks=cb_,_cb
-
-# List of qualified module names which can have objects that can redefine
-# builtins.
-redefining-builtins-modules=six.moves,future.builtins
-
-
-[LOGGING]
-
-# Logging modules to check that the string format arguments are in logging
-# function parameter format
-logging-modules=logging
-
-
-[SIMILARITIES]
-
-# Minimum lines number of a similarity.
-min-similarity-lines=4
-
-# Ignore comments when computing similarities.
-ignore-comments=yes
-
-# Ignore docstrings when computing similarities.
-ignore-docstrings=yes
-
-# Ignore imports when computing similarities.
-ignore-imports=no
-
-
-[SPELLING]
-
-# Spelling dictionary name. Available dictionaries: none. To make it working
-# install python-enchant package.
-spelling-dict=
-
-# List of comma separated words that should not be checked.
-spelling-ignore-words=
-
-# A path to a file that contains private dictionary; one word per line.
-spelling-private-dict-file=
-
-# Tells whether to store unknown words to indicated private dictionary in
-# --spelling-private-dict-file option instead of raising a message.
-spelling-store-unknown-words=no
-
-
-[IMPORTS]
-
-# Deprecated modules which should not be used, separated by a comma
-deprecated-modules=regsub,TERMIOS,Bastion,rexec
-
-# Create a graph of every (i.e. internal and external) dependencies in the
-# given file (report RP0402 must not be disabled)
-import-graph=
-
-# Create a graph of external dependencies in the given file (report RP0402 must
-# not be disabled)
-ext-import-graph=
-
-# Create a graph of internal dependencies in the given file (report RP0402 must
-# not be disabled)
-int-import-graph=
-
-# Force import order to recognize a module as part of the standard
-# compatibility libraries.
-known-standard-library=
-
-# Force import order to recognize a module as part of a third party library.
-known-third-party=enchant
-
-# Analyse import fallback blocks. This can be used to support both Python 2 and
-# 3 compatible code, which means that the block might have code that exists
-# only in one or another interpreter, leading to false positives when analysed.
-analyse-fallback-blocks=no
-
-
-[DESIGN]
-
-# Maximum number of arguments for function / method
-max-args=7
-
-# Argument names that match this expression will be ignored. Default to name
-# with leading underscore
-ignored-argument-names=_.*
-
-# Maximum number of locals for function / method body
-max-locals=15
-
-# Maximum number of return / yield for function / method body
-max-returns=6
-
-# Maximum number of branch for function / method body
-max-branches=12
-
-# Maximum number of statements in function / method body
-max-statements=50
-
-# Maximum number of parents for a class (see R0901).
-max-parents=7
-
-# Maximum number of attributes for a class (see R0902).
-max-attributes=7
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=0
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=20
-
-# Maximum number of boolean expressions in a if statement
-max-bool-expr=5
-
-
-[CLASSES]
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,__new__,setUp
-
-# List of valid names for the first argument in a class method.
-valid-classmethod-first-arg=cls
-
-# List of valid names for the first argument in a metaclass class method.
-valid-metaclass-classmethod-first-arg=mcs
-
-# List of member names, which should be excluded from the protected access
-# warning.
-exclude-protected=_asdict,_fields,_replace,_source,_make
-
-
-[EXCEPTIONS]
-
-# Exceptions that will emit a warning when being caught. Defaults to
-# "Exception"
-overgeneral-exceptions=Exception

CHANGELOG

@@ -0,0 +1,2 @@
+- 0.1.0
+	* Add wei converters

CHANGELOG.md

@@ -1,44 +0,0 @@
-# Changelog
-
-<!--next-version-placeholder-->
-
-## v0.2.5 (2022-02-25)
-### Fix
-* Bump ([`798a949`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/798a949bbffee3cdfc41fb897d84e488af0fa636))
-
-## v0.2.4 (2022-02-25)
-### Fix
-* Test pypi publish ([`dbff716`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/dbff716cdbb15e2c59a750e726c22ec59eb57780))
-
-### Documentation
-* Remove old changelog ([`b8b3550`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/b8b355025d96f2e7adb9546ccf04755d0c359952))
-
-## v0.2.3 (2022-02-25)
-### Fix
-* Bump python-semantic-release ([`8a0d07a`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/8a0d07aea00c0ced3318f7f3b25a9cfc6593954a))
-
-## v0.2.2 (2022-02-24)
-### Fix
-* Test fixed asset upload ([`bf59490`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/bf59490a32cc9c0aa7e1c6257ab763551a0a5e5f))
-
-## v0.2.1 (2022-02-23)
-### Fix
-* Versioning ([`5eb6a99`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/5eb6a99114867ee4ff72523922a13dc847b75196))
-
-## v0.2.0 (2022-02-23)
-### Feature
-* **converters:** Add from_wei and to_wei ([`c044fb9`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/c044fb9c70b20ceff70613f5e35ab9d358545ee8))
-
-### Fix
-* Disable check_build_status ([`adac26c`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/adac26c82d82d5ea26609437e434acee65021623))
-* Another ([`d8739a7`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/d8739a71a6aa5a33384208aa252ab772585b5365))
-* Another test ([`5366d1a`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/5366d1af930d3f8889c884a3743cd9b187d05a01))
-* Remove condition ([`4c920b2`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/4c920b27176502e0b6687e2eea51c9f2c4f0306f))
-* Use refs ([`99070b6`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/99070b6ee47d5b2a2946f4fc6fe8abf4b9d47d64))
-* Another test ([`2fd72c1`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/2fd72c199bb4118b1a6a4ed9deba780c2a0184ee))
-* Only publish on main ([`f75c44c`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/f75c44cc1c8ed1e6678a165dcc03e86d90d41bbb))
-* Drone publishing branch ([`932bd0f`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/932bd0ff73eb9074a22b1107484f50abf7bcbf9e))
-* Clean up ([`e9c537e`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/e9c537e29e83d4b9d4a7f2fde8c91116312a38b7))
-
-### Documentation
-* Add ci status ([`50107b2`](https://git.grassecon.net/grassrootseconomics/cic-utils/commit/50107b205e2b652dc37dd5972cb66071eae91904))

Readme.md

@@ -1,15 +1,6 @@
 # CIC-Utils
 [![Status](https://ci.grassecon.net/api/badges/grassrootseconomics/cic-utils/status.svg?ref=refs/heads/main)](https://ci.grassecon.net/grassrootseconomics/cic-utils)
-[![Version](https://img.shields.io/pypi/v/cic_utils?color=green)](https://pypi.org/project/cic-utils/)
+## Tests
-## Development
-### Requirements
- - [poetry](https://python-poetry.org/docs/#installation) 
- - `poetry install`
-
-### Testing
-```
-poetry run pytest
-```
-### Publishing
 ```
+bash ./tests/run_tests.sh
 ```

cic_utils/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.5"

cic_utils/converters.py

@@ -1,6 +1,6 @@
 import decimal
-
+import fractions
-
+import math
 def from_wei(decimals: int, value: int) -> float:
     """This function converts values in Wei to a token in the cic network.
     :param decimals: The decimals required for wei values.
@@ -25,7 +25,6 @@ def to_wei(decimals: int, value: int) -> int:
     """
     return int(value * (10**decimals))
 
-
 def truncate(value: float, decimals: int) -> float:
     """This function truncates a value to a specified number of decimals places.
     :param value: The value to be truncated.
@@ -41,3 +40,4 @@ def truncate(value: float, decimals: int) -> float:
         #     raise ValueError('Value too small to truncate')
         ctx.rounding = decimal.ROUND_DOWN
         return float(round(d, decimals))
+    

pyproject.toml

@@ -1,40 +0,0 @@
-[tool.poetry]
-name = "cic-utils"
-version = "0.2.5"
-description = ""
-authors = ["William Luke <williamluke4@gmail.com>"]
-license = "GPL-3.0-or-later"
-readme = "Readme.md"
-repository = "https://git.grassecon.net/grassrootseconomics/cic-utils"
-
-[tool.poetry.dependencies]
-python = "^3.7"
-
-[tool.poetry.dev-dependencies]
-pytest = "6.2.5"
-pytest-cov = "2.10.1"
-python-semantic-release = "^7.25.2"
-pylint = "^2.12.2"
-black = {version = "^22.1.0", allow-prereleases = true}
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.pytest.ini_options]
-addopts = "-x --cov=cic_utils --cov-fail-under=97 --cov-report term-missing"
-testpaths = ["tests"]
-
-[tool.semantic_release]
-version_variable = [
-    "cic_utils/__init__.py:__version__",
-    "pyproject.toml:version",
-]
-version_source = "commit"
-branch = "main"
-upload_to_repository=true
-upload_to_release = true
-build_command = "pip install poetry && poetry build"
-hvcs="gitea"
-hvcs_domain = "git.grassecon.net"
-check_build_status=false

rsync.sh

@@ -1,2 +0,0 @@
-# rsync -r ./dist/ root@root.grassrootseconomics.net:/usr/local/share/python/packages/
-rsync -r ./dist/ root@vultr.williamluke.dev:/root/

setup.cfg

@@ -0,0 +1,22 @@
+[metadata]
+name = cic_utils
+version = 0.2.0
+description = Common utils for CIC
+author = William Luke
+author_email = william@atto-byte.com
+url = https://git.grassecon.net/grassrootseconomics/cic-utils
+keywords =
+	cic
+classifiers =
+	Programming Language :: Python :: 3
+	Operating System :: OS Independent
+	Intended Audience :: Developers
+	License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+license = GPL
+licence_files =
+	LICENSE
+
+[options]
+python_requires = >= 3.6
+packages = 
+	cic-utils.converters

setup.py

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

test_requirements.txt

@@ -0,0 +1,2 @@
+pytest==6.2.5
+pytest-cov==2.10.1

tests/run_tests.sh

@@ -0,0 +1,3 @@
+
+pip install -r test_requirements.txt
+pytest -x --cov=cic_utils --cov-fail-under=97 --cov-report term-missing tests