chore: poetry+ruff

Author: eggplants

.github/dependabot.yml

@@ -1,14 +1,14 @@
 version: 2
 updates:
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: "daily"
+- package-ecosystem: pip
+  directory: /
+  schedule:
+    interval: daily
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: daily
+- package-ecosystem: docker
+  directory: /
+  schedule:
+    interval: daily

.github/workflows/release.yml

@@ -6,81 +6,59 @@ name: Release Package
 on:
   push:
     tags:
-      - 'v*'
+    - v*
+env:
+  PYTHON_VERSION: '3.11'
+  PROJECT_NAME: deepl_cli
 
 jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Setup Python
-        uses: actions/setup-python@v4
-      - name: Run pre-commit
-        uses: pre-commit/[email protected]
   release:
-    needs: check
-    name: Create Release
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          draft: false
-          prerelease: false
+    - uses: actions/checkout@v3
+
+    - id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release ${{ github.ref }}
+        draft: false
+        prerelease: false
   pypi:
     needs: release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          persist-credentials: false
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.x"
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install setuptools wheel twine
-      - name: Build
-        run: |
-          python setup.py sdist bdist_wheel
-      - name: Publish a Python distribution to PyPI
-        if: startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release'
-        uses: pypa/gh-action-pypi-publish@master
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_PASSWORD }}
-          skip_existing: true
-          verbose: true
+    - uses: actions/checkout@v3
+      with:
+        persist-credentials: false
+    - name: Build and publish to pypi
+      uses: JRubics/[email protected]
+      with:
+        pypi_token: ${{ secrets.PYPI_PASSWORD }}
   ghcr:
     needs: release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: docker/metadata-action@v4
-        id: meta
-        with:
-          images: ghcr.io/${{ github.repository }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-      - uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+    - uses: actions/checkout@v3
+    - uses: docker/metadata-action@v4
+      id: meta
+      with:
+        images: ghcr.io/${{ github.repository }}
+        tags: |
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}.{{minor}}
+    - uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+        build-args: |
+          VERSION=${{ github.event.release.tag_name }}

.github/workflows/test.yml

@@ -3,7 +3,7 @@ name: Test
 on:
   push:
     branches:
-      - master
+    - master
   pull_request:
 
 jobs:
@@ -14,35 +14,32 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
+        - ubuntu-latest
+        - windows-latest
+        - macos-latest
         python-version:
-          # - '3.8'
-          - '3.11'
+        # - '3.8'
+        - '3.11'
 
     steps:
     - name: Checkout Repository
       uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+    - uses: actions/setup-python@v4
       with:
-        cache: 'pip'
-        cache-dependency-path: setup.cfg
+        cache: pip
+        cache-dependency-path: poetry.lock
         python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install -U pip
-        pip install -e .[dev]
+    - uses: abatilo/actions-poetry@v2
+    - run: poetry install --no-interaction
     - name: Test
       if: ${{ runner.os == 'Windows' }}
-      run: pytest tests/ --cov-report=term
+      run: poetry run task test
     - name: Test & publish code coverage
       if: ${{ runner.os != 'Windows' && env.CC_TEST_REPORTER_ID != '' }}
       uses: paambaati/[email protected]
       env:
         CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
       with:
-        coverageCommand: pytest --cov=./ tests/ --cov-report xml:cov.xml --cov-report=term
+        coverageCommand: poetry run task test:ci
         coverageLocations: ${{github.workspace}}/cov.xml:coverage.py
         debug: true

.gitignore

@@ -1,3 +1,5 @@
+cov.xml
+
 # https://github.com/github/gitignore/blob/master/Python.gitignore
 # Byte-compiled / optimized / DLL files
 __pycache__/

.pre-commit-config.yaml

@@ -1,52 +1,53 @@
 repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
