Skip to content

ci: sync main with master branch #2449

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

Merged
merged 6 commits into from
Jul 28, 2025
Merged

ci: sync main with master branch #2449

merged 6 commits into from
Jul 28, 2025

Conversation

moe-ad
Copy link
Contributor

@moe-ad moe-ad commented Jul 21, 2025

Related to #2416

The migration from master to main branch is under way and this PR adds a job that will sync the main branch and master branch throughout the deprecation period. The job is to be removed once the deprecation period has elapsed (#2450 has been created for that).

@moe-ad moe-ad force-pushed the feat/main-master-sync-job branch from 2482201 to 767ecd2 Compare July 21, 2025 10:28
Copy link
Contributor

Pull request documentation preview limit (10) reached: skipping documentation deployment for this pull request.

Copy link

codecov bot commented Jul 21, 2025

❌ 54 Tests Failed:

Tests completed Failed Passed Skipped
25723 54 25669 3465
View the top 3 failed test(s) by shortest run time
tests/test_examples.py::test_download_average_filter_plugin
Stack Traces | 0.031s run time
def test_download_average_filter_plugin():
>       assert Path(examples.download_average_filter_plugin(return_local_path=True)).exists()

tests/test_examples.py:202: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
..../test-api/lib/python3.10.../core/examples/downloads.py:2028: in download_average_filter_plugin
    return _retrieve_plugin(
..../test-api/lib/python3.10.../core/examples/downloads.py:2121: in _retrieve_plugin
    operator_file_path = _retrieve_file(EXAMPLE_FILE, file, directory="python_plugins")
..../test-api/lib/python3.10.../core/examples/downloads.py:109: in _retrieve_file
    _, resp = urlretrieve(url, local_path)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:241: in urlretrieve
    with contextlib.closing(urlopen(url, data)) as fp:
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:216: in urlopen
    return opener.open(url, data, timeout)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:525: in open
    response = meth(req, response)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:634: in http_response
    response = self.parent.error(
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:563: in error
    return self._call_chain(*args)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:496: in _call_chain
    result = func(*args)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 

self = <urllib.request.HTTPDefaultErrorHandler object at 0x7fcfe8ac0190>
req = <urllib.request.Request object at 0x7fd004bf66e0>
fp = <http.client.HTTPResponse object at 0x7fd004bf7070>, code = 404
msg = 'Not Found', hdrs = <http.client.HTTPMessage object at 0x7fd004bf6a40>

    def http_error_default(self, req, fp, code, msg, hdrs):
>       raise HTTPError(req.full_url, code, msg, hdrs, fp)
E       urllib.error.HTTPError: HTTP Error 404: Not Found

.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:643: HTTPError
tests/test_examples.py::test_download_easy_statistics
Stack Traces | 0.038s run time
def test_download_easy_statistics():
>       assert Path(examples.download_easy_statistics(return_local_path=True)).exists()

tests/test_examples.py:198: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
..../test-api/lib/python3.10.../core/examples/downloads.py:2109: in download_easy_statistics
    operator_file_path = _retrieve_file(
..../test-api/lib/python3.10.../core/examples/downloads.py:109: in _retrieve_file
    _, resp = urlretrieve(url, local_path)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:241: in urlretrieve
    with contextlib.closing(urlopen(url, data)) as fp:
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:216: in urlopen
    return opener.open(url, data, timeout)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:525: in open
    response = meth(req, response)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:634: in http_response
    response = self.parent.error(
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:563: in error
    return self._call_chain(*args)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:496: in _call_chain
    result = func(*args)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 

self = <urllib.request.HTTPDefaultErrorHandler object at 0x7fcfe8ac0190>
req = <urllib.request.Request object at 0x7fcf73a49030>
fp = <http.client.HTTPResponse object at 0x7fcf73a49e70>, code = 404
msg = 'Not Found', hdrs = <http.client.HTTPMessage object at 0x7fcf73a4b4c0>

    def http_error_default(self, req, fp, code, msg, hdrs):
>       raise HTTPError(req.full_url, code, msg, hdrs, fp)
E       urllib.error.HTTPError: HTTP Error 404: Not Found

.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:643: HTTPError
tests/test_examples.py::test_download_gltf_plugin
Stack Traces | 0.047s run time
def test_download_gltf_plugin():
>       assert Path(examples.download_gltf_plugin(return_local_path=True)).exists()

tests/test_examples.py:206: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
..../test-api/lib/python3.10.../core/examples/downloads.py:2072: in download_gltf_plugin
    return _retrieve_plugin(
..../test-api/lib/python3.10.../core/examples/downloads.py:2121: in _retrieve_plugin
    operator_file_path = _retrieve_file(EXAMPLE_FILE, file, directory="python_plugins")
..../test-api/lib/python3.10.../core/examples/downloads.py:109: in _retrieve_file
    _, resp = urlretrieve(url, local_path)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:241: in urlretrieve
    with contextlib.closing(urlopen(url, data)) as fp:
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:216: in urlopen
    return opener.open(url, data, timeout)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:525: in open
    response = meth(req, response)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:634: in http_response
    response = self.parent.error(
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:563: in error
    return self._call_chain(*args)
.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:496: in _call_chain
    result = func(*args)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 

self = <urllib.request.HTTPDefaultErrorHandler object at 0x7fcfe8ac0190>
req = <urllib.request.Request object at 0x7fcfe9bfafb0>
fp = <http.client.HTTPResponse object at 0x7fcfe9bf9840>, code = 404
msg = 'Not Found', hdrs = <http.client.HTTPMessage object at 0x7fd004ad05e0>

    def http_error_default(self, req, fp, code, msg, hdrs):
>       raise HTTPError(req.full_url, code, msg, hdrs, fp)
E       urllib.error.HTTPError: HTTP Error 404: Not Found

.../hostedtoolcache/Python/3.10.18...................../x64/lib/python3.10/urllib/request.py:643: HTTPError

To view more test analytics, go to the Test Analytics Dashboard
📋 Got 3 mins? Take this short survey to help us improve Test Analytics.

@moe-ad
Copy link
Contributor Author

moe-ad commented Jul 21, 2025

@PProfizi, we should merge ansys/pydpf-post#867 before merging this one.

As for instructions to provide users as part of the migration announcement, the recommended local workflow would be to:

  • First fetch from remote (git fetch), this ensures the presence of the new main ref in their local repo.
  • Run git checkout <their-local-branch-name>
  • Run git rebase main (and resolve conflicts manually, if any).
  • Run git push --force-with-lease.
  • And finally change the target branch of their PR.

An alternative workflow would be to just change the target branch of their PR and resolve any conflict directly on Github. And then proceed to pull the update.

@jorgepiloto what do you think?

@moe-ad moe-ad marked this pull request as ready for review July 21, 2025 12:15
@moe-ad
Copy link
Contributor Author

moe-ad commented Jul 21, 2025

Note that failing tests are mostly due to the reference to master which has been swapped for main in src/ansys/dpf/core/examples/downloads.py.

@moe-ad moe-ad self-assigned this Jul 21, 2025
@PProfizi PProfizi changed the title feat: sync main with master branch ci: sync main with master branch Jul 28, 2025
@PProfizi PProfizi changed the base branch from master to main July 28, 2025 09:11
@PProfizi PProfizi merged commit dd3320e into main Jul 28, 2025
1 check failed
@PProfizi PProfizi deleted the feat/main-master-sync-job branch July 28, 2025 09:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants