Merge pull request #10 from ConorSheehan1/poetry

Poetry closes #7 #8

Author: ConorSheehan1

.bumpversion.cfg

@@ -0,0 +1,10 @@
+[bumpversion]
+current_version = 0.1.2
+
+[bumpversion:file:pyproject.toml]
+search = version = "{current_version}"
+replace = version = "{new_version}"
+
+[bumpversion:file:osxdocker/__init__.py]
+search = __version__ = "{current_version}"
+replace = __version__ = "{new_version}"

.githooks/install.py

@@ -0,0 +1,33 @@
+# Standard Library
+import os
+from glob import glob
+
+# Third party
+import fire
+
+githooks_dir = os.path.dirname(os.path.realpath(__file__))
+
+
+def install_hooks(force=False):
+    """
+    symlink every file from .githooks to .git/hooks and make them executable
+
+    Args:
+        force (bool): force the symlink to overwrite existing files in .git/hooks
+    """
+    ln_args = "--symbolic"
+    if force:
+        ln_args += " --force"
+
+    for filepath in glob(f"{githooks_dir}/*"):
+        if filepath.endswith("install.py"):
+            continue
+
+        filename = os.path.basename(filepath)
+        new_path = os.path.join(githooks_dir, "..", ".git", "hooks", filename)
+        os.system(f"ln {ln_args} {filepath} {new_path}")
+        os.system(f"sudo chmod +x {new_path}")
+
+
+if __name__ == "__main__":
+    fire.Fire(install_hooks)

.githooks/pre-commit

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+ret=0
+message=""
+
+# if ci_lint doesn't return 0
+if ! poetry run task ci_lint; then
+    ((ret+=1))
+    message="$message to fix run: poetry run task lint"
+fi
+
+# if diff outputs anything
+difflen=$(poetry run task isort --diff | wc -l)
+if [ "$difflen" -gt 1 ]; then
+    ((ret+=1))
+    message="$message to fix run: poetry run task isort"
+fi
+
+echo "$message"
+exit $ret

.github/workflows/ci.yml

@@ -25,17 +25,16 @@ jobs:
       uses: actions/setup-python@v1
       with:
         python-version: ${{ matrix.python }}
-    - name: Install Pipenv
+    - name: Install Poetry
       run: |
         python -m pip install --upgrade pip
-        pip install pipenv
-    # must be in it's own step, see https://github.com/actions/runner/issues/258
+        pip install poetry
     - name: Install python packages
       run: |
-        pipenv install --verbose --dev --skip-lock --python=${{ matrix.python }}
+        poetry install
     # - name: Run tests
     #   run: |
     #     pipenv run tests
     - name: Lint with black
       run: |
-        pipenv run black --check .
+        poetry run task ci_lint

.github/workflows/deploy.yml

@@ -16,13 +16,13 @@ jobs:
       uses: actions/setup-python@v1
       with:
         python-version: 3
-    - name: Install flit
+    - name: Install poetry
       run: |
         python -m pip install --upgrade pip
-        pip install flit
+        pip install poetry
     - name: Publish to pypi
       env:
-        FLIT_USERNAME: __token__
-        FLIT_PASSWORD: ${{ secrets.osxdocker_pypi_api_token }}
+        POETRY_HTTP_BASIC_PYPI_USERNAME: __token__
+        POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.osxdocker_pypi_api_token }}
       run: |
-        flit publish
+        poetry publish --build

.readthedocs.yml

@@ -0,0 +1,12 @@
+version: 2
+
+python:
+  version: 3.6
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
+
+sphinx:
+  configuration: docs/source/conf.py