diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 5e64c9b..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,15 +0,0 @@ -* topalias version: -* Python version: -* Operating System: - -### Description - -Describe what you were trying to get done. -Tell us what happened, what went wrong, and what you expected to happen. - -### What I Did - -``` -Paste the command(s) you ran and the output. -If there was a crash, please include the traceback here. -``` diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 2cee1a2..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: 2 -updates: -- package-ecosystem: pip - directory: "/" - schedule: - interval: daily - time: "11:00" - open-pull-requests-limit: 10 \ No newline at end of file diff --git a/.github/workflows/misspell.yml b/.github/workflows/misspell.yml deleted file mode 100644 index 5ca4d96..0000000 --- a/.github/workflows/misspell.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: misspell - -on: - schedule: - - cron: "0 0 * * *" - workflow_dispatch: - -jobs: - build: - runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - uses: crate-ci/typos@v1.19.0 - with: - format: json - exit-code: 0 - - - uses: peter-evans/create-pull-request@v6 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "Fix typos" - title: "Fix typos" - body: | - Automated typo fixes by [typos](https://github.com/crate-ci/typos) - branch: fix-typos - base: master - labels: | - automated pr - typo diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml deleted file mode 100644 index a7057ae..0000000 --- a/.github/workflows/publish-docker.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: Publish docker image - -on: - push: - tags: "v*" - -jobs: - github-docker: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - steps: - - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v5 - with: - context: . - push: true - tags: ghcr.io/${{ github.repository }}:${{ github.ref_name }} - cache-from: type=gha - cache-to: type=gha,mode=max - - docker-hub: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push - uses: docker/build-push-action@v5 - with: - context: . - push: true - tags: csredrat/topalias:${{ github.ref_name }} - cache-from: type=gha - cache-to: type=gha,mode=max diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml deleted file mode 100644 index 63d1fbb..0000000 --- a/.github/workflows/publish-to-pypi.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: Publish đ to PyPI.org - -on: - push: - tags: - - "v*" - -jobs: - release: - name: Create Release - runs-on: ubuntu-latest - permissions: - contents: write - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Create Release - id: create_release - uses: softprops/action-gh-release@v1 - with: - name: Release ${{ github.ref_name }} - body: | - Changes in this Release - ${{ github.event.head_commit.message }} - draft: false - prerelease: false - generate_release_notes: true - build-n-publish: - runs-on: ubuntu-latest - name: Build and publish Python đ distributions đŚ to PyPI - needs: release - permissions: - contents: read - id-token: write - steps: - - uses: actions/checkout@v4 - - name: Set up Python 3.11 - uses: actions/setup-python@v5 - with: - python-version: 3.11 - cache: "pip" - - name: Install build dependencies - run: | - python -m pip install --upgrade pip - pip install build twine - - name: Build package - run: python -m build - - name: Test Package & Repo Page - run: | - sudo apt-get update && sudo apt-get install -y html2text - curl https://pypi.org/project/topalias/ | html2text - pip install -U --user topalias - echo "Project development history" - curl https://github.com/CSRedRat/topalias/wiki/Development | html2text - python -m topalias - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@v1.8.11 - with: - verbose: true -# - name: Build and publish with Twine or use GitHub Action (with workflow example): https://github.com/marketplace/actions/py-package-publish -# env: -# TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} -# TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} -# run: | -# python setup.py sdist bdist_wheel -# twine upload dist/* diff --git a/.github/workflows/publish-to-test-pypi.yml b/.github/workflows/publish-to-test-pypi.yml deleted file mode 100644 index 70137d5..0000000 --- a/.github/workflows/publish-to-test-pypi.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Publish Python đ distributions đŚ to TestPyPI - -on: - push: - branches: - - '!dependabot/*' - pull_request: - branches: - - '!dependabot/*' - -jobs: - build-n-publish: - name: Build and publish Python đ distributions đŚ to TestPyPI - runs-on: ubuntu-latest - permissions: - contents: read - id-token: write - - steps: - - uses: actions/checkout@v4 - - - name: Set up Python 3.11 - uses: actions/setup-python@v5 - with: - python-version: 3.11 - cache: 'pip' - - - name: Install build dependencies - run: | - python -m pip install --upgrade pip - pip install build twine - - - name: Build package - run: python -m build - - - name: Publish distribution đŚ to Test PyPI - uses: pypa/gh-action-pypi-publish@v1.8.11 - with: - repository_url: https://test.pypi.org/legacy/ - verbose: true - skip_existing: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 83c359a..1adabb1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,103 +1,103 @@ -name: Test - -on: - pull_request: {} - push: - branches: [master] - tags: ["*"] - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.11] - - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - cache: "poetry" - - - name: Install poetry - uses: snok/install-poetry@v1 - with: - version: latest - virtualenvs-create: true - virtualenvs-in-project: true - installer-parallel: true - - - name: Add Poetry to PATH - run: | - echo "$HOME/.local/bin" >> $GITHUB_PATH - poetry --version - - - name: Load cached venv - id: cached-poetry-dependencies - uses: actions/cache@v4 - with: - path: .venv - key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }} - restore-keys: | - venv-${{ runner.os }}-${{ matrix.python-version }}- - - - name: Install dependencies - if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' - run: poetry install --no-interaction --no-root - - - name: Run checks - run: | - poetry run make test - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - token: ${{ secrets.CODECOV_TOKEN }} - file: ./coverage.xml - fail_ci_if_error: true - - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Setup Python - uses: actions/setup-python@v5 - with: - python-version: 3.11 - cache: "pip" - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install black isort flake8 pytest pytest-cov - - - name: Run linters - run: | - isort --check-only --profile black --settings-path setup.cfg . - black --check . - flake8 . - pytest --cov --cov-fail-under=50 - - docker-image: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Build docker image - uses: docker/build-push-action@v5 - with: - context: . - load: true - tags: topalias:test - cache-from: type=gha - cache-to: type=gha,mode=max - - - name: Smoke test docker image - run: | - docker run --rm topalias:test +name: Test + +on: + pull_request: {} + push: + branches: [master] + tags: ["*"] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.11] + + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + cache: "poetry" + + - name: Install poetry + uses: snok/install-poetry@v1 + with: + version: latest + virtualenvs-create: true + virtualenvs-in-project: true + installer-parallel: true + + - name: Add Poetry to PATH + run: | + echo "$HOME/.local/bin" >> $GITHUB_PATH + poetry --version + + - name: Load cached venv + id: cached-poetry-dependencies + uses: actions/cache@v4 + with: + path: .venv + key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }} + restore-keys: | + venv-${{ runner.os }}-${{ matrix.python-version }}- + + - name: Install dependencies + if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' + run: poetry install --no-interaction --no-root + + - name: Run checks + run: | + poetry run make test + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: ./coverage.xml + fail_ci_if_error: true + + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: 3.11 + cache: "pip" + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install black isort flake8 pytest pytest-cov + + - name: Run linters + run: | + isort --check-only --profile black --settings-path setup.cfg . + black --check . + flake8 . + pytest --cov --cov-fail-under=50 + + docker-image: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Build docker image + uses: docker/build-push-action@v5 + with: + context: . + load: true + tags: topalias:test + cache-from: type=gha + cache-to: type=gha,mode=max + + - name: Smoke test docker image + run: | + docker run --rm topalias:test diff --git a/camo.githubusercontent.com/373c6045aaa7962f037c3c43fda4f71739fb24a892c7817396a484c8cbe8a132/68747470733a2f2f76697369746f722d62616467652e6c616f62692e6963752f62616467653f706167655f69643d43535265645261742e67656e746c656d616e b/camo.githubusercontent.com/373c6045aaa7962f037c3c43fda4f71739fb24a892c7817396a484c8cbe8a132/68747470733a2f2f76697369746f722d62616467652e6c616f62692e6963752f62616467653f706167655f69643d43535265645261742e67656e746c656d616e index 542ef6f..2b00433 100644 --- a/camo.githubusercontent.com/373c6045aaa7962f037c3c43fda4f71739fb24a892c7817396a484c8cbe8a132/68747470733a2f2f76697369746f722d62616467652e6c616f62692e6963752f62616467653f706167655f69643d43535265645261742e67656e746c656d616e +++ b/camo.githubusercontent.com/373c6045aaa7962f037c3c43fda4f71739fb24a892c7817396a484c8cbe8a132/68747470733a2f2f76697369746f722d62616467652e6c616f62692e6963752f62616467653f706167655f69643d43535265645261742e67656e746c656d616e @@ -1 +1,5 @@ - \ No newline at end of file +<<<<<<< HEAD + +======= + +>>>>>>> 8a456c0f59bde4f625dc2e4d4701896b64462524 diff --git a/github.com/meteoritt/gentleman.html b/github.com/meteoritt/gentleman.html index 21c1cf3..8e4e6b6 100644 --- a/github.com/meteoritt/gentleman.html +++ b/github.com/meteoritt/gentleman.html @@ -49,7 +49,11 @@ +<<<<<<< HEAD + +======= +>>>>>>> 8a456c0f59bde4f625dc2e4d4701896b64462524 @@ -115,13 +119,21 @@ +<<<<<<< HEAD + +======= +>>>>>>> 8a456c0f59bde4f625dc2e4d4701896b64462524 +<<<<<<< HEAD + +======= +>>>>>>> 8a456c0f59bde4f625dc2e4d4701896b64462524 @@ -291,17 +303,24 @@