From af6dd20e8d88d48e930c6694ac2d009b58e2b2ad Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Wed, 12 Jan 2022 11:22:16 -0800 Subject: [PATCH 1/2] CI: Change master -> main --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .github/ISSUE_TEMPLATE/documentation_improvement.yaml | 2 +- .github/ISSUE_TEMPLATE/performance_issue.yaml | 2 +- .github/workflows/asv-bot.yml | 4 ++-- .github/workflows/code-checks.yml | 4 ++-- .github/workflows/comment_bot.yml | 2 +- .github/workflows/datamanger.yml | 4 ++-- .github/workflows/docbuild-and-upload.yml | 10 +++++----- .github/workflows/posix.yml | 4 ++-- .github/workflows/python-dev.yml | 4 ++-- .github/workflows/sdist.yml | 4 ++-- azure-pipelines.yml | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 805413d79aae2..36bc8dcf02bae 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -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: diff --git a/.github/ISSUE_TEMPLATE/documentation_improvement.yaml b/.github/ISSUE_TEMPLATE/documentation_improvement.yaml index 8486d6e3eebdc..b89600f8598e7 100644 --- a/.github/ISSUE_TEMPLATE/documentation_improvement.yaml +++ b/.github/ISSUE_TEMPLATE/documentation_improvement.yaml @@ -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 diff --git a/.github/ISSUE_TEMPLATE/performance_issue.yaml b/.github/ISSUE_TEMPLATE/performance_issue.yaml index 9cde5b6dca385..096e012f4ee0f 100644 --- a/.github/ISSUE_TEMPLATE/performance_issue.yaml +++ b/.github/ISSUE_TEMPLATE/performance_issue.yaml @@ -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: diff --git a/.github/workflows/asv-bot.yml b/.github/workflows/asv-bot.yml index c2a49dd96c1c1..ad2e2b4278dd2 100644 --- a/.github/workflows/asv-bot.yml +++ b/.github/workflows/asv-bot.yml @@ -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<> $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 diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 6bf3577f2bd3d..838143deafb03 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -3,11 +3,11 @@ name: Code Checks on: push: branches: - - master + - main - 1.4.x pull_request: branches: - - master + - main - 1.4.x env: diff --git a/.github/workflows/comment_bot.yml b/.github/workflows/comment_bot.yml index dc396be753269..24f8d5d0116c5 100644 --- a/.github/workflows/comment_bot.yml +++ b/.github/workflows/comment_bot.yml @@ -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)" diff --git a/.github/workflows/datamanger.yml b/.github/workflows/datamanger.yml index 896064e1cccea..3fc515883a225 100644 --- a/.github/workflows/datamanger.yml +++ b/.github/workflows/datamanger.yml @@ -3,11 +3,11 @@ name: Data Manager on: push: branches: - - master + - main - 1.4.x pull_request: branches: - - master + - main - 1.4.x env: diff --git a/.github/workflows/docbuild-and-upload.yml b/.github/workflows/docbuild-and-upload.yml index e9c813a51ff78..e8ed6d4545194 100644 --- a/.github/workflows/docbuild-and-upload.yml +++ b/.github/workflows/docbuild-and-upload.yml @@ -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: @@ -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 diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 7f4d3e4534278..3e034ec9460a0 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -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/**" diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 389607f1b356a..3f9ea2aac22c7 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -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/**" diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml index ace22d716e065..dd030f1aacc44 100644 --- a/.github/workflows/sdist.yml +++ b/.github/workflows/sdist.yml @@ -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/**" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6f221cd62797d..9c04d10707a64 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,7 +2,7 @@ trigger: branches: include: - - master + - main - 1.4.x paths: exclude: @@ -12,7 +12,7 @@ pr: autoCancel: true branches: include: - - master + - main - 1.4.x variables: From e074d8053dfae2245f017501b0d30cb3909b9588 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Wed, 12 Jan 2022 11:36:41 -0800 Subject: [PATCH 2/2] Change internal code references to main --- pandas/plotting/_misc.py | 4 ++-- pandas/tests/io/excel/test_readers.py | 2 +- pandas/tests/io/generate_legacy_storage_files.py | 2 +- pandas/tests/io/parser/common/test_file_buffer_url.py | 2 +- pandas/tests/io/parser/test_network.py | 4 ++-- pandas/tests/io/test_feather.py | 2 +- pandas/tests/io/test_html.py | 2 +- pandas/tests/io/test_parquet.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pandas/plotting/_misc.py b/pandas/plotting/_misc.py index ac7e467aa3d9f..49cd7ded3f74e 100644 --- a/pandas/plotting/_misc.py +++ b/pandas/plotting/_misc.py @@ -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') @@ -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') diff --git a/pandas/tests/io/excel/test_readers.py b/pandas/tests/io/excel/test_readers.py index 7d18c2e63e74f..1c5557216fd6a 100644 --- a/pandas/tests/io/excel/test_readers.py +++ b/pandas/tests/io/excel/test_readers.py @@ -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) diff --git a/pandas/tests/io/generate_legacy_storage_files.py b/pandas/tests/io/generate_legacy_storage_files.py index dede9127821fd..8f03655ec27cc 100644 --- a/pandas/tests/io/generate_legacy_storage_files.py +++ b/pandas/tests/io/generate_legacy_storage_files.py @@ -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 diff --git a/pandas/tests/io/parser/common/test_file_buffer_url.py b/pandas/tests/io/parser/common/test_file_buffer_url.py index 4a8f734a34abf..37b0239516b72 100644 --- a/pandas/tests/io/parser/common/test_file_buffer_url.py +++ b/pandas/tests/io/parser/common/test_file_buffer_url.py @@ -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) diff --git a/pandas/tests/io/parser/test_network.py b/pandas/tests/io/parser/test_network.py index 21cdf6f3274df..4e89fdcd700f4 100644 --- a/pandas/tests/io/parser/test_network.py +++ b/pandas/tests/io/parser/test_network.py @@ -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" ) @@ -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) diff --git a/pandas/tests/io/test_feather.py b/pandas/tests/io/test_feather.py index 15d41c56c13c1..19b5ef51e738c 100644 --- a/pandas/tests/io/test_feather.py +++ b/pandas/tests/io/test_feather.py @@ -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) diff --git a/pandas/tests/io/test_html.py b/pandas/tests/io/test_html.py index 3aac7e95e6591..9c978623d4fb6 100644 --- a/pandas/tests/io/test_html.py +++ b/pandas/tests/io/test_html.py @@ -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.*") diff --git a/pandas/tests/io/test_parquet.py b/pandas/tests/io/test_parquet.py index ea88454ce7963..e6cf2d437731f 100644 --- a/pandas/tests/io/test_parquet.py +++ b/pandas/tests/io/test_parquet.py @@ -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)