diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index f794220898..507dacaff1 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -2,10 +2,10 @@ name: PyPI on: push: branches: - - master + - main - auto-release pull_request: - branches: [master] + branches: [main] release: types: [published] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 11e6b7def1..e993c32603 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,11 +3,11 @@ name: Tests on: push: branches: - - master + - main - checks pull_request: branches: - - master + - main jobs: changes: diff --git a/Makefile b/Makefile index e7234778d9..1d37c8c437 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ test: # Test code using pytest. pytest -v tests/ ${PROJECT_DIR} --cov=${PROJECT_DIR} --cov-report=xml --html=testing-report.html --self-contained-html coverage: test - diff-cover coverage.xml --compare-branch=master --fail-under=100 + diff-cover coverage.xml --compare-branch=main --fail-under=100 pypi: ${PYTHON} setup.py clean --all; \ diff --git a/README.rst b/README.rst index 94549e734f..90a462c38b 100644 --- a/README.rst +++ b/README.rst @@ -122,5 +122,5 @@ The PyMC group operates under the NumFOCUS umbrella. If you want to support us f .. |Project Name| replace:: Aesara .. |Tests Status| image:: https://github.com/pymc-devs/aesara/workflows/Tests/badge.svg :target: https://github.com/pymc-devs/aesara/actions?query=workflow%3ATests -.. |Coverage| image:: https://codecov.io/gh/pymc-devs/aesara/branch/master/graph/badge.svg?token=WVwr8nZYmc +.. |Coverage| image:: https://codecov.io/gh/pymc-devs/aesara/branch/main/graph/badge.svg?token=WVwr8nZYmc :target: https://codecov.io/gh/pymc-devs/aesara diff --git a/doc/dev_start_guide.rst b/doc/dev_start_guide.rst index 60fb12fa9b..846d881724 100644 --- a/doc/dev_start_guide.rst +++ b/doc/dev_start_guide.rst @@ -345,12 +345,12 @@ Using your local copy --------------------- To update your library to the latest revision, you should have a local branch -that tracks central/master. You can add one (named "trunk" here) with: +that tracks ``origin/main``. You can add one (named "trunk" here) with: .. code-block:: bash - git fetch central - git branch trunk central/master + git fetch origin + git branch trunk origin/main Once you have such a branch, in order to update it, do: @@ -396,13 +396,13 @@ Start a new local branch ------------------------ When working on a new feature in your own fork, start from an up-to-date copy -of the `master` branch (the principal one) of the central repository +of the `main` branch (the principal one) of the central repository (Aesara/Aesara on GitHub): .. code-block:: bash - git fetch central - git checkout -b my_shiny_feature central/master + git fetch origin + git checkout -b my_shiny_feature origin/main .. note:: @@ -410,7 +410,7 @@ of the `master` branch (the principal one) of the central repository .. code-block:: bash - git branch my_shiny_feature central/master + git branch my_shiny_feature origin/main git checkout my_shiny_feature @@ -422,7 +422,7 @@ branch to your github fork first: .. code-block:: bash - git commit -a -m "your message here" + git commit -a -m "Your message here" .. code-block:: bash @@ -431,7 +431,7 @@ branch to your github fork first: Then, go to your fork's github page on the github website, select your feature branch and hit the "Pull Request" button in the top right corner. This will signal the maintainers that you wish to submit your -changes for inclusion in central/master. +changes for inclusion in ``origin/main``. Address reviewer comments diff --git a/doc/extending/jax_op.rst b/doc/extending/jax_op.rst index d555d6a4d8..b7524ae9f0 100644 --- a/doc/extending/jax_op.rst +++ b/doc/extending/jax_op.rst @@ -15,7 +15,7 @@ to know what we want JAX to do. | Here are the examples for ``eye`` and ``ifelse`` from Aesara from the compiled doc and codebase respectively | https://aesara.readthedocs.io/en/latest/library/tensor/basic.html?highlight=eye#aesara.tensor.eye -| https://github.com/pymc-devs/aesara/blob/master/aesara/ifelse.py#L35 +| https://github.com/pymc-devs/aesara/blob/main/aesara/ifelse.py#L35 Step 2: Find the relevant JAX method (or something close) ========================================================= @@ -39,7 +39,7 @@ logic. return res if n_outs > 1 else res[0] *Code in context:* -https://github.com/pymc-devs/aesara/blob/master/aesara/link/jax/dispatch.py#L583 +https://github.com/pymc-devs/aesara/blob/main/aesara/link/jax/dispatch.py#L583 Step 3: Register the function with the jax_funcify dispatcher ============================================================= @@ -51,7 +51,7 @@ short tutorial on dispatching is at the bottom. The linker functions should be added to ``dispatch`` module linked below. -https://github.com/pymc-devs/aesara/blob/master/aesara/link/jax/dispatch.py +https://github.com/pymc-devs/aesara/blob/main/aesara/link/jax/dispatch.py Here’s an example for the Eye Op. @@ -69,7 +69,7 @@ Here’s an example for the Eye Op. return eye *Code in context:* -https://github.com/pymc-devs/aesara/blob/master/aesara/link/jax/dispatch.py#L1071 +https://github.com/pymc-devs/aesara/blob/main/aesara/link/jax/dispatch.py#L1071 Step 4: Write tests =================== @@ -82,7 +82,7 @@ compile the same function graph in Python and JAX and check that the numerical output is similar betwen the JAX and Python output, as well object types to ensure correct compilation. -https://github.com/pymc-devs/aesara/blob/master/tests/link/test_jax.py +https://github.com/pymc-devs/aesara/blob/main/tests/link/test_jax.py .. code:: python