Skip to content

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
jarrodmillman committed Mar 13, 2024
1 parent a63e561 commit 4a90b88
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 28 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Test Pyodide build
on:
push:
branches:
# Runs on every merge to master to upload .dev0 wheels to anaconda.org
- master
# Runs on every merge to main to upload .dev0 wheels to anaconda.org
- main
- v1.**
pull_request:
branches:
- master
- main
- v1.**
# Make it possible to upload wheels manually if needed
workflow_dispatch:
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
# https://anaconda.org/scientific-python-nightly-wheels/pywavelets
# WARNING: this job will overwrite existing wheels.
- name: Push to Anaconda PyPI index
if: (github.repository == 'PyWavelets/pywt') && (github.event_name == 'push' && github.ref == 'refs/heads/master') || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_wheels == 'true') || (github.event_name == 'schedule')
if: (github.repository == 'PyWavelets/pywt') && (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'workflow_dispatch' && github.event.inputs.push_wheels == 'true') || (github.event_name == 'schedule')
uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # v0.5.0
with:
artifacts_path: dist/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- v1.**
pull_request:
branches:
- master
- main
- v1.**

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- v1.**
pull_request:
branches:
- master
- main
- v1.**

jobs:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/wheel_tests_and_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
- "v*"
- "buildwheels*"
branches:
# Runs on every merge to master to upload .dev0 wheels to anaconda.org
- master
# Runs on every merge to main to upload .dev0 wheels to anaconda.org
- main
- v1.**
# Make it possible to upload wheels manually if needed (for anaconda.org only, not PyPI)
workflow_dispatch:
Expand Down Expand Up @@ -251,10 +251,10 @@ jobs:
build_macos_wheels,
build_windows_wheels,
]
# Run only on pushes to the master branch, on schedule, or when triggered manually
# Run only on pushes to the main branch, on schedule, or when triggered manually
if: >-
github.repository == 'PyWavelets/pywt' &&
(github.event_name == 'push' && github.ref == 'refs/heads/master') ||
(github.event_name == 'push' && github.ref == 'refs/heads/main') ||
(github.event_name == 'workflow_dispatch' && github.event.inputs.push_wheels == 'true') ||
(github.event_name == 'schedule')
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ When submitting a pull request, we ask you check the following:
some further changes.