-    hooks:
-      - id: check-added-large-files
-      - id: check-ast
-      - id: check-case-conflict
-      - id: check-executables-have-shebangs
-      - id: check-merge-conflict
-      - id: check-symlinks
-      - id: check-yaml
-      - id: debug-statements
-      - id: destroyed-symlinks
-      # - id: double-quote-string-fixer
-      - id: end-of-file-fixer
-        exclude: tests/test_changes/
-        files: \.(py|sh|rst|yml|yaml)$
-      # - id: name-tests-test
-      - id: mixed-line-ending
-      - id: trailing-whitespace
-        files: \.(py|sh|rst|yml|yaml)$
-      # - id: requirements-txt-fixer
-  - repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.2.0
-    hooks:
-      - id: setup-cfg-fmt
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
-    hooks:
-      - id: pyupgrade
-  - repo: https://github.com/psf/black
-    rev: 23.1.0
-    hooks:
-      - id: black
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
-    hooks:
-      - id: flake8
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.1.1
-    hooks:
-      - id: mypy
-        additional_dependencies:
-          - types-setuptools
-          - playwright
-          - install-playwright
-        files: ^deepl/
-        args: []
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.4.0
+  hooks:
+  - id: check-added-large-files
+    args: [--maxkb=2000]
+  - id: check-ast
+  - id: check-case-conflict
+  - id: check-executables-have-shebangs
+  - id: check-merge-conflict
+  - id: check-symlinks
+  - id: check-toml
+  - id: check-yaml
+  - id: debug-statements
+  - id: destroyed-symlinks
+  - id: end-of-file-fixer
+    files: \.(py|sh|rst|yml|yaml)$
+  - id: mixed-line-ending
+  - id: trailing-whitespace
+    files: \.(py|sh|rst|yml|yaml)$
+- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+  rev: v2.7.0
+  hooks:
+  - id: pretty-format-yaml
+    args: [--autofix, --indent, '2']
+- repo: https://github.com/tox-dev/pyproject-fmt
+  rev: 0.9.1
+  hooks:
+  - id: pyproject-fmt
+- repo: https://github.com/psf/black
+  rev: 23.1.0
+  hooks:
+  - id: black
+- repo: https://github.com/charliermarsh/ruff-pre-commit
+  rev: v0.0.248
+  hooks:
+  - id: ruff
+    args: [--fix]
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v1.0.1
+  hooks:
+  - id: mypy
+    files: ^deepl/
+    args: [--strict]
+    additional_dependencies:
+    - playwright
+    - install-playwright
+- repo: https://github.com/igorshubovych/markdownlint-cli
+  rev: v0.33.0
+  hooks:
+  - id: markdownlint
+    exclude: ^.github/PULL_REQUEST_TEMPLATE.md
+    args: [--disable=MD013]

Dockerfile

@@ -1,5 +1,8 @@
 FROM mcr.microsoft.com/playwright/python:v1.31.1-focal
 
-RUN pip3 install -U --progress-bar=off --no-use-pep517 deepl-cli
+ARG VERSION
+ENV VERSION ${VERSION:-master}
+
+RUN python -m pip install git+https://github.com/eggplants/deepl-cli@${VERSION}
 
 ENTRYPOINT ["deepl"]

README.md

@@ -1,23 +1,23 @@
 # deepl-cli
 
 [![Release Package](
-  https://github.com/eggplants/deepl-cli/workflows/Release%20Package/badge.svg
+  <https://github.com/eggplants/deepl-cli/workflows/Release%20Package/badge.svg>
   )](
-  https://github.com/eggplants/deepl-cli/actions/runs/345738487
+  <https://github.com/eggplants/deepl-cli/actions/runs/345738487>
 ) [![PyPI version](
-  https://badge.fury.io/py/deepl-cli.svg
+  <https://badge.fury.io/py/deepl-cli.svg>
   )](
-  https://badge.fury.io/py/deepl-cli
+  <https://badge.fury.io/py/deepl-cli>
 )
 
 [![Maintainability](
-  https://api.codeclimate.com/v1/badges/a56630914df8538ca93b/maintainability
+  <https://api.codeclimate.com/v1/badges/a56630914df8538ca93b/maintainability>
   )](
-  https://codeclimate.com/github/eggplants/deepl-cli/maintainability
+  <https://codeclimate.com/github/eggplants/deepl-cli/maintainability>
 ) [![pre-commit.ci status](
-  https://results.pre-commit.ci/badge/github/eggplants/deepl-cli/master.svg
+  <https://results.pre-commit.ci/badge/github/eggplants/deepl-cli/master.svg>
   )](
-  https://results.pre-commit.ci/latest/github/eggplants/deepl-cli/master
+  <https://results.pre-commit.ci/latest/github/eggplants/deepl-cli/master>
 )
 
 ![image](https://user-images.githubusercontent.com/42153744/159145088-752decf7-8736-44c3-86aa-37fd0cee83df.png)

deepl/__init__.py

@@ -2,4 +2,4 @@
 
 from .deepl import DeepLCLI, DeepLCLIError
 
-__all__ = ["DeepLCLI", "DeepLCLIError"]
+__all__ = ("DeepLCLI", "DeepLCLIError")