Merge pull request #333 from deeppavlov/dev

Release v0.7.0
deeppavlov · Mar 1, 2024 · 224eaf1 · 224eaf1
2 parents 18908d0 + 1042493
commit 224eaf1
Show file tree

Hide file tree

Showing 139 changed files with 8,649 additions and 2,036 deletions.
diff --git a/.coveragerc b/.coveragerc
diff --git a/.dockerignore b/.dockerignore
@@ -1,7 +1,6 @@
 *.DS_Store*
 *.egg-info/
 dist/
-venv/
 build/
 docs/source/apiref
 docs/source/_misc
@@ -22,9 +21,9 @@ GlobalUserTableAccessor*
 memory_debugging*
 opening_database*
 _globals.py
-venv*
 .vscode
 .coverage
+.coverage.*
 .pytest_cache
 htmlcov
 tutorials/context_storages/dbs

diff --git a/.env_file b/.env_file
@@ -1,3 +1,4 @@
+TG_BOT_TOKEN=token
 MYSQL_USERNAME=root
 MYSQL_PASSWORD=pass
 MYSQL_ROOT_PASSWORD=pass

diff --git a/.github/process_github_events.py b/.github/process_github_events.py
@@ -46,6 +46,7 @@ def post_comment_on_pr(comment: str, pr_number: int):
 Here's a release checklist:
 
 - [ ] Update package version
+- [ ] Update `poetry.lock`
 - [ ] Change PR merge option
 - [ ] Test modules without automated testing:
   - [ ] Requiring telegram `api_id` and `api_hash`

diff --git a/.github/workflows/build_and_publish_docs.yml b/.github/workflows/build_and_publish_docs.yml
@@ -23,21 +23,18 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: set up python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 
-      - name: Build images
-        run: |
-            make docker_up
-
       - uses: r-lib/actions/setup-pandoc@v2
         with:
           pandoc-version: '3.1.6'
 
-      - name: install dependencies
+      - name: setup poetry and install dependencies
         run: |
-            make venv
+          python -m pip install --upgrade pip poetry
+          python -m poetry install --with tutorials,docs --all-extras --no-ansi --no-interaction
 
       - name: build documentation
         env:
@@ -46,7 +43,7 @@ jobs:
           TG_API_HASH: ${{ secrets.TG_API_HASH }}
           TG_BOT_USERNAME: ${{ secrets.TG_BOT_USERNAME }}
         run: |
-            make doc
+          python -m poetry run poe docs
 
       - name: remove jekyll theming
         run: touch docs/build/.nojekyll
@@ -62,7 +59,7 @@ jobs:
 
       - name: save artifact
         if: ${{ github.ref != 'refs/heads/master' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ format('github-pages-for-branch-{0}', env.BRANCH_NAME) }}
           path: docs/build/

diff --git a/.github/workflows/build_and_upload_release.yml b/.github/workflows/build_and_upload_release.yml
@@ -1,9 +1,13 @@
 name: build_and_upload_release
 
 on:
-  push:
-    tags:
-      - '*'
+  release:
+    types:
+      - published
+  pull_request:
+    branches:
+      - dev
+      - master
 
 jobs:
   build:
@@ -14,24 +18,26 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: set up python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
 
-      - name: install latest pip, setuptools, twine + wheel
+      - name: setup poetry
         run: |
-          python -m pip install --upgrade pip setuptools twine wheel
+          python -m pip install --upgrade pip poetry
 
-      - name: build wheels
+      - name: build wheels and test uploading to pypi
+        if: startsWith(github.ref, 'refs/tags/v') != true
         run: |
-          python setup.py bdist_wheel
-          python setup.py sdist
+          python -m poetry --build publish --dry-run
 
-      - name: upload to pypi via twine
+      - name: build wheels and upload to pypi
+        if: startsWith(github.ref, 'refs/tags/v')
         env:
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
         run: |