2. The contributed code will be **licensed under PyWavelets's license**,
(the MIT license, https://github.com/PyWavelets/pywt/blob/master/LICENSE).
(the MIT license, https://github.com/PyWavelets/pywt/blob/main/LICENSE).
If you did not write the code yourself, you ensure the existing
license is compatible and include the license information in the
contributed files, or obtain a permission from the original
Expand Down Expand Up @@ -63,4 +63,4 @@ Coding guidelines

.. _pyflakes: http://pypi.python.org/pypi/pyflakes

.. _testing guidelines: https://github.com/numpy/numpy/blob/master/doc/TESTS.rst.txt
.. _testing guidelines: https://github.com/numpy/numpy/blob/main/doc/TESTS.rst.txt
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
+---------------+-----------------+


.. |ghactions_ci| image:: https://github.com/PyWavelets/pywt/actions/workflows/tests.yml/badge.svg?branch=master
.. |ghactions_ci| image:: https://github.com/PyWavelets/pywt/actions/workflows/tests.yml/badge.svg?branch=main
:alt: Build Status
:target: https://github.com/PyWavelets/pywt/actions/workflows/tests.yml?query=branch%3Amaster
:target: https://github.com/PyWavelets/pywt/actions/workflows/tests.yml?query=branch%3Amain

.. |appveyor_ci| image:: https://ci.appveyor.com/api/projects/status/github/PyWavelets/pywt
:align: middle
Expand Down Expand Up @@ -149,7 +149,7 @@ the link in the badge below to Zenodo:

.. _built-in wavelet filters: http://wavelets.pybytes.com/
.. _Cython: http://cython.org/
.. _demo: https://github.com/PyWavelets/pywt/tree/master/demo
.. _demo: https://github.com/PyWavelets/pywt/tree/main/demo
.. _Anaconda: https://www.continuum.io
.. _GitHub: https://github.com/PyWavelets/pywt
.. _GitHub Issues: https://github.com/PyWavelets/pywt/issues
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
//"repo": "https://github.com/PyWavelets/pywt.git",
"repo": "..",

// List of branches to benchmark. If not provided, defaults to "master"
// List of branches to benchmark. If not provided, defaults to "main"
// (for git) or "tip" (for mercurial).
"branches": ["master"], // for git
"branches": ["main"], // for git
// "branches": ["tip"], // for mercurial

// The DVCS being used. If not set, it will be automatically
Expand Down
8 changes: 4 additions & 4 deletions doc/source/common_refs.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.. _built-in wavelet filters: http://wavelets.pybytes.com/
.. _Cython: http://cython.org/
.. _demo: https://github.com/PyWavelets/pywt/tree/master/demo
.. _demo: https://github.com/PyWavelets/pywt/tree/main/demo
.. _Anaconda: https://www.continuum.io
.. _GitHub: https://github.com/PyWavelets/pywt
.. _GitHub repository: https://github.com/PyWavelets/pywt
Expand All @@ -14,8 +14,8 @@
.. _PyWavelets discussions group: http://groups.google.com/group/pywavelets
.. _Releases Page: https://github.com/PyWavelets/pywt/releases
.. _Matplotlib: http://matplotlib.org
.. _guidelines for pull requests: https://github.com/PyWavelets/pywt/tree/master/CONTRIBUTING.rst
.. _community guidelines: https://github.com/PyWavelets/pywt/tree/master/community_guidelines.rst
.. _code of conduct: https://github.com/PyWavelets/pywt/tree/master/doc/source/dev/conduct/community_guidelines.rst
.. _guidelines for pull requests: https://github.com/PyWavelets/pywt/tree/main/CONTRIBUTING.rst
.. _community guidelines: https://github.com/PyWavelets/pywt/tree/main/community_guidelines.rst
.. _code of conduct: https://github.com/PyWavelets/pywt/tree/main/doc/source/dev/conduct/community_guidelines.rst
.. _StackOverflow: https://stackoverflow.com
.. _wavelets.pybytes.com: http://wavelets.pybytes.com/
5 changes: 1 addition & 4 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@
# The encoding of source files.
source_encoding = 'utf-8'

# The master toctree document.
master_doc = 'index'

# General information about the project.
project = 'PyWavelets'
copyright = f'2006-{datetime.date.today().year}, The PyWavelets Developers'
Expand Down Expand Up @@ -167,7 +164,7 @@
"github_url": "https://github.com", # or your GitHub Enterprise site
"github_user": "PyWavelets",
"github_repo": "pywt",
"github_version": "master",
"github_version": "main",
"doc_path": "doc/source",
"default_mode": "light",
}
Expand Down
4 changes: 2 additions & 2 deletions doc/source/dev/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ The project is using GitHub Actions for continuous integration and testing.

Current build status is:

.. image:: https://github.com/PyWavelets/pywt/actions/workflows/tests.yml/badge.svg?branch=master
.. image:: https://github.com/PyWavelets/pywt/actions/workflows/tests.yml/badge.svg?branch=main
:alt: Build Status
:target: https://github.com/PyWavelets/pywt/actions/workflows/tests.yml?query=branch%3Amaster
:target: https://github.com/PyWavelets/pywt/actions/workflows/tests.yml?query=branch%3Amain

If you are submitting a patch or pull request please make sure it
does not break the build.
Expand Down
2 changes: 1 addition & 1 deletion doc/source/ref/2d-decompositions-overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ data prior to moving onto each additional axis in turn. This is illustrated
for the 2D case in the upper right panel of the figure below. This approach has
a factor of two higher computational cost as compared to the Mallat approach,
but has advantages in compactly representing anisotropic data. A demo of this
is `available <https://github.com/PyWavelets/pywt/tree/master/demo/fswavedecn_mondrian.py>`_).
is `available <https://github.com/PyWavelets/pywt/tree/main/demo/fswavedecn_mondrian.py>`_).

This form of the DWT is also sometimes referred to as the tensor wavelet
transform or the hyperbolic wavelet transform. In PyWavelets it is implemented
Expand Down

0 comments on commit 4a90b88

Please sign in to comment.