Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maintenance: Rename default branch to main #672

Merged
merged 1 commit into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ "master" ]
branches: [ "main" ]
pull_request:
branches: [ "master" ]
branches: [ "main" ]
schedule:
- cron: "46 2 * * 5"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request: ~
push:
branches:
- master
- main
schedule:
- cron: '0 7 * * *'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Tests

on:
push:
branches: [ master ]
branches: [ main ]
pull_request: ~
workflow_dispatch:

Expand Down
6 changes: 3 additions & 3 deletions DEVELOP.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Renew certificates
==================

For conducting TLS connectivity tests, there are a few X.509 certificates at
`src/crate/client/pki/*.pem`_. In order to renew them, follow the instructions
`tests/assets/pki/*.pem`_. In order to renew them, follow the instructions
within the README file in this folder.


Expand All @@ -130,7 +130,7 @@ In the release branch:
- Create a tag by running ``./devtools/create_tag.sh``. This will trigger a
Github action which releases the new version to PyPi.

On master:
On branch ``main``:

- Update the release notes to reflect the release

Expand Down Expand Up @@ -171,7 +171,7 @@ nothing special you need to do to get the live docs to update.
.. _Read the Docs: http://readthedocs.org
.. _ReStructuredText: http://docutils.sourceforge.net/rst.html
.. _Sphinx: http://sphinx-doc.org/
.. _src/crate/client/pki/*.pem: https://github.com/crate/crate-python/tree/master/src/crate/client/pki
.. _tests/assets/pki/*.pem: https://github.com/crate/crate-python/tree/main/tests/assets/pki
.. _tox: http://testrun.org/tox/latest/
.. _twine: https://pypi.python.org/pypi/twine
.. _useful command-line options for zope-testrunner: https://pypi.org/project/zope.testrunner/#some-useful-command-line-options-to-get-you-started
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CrateDB Python Client
:target: https://github.com/crate/crate-python/actions?workflow=Tests
:alt: Build status

.. image:: https://codecov.io/gh/crate/crate-python/branch/master/graph/badge.svg
.. image:: https://codecov.io/gh/crate/crate-python/branch/main/graph/badge.svg
:target: https://app.codecov.io/gh/crate/crate-python
:alt: Coverage

Expand Down
2 changes: 1 addition & 1 deletion devtools/create_tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ git fetch origin > /dev/null
BRANCH=`git branch | grep "^*" | cut -d " " -f 2`
echo "Current branch is $BRANCH."

# check if master == origin/master
# check if main == origin/main
LOCAL_COMMIT=`git show --format="%H" $BRANCH`
ORIGIN_COMMIT=`git show --format="%H" origin/$BRANCH`

Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,12 @@ The project is licensed under the terms of the Apache 2.0 license, like
.. _CrateDB source: https://github.com/crate/crate
.. _Create an issue: https://github.com/crate/crate-python/issues
.. _Dask: https://en.wikipedia.org/wiki/Dask_(software)
.. _development sandbox: https://github.com/crate/crate-python/blob/master/DEVELOP.rst
.. _development sandbox: https://github.com/crate/crate-python/blob/main/DEVELOP.rst
.. _cratedb-examples repository: https://github.com/crate/cratedb-examples
.. _FIWARE QuantumLeap data historian: https://github.com/orchestracities/ngsi-timeseries-api
.. _GeoJSON: https://geojson.org/
.. _GeoJSON geometry objects: https://tools.ietf.org/html/rfc7946#section-3.1
.. _LICENSE: https://github.com/crate/crate-python/blob/master/LICENSE
.. _LICENSE: https://github.com/crate/crate-python/blob/main/LICENSE
.. _managed on GitHub: https://github.com/crate/crate-python
.. _migrate to sqlalchemy-cratedb: https://cratedb.com/docs/sqlalchemy-cratedb/migrate-from-crate-client.html
.. _pandas: https://en.wikipedia.org/wiki/Pandas_(software)
Expand Down
4 changes: 2 additions & 2 deletions tests/assets/pki/readme.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ About
*****

For conducting TLS connectivity tests, there are a few X.509 certificates at
`src/crate/client/pki/*.pem`_. The instructions here outline how to renew them.
`tests/assets/pki/*.pem`_. The instructions here outline how to renew them.

In order to invoke the corresponding test cases, run::

Expand Down Expand Up @@ -88,4 +88,4 @@ Combine private key and certificate into single PEM file::
cat invalid_cert.pem >> client_invalid.pem


.. _src/crate/client/pki/*.pem: https://github.com/crate/crate-python/tree/master/src/crate/client/pki
.. _tests/assets/pki/*.pem: https://github.com/crate/crate-python/tree/main/tests/assets/pki
Loading