diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml new file mode 100644 index 0000000..aecf2ca --- /dev/null +++ b/.github/workflows/build_and_publish.yml @@ -0,0 +1,49 @@ +name: Build and Publish +on: + pull_request: + branches: [ "main" ] +permissions: + contents: read +jobs: + build_linux: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: "3.8" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install .[development] + - name: Build docs + run: | + extras/scripts/mkdocs.sh + - name: Build pyinstaller + run: | + powershell extras/scripts/pyinstaller.sh + - name: Build pypi + run: | + powershell extras/scripts/pypi.sh + build_windows: + runs-on: self-hosted + steps: + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: "3.8" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install .[development] + - name: Build docs + run: | + powershell extras/scripts/mkdocs.ps1 + - name: Build pyinstaller + run: | + powershell extras/scripts/pyinstaller.ps1 + - name: Build pypi + run: | + powershell extras/scripts/pypi.ps1 \ No newline at end of file diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/lint_and_test.yml similarity index 75% rename from .github/workflows/test_and_build.yml rename to .github/workflows/lint_and_test.yml index 9d89d56..5da1d49 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/lint_and_test.yml @@ -1,17 +1,10 @@ -# This workflow will install Python dependencies, run tests and lint with a single version of Python -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python - -name: Python application - +name: Lint and Test on: push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - + branches: + - 0.1.*` permissions: contents: read - jobs: build_linux: runs-on: ubuntu-latest diff --git a/extras/docs/src/plugins.md b/extras/docs/src/plugins.md index 47de37e..9644634 100644 --- a/extras/docs/src/plugins.md +++ b/extras/docs/src/plugins.md @@ -126,5 +126,5 @@ description: An example application This topic is covered in two examples. -- [Directory Plugin Example](https://github.com/camratchford/zenplate/tree/master/examples/directory_plugin_example) +- [Directory Plugin Example](https://github.com/camratchford/zenplate/tree/main/extras/examples/directory_plugin_example) - [Python Package Plugin Example](https://github.com/camratchford/zenplate/tree/master/examples/python_package_plugin_example) \ No newline at end of file diff --git a/extras/docs/src/quickstart.md b/extras/docs/src/quickstart.md index 3eb3ef7..7bacead 100644 --- a/extras/docs/src/quickstart.md +++ b/extras/docs/src/quickstart.md @@ -104,5 +104,5 @@ zenplate --var-file ~/zenplate_project/vars/vars.yml ~/zenplate_project/template ## Next Steps -Check out the examples included in the [examples](https://github.com/camratchford/zenplate/tree/master/examples) directory. +Check out the examples included in the [examples](https://github.com/camratchford/zenplate/tree/main/extras/examples) directory. These examples will show you how to use the plugin system to extend Zenplate's functionality. \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 81e6a10..2704cff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools", "setuptools-scm"] build-backend = "setuptools.build_meta" [tool.setuptools] -packages = ["zenplate"] +packages = ["zenplate", "zenplate.plugins"] [project] name = 'zenplate' @@ -25,7 +25,7 @@ classifiers = [ 'Environment :: MacOS X', 'Topic :: Software Development :: Libraries :: Python Modules', ] -version = "0.1.1" +version = "0.1.2" requires-python = '>=3.7' dependencies = [ "click==8.1.7",