Merge pull request #6 from MarcinKonowalczyk/master

0.1.6

Author: lczyk

.coveragerc

@@ -14,21 +14,17 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-
+  
       - name: Set up Python 3.9
         uses: actions/setup-python@v4
         with:
           python-version: 3.9
-
-      - name: Install uv
-        run: curl -LsSf https://astral.sh/uv/install.sh | sh && uv --version
-
-      - name: Build
-        run: |
-          uv pip install --system --upgrade wheel setuptools build twine
-          python -m build
-          twine check dist/*
-
-      # --repository testpypi
-      - name: Publish
-        run: twine upload --verbose --username __token__ --password "$PYPI_TOKEN" dist/*
+  
+      - name: install flit
+        run: pip install flit
+  
+      - name: build and publish
+        run: flit publish --pypirc .pypirc
+        env:
+          FLIT_USERNAME: __token__
+          FLIT_PASSWORD: ${{ secrets.PYPI_TOKEN }}

.flake8

@@ -2,7 +2,8 @@ name: test-commit
 
 on:
   push:
-    branches: [master]
+    branches:
+      - master
 
 jobs:
   build:
@@ -28,22 +29,19 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: Install uv
-        run: curl -LsSf https://astral.sh/uv/install.sh | sh && uv --version
-
-      - name: Install test dependencies
+      - name: Install flit and uv
         run: |
-          uv pip install --system --upgrade wheel setuptools
-          uv pip install --system --upgrade coverage pytest black mypy
+          pip install flit uv
+          uv sync
 
-      - name: Install psll
-        run: uv pip install --system  "psll @ ."
+      - name: Flit install
+        run: flit install
 
-      - name: Check with black
-        run: black --preview --check --verbose .
+      - name: Check with ruff
+        run: uv run ruff format --check .
 
       - name: Check with mypy
-        run: mypy --config-file ./mypy.ini psll
+        run: uv run mypy
 
       - name: Run tests and coverage
         run: bash test.sh -e -c
@@ -76,4 +74,4 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
           git commit -a -m "Automated report"
-          git push
+          git push

.github/workflows/publish.yml

@@ -0,0 +1,42 @@
+name: test-tox
+
+on:
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  test:
+    strategy:
+        matrix:
+          os: [ubuntu-latest, windows-latest, macos-latest]
+
+    runs-on: ${{ matrix.os }}  
+
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    
+    timeout-minutes: 10 # windows is slow
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.6
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.9
+
+      - name: Install uv and tox
+        run: |
+          pip install uv
+          uv tool install tox --with tox-uv
+
+      - name: Run tox
+        run: uv tool run tox

.github/workflows/test-commit.yml

@@ -37,4 +37,9 @@ Gemfile.lock
 *.egg-info
 .cspellcache
 dist
-psll/pyra.rb
+psll/pyra.rb
+*.*~
+.tox
+.python-version
+.ruff_cache
+.venv

.github/workflows/test-pr.yml

@@ -19,7 +19,6 @@ repos:
       - id: mypy
         additional_dependencies:
           - more-itertools>=8.5.0
-          - types-setuptools
         # Using bash makes this less portable, but also makes it use the correct
         # config file. Is there a better way to do this?
         entry: bash -c 'mypy --config-file ./mypy.ini .'

.github/workflows/test-tox.yml

@@ -0,0 +1,12 @@
+[distutils]
+index-servers =
+   pypi
+   testpypi
+
+[pypi]
+repository = https://upload.pypi.org/legacy/
+username = __token__
+
+[testpypi]
+repository = https://test.pypi.org/legacy/
+username = __token__