Merge pull request #9 from jedie/modernize

Modernize

Author: jedie

.coveragerc

@@ -0,0 +1,28 @@
+[run]
+branch = True
+source = MC6809
+omit =
+    */tests/*
+    */site-packages/*
+
+[report]
+# Regexes for lines to exclude from consideration
+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 __name__ == .__main__.:
+
+#ignore_errors = True
+
+[html]
+directory = coverage_html

.editorconfig

@@ -0,0 +1,24 @@
+# see http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{html,css,js}]
+insert_final_newline = false
+
+[*.py]
+line_length = 119
+
+[{Makefile,**.mk}]
+indent_style = tab
+insert_final_newline = false
+
+[*.{yml}]
+indent_style = space
+indent_size = 2

.flake8

@@ -0,0 +1,4 @@
+[flake8]
+exclude = .pytest_cache
+ignore = E501
+max-line-length = 119

.github/workflows/pythonapp.yml

@@ -0,0 +1,50 @@
+name: test
+
+on:
+  schedule:
+    - cron: '0 8 * * *'
+  push:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [3.8, 3.7, 3.6, pypy3]
+    steps:
+    - uses: actions/checkout@v1
+    - name: 'Set up Python ${{ matrix.python-version }}'
+      uses: actions/setup-python@v1
+      with:
+        python-version: '${{ matrix.python-version }}'
+
+    - name: 'Install package'
+      run: |
+        make install-poetry
+        source $HOME/.poetry/env
+        make install
+
+    - name: 'List installed packages'
+      run: |
+        source $HOME/.poetry/env
+        poetry run pip freeze
+
+    - name: 'List all tox test environments'
+      run: |
+        source $HOME/.poetry/env
+        make tox-listenvs
+
+    - name: 'Run tests with Python v${{ matrix.python-version }}'
+      run: |
+        source $HOME/.poetry/env
+        make pytest
+
+#    - name: 'Run linters'
+#      if: matrix.python-version == '3.8'
+#      run: |
+#        source $HOME/.poetry/env
+#        make lint
+
+    - name: 'Upload coverage report'
+      run: bash <(curl -s https://codecov.io/bash)

.gitignore

@@ -38,4 +38,6 @@ nosetests.xml
 .project
 .pydevproject
 .idea/*
-.settings/*
+.settings/*
+/publish.log
+/coverage.xml

.isort.cfg

@@ -0,0 +1,21 @@
+# Configuring isort
+# https://github.com/timothycrosley/isort/wiki/isort-Settings
+
+[settings]
+atomic=true
+line_length=119
+case_sensitive=false
+
+# https://github.com/timothycrosley/isort#multi-line-output-modes
+# 3 - Vertical Hanging Indent
+multi_line_output=3
+include_trailing_comma=true
+
+known_first_party=dragonpy
+
+no_lines_before=LOCALFOLDER
+
+default_section=THIRDPARTY
+sections=FUTURE,STDLIB,EXTERNAL,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
+
+lines_after_imports=2

.travis.yml

@@ -1,37 +1,38 @@
 # Config file for automatic testing at travis-ci.org
 
 language: python
-sudo: false
-
-python:
-    - "2.7"
-    - "3.4"
-    - "pypy"
-    - "pypy3"
+cache: pip
+
+matrix:
+  include:
+  - os: linux
+    python: 3.6
+    env: TOXENV=py36
+  - os: linux
+    python: 3.7
+    env: TOXENV=py37
+  - os: linux
+    python: 3.8
+    env: TOXENV=py38
+  - os: linux
+    python: pypy3
+  # TODO:
+  #- os: osx
+  #  language: generic
 
 install:
-    - pip install --upgrade pip
-    - pip install .
-    - pip install coveralls
+  - make install-poetry
+  - source $HOME/.poetry/env
+  - make install
+  - poetry run pip freeze
+  - make tox-listenvs
 
 script:
-    - coverage run --source=dragonpy ./setup.py nosetests
+  - if [ "$TOXENV" == "" ]; then make pytest; fi
+  - if [ "$TOXENV" != "" ]; then make tox; fi
+  - if [ "$TOXENV" != "" ]; then make lint; fi
 
 after_success:
-    - coveralls
-
-# blacklist
-branches:
-  except:
-    - wip
-    - WIP
-    - experimental
-
-# whitelist
-#branches:
-#  only:
-#    - master
-#    - stable
-
-notifications:
-    irc: "irc.freenode.org#pylucid"
+  - coveralls
+  # https://github.com/codecov/codecov-bash
+  - bash <(curl -s https://codecov.io/bash)

Makefile

@@ -0,0 +1,104 @@
+SHELL := /bin/bash
+MAX_LINE_LENGTH := 119
+POETRY_VERSION := $(shell poetry --version 2>/dev/null)
+
+help: ## List all commands
+	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z0-9 -]+:.*?## / {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
+
+check-poetry:
+	@if [[ "${POETRY_VERSION}" == *"Poetry"* ]] ; \
+	then \
+		echo "Found ${POETRY_VERSION}, ok." ; \
+	else \
+		echo 'Please install poetry first, with e.g.:' ; \
+		echo 'make install-poetry' ; \
+		exit 1 ; \
+	fi
+
+install-poetry: ## install or update poetry
+	@if [[ "${POETRY_VERSION}" == *"Poetry"* ]] ; \
+	then \
+		echo 'Update poetry v$(POETRY_VERSION)' ; \
+		poetry self update ; \
+	else \
+		echo 'Install poetry' ; \
+		curl -sSL "https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py" | python3 ; \
+	fi
+
+install: check-poetry ## install DragonPy via poetry
+	poetry install
+
+update: check-poetry ## Update the dependencies as according to the pyproject.toml file
+	poetry update
+
+lint: ## Run code formatters and linter
+	poetry run flynt --fail-on-change --line_length=${MAX_LINE_LENGTH} dragonpy
+	poetry run isort --check-only --recursive dragonpy
+	poetry run flake8 dragonpy
+
+fix-code-style: ## Fix code formatting
+	poetry run flynt --line_length=${MAX_LINE_LENGTH} dragonpy
+	poetry run autopep8 --ignore-local-config --max-line-length=${MAX_LINE_LENGTH} --aggressive --aggressive --in-place --recursive dragonpy
+	poetry run isort --apply --recursive dragonpy
+
+tox-listenvs: check-poetry ## List all tox test environments
+	poetry run tox --listenvs
+
+tox: check-poetry ## Run pytest via tox with all environments
+	poetry run tox
+
+tox-py36: check-poetry ## Run pytest via tox with *python v3.6*
+	poetry run tox -e py36
+
+tox-py37: check-poetry ## Run pytest via tox with *python v3.7*
+	poetry run tox -e py37
+
+tox-py38: check-poetry ## Run pytest via tox with *python v3.8*
+	poetry run tox -e py38
+
+pytest: check-poetry ## Run pytest
+	poetry run pytest
+
+update-rst-readme: ## update README.rst from README.creole
+	poetry run update_rst_readme
+
+publish: ## Release new version to PyPi
+	poetry run publish
+
+download-roms:  ## Download/Test only ROM files
+	poetry run DragonPy download-roms
+
+profile:  ## Profile the MC6809 emulation benchmark
+	poetry run MC6809 profile
+
+benchmark:  ## Run MC6809 emulation benchmark
+	poetry run MC6809 benchmark
+
+editor: check-poetry  ## Run only the BASIC editor
+	poetry run DragonPy editor
+
+Vectrex: check-poetry  ## Run GUI with Vectrex emulation (not working, yet!)
+	poetry run DragonPy --machine Vectrex run
+
+sbc09: check-poetry  ## Run GUI with sbc09 ROM emulation
+	poetry run DragonPy --machine sbc09 run
+
+Multicomp6809: check-poetry  ## Run GUI with Multicomp6809 ROM emulation
+	poetry run DragonPy --machine Multicomp6809 run
+
+Simple6809: check-poetry  ## Run GUI with Simple6809 ROM emulation
+	poetry run DragonPy --machine Simple6809 run
+
+CoCo2b: check-poetry  ## Run GUI with CoCo 2b emulation
+	poetry run DragonPy --machine CoCo2b run
+
+Dragon32: check-poetry  ## Run GUI with Dragon 32 emulation
+	poetry run DragonPy --machine Dragon32 run
+
+Dragon64: check-poetry  ## Run GUI with Dragon 64 emulation
+	poetry run DragonPy --machine Dragon64 run
+
+run: check-poetry ## *Run the DragonPy Emulator GUI*
+	poetry run DragonPy
+
+.PHONY: help install lint fix test publish