ongoing changes to overview.md

.build/generate_changelog.sh

@@ -59,6 +59,6 @@ git config --global user.email "[email protected]"
 git config --global user.name "Jrnl Bot"
 git checkout $BRANCH
 git add "$FILENAME"
-git commit -m "Updating changelog [ci skip]"
+git commit -m "Update changelog [ci skip]"
 git push https://${GITHUB_TOKEN}@github.com/jrnl-org/jrnl.git $BRANCH
 

.build/gitlab-ci.yml

@@ -0,0 +1,36 @@
+# This file is a template, and might need editing before it works on your project.
+# Official language image. Look for the different tagged releases at:
+# https://hub.docker.com/r/library/python/tags/
+image: python:latest
+
+# Change pip's cache directory to be inside the project directory since we can
+# only cache local items.
+variables:
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+
+# Pip's cache doesn't store the python packages
+# https://pip.pypa.io/en/stable/reference/pip_install/#caching
+#
+# If you want to also cache the installed packages, you have to install
+# them in a virtualenv and cache it as well.
+cache:
+  paths:
+    - .cache/pip
+
+before_script:
+  - python -V  # Print out python version for debugging
+  - pip install poetry
+
+release:
+  rules:
+    - if: $RELEASE != null
+  script:
+    - git config --global user.email "[email protected]"
+    - git config --global user.name "Jrnl Bot"
+    - git checkout "$CI_COMMIT_BRANCH"
+    - poetry version "$RELEASE"
+    - echo __version__ = \"$RELEASE\" > jrnl/__version__.py
+    - git add pyproject.toml jrnl/__version__.py
+    - git commit -m "Increment version to ${RELEASE}"
+    - git tag -a -m "$RELEASE" "$RELEASE"
+    - git push --follow-tags "https://${GITHUB_TOKEN}@github.com/jrnl-org/jrnl.git" "$CI_COMMIT_BRANCH"

.gitattributes

@@ -0,0 +1,2 @@
+*.journal text eol=lf
+*.feature text eol=lf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,20 +7,36 @@ assignees: ''
 
 ---
 
-## Bug report
-
-Hello! Thank you for reporting an issue!
-If you would fill out the below points, that would make our process a whole lot easier!
-
-* **Please tell us about your environment:**
-  - Jrnl version: (run `jrnl -v`)
-  - How you installed Jrnl
-  - Operating system [MacOS, Linux, Windows?]
-
-* **What is the current behavior?**
-
-* **Please provide the steps to reproduce and if possible a minimal demo of the problem**
-
-* **What is the expected behavior?**
-
-* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
+## Bug Report
+<!--
+Hello, and thank you for reporting an issue!
+Please fill out the points below, as it will make our process much easier.
+-->
+
+<!-- Please tell us about your environment -->
+### Environment
+  - Jrnl version: <!-- Run `jrnl -v` -->
+  - Install method: <!-- How did you install jrnl? (pipx, brew, etc) -->
+  - OS <!-- What is your operating system? (MacOS, Linux, Windows) -->
+
+### Current Behavior
+<!--
+Please put a short description of what is currently happening.
+-->
+
+### Expected Behavior
+<!--
+Please write a short description of what you would expect to happen
+(instead of what is currently happening).
+-->
+
+### Repro Steps
+<!--
+Please provide the steps to reproduce the problem. It is important for you to
+be as precise as possible here, since more info will let us help you faster.
+-->
+
+### Other Information
+<!-- (e.g. more detailed explanation, stacktraces, related
+issues, suggestions how to fix, links for us to have context, eg.
+stackoverflow, gitter, etc) -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,12 +8,24 @@ assignees: ''
 ---
 
 ## Feature Request
+<!--
+Hello, and thank you for reporting an issue!
+Please fill out the points below, as it will make our process much easier.
+-->
 
-Hello! Thank you for reporting an issue!
-If you would fill out the below points, that would make our process a whole lot easier!
+### Use Case/Motivation
+<!--
+What is the motivation / use case for changing the behavior?
+-->
 
-* **What is the motivation / use case for changing the behavior?**
+### Example Usage
+<!--
+Please provide examples of the usage you would like to see.
+e.g `jrnl --new-flag="super cool new feature"`
+-->
 
-* **Please provide examples of the usage**
-
-* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
+### Other information
+<!--
+Please provide any other relevant info about this request (e.g. stacktraces,
+related issues, suggestions how to fix, etc)
+-->

.github/ISSUE_TEMPLATE/support_request.md

@@ -7,20 +7,33 @@ assignees: ''
 
 ---
 
-## Support request
-
-Hello! Thank you for reporting an issue!
-If you would fill out the below points, that would make our process a whole lot easier!
-
-* **Please tell us about your environment:**
-
-  - Jrnl version: (run `jrnl -v`)
-  - How you installed Jrnl
-
-  - Operating system [MacOS, Linux, Windows?]
-
-* **What are you trying to do?**
-
-* **What have you tried?**
-
-* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
+## Support Request
+<!--
+Hello, and thank you for reporting an issue!
+Please fill out the points below, as it will make our process much easier.
+-->
+
+### Environment
+<!--
+Please tell us about your environment
+-->
+  - Jrnl version: <!-- Run `jrnl -v` -->
+  - Install method: <!-- How did you install jrnl? (pipx, brew, etc) -->
+  - OS <!-- What is your operating system? (MacOS, Linux, Windows) -->
+
+### What are you trying to do?
+<!--
+Please write a short description of what is happening.
+-->
+
+### What have you tried?
+<!--
+Have you tried anything to fix the problem? This can help give us more
+information to help you with.
+-->
+
+### Other Information
+<!--
+Is there anything else we should know that might be helpful?
+e.g. detailed explanation, stacktraces, related issues, suggestions how to fix
+-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,26 @@
+<!--
+Thank you for wanting to contribute!
 
