Merge branch 'constraints'

.github/defaults/probot-settings.yml

@@ -0,0 +1,162 @@
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+
+repository:
+  # See https://developer.github.com/v3/repos/#edit for all available settings.
+
+  # The name of the repository. Changing this will rename the repository
+#  name: repo-name
+
+  # A short description of the repository that will show up on GitHub
+  description: easyTemplateLib - an easyScience library
+
+  # A URL with more information about the repository
+  homepage: https://easyTemplateLib.github.io/
+
+  # A comma-separated list of topics to set on the repository
+#  topics: github, probot
+
+  # Either `true` to make the repository private, or `false` to make it public.
+  private: false
+
+  # Either `true` to enable issues for this repository, `false` to disable them.
+  has_issues: true
+
+  # Either `true` to enable projects for this repository, or `false` to disable them.
+  # If projects are disabled for the organization, passing `true` will cause an API error.
+  has_projects: true
+
+  # Either `true` to enable the wiki for this repository, `false` to disable it.
+  has_wiki: true
+
+  # Either `true` to enable downloads for this repository, `false` to disable them.
+  has_downloads: true
+
+  # Updates the default branch for this repository.
+  default_branch: master
+
+  # Either `true` to allow squash-merging pull requests, or `false` to prevent
+  # squash-merging.
+  allow_squash_merge: true
+
+  # Either `true` to allow merging pull requests with a merge commit, or `false`
+  # to prevent merging pull requests with merge commits.
+  allow_merge_commit: true
+
+  # Either `true` to allow rebase-merging pull requests, or `false` to prevent
+  # rebase-merging.
+  allow_rebase_merge: true
+
+# Labels: define labels for Issues and Pull Requests
+labels:
+  - name: bug
+    color: CC0000
+    description: An issue with the system.
+
+  - name: feature
+    # If including a `#`, make sure to wrap it with quotes!
+    color: 336699
+    description: New functionality.
+
+  - name: major
+    color: dd0316
+    description: Apply to bump the version by x.0.0
+
+  - name: minor
+    color: dd6903
+    description: Apply to bump the version by 0.x.0
+
+  - name: patch
+    color: fbe204
+    description: Apply to bump the version by 0.0.x
+
+# Milestones: define milestones for Issues and Pull Requests
+milestones:
+  - title: Customise Repo
+    description: This repos was generated from a template. Personalise it!
+    # The state of the milestone. Either `open` or `closed`
+    state: open
+
+# Collaborators: give specific users access to this repository.
+# See https://developer.github.com/v3/repos/collaborators/#add-user-as-a-collaborator for available options
+#collaborators:
+#  - username: bkeepers
+#    # Note: Only valid on organization-owned repositories.
+#    # The permission to grant the collaborator. Can be one of:
+#    # * `pull` - can pull, but not push to or administer this repository.
+#    # * `push` - can pull and push, but not administer this repository.
+#    # * `admin` - can pull, push and administer this repository.
+#    permission: push
+#
+#  - username: hubot
+#    permission: pull
+#
+## See https://developer.github.com/v3/teams/#add-or-update-team-repository for available options
+#teams:
+#  - name: core
+#    # The permission to grant the team. Can be one of:
+#    # * `pull` - can pull, but not push to or administer this repository.
+#    # * `push` - can pull and push, but not administer this repository.
+#    # * `admin` - can pull, push and administer this repository.
+#    permission: admin
+#  - name: docs
+#    permission: push
+
+branches:
+  - name: master
+    # https://developer.github.com/v3/repos/branches/#update-branch-protection
+    # Branch Protection settings. Set to null to disable
+    protection:
+      # Required. Require at least one approving review on a pull request, before merging. Set to null to disable.
+      required_pull_request_reviews:
+        # The number of approvals required. (1-6)
+        required_approving_review_count: 1
+        # Dismiss approved reviews automatically when a new commit is pushed.
+        dismiss_stale_reviews: true
+        # Blocks merge until code owners have reviewed.
+        require_code_owner_reviews: true
+        # Specify which users and teams can dismiss pull request reviews. Pass an empty dismissal_restrictions object to disable. User and team dismissal_restrictions are only available for organization-owned repositories. Omit this parameter for personal repositories.
+        dismissal_restrictions:
+          users: []
+          teams: []
+      # Required. Require status checks to pass before merging. Set to null to disable
+      required_status_checks:
+        # Required. Require branches to be up to date before merging.
+        strict: true
+        # Required. The list of status checks to require in order to merge into this branch
+        contexts: []
+      # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
+      enforce_admins: true
+      # Required. Restrict who can push to this branch. Team and user restrictions are only available for organization-owned repositories. Set to null to disable.
+      restrictions:
+        apps: []
+        users: []
+        teams: []
+  - name: develop
+    # https://developer.github.com/v3/repos/branches/#update-branch-protection
+    # Branch Protection settings. Set to null to disable
+    protection:
+      # Required. Require at least one approving review on a pull request, before merging. Set to null to disable.
+      required_pull_request_reviews:
+        # The number of approvals required. (1-6)
+        required_approving_review_count: 1
+        # Dismiss approved reviews automatically when a new commit is pushed.
+        dismiss_stale_reviews: false
+        # Blocks merge until code owners have reviewed.
+        require_code_owner_reviews: false
+        # Specify which users and teams can dismiss pull request reviews. Pass an empty dismissal_restrictions object to disable. User and team dismissal_restrictions are only available for organization-owned repositories. Omit this parameter for personal repositories.
+        dismissal_restrictions:
+          users: []
+          teams: []
+      # Required. Require status checks to pass before merging. Set to null to disable
+      required_status_checks:
+        # Required. Require branches to be up to date before merging.
+        strict: true
+        # Required. The list of status checks to require in order to merge into this branch
+        contexts: []
+      # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable.
+      enforce_admins: false
+      # Required. Restrict who can push to this branch. Team and user restrictions are only available for organization-owned repositories. Set to null to disable.
+      restrictions:
+        apps: []
+        users: []
+        teams: []

