Merge branch 'release/v0.1.3'

MichaelSasser · Nov 20, 2020 · 50cd2ba · 50cd2ba
2 parents 5997e1f + 46d9ff7
commit 50cd2ba
Show file tree

Hide file tree

Showing 31 changed files with 558 additions and 383 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,19 +33,34 @@ jobs:
           python-version: 3.9
 
       - name: Install Poetry
-        uses: dschep/install-poetry-action@v1.3
+        uses: snok/install-poetry@v1.1.1
         with:
-          version: 1.1.4
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v2
+        with:
+          path: .venv
+          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
 
       - name: Install Project Dependencies
         run: poetry install -E docs
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
 
       - name: Run pre-commit
-        run: poetry run pre-commit run --all-files
+        run: |
+          source .venv/bin/activate
+          pre-commit run --all-files
 
       - name: Sphinx Build
         working-directory: ./docs
-        run: make html
+        run: |
+          source ../.venv/bin/activate
+          make html
 
       - name: Test with pytest
-        run: poetry run pytest
+        run: |
+          source .venv/bin/activate
+          poetry run pytest
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -35,16 +35,27 @@ jobs:
           python-version: 3.9
 
       - name: Install Poetry
-        uses: dschep/install-poetry-action@v1.3
+        uses: snok/install-poetry@v1.1.1
         with:
-          version: 1.1.4
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v2
+        with:
+          path: .venv
+          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
 
       - name: Install Project Dependencies
         run: poetry install -E docs
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
 
       - name: Make docs
         working-directory: ${{env.working-directory}}
-        run: make html
+        run: |
+          source ../.venv/bin/activate
+          make html
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,14 +32,25 @@ jobs:
         uses: actions/setup-python@v1
         with:
           python-version: 3.9
+
       - name: Install Poetry
-        uses: dschep/install-poetry-action@v1.3
+        uses: snok/install-poetry@v1.1.1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v2
         with:
-          version: 1.1.4
+          path: .venv
+          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}
+
       - name: Build project
         run: poetry build
+
       - name: pypi-publish
-        uses: pypa/gh-action-pypi-publish@v1.1.0
+        uses: pypa/gh-action-pypi-publish@v1.4.1
         with:
           # PyPI user
           # user: # optional, default is __token__
@@ -49,8 +60,10 @@ jobs:
           # repository_url: # optional
           # The target directory for distribution
           # packages_dir: # optional, default is dist
+
       - name: Zip project
         run: zip --junk-paths fsactl.zip  dist/* README.md LICENSE.txt
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -61,6 +74,7 @@ jobs:
           release_name: Release ${{ github.ref }}
           draft: true
           prerelease: true
+
       - name: Upload Release Asset
         id: upload-release-asset
         uses: actions/upload-release-asset@v1

diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/copyright/Michael_Sasser.xml b/.idea/copyright/Michael_Sasser.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/fsactl.iml b/.idea/fsactl.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
diff --git a/README.md b/README.md
@@ -46,9 +46,21 @@ msfs:
           command: update-layout.bat  # first build command
         - path: "{{ addon_path }}/community-vl3rotax915"  # second build directory
           command: "python {{ addon_path }}/build.py"  # second build command
+    - github: Working-Title-MSFS-Mods/fspackages
+      install:  # Don't use autodiscovery. Install one or more directories of a single source
+        - "{{ addon_path }}/build/workingtitle-g3000"  # install the g3000 update
+        - "{{ addon_path }}/build/workingtitle-g1000"  # install the g1000 update
+        - "{{ addon_path }}/build/workingtitle-aircraft-cj4"  # install the cj4 update
+      build:
+        - path: "{{ addon_path }}"
+          command: powershell.exe "Set-ExecutionPolicy Bypass -Scope Process -Force; .\build.ps1 workingtitle-project-g3000.xml"
+        - path: "{{ addon_path }}"
+          command: powershell.exe "Set-ExecutionPolicy Bypass -Scope Process -Force; .\build.ps1 workingtitle-project-g1000.xml"
+        - path: "{{ addon_path }}"
+          command: powershell.exe "Set-ExecutionPolicy Bypass -Scope Process -Force; .\build.ps1 workingtitle-project-cj4.xml"
 ```
 
-Be sure to use slashs `/` instead of backslashs in all paths.
+Be sure to use slashs `/` instead of backslashs in paths.
 
 You will get a more detailed Documentation to this in the near future.
 
@@ -59,9 +71,9 @@ $ fsactl
 usage: fsactl [-h] [--version] [-d] {update,download,make,install} ...
 
 positional arguments:
-  {update,download,make,install}
-    update              Update and build addons
+  {download,update,make,install}
     download            Download new addons
+    update              Update and build addons
     make                Force to rebuild the addons
     install             Install addons
 

diff --git a/app.py b/app.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-# fsactl - install and manager your MSFS2020 addons
-# Copyright (c) 2020  Michael Sasser <Michael@MichaelSasser.org>
+#  ${PROJECT_NAME} - install and manage your MSFS2020 addons
+#  Copyright (C) ${YEAR}  Michael Sasser <Michael@MichaelSasser.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -1,6 +1,32 @@
 #!/usr/bin/env python
-# fsactl - install and manage your MSFS2020 addons
-# Copyright (C) 2020  Michael Sasser <Michael@MichaelSasser.org>
+#  fsactl - install and manage your MSFS2020 addons
+#  Copyright (C) 2020  Michael Sasser <Michael@MichaelSasser.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/fsactl/__init__.py b/fsactl/__init__.py
@@ -1,19 +1,19 @@
 #!/usr/bin/env python
-# fsactl - install and manager your MSFS2020 addons
-# Copyright (c) 2020  Michael Sasser <Michael@MichaelSasser.org>
+#  fsactl - install and manage your MSFS2020 addons
+#  Copyright (C) 2020  Michael Sasser <Michael@MichaelSasser.org>
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # flake8: noqa
 # pylint: disable:undefined-variable
 from __future__ import annotations

diff --git a/fsactl/addons.py b/fsactl/addons.py
@@ -1,19 +1,19 @@
 #!/usr/bin/env python
-# fsactl - install and manage your MSFS2020 addons
-# Copyright (C) 2020  Michael Sasser <Michael@MichaelSasser.org>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#  fsactl - install and manage your MSFS2020 addons
+#  Copyright (C) 2020  Michael Sasser <Michael@MichaelSasser.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from __future__ import annotations
 
 import re
@@ -77,6 +77,7 @@ def download(self) -> None:  # NEW
         print("\n\nDownloading...\n\n")
         for worker in self.workers:
             worker.download()
+        print("Download finished.")
 
     def install(self, force: bool = True) -> None:
         print("\n\nInstalling...\n\n")

diff --git a/fsactl/app.py b/fsactl/app.py
@@ -1,19 +1,19 @@
 #!/usr/bin/env python
-# fsactl - install and manage your MSFS2020 addons
-# Copyright (C) 2020  Michael Sasser <Michael@MichaelSasser.org>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#  fsactl - install and manage your MSFS2020 addons
+#  Copyright (C) 2020  Michael Sasser <Michael@MichaelSasser.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 from __future__ import annotations
 
 import argparse