Skip to content

Commit

Permalink
Get ready moving master into main (#693)
Browse files Browse the repository at this point in the history
* Get ready moving master into main

* Update github workflows to account for the new branch name.
  • Loading branch information
Natim committed Jan 18, 2024
1 parent 5c1fb3e commit 4fcac22
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:

name: Code Lint
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
pull_request:

name: Unit Testing
Expand All @@ -25,13 +25,13 @@ jobs:

strategy:
matrix:
toxenv: [py38, kinto-master, upload-download-scripts]
toxenv: [py38, kinto-main, upload-download-scripts]
include:
- toxenv: py38
python-version: "3.8"
- toxenv: upload-download-scripts
python-version: "3.8"
- toxenv: kinto-master
- toxenv: kinto-main
python-version: "3.8"

steps:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Kinto Attachment
.. image:: https://img.shields.io/pypi/v/kinto-attachment.svg
:target: https://pypi.python.org/pypi/kinto-attachment

.. image:: https://coveralls.io/repos/Kinto/kinto-attachment/badge.svg?branch=master
.. image:: https://coveralls.io/repos/Kinto/kinto-attachment/badge.svg?branch=main
:target: https://coveralls.io/r/Kinto/kinto-attachment

Attach files to `Kinto records <http://kinto.readthedocs.io>`_.
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38,kinto-master,upload-download-scripts,flake8
envlist = py38,kinto-main,upload-download-scripts,flake8
skip_missing_interpreters = True

[testenv]
Expand All @@ -9,7 +9,7 @@ commands =
deps = -rdev-requirements.txt
install_command = pip install {opts} {packages}

[testenv:kinto-master]
[testenv:kinto-main]
commands =
python --version
py.test kinto_attachment/tests --cov-report term-missing --cov-fail-under 100 --cov kinto_attachment {posargs}
Expand Down

0 comments on commit 4fcac22

Please sign in to comment.