Merge pull request #30 from bear/make-python-3-default

Adjust build environment to Python 3 standards

Author: bear

.circleci/config.yml

@@ -5,20 +5,17 @@ jobs:
   build:
     working_directory: ~/ronkyuu
     docker:
-      - image: circleci/python:3.7
+      - image: circleci/python:3.9
         environment:
           PIPENV_VENV_IN_PROJECT: true
     steps:
       - checkout # check out source code to working directory
-      - run:
-          command: |
-            make env
       - run:
           command: |
             make info
       - run:
           command: |
-            make test
+            make dev
       - run:
           command: |
             make coverage

.coveragerc

@@ -0,0 +1,21 @@
+[run]
+source = ronkyuu
+omit=
+    .venv/*
+
+[report]
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain about missing debug-only code:
+    def __repr__
+    if self\.debug
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise AssertionError
+    raise NotImplementedError
+
+    # Don't complain if non-runnable code isn't run:
+    if 0:
+    if __name__ == .__main__.:

.gitignore

@@ -1,12 +1,13 @@
-.DS_Store
-
-*.cfg
-
-*.py[cod]
+*.py[co]
+MANIFEST
 
 # C extensions
 *.so
 
+.DS_Store
+__pycache__
+.cache
+
 # Packages
 *.egg
 *.egg-info
@@ -21,13 +22,8 @@ develop-eggs
 .installed.cfg
 lib
 lib64
-__pycache__
-.cache
 .eggs
 
-# Installer logs
-pip-log.txt
-
 # Unit test / coverage reports
 .coverage
 .codecov-token
@@ -52,5 +48,7 @@ env
 
 violations.flake8.txt
 
+.vscode
+
 # Built docs
 doc/_build/**

MANIFEST.in

@@ -3,13 +3,16 @@ include README.md
 include Pipfile
 include Pipfile.lock
 include Makefile
-include pytest.ini
 include *.py
+include pyproject.toml
+include setup.cfg
+include .coveragerc
 recursive-include docs *.md
 recursive-include tests *.py
 recursive-include tests *.html
 recursive-include tests *.json
 recursive-include examples *.py
+graft src
 prune .DS_Store
 prune .git
 prune .circleci

Makefile

@@ -1,45 +1,50 @@
 help:
-	@echo "  env         install all production dependencies"
+	@echo "  env         install all dependencies"
+	@echo "  dev         install all development dependencies"
 	@echo "  clean       remove unwanted stuff"
-	@echo "  lint        check style with pycodestyle"
+	@echo "  lint        lint with flake8"
 	@echo "  test        run tests"
 	@echo "  coverage    run codecov"
 
-env:
-	pipenv install -d
-
-info:
-	@pipenv run python --version
-	@pipenv graph
-
 clean:
 	rm -rf build
 	rm -rf dist
 	rm -f violations.flake8.txt
 	pipenv clean
-	pipenv run python setup.py clean
-	find . -name '*.pyc' -exec rm -f {} \;
-	find . -name '*.pyo' -exec rm -f {} \;
-	find . -name '*~' ! -name '*.un~' -exec rm -f {} \;
 
-lint: 
-	pipenv run pylint --rcfile=./setup.cfg ronkyuu tests
+dev:
+	pipenv install --dev
+
+env: clean
+	pipenv install
+
+info: env
+	@pipenv run python --version
+	@pipenv check
+	@pipenv graph
+
+lint: dev
+	pipenv run flake8 --tee --output-file=violations.flake8.txt
 
 test: lint
-	pipenv run python setup.py test
+	pipenv install "-e ."
+	pipenv run pytest
 
 coverage: clean
-	pipenv run coverage run --source=ronkyuu setup.py test
+	pipenv install "-e ."
+	pipenv run coverage run -m pytest
 	pipenv run coverage report
 	pipenv run coverage html
 	pipenv run codecov
 
-check: clean
-	pipenv run check-manifest
-	pipenv run python setup.py check
+check: env
+	pipenv run check-manifest -v
+
+dist: check
+	pipenv run python -m build
 
 upload: dist
-	pipenv run python -m twine upload --repository-url https://upload.pypi.org/legacy/ dist/*
+	pipenv run python -m twine upload --repository testpypi dist/*
 
-dist: check
-	pipenv run python setup.py sdist bdist_wheel
+upload-prod: dist
+	pipenv run python -m twine upload dist/*

Pipfile

@@ -14,7 +14,6 @@ coveralls = "*"
 codecov = "*"
 check-manifest = "*"
 httmock = "*"
-pylint = "*"
 wheel = "*"
 twine = "*"
 bleach = "*"
@@ -24,6 +23,7 @@ requests = "*"
 beautifulsoup4 = "*"
 mf2py = "*"
 html5lib = "*"
+ronkyuu = {editable = true, path = "."}
 
 [requires]
-python_version = "3.7"
+python_version = "3.9"