Skip to content

Commit

Permalink
further migration in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
daquinteroflex committed Jun 14, 2024
1 parent 3f95ab0 commit 02e8902
Show file tree
Hide file tree
Showing 90 changed files with 55 additions and 58 deletions.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
55 changes: 0 additions & 55 deletions docs/development/feature_contribution.rst

This file was deleted.

56 changes: 54 additions & 2 deletions docs/development/release/flow.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,29 @@
Feature Contribution
=====================



Feature Development Workflow
------------------------------


1. Create a branch off of ``develop``
-------------------------------------

Our ``pre/x.x`` branches are where new features, bug fixes, and other things get added before a major release. To switch to the ``pre/x.x`` branch:

.. code-block:: bash
git checkout pre/x.x
And then you can create a new branch from here with your GitHub username pre-pended:

.. code-block:: bash
git checkout -b myusername/cool-feature
Currently most of our release development flow is made under the latest ``pre/*`` branch under the main frontend
tidy3d repository. You want to fork from this latest branch to develop your feature in order for it to be included
under that release.
tidy3d repository. You want to fork from this latest branch to develop your feature in order for it to be included under that release.

We are using a variation of the `gitflow
workflow <https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow>`__
Expand Down Expand Up @@ -35,10 +55,26 @@ a clean branch on your machine.
git pull origin pre/x.x
git checkout -b my_name/new_feature
2. Writing code
---------------

Develop your code in this new branch, committing your changes when it seems like a natural time to “save your progress”.

If you are working on a new feature, make sure you add a line in the `CHANGELOG.md <https://github.com/flexcompute/Tidy3D-client-revamp/blob/develop/CHANGELOG.md>`_ file (if it exists in that repository) to summarize your changes.


Create your feature rebase
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

3. Create a pull request on GitHub
-----------------------------------

First, push your changes to your branch on GitHub.

In the GitHub website, create a pull request to merge your branch into ``pre/x.x``.

Write some comments or a summary of changes in your pull request to be clear about what is being added/changed and why.

Before rebasing, you should make sure you have the latest version
of ``develop``, in case other work has been merged meanwhile.

Expand Down Expand Up @@ -81,6 +117,22 @@ rebasing has changed its history.
Submitting to PR
^^^^^^^^^^^^^^^^^

4. Submit for review
--------------------

Every PR must have the following before it can be merged:

- At least one review.
- A description in the CHANGELOG of what has been done.

Every new major feature must also pass all of the following before it can be merged:

- Frontend and backend tests by the developer (unless no code has changed on one or the other), as well as a new example notebook or a modification to an existing example notebook that utilizes the new feature. Intermediate reviews can happen, but these conditions must be met for the feature to begin to be considered for a merge.
- Ensure any known limitations are listed at the top message in the PR conversation (e.g., does the feature work with the mode solver? The auto grid? Does it work, but not as well as it should?). The feature can be merged given the limitations if we make a decision to do that, but only if an error or warning is issued whenever a user could encounter them, and after the list has been moved to another PR or an issue to keep track.
- If backend changes are present, review by one of the people well-versed with the solver (Momchil, Weiliang, Shashwat, Daniil).
- If frontend changes are present, review by any member of the team and additional approval by Momchil or Tyler.
- QA from any member of the team: playing around with the new feature and trying to find limitations. The goal is not to construct one successful example but to figure out if there is any allowed usage that may be problematic. An extra example notebook may or may not come out of this.

After this, you can notify Momchil that the branch is ready to to be
merged. In the comment you can optionally also say things like “Fixes
#34”. This will then automatically link that PR to the particular issue,
Expand Down
2 changes: 1 addition & 1 deletion docs/development/release/index.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Release Flow
==============

This page contains all the relevant information relating to each version release process for ``tidy3d``.
This page contains all the relevant information relating to the development cycle and each version release process for ``tidy3d``.

.. You just need to make sure that the ``<same>`` branches of both ``tidy3d/`` and ``tidy3d-notebooks/`` repositories within the ``./`` and ``./docs/notebooks/`` directories are updated. The ``readthedocs`` documentation will be automatically updated through the ``sync-readthedocs-repo`` Github action.
Expand Down

0 comments on commit 02e8902

Please sign in to comment.