🐞 fix: 调整repo.sh中初始化顺序

必须要建立repo，然后才能设置secrets

Author: aaron-yang-biz

.github/workflows/dev.yml

@@ -72,8 +72,10 @@ jobs:
         run: |
           poetry install -E dev
           poetry run mkdocs build
+          echo "config git user"
           git config --global user.name Docs deploy
           git config --global user.email docs@dummy.bot.com
+          echo "run mike deploy"
           poetry run mike deploy -p -f "`poetry version --short`.dev"
           poetry run mike set-default -p "`poetry version --short`.dev"
 

docs/history.md

@@ -3,8 +3,9 @@
     `(#{number})` means an issue of this project. You may check details of the issue by visiting https://github.com/zillionare/python-project-wizard/issues/_{number}_
 
 ## v1.3
-* [#23](https://github.com/zillionare/python-project-wizard/issues/23)
-* [#24](https://github.com/zillionare/python-project-wizard/issues/24)
+* [#23](https://github.com/zillionare/python-project-wizard/issues/23) add email notification upon build success
+* [#24](https://github.com/zillionare/python-project-wizard/issues/24) config repo secrets by script
+* [#25](https://github.com/zillionare/python-project-wizard/issues/25) support create repo and upload source code
 ## v1.2.2
 * [#22](https://github.com/zillionare/python-project-wizard/issues/22) mike deploy failed
 ## v1.2.1

docs/tutorial.md

@@ -155,6 +155,11 @@ This will give you a test report and a lint report. You should see no errors exc
 
     The script looks like the following:
     ```
+    # uncomment the following to create repo and push code to github
+    # git add .
+    # git commit -m "Initial commit by ppw"
+    # gh repo create {{cookiecutter.project_slug}} --public -s . --push
+
     # Uncomment the following to config github secret used by github workflow. 
     # gh secret set PERSONAL_TOKEN --body $GH_TOKEN
     # gh secret set PYPI_API_TOKEN --body $PYPI_API_TOKEN
@@ -165,11 +170,6 @@ This will give you a test report and a lint report. You should see no errors exc
     # gh secret set BUILD_NOTIFY_MAIL_FROM --body $BUILD_NOTIFY_MAIL_FROM
     # gh secret set BUILD_NOTIFY_MAIL_PASSWORD --body $BUILD_NOTIFY_MAIL_PASSWORD
     # gh secret set BUILD_NOTIFY_MAIL_RCPT --body $BUILD_NOTIFY_MAIL_RCPT
-
-    # uncomment the following to create repo and push code to github
-    # git add ./{{cookiecutter.project_slug}}
-    # git commit -m "Initial commit by ppw"
-    # gh repo create your_repo --public -s ./path/to/source --push
     ```
     before launch the script, you will need to apply github personal token and set environment variable GH_TOKEN beforehand. And you need install the tool [**gh**](https://cli.github.com/) too.
 
@@ -225,7 +225,7 @@ In your browser, visit [install codecov app], you'll be landed at this page:
 Click on the green `install` button at top right, choose `all repositories` then click
 on `install` button, following directions until all sets.
 
-### Step 9: Check the CI result
+## Step 9: Check the CI result
 
 After pushing your code to github, go to github web page, navigate to your repo, then
 click on actions link, you should find screen like this:
@@ -237,28 +237,25 @@ new artifact is published under the name {{ cookiecutter.project_slug }}
 
 ## Step 10. Check the documentation
 
-  Documentation will be published and available at
-  <https://{your_github_account}.github.io/{your_repo}> once:
+Documentation will be published and available at <https://{your_github_account}.github.io/{your_repo}> once:
 
     1. the branch is either main or master
     2. the commit is tagged, and the tag name is started with 'v' (lower case)
     3. build/testing executed by github CI passed
 
-  If you'd like to see what it looks like now, you could run the followng command:
+If you'd like to see what it looks like now, you could run the followng command:
 
   ```
   mkdocs gh-deploy
   ```
 
-  then check your documentation at <https://{your_github_account}.github.io/{your_repo}>
-
-  or you can serve it locally by:
+then check your documentation at <https://{your_github_account}.github.io/{your_repo}> or you can serve it locally by:
 
   ```
   mkdocs serve -a 0.0.0.0:8000
   ```
 
-  then open your browser, visit your dev machine on port 8000.
+then open your browser, visit your dev machine on port 8000.
 
 ???+ Info
     Though we used mkdocs here, however, in order to support multiple versions of documentation, we actually use mike in github actions.
@@ -272,7 +269,7 @@ new artifact is published under the name {{ cookiecutter.project_slug }}
 
 ## Step 11. Make an official release
 
-    After done with your phased development, switch to either of (main, master) branch, following instructions at [release checklist](/python-project-wizard/pypi_release_checklist), trigger first official release and check result at [PYPI].
+After done with your phased development, switch to either of (main, master) branch, following instructions at [release checklist](/pypi_release_checklist), trigger first official release and check result at [PYPI].
 
 ## Step 12. Customization
 

hooks/post_gen_project.py

@@ -58,7 +58,7 @@ def init_dev():
     print(Style.RESET_ALL, Style.DIM)
     try:
         execute(sys.executable, "-m", "pip", "install", "pre-commit")
-        execute("pre-commit", "install")
+        execute("pre-commit", "install", cwd=PROJECT_DIRECTORY)
         print(Style.NORMAL, Fore.GREEN, "pre-commit hooks was successfully installed")
         print(Style.RESET_ALL)
     except Exception as e:
@@ -87,7 +87,7 @@ def init_dev():
     try:
         print(Style.NORMAL, Fore.BLUE, "install all dev dependency packages...")
         print(Style.RESET_ALL, Style.DIM)
-        execute("poetry", "install", "-E", "dev", "-E", "doc", "-E", "test")
+        execute("poetry", "install", "-E", "dev", "-E", "doc", "-E", "test", cwd=PROJECT_DIRECTORY)
         print(
             Style.NORMAL,
             Fore.GREEN,
@@ -106,7 +106,7 @@ def init_dev():
     try:
         print(Style.NORMAL, Fore.BLUE, "lint files...")
         print(Style.RESET_ALL, Style.DIM)
-        execute("pre-commit", "run", "--all")
+        execute("pre-commit", "run", "--all", cwd=PROJECT_DIRECTORY)
         print(
             Style.NORMAL,
             Fore.GREEN,

repo.sh

@@ -13,8 +13,8 @@ gh secret set BUILD_NOTIFY_MAIL_SERVER --body $BUILD_NOTIFY_MAIL_SERVER
 gh secret set BUILD_NOTIFY_MAIL_FROM --body $BUILD_NOTIFY_MAIL_FROM
 gh secret set BUILD_NOTIFY_MAIL_PASSWORD --body $BUILD_NOTIFY_MAIL_PASSWORD
 gh secret set BUILD_NOTIFY_MAIL_RCPT --body $BUILD_NOTIFY_MAIL_RCPT
-gh secret set DINGTALK_ACCESS_TOKEN --body $DINGTALK_ACCESS_TOKEN
-gh secret set DINGTALK_SECRET --body $DINGTALK_SECRET
+gh secret set DINGTALK_ACCESS_TOKEN --body $BUILD_DINGTALK_ACCESS_TOKEN
+gh secret set DINGTALK_SECRET --body $BUILD_DINGTALK_SECRET
 
 # uncomment the following to create repo and push code to github
 # git add ./{{cookiecutter.project_slug}}

{{cookiecutter.project_slug}}/repo.sh

@@ -1,8 +1,14 @@
 #!/bin/bash
 
+# !!!NOTICE!!
 # Personal token with full access rights is required to run this scripts
 # Once you got persona token, set enviroment variable GH_TOKEN with it
 
+# uncomment the following to create repo and push code to github
+# git add .
+# git commit -m "Initial commit by ppw"
+# gh repo create {{cookiecutter.project_slug}} --public -s . --push
+
 # Uncomment the following to config github secret used by github workflow. 
 # gh secret set PERSONAL_TOKEN --body $GH_TOKEN
 # gh secret set PYPI_API_TOKEN --body $PYPI_API_TOKEN
@@ -13,8 +19,3 @@
 # gh secret set BUILD_NOTIFY_MAIL_FROM --body $BUILD_NOTIFY_MAIL_FROM
 # gh secret set BUILD_NOTIFY_MAIL_PASSWORD --body $BUILD_NOTIFY_MAIL_PASSWORD
 # gh secret set BUILD_NOTIFY_MAIL_RCPT --body $BUILD_NOTIFY_MAIL_RCPT
-
-# uncomment the following to create repo and push code to github
-# git add ./{{cookiecutter.project_slug}}
-# git commit -m "Initial commit by ppw"
-# gh repo create {{cookiecutter.project_slug}} --public -s ./{{cookiecutter.project_slug}} --push