Merge pull request #10 from fyndata/develop

Release

Author: glarrain

.bumpversion.cfg

@@ -0,0 +1,7 @@
+[bumpversion]
+current_version = 0.1.1
+commit = True
+tag = True
+
+[bumpversion:file:fd_gcp/__init__.py]
+

.circleci/config.yml

@@ -11,9 +11,9 @@
 #
 version: 2
 jobs:
-  build:
+  test-py37:
     docker:
-      - image: python:3.7.1
+      - image: python:3.7.2
 
     working_directory: ~/repo
 
@@ -28,19 +28,52 @@ jobs:
             pip install --upgrade pip
             pip install --upgrade setuptools wheel
             pip install -r requirements/test.txt
-#            pip install -r requirements/extras.txt
 
-      # run tests!
       - run:
           name: run tests
           command: |
             . venv/bin/activate
             make lint
-            make test-coverage
+            tox -e py37
+            codecov
             make test-coverage-report-console
             make test-coverage-report-html
-            make dist
 
       - store_artifacts:
           path: test-reports
           destination: test-reports
+
+  dist:
+    docker:
+      - image: python:3.7.2
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      - run:
+          name: install dependencies
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install --upgrade pip
+            pip install --upgrade setuptools wheel
+            pip install -r requirements/release.txt
+
+      - run:
+          name: make dist
+          command: |
+            . venv/bin/activate
+            make dist
+
+      - store_artifacts:
+          path: dist
+          destination: dist
+
+workflows:
+  version: 2
+  ci:
+    jobs:
+      - test-py37
+      - dist

.coveragerc

@@ -0,0 +1,17 @@
+History
+-------
+
+unreleased (YYYY-MM-DD)
++++++++++++++++++++++++
+
+0.1.1 (2019-03-07)
+++++++++++++++++++
+
+* (PR #9, 2019-03-07) Misc fixes and improvements to config and test setup
+* (PR #8, 2019-03-07) Update requirements
+
+0.1.0 (2019-01-24)
+++++++++++++++++++
+
+* First implementation.
+* First release on PyPI.

HISTORY.rst

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Fyndata
+Copyright (c) 2019, Fyndata (Fynpal SpA)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,8 +1,5 @@
+include HISTORY.rst
 include LICENSE
 include README.md
-
-recursive-include tests *
-recursive-exclude * __pycache__
-recursive-exclude * *.py[co]
-
-recursive-include docs *.md
+recursive-include fd_gcp *py
+include fd_gcp/py.typed

MANIFEST.in

@@ -4,25 +4,10 @@ SHELL = /usr/bin/env bash
 .PHONY: help
 .PHONY: clean clean-build clean-pyc clean-test
 .PHONY: lint test test-all test-coverage test-coverage-report-console test-coverage-report-html
-.PHONY: dist install
-
-define PRINT_HELP_PYSCRIPT
-import re, sys
-
-for line in sys.stdin:
-	match = re.match(r'^([a-zA-Z_-]+):.*?## (.*)$$', line)
-	if match:
-		target, help = match.groups()
-		print("%-20s %s" % (target, help))
-endef
-export PRINT_HELP_PYSCRIPT
-
+.PHONY: dist upload-release
 
 help:
-	@echo "Read README.md"
-	@echo ""
-	@echo "Makefile tasks:"
-	@python -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
+	@grep '^[a-zA-Z]' $(MAKEFILE_LIST) | sort | awk -F ':.*?## ' 'NF==2 {printf "\033[36m  %-25s\033[0m %s\n", $$1, $$2}'
 
 clean: clean-build clean-pyc clean-test ## remove all build, test, lint, coverage and Python artifacts
 
@@ -51,25 +36,26 @@ lint: ## run tools for code style analysis, static type check, etc
 	flake8 --config=setup.cfg  fd_gcp  tests
 	mypy --config-file setup.cfg  fd_gcp
 
-test: ## run tests
+test: ## run tests quickly with the default Python
 	python setup.py test
 
 test-all: ## run tests on every Python version with tox
-	@echo "TODO: configure tox"
+	tox
 
 test-coverage: ## run tests and record test coverage
-	coverage run setup.py test
+	coverage run --rcfile=setup.cfg setup.py test
 
 test-coverage-report-console: ## print test coverage summary
-	coverage report -m
+	coverage report --rcfile=setup.cfg -m
 
 test-coverage-report-html: ## generate test coverage HTML report
-	coverage html
+	coverage html --rcfile=setup.cfg
 
 dist: clean ## builds source and wheel package
 	python setup.py sdist
 	python setup.py bdist_wheel
+	twine check dist/*
 	ls -l dist
 
-install: clean ## install the package to the active Python's site-packages
-	python setup.py install
+upload-release: ## upload dist packages
+	python -m twine upload 'dist/*'

Makefile

@@ -28,3 +28,6 @@
   ``kms_crypto_key_resource_name`` (unlike ``kms_crypto_key_id``).
 
 """
+
+
+__version__ = '0.1.1'

fd_gcp/__init__.py

@@ -57,7 +57,7 @@ def get_env_project_id() -> str:
     return project_id
 
 
-def get_gce_credentials(service_account_email: str =None) -> GcpCredentials:
+def get_gce_credentials(service_account_email: str = None) -> GcpCredentials:
     """
     Return credentials provided by Compute Engine service account.
 

fd_gcp/auth.py

@@ -42,7 +42,7 @@ class ResourcePermissionDenied(Error):
 
     """
 
-    def __init__(self, resource: str =None, permission: str =None) -> None:
+    def __init__(self, resource: str = None, permission: str = None) -> None:
         """Constructor.
 
         :param resource: a resource's ID, GRN or some other identifier
@@ -76,7 +76,7 @@ class ResourceNotFound(Error):
 
     """
 
-    def __init__(self, resource: str =None) -> None:
+    def __init__(self, resource: str = None) -> None:
         """Constructor.
 
         :param resource: a resource's ID, GRN or some other identifier
@@ -192,7 +192,7 @@ def _detect_resource_not_found(
 
     try:
         exc_reason = exc._get_reason().strip()
-        re_pattern = re.compile("^(?P<resource_type>[a-zA-Z0-9_]+) (?P<resource>.+) not found\.")
+        re_pattern = re.compile(r"^(?P<resource_type>[a-zA-Z0-9_]+) (?P<resource>.+) not found\.")
         re_match = re_pattern.match(exc_reason)
 
         if re_match: