Merge pull request #407 from davidhozic/develop

v2.10 changes

Author: davidhozic

.github/workflows/create_release.yml

@@ -1,14 +1,17 @@
 on:
   workflow_dispatch:
     inputs:
+      version-major:
+        type: string
+        description: Major version (eg. x.0.0)
       version-minor:
         type: string
-        description: Minor version to create tag on (eg. x.x)
+        description: Minor version (eg. 0.x.0)
 
       version-bugfix:
         type: string
-        description: Minor version to create tag on (eg. 2.x)
-        default: ""    
+        description: Bug fix version (eg. 0.0.x)
+        default: "0"
 
 name: Create Release
 
@@ -24,7 +27,7 @@ jobs:
         uses: mathieudutour/[email protected]
         with:
           github_token: ${{ secrets.TOKEN_GH }}
-          custom_tag : ${{github.event.inputs.version-minor}}.${{github.event.inputs.version-bugfix}}
+          custom_tag : ${{github.event.inputs.version-major}}.${{github.event.inputs.version-minor}}.${{github.event.inputs.version-bugfix}}
       - name: Create Release
         id: create_release
         uses: actions/create-release@latest
@@ -33,6 +36,6 @@ jobs:
         with:
           tag_name: ${{ steps.tag_version.outputs.new_tag }}
           release_name: ${{ steps.tag_version.outputs.new_tag }}
-          body: "Changelog: https://daf.davidhozic.com/en/v${{github.event.inputs.version-minor}}.x/changelog.html"
+          body: "Changelog: https://daf.davidhozic.com/en/v${{github.event.inputs.version-major}}.${{github.event.inputs.version-minor}}.x/changelog.html"
           draft: false
           prerelease: false

.github/workflows/python-publish.yml

@@ -1,9 +1,6 @@
-name: Publish to PyPi
+name: (todo) Nuitka build and publish to PyPi
 
 on:
-  release:
-    types: [published]
-
   workflow_dispatch:
 
 jobs:
@@ -12,12 +9,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: "3.x"
+        cache: 'pip'
 
     - name: Install dependencies
       run: |
@@ -29,7 +27,7 @@ jobs:
         python -m build
 
     - name: Publish package
-      uses: pypa/gh-action-pypi-publish@f5622bde02b04381239da3573277701ceca8f6a0
+      uses: pypa/gh-action-pypi-publish@f8c70e705ffc13c3b4d1221169b84f12a75d6ca8
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/python-tests.yml

@@ -7,6 +7,10 @@ on:
     branches: [ "master" , "develop"]
   workflow_dispatch:
 
+concurrency:
+    group: "selftest-cg"
+    cancel-in-progress: true
+
 jobs:
   pytest:
     runs-on: ubuntu-latest
@@ -21,16 +25,17 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Disable initramfs update
-      run: sudo sed -i 's/yes/no/g' /etc/initramfs-tools/update-initramfs.conf
-    - name: Disable man-db update
-      run: sudo rm -f /var/lib/man-db/auto-update
-    - name: Install dependencies
+        cache: 'pip'
+    - name: Patch pyproject.toml (remove nuitka build)
+      run: python setup-universal.py
+    - name: Install APT dependencies
+      run: |
+        sudo apt-get update
+        sudo apt install ffmpeg
+    - name: Install Python dependencies
       run: |
-        sudo apt update
-        sudo apt install -y ffmpeg
         python -m pip install --upgrade pip
-        pip install -r requirements/mandatory.txt -r requirements/sql.txt -r requirements/web.txt -r requirements/voice.txt -r requirements/testing.txt
+        pip install .[all] .[testing]
     - name: Test version compatibility
       env:
         DISCORD_TOKEN: ${{secrets.DATT}}
@@ -42,5 +47,6 @@ jobs:
         DISCORD_TOKEN: ${{secrets.DATT}}
       if: ${{ matrix.python-version == 3.8 }}
       run: |
-        pytest -v
+        pytest -v -m "not group_remote"
+        pytest -v -m "group_remote"
       

.gitignore

@@ -1,6 +1,6 @@
 **/__pycache__/**
 dist/**
-build**
+build/**
 **egg-info**
 
 .vscode
@@ -19,4 +19,7 @@ daf_web_data
 test.py
 
 venv*
-.venv*
+.venv*
+
+*.bkp
+*.dtmp

.readthedocs.yml

@@ -15,5 +15,6 @@ build:
     python: "3.8"
   jobs:
     pre_build:
+      - python ./setup-universal.py
       - pip install .[all] .[docs]
       - python3 ./docs/setup.py --start-dir source

Examples/Message Types/VoiceMESSAGE/VoiceMessage.mp3

@@ -13,6 +13,16 @@ export LANGUAGE=$(USE_LANGUAGE)
 
 _BUILD_DIR = $(BUILDDIR)/$(SOURCEDIR)
 
+# OS specific commands
+ifeq ($(OS), Windows_NT)
+LATEX_CMD := \
+	cp $(CURDIR)/build-latex-win.sh $(CURDIR)/$(_BUILD_DIR)/latex/ &&\
+	wsl --cd $(CURDIR)/$(_BUILD_DIR)/latex sh build-latex-win.sh
+
+else
+LATEX_CMD := cd $(CURDIR)/$(_BUILD_DIR)/latex && make all-pdf
+endif
+
 
 # Put it first so that "make" without argument is like "make help".
 help:
@@ -25,14 +35,13 @@ help:
 
 clean:
 	python3 ./setup.py --clean --start-dir $(SOURCEDIR)
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(_BUILD_DIR)" $(SPHINXOPTS) $(O)
 
 pdf: latex
-	docker run --rm -v $(CURDIR)/$(_BUILD_DIR)/latex:/home/ -w /home/ texlive/texlive make all-pdf
 	mkdir -p $(CURDIR)/$(_BUILD_DIR)/pdf/
+	$(LATEX_CMD)
 	cp $(CURDIR)/$(_BUILD_DIR)/latex/*.pdf $(CURDIR)/$(_BUILD_DIR)/pdf/
 
-
 %: Makefile
 	python3 ./setup.py --start-dir $(SOURCEDIR)
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(_BUILD_DIR)" $(SPHINXOPTS) $(O)

docs/Makefile

@@ -0,0 +1,21 @@
+# Script is created to speed up the latex compilation on the windows system though wsl.
+# It copis all latex files to a wsl directory, runs the latex compiler and then copies them back
+# to the orignal path.
+
+ORIGIN_DIR=$(pwd)
+LATEX_BUILD_PATH=~/latex-build/
+
+# Copy the current folder (latex build folder) contents to our home folder
+echo Creating dir $LATEX_BUILD_PATH
+mkdir -p $LATEX_BUILD_PATH
+
+echo Copying files to $LATEX_BUILD_PATH
+cp -r $ORIGIN_DIR/** $LATEX_BUILD_PATH
+
+echo Building latex
+cd $LATEX_BUILD_PATH
+make all-pdf
+cp -r $LATEX_BUILD_PATH/** $ORIGIN_DIR
+
+echo Cleaning up $LATEX_BUILD_PATH
+rm -rf $LATEX_BUILD_PATH