Resolve merge conflicts

.circleci/config.yml

@@ -33,15 +33,11 @@ jobs:
       - run:
           name: install-dev-requirements
           command: |
-            pip install --user -U -r requirements-test.txt
-      - run:
-          name: check-code-style
-          command: |
-            python -m flake8 --show-source .
+            pip install --user -U -r requirements-precommit.txt
       - run:
-          name: check-doc-strings-style
+          name: Run pre-checks
           command: |
-            pydocstyle
+            pre-commit run --all-files
 
   test-3.8: &test-template
     environment:

.pre-commit-config.yaml

@@ -0,0 +1,19 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: ''
+    hooks:
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+    -   id: debug-statements
+-   repo: local
+    hooks:
+    -   id: flake8
+        name: flake8
+        entry: flake8
+        language: python
+        types: [python]
+    -   id: pydocstyle
+        name: pydocstyle
+        entry: pydocstyle
+        language: python
+        types: [python]

.zenodo.json

@@ -162,4 +162,4 @@
     "title": "signac-flow",
     "upload_type": "software",
     "version": "0.10.0"
-}
+}

changelog.txt

@@ -11,16 +11,23 @@ next
 next
 ----
 
+Added
++++++
+
+- Added support for `pre-commit hooks <https://pre-commit.com/>`__ (#333).
+
 Changed
 +++++++
 
 - Make ``FlowCondition`` class private (#307, #315).
+- Deprecate ``JobOperation`` class, make ``SubmissionJobOperation`` a private class and deprecate the following methods of ``FlowProject``: ``script``, ``run_operations``, ``submit_operations``, ``next_operations``. (#313)
+- Deprecate the following methods: ``FlowGroup.eligible``, ``FlowGroup.complete``, ``BaseFlowOperation.eligible``, ``BaseFlowOperation.complete`` (#337).
 
 Removed
 +++++++
 
 - Drop support for Python 3.5 (#305). The signac project will follow the `NEP 29 deprecation policy <https://numpy.org/neps/nep-0029-deprecation_policy.html>`_ going forward.
-
+- Remove the deprecated methods ``always``, ``make_bundles``, and ``JobOperation.get_id`` (#312).
 
 Version 0.10
 ============

doc/api.rst

@@ -40,7 +40,6 @@ The FlowProject
     FlowProject.operation
     FlowProject.operations
     FlowProject.post
-    FlowProject.post.always
     FlowProject.post.copy_from
     FlowProject.post.false
     FlowProject.post.isfile
@@ -49,7 +48,6 @@ The FlowProject
     FlowProject.post.true
     FlowProject.pre
     FlowProject.pre.after
-    FlowProject.pre.always
     FlowProject.pre.copy_from
     FlowProject.pre.false
     FlowProject.pre.isfile
@@ -72,8 +70,6 @@ The FlowProject
 
 .. automethod:: flow.FlowProject.post
 
-.. automethod:: flow.FlowProject.post.always
-
 .. automethod:: flow.FlowProject.post.copy_from
 
 .. automethod:: flow.FlowProject.post.false
@@ -90,8 +86,6 @@ The FlowProject
 
 .. automethod:: flow.FlowProject.pre.after
 
-.. automethod:: flow.FlowProject.pre.always
-
 .. automethod:: flow.FlowProject.pre.copy_from
 
 .. automethod:: flow.FlowProject.pre.false

doc/index.rst

@@ -32,4 +32,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-