-          twine upload --verbose -u '__token__' dist/*
+          python -m poetry --build publish
 
       - name: upload binaries into release
+        if: startsWith(github.ref, 'refs/tags/v')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/codestyle.yml b/.github/workflows/codestyle.yml
@@ -22,14 +22,15 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: set up python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.9
 
-      - name: install dependencies
+      - name: setup poetry and install dependencies
         run: |
-            make venv
+          python -m pip install --upgrade pip poetry
+          python -m poetry install --with lint --no-ansi --no-interaction
 
       - name: run codestyle
         run: |
-            make lint
+          python -m poetry run poe lint
diff --git a/.github/workflows/event_handler.yml b/.github/workflows/event_handler.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: set up python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 

diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml
@@ -25,30 +25,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Build images
-        run: |
-          make docker_up
-
       - name: set up python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
 
-      - name:  build & install package
-        run: |
-          python -m pip install build
-          python -m build
-          find . -name "*.whl" -exec python -m pip install {}[test_full] ';'
-
-      - name: clean environment
+      - name: setup poetry and install dependencies
         run: |
-          export backup_files=( tests tutorials utils .env_file makefile .coveragerc pytest.ini docs )
-          mkdir /tmp/backup
-          for i in "${backup_files[@]}" ; do mv "$i"  /tmp/backup ; done
-          rm -rf ..?* .[!.]* *
-          for i in "${backup_files[@]}" ; do mv  "/tmp/backup/$i"  .  ; done
-          rm -rf /tmp/backup
-          touch venv  # disable venv target
+          python -m pip install --upgrade pip poetry
+          python -m poetry install --with test,tutorials --all-extras --no-ansi --no-interaction
 
       - name: run tests
         env:
@@ -57,4 +42,4 @@ jobs:
           TG_API_HASH: ${{ secrets.TG_API_HASH }}
           TG_BOT_USERNAME: ${{ secrets.TG_BOT_USERNAME }}
         run: |
-          make test TEST_ALLOW_SKIP=telegram
+          python -m poetry run poe test_all
diff --git a/.github/workflows/test_full.yml b/.github/workflows/test_full.yml
@@ -27,21 +27,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Build images
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          make docker_up
-
       - name: set up python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install -e .[test_full]
-        shell: bash
+          python -m pip install --upgrade pip poetry
+          python -m poetry install --with test,tutorials --all-extras --no-ansi --no-interaction
 
       - name: run pytest
         env:
@@ -50,32 +44,22 @@ jobs:
           TG_API_HASH: ${{ secrets.TG_API_HASH }}
           TG_BOT_USERNAME: ${{ secrets.TG_BOT_USERNAME }}
         run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then
-              source <(cat .env_file | sed 's/=/=/' | sed 's/^/export /')
-              pytest --tb=long -vv --cache-clear --no-cov --allow-skip=telegram tests/
-          else
-              pytest -m "not docker" --tb=long -vv --cache-clear --no-cov --allow-skip=telegram,docker tests/
-          fi
-        shell: bash
+          python -m poetry run poe test_no_cov
+
   test_no_deps:
     runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v4
 
-      - name: Build images
-        run: |
-          make docker_up
-
       - name: set up python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.8
 
       - name: install dependencies
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install -e .[tests]
-        shell: bash
+          python -m pip install --upgrade pip poetry
+          python -m poetry install --with test --no-ansi --no-interaction
 
       - name: run pytest
         env:
@@ -84,6 +68,4 @@ jobs:
           TG_API_HASH: ${{ secrets.TG_API_HASH }}
           TG_BOT_USERNAME: ${{ secrets.TG_BOT_USERNAME }}
         run: |
-          source <(cat .env_file | sed 's/=/=/' | sed 's/^/export /')
-          pytest --tb=long -vv --cache-clear --no-cov --allow-skip=all tests/
-        shell: bash
+          python -m poetry run poe test_no_deps
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 *.DS_Store*
 *.egg-info/
 dist/
-venv/
 build/
 docs/source/apiref
 docs/source/_misc
@@ -22,9 +21,9 @@ GlobalUserTableAccessor*
 memory_debugging*
 opening_database*
 _globals.py
-venv*
 .vscode
 .coverage
+.coverage.*
 .pytest_cache
 htmlcov
 tutorials/context_storages/dbs