Skip to content

CI: Change master -> main #45335

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

Closed
wants to merge 2 commits into from
Closed
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body:
[latest version](https://pandas.pydata.org/docs/whatsnew/index.html) of pandas.
required: true
- label: >
I have confirmed this bug exists on the master branch of pandas.
I have confirmed this bug exists on the main branch of pandas.
- type: textarea
id: example
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/documentation_improvement.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ body:
options:
- label: >
I have checked that the issue still exists on the latest versions of the docs
on `master` [here](https://pandas.pydata.org/docs/dev/)
on `main` [here](https://pandas.pydata.org/docs/dev/)
required: true
- type: textarea
id: location
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/performance_issue.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body:
[latest version](https://pandas.pydata.org/docs/whatsnew/index.html) of pandas.
required: true
- label: >
I have confirmed this issue exists on the master branch of pandas.
I have confirmed this issue exists on the main branch of pandas.
- type: textarea
id: example
attributes:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/asv-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ jobs:
git remote add upstream https://github.com/pandas-dev/pandas.git
git fetch upstream
asv machine --yes
asv continuous -f 1.1 -b $REGEX upstream/master HEAD
asv continuous -f 1.1 -b $REGEX upstream/main HEAD
echo 'BENCH_OUTPUT<<EOF' >> $GITHUB_ENV
asv compare -f 1.1 upstream/master HEAD >> $GITHUB_ENV
asv compare -f 1.1 upstream/main HEAD >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
echo "REGEX=$REGEX" >> $GITHUB_ENV

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/code-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Code Checks
on:
push:
branches:
- master
- main
- 1.4.x
pull_request:
branches:
- master
- main
- 1.4.x

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/comment_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install-pre-commit
run: python -m pip install --upgrade pre-commit
- name: Run pre-commit
run: pre-commit run --from-ref=origin/master --to-ref=HEAD --all-files || (exit 0)
run: pre-commit run --from-ref=origin/main --to-ref=HEAD --all-files || (exit 0)
- name: Commit results
run: |
git config user.name "$(git log -1 --pretty=format:%an)"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/datamanger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Data Manager
on:
push:
branches:
- master
- main
- 1.4.x
pull_request:
branches:
- master
- main
- 1.4.x

env:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docbuild-and-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Doc Build and Upload
on:
push:
branches:
- master
- main
- 1.4.x
pull_request:
branches:
- master
- main
- 1.4.x

env:
Expand Down Expand Up @@ -53,18 +53,18 @@ jobs:
echo "${{ secrets.server_ssh_key }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
echo "${{ secrets.server_ip }} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE1Kkopomm7FHG5enATf7SgnpICZ4W2bw+Ho+afqin+w7sMcrsa0je7sbztFAV8YchDkiBKnWTG4cRT+KZgZCaY=" > ~/.ssh/known_hosts
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/main'}}

- name: Copy cheatsheets into site directory
run: cp doc/cheatsheet/Pandas_Cheat_Sheet* web/build/

- name: Upload web
run: rsync -az --delete --exclude='pandas-docs' --exclude='docs' web/build/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/main'}}

- name: Upload dev docs
run: rsync -az --delete doc/build/html/ docs@${{ secrets.server_ip }}:/usr/share/nginx/pandas/pandas-docs/dev
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/master'}}
if: ${{github.event_name == 'push' && github.ref == 'refs/heads/main'}}

- name: Move docs into site directory
run: mv doc/build/html web/build/docs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Posix
on:
push:
branches:
- master
- main
- 1.4.x
pull_request:
branches:
- master
- main
- 1.4.x
paths-ignore:
- "doc/**"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Python Dev
on:
push:
branches:
- master
- main
- 1.4.x
pull_request:
branches:
- master
- main
- 1.4.x
paths-ignore:
- "doc/**"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sdist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: sdist
on:
push:
branches:
- master
- main
- 1.4.x
pull_request:
branches:
- master
- main
- 1.4.x
paths-ignore:
- "doc/**"
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
trigger:
branches:
include:
- master
- main
- 1.4.x
paths:
exclude:
Expand All @@ -12,7 +12,7 @@ pr:
autoCancel: true
branches:
include:
- master
- main
- 1.4.x

variables:
Expand Down
4 changes: 2 additions & 2 deletions pandas/plotting/_misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def andrews_curves(

>>> df = pd.read_csv(
... 'https://raw.github.com/pandas-dev/'
... 'pandas/master/pandas/tests/io/data/csv/iris.csv'
... 'pandas/main/pandas/tests/io/data/csv/iris.csv'
... )
>>> pd.plotting.andrews_curves(df, 'Name')
<AxesSubplot:title={'center':'width'}>
Expand Down Expand Up @@ -406,7 +406,7 @@ def parallel_coordinates(

>>> df = pd.read_csv(
... 'https://raw.github.com/pandas-dev/'
... 'pandas/master/pandas/tests/io/data/csv/iris.csv'
... 'pandas/main/pandas/tests/io/data/csv/iris.csv'
... )
>>> pd.plotting.parallel_coordinates(
... df, 'Name', color=('#556270', '#4ECDC4', '#C7F464')
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/io/excel/test_readers.py
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ def test_corrupt_bytes_raises(self, read_ext, engine):
@tm.network
def test_read_from_http_url(self, read_ext):
url = (
"https://raw.githubusercontent.com/pandas-dev/pandas/master/"
"https://raw.githubusercontent.com/pandas-dev/pandas/main/"
"pandas/tests/io/data/excel/test1" + read_ext
)
url_table = pd.read_excel(url)
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/io/generate_legacy_storage_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
generate a pickle file. We will then check this file into a current
branch, and test using test_pickle.py. This will load the *older*
pickles and test versus the current data that is generated
(with master). These are then compared.
(with main). These are then compared.

If we have cases where we changed the signature (e.g. we renamed
offset -> freq in Timestamp). Then we have to conditionally execute
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/io/parser/common/test_file_buffer_url.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def test_url(all_parsers, csv_dir_path):
kwargs = {"sep": "\t"}

url = (
"https://raw.github.com/pandas-dev/pandas/master/"
"https://raw.github.com/pandas-dev/pandas/main/"
"pandas/tests/io/parser/data/salaries.csv"
)
url_result = parser.read_csv(url, **kwargs)
Expand Down
4 changes: 2 additions & 2 deletions pandas/tests/io/parser/test_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def check_compressed_urls(salaries_table, compression, extension, mode, engine):
# test reading compressed urls with various engines and
# extension inference
base_url = (
"https://github.com/pandas-dev/pandas/raw/master/"
"https://github.com/pandas-dev/pandas/raw/main/"
"pandas/tests/io/parser/data/salaries.csv"
)

Expand All @@ -55,7 +55,7 @@ def test_url_encoding_csv():
GH 10424
"""
path = (
"https://raw.githubusercontent.com/pandas-dev/pandas/master/"
"https://raw.githubusercontent.com/pandas-dev/pandas/main/"
+ "pandas/tests/io/parser/data/unicode_series.csv"
)
df = read_csv(path, encoding="latin-1", header=None)
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/io/test_feather.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def test_passthrough_keywords(self):
def test_http_path(self, feather_file):
# GH 29055
url = (
"https://raw.githubusercontent.com/pandas-dev/pandas/master/"
"https://raw.githubusercontent.com/pandas-dev/pandas/main/"
"pandas/tests/io/data/feather/feather-0_3_1.feather"
)
expected = read_feather(feather_file)
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/io/test_html.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def test_banklist_url(self):
@tm.network
def test_spam_url(self):
url = (
"https://raw.githubusercontent.com/pandas-dev/pandas/master/"
"https://raw.githubusercontent.com/pandas-dev/pandas/main/"
"pandas/tests/io/data/html/spam.html"
)
df1 = self.read_html(url, match=".*Water.*")
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/io/test_parquet.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ def test_parquet_read_from_url(self, df_compat, engine):
pytest.importorskip(engine)
url = (
"https://raw.githubusercontent.com/pandas-dev/pandas/"
"master/pandas/tests/io/data/parquet/simple.parquet"
"main/pandas/tests/io/data/parquet/simple.parquet"
)
df = read_parquet(url)
tm.assert_frame_equal(df, df_compat)
Expand Down