.github/workflows/on_create.yaml

@@ -0,0 +1,62 @@
+name: Create Repo
+
+on: [create]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    if: endsWith(github.ref, '/master') && ! contains(github.repository, 'easyExampleApp')
+
+    steps:
+
+    - name: Check-out repository
+      uses: actions/checkout@v2
+
+    - name: Replace names
+      shell: bash
+      run: |
+        export REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//")
+        git mv easyExampleApp $REPOSITORY_NAME
+        cp ./.github/defaults/probot-settings.yml ./
+        find . -path '*/.git*' -prune -o -type f -exec sed -i 's/easyExampleApp\b/'$REPOSITORY_NAME'/g' {} +
+
+    - name: Clean up
+      shell: bash
+      run: |
+        git rm ./.github/workflows/on_create.yaml
+        git rm -f --cached ./.github/defaults/probot-settings.yml
+
+    - name: Commit changes
+      run: |
+        git config --global user.name 'On Create Bot'
+        git commit -am 'Automated Repo Maker'
+        git push --set-upstream origin master --force
+
+    - name: Create branches
+      run: |
+        git checkout -b develop
+        git push origin develop:develop
+        git checkout -b release
+        git push origin release:release
+        git checkout master
+
+    - name: Set up Python environment
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+
+    - name: Update branch protections
+      run: |
+        pip install pyyaml requests
+        python Tools/Scripts/branch_protection.py
+      env:
+        INPUT_GITHUB-TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+        INPUT_CONFIG-FILE: ./probot-settings.yml
+
+    - name: Manage repo
+      uses: mattsb42/[email protected]
+      with:
+        github-token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+        config-file: ./probot-settings.yml
+        debug: true

.project.pyproject

@@ -1,21 +1,16 @@
 {
 "files": [
     "easyExampleApp/main.py",
-
-    "easyExampleApp/Logic/ProjectSentinel.py",
     "easyExampleApp/Logic/PyQmlProxy.py",
-    "easyExampleApp/Logic/QtInterface.py",
-
+    "easyExampleApp/Logic/QtDataStore.py",
     "easyExampleApp/Logic/DisplayModels/DataModels.py",
 
-    "../easyAppLogic/easyAppLogic/Translator.py",
-
-    "../easyTemplateLib/easyTemplateLib/interface.py",
-
-    "../easyTemplateLib/easyTemplateLib/Objects/fitting.py",
+    "../easyAppLogic/easyAppLogic/Translate.py",
 
-    "../easyTemplateLib/easyTemplateLib/Engines/calculator1.py",
-    "../easyTemplateLib/easyTemplateLib/Engines/calculator2.py",
-    "../easyTemplateLib/easyTemplateLib/Engines/calculatorTemplate.py"
+    "../easyExampleLib/easyExampleLib/interface.py",
+    "../easyExampleLib/easyExampleLib/model.py",
+    "../easyExampleLib/easyExampleLib/Calculators/calculator1.py",
+    "../easyExampleLib/easyExampleLib/Interfaces/interface1.py",
+    "../easyExampleLib/easyExampleLib/Interfaces/interfaceTemplate.py"
     ]
 }

.project.qmlproject

@@ -17,6 +17,14 @@ Project {
         directory: "../easyAppGui"
     }
 
+    // Include .js files from specified directory and its subdirectories
+    JavaScriptFiles {
+        directory: "easyExampleApp"
+    }
+    JavaScriptFiles {
+        directory: "../easyAppGui"
+    }
+
     // Include Module Definition Files (qmldir), as well as .ts and .qrc
     // from specified directory and its subdirectories
     Files {

docs/index.html

@@ -4,15 +4,15 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>Dev web pages for easyTemplateApp repo</title>
+    <title>Dev web pages for easyExampleApp repo</title>
     <link rel="stylesheet" href="WebPages/style.css">
   </head>
 
   <body>
     <div class="video-frame">
-      <h1>Test video for <a href="https://github.com/easyScience/easyTemplateApp">easyScience/easyTemplateApp</a> repo</h1>
+      <h1>Test video for <a href="https://github.com/easyScience/easyExampleApp">easyScience/easyExampleApp</a> repo</h1>
       <video controls muted>
-        <source type="video/mp4" src="https://github.com/easyScience/easyTemplateApp/blob/master/docs/UserManual/VideoTutorials/tutorial.mp4?raw=true">
+        <source type="video/mp4" src="https://github.com/easyScience/easyExampleApp/blob/master/docs/UserManual/VideoTutorials/tutorial.mp4?raw=true">
       </video>
     </div>
   </body>