-# **TEMPLATE PLEASE EDIT**
-*Thank you for wanting to contribute! Please fill out this description as well as look at the checklist!*
+Please fill out this description, and the checklist below.
+
+Here are some key points to include in your description:
+- What is this new code intended to do?
+- Are there any related issues?
+- What is the motivation for this change?
+- What is an example of usage, or changes to config files? (if applicable)
+-->
 
-*Short block of text containing:
-- Relevant changes in text form
-- related issues
-- Motivation (if applicable)
-- Example of usage (if applicable)
-- Example of changes to config files (if applicable)
-*
 ### Checklist
-- [ ] The code change is tested and works locally.
-- [ ] Tests pass. Your PR cannot be merged unless tests pass
-- [ ] There is no commented out code in this PR.
-- [ ] Have you followed the guidelines in our Contributing document?
-- [ ] Have you checked to ensure there aren't other open [Pull Requests](../pulls) for the same update/change?
-- [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
-- [ ] Have you written new tests for your core changes, as applicable?
+
+- [ ] I have read the [contributing doc](https://github.com/jrnl-org/jrnl/blob/develop/CONTRIBUTING.md).
+- [ ] I have included a link to the relevant issue number.
+- [ ] I have tested this code locally.
+- [ ] I have checked to ensure there aren't other open [pull requests](../pulls)
+  for the same issue.
+- [ ] I have written new tests for these changes, as needed.
+- [ ] All tests pass.
+<!--
+NOTE: Your PR may not be reviewed if there are any failing tests. You can run
+tests locally with `make test` (see the contributing doc if you need help with
+`make`), or use our automated tests after you submit your PR.
+-->

.github/lock.yml

@@ -0,0 +1,39 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 90
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: ':lock:'
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a new issue for
+  related bugs. You can link back here from your new issue to continue
+  the conversation.
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

.gitignore

@@ -42,11 +42,13 @@ obj
 # virtaulenv
 env/
 env*/
+venv*/
+.venv*/
 
 # PyCharm Project files
 .idea/
 
-# export testing director
+# export testing directories
 exp/
 
 _extras/

.travis.yml

@@ -62,11 +62,15 @@ jobs:
     - python: nightly
 
   include:
-    - name: Lint, via Black
+    - name: Misc Linting
       python: 3.8
       script:
+        - poetry --version
+        - poetry check
         - black --version
-        - black --check . --verbose --diff
+        - black --check --diff .
+        - pyflakes --version
+        - pyflakes .
 
     # Python 3.6 Tests
     - name: Python 3.6 on Linux
@@ -90,13 +94,13 @@ jobs:
       name: Python 3.7 on MacOS
       python: 3.7
       env:
-        JRNL_PYTHON_VERSION: 3.7.5
+        JRNL_PYTHON_VERSION: 3.7.7
     - <<: *test_windows
       name: Python 3.7 on Windows
       python: 3.7
       env:
         <<: *env_windows
-        JRNL_PYTHON_VERSION: 3.7.5
+        JRNL_PYTHON_VERSION: 3.7.7
 
     # Python 3.8 Tests
     - name: Python 3.8 on Linux
@@ -105,13 +109,13 @@ jobs:
       name: Python 3.8 on MacOS
       python: 3.8
       env:
-        JRNL_PYTHON_VERSION: 3.8.0
+        JRNL_PYTHON_VERSION: 3.8.2
     - <<: *test_windows
       name: Python 3.8 on Windows
       python: 3.8
       env:
         <<: *env_windows
-        JRNL_PYTHON_VERSION: 3.8.0
+        JRNL_PYTHON_VERSION: 3.8.2
 
     # ... and beyond!
     - name: Python nightly on Linux
@@ -125,19 +129,9 @@ jobs:
       env:
         TZ: America/Edmonton
 
-    # Changelog for Unreleased changes
-    - stage: Update Changelog
-      if: (tag IS present) OR (branch = develop AND type NOT IN (pull_request))
-      install:
-        - echo 'Skipping install'
-      script:
-        - ./.build/generate_changelog.sh
-
     - stage: Deploy
       if: tag IS present
       before_deploy:
-        - poetry version "$TRAVIS_TAG"
-        - echo __version__ = \"$TRAVIS_TAG\" > jrnl/__version__.py
         - poetry build
       script:
         - echo "Deployment starting..."
@@ -146,12 +140,13 @@ jobs:
           script: poetry publish
           skip_cleanup: true
           on:
-            branch: master
-            tags: true
-      after_deploy:
-        - git config --global user.email "[email protected]"
-        - git config --global user.name "Jrnl Bot"
-        - git checkout master
-        - git add pyproject.toml jrnl/__version__.py
-        - git commit -m "Incrementing version to ${TRAVIS_TAG} [ci skip]"
-        - git push https://${GITHUB_TOKEN}@github.com/jrnl-org/jrnl.git master
+            all_branches: true
+
+    # Changelog for Unreleased changes
+    - stage: Update Changelog
+      if: (tag IS present) OR (branch = develop AND type NOT IN (pull_request))
+      install:
+        - echo 'Skipping installation step'
+      script:
+        - ./.build/generate_changelog.sh
+