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

[1.x] Backport recent changes #692

Merged
merged 7 commits into from
May 24, 2021
Merged

Conversation

henryiii
Copy link
Contributor

Putting in cherry-picked changes to get the 1.x branch working with the new name and CI changes.

(rebase and merge)

joerick and others added 6 commits May 24, 2021 10:22
* Update projects.yml

Added EdoPro98/SimSiPM project

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* docs: add more projects

* docs: rerun projects.py

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Henry Schreiner <henryschreineriii@gmail.com>
* Remove macOS build on travis-ci
* Remove travis-ci macOS from docs/examples
* Disable manylinux only tests on Travis CI ppc64le

Those tests are taking too much disk space for the Travis CI runner right now.
c.f. https://travis-ci.community/t/running-out-of-disk-space-quota-when-using-docker-on-ppc64le/11634

* Use focal to run aarch64/ppc64le/s390x jobs on Travis CI

This removes allow_failures from the Travis CI s390x job

* Use `focal` distribution for all Travis CI configurations

* Revert "Disable manylinux only tests on Travis CI ppc64le"

This reverts commit d0a09c6.

* Skip test_manylinuxXXXX_only on Travis CI ppc64le

* Add a comment on why test_manylinuxXXXX_only test is skipped
* chore: rename joerick/cibuildwheel -> pypa/cibuildwheel

* Update Appveyor status badge markup

Note that it still has joerick/cibuildwheel - confusingly it's still within my appveyor account, but this is the new project that points to the pypa github repo

* Update Appveyor badge markup again

I went through a few passes to enable that project, here's the latest.

* Update Azure badge, also

* Update Travis badge to reference the .com

Co-authored-by: Joe Rickerby <joerick@mac.com>
@henryiii henryiii changed the base branch from master to 1.x May 24, 2021 14:31
@joerick
Copy link
Contributor

joerick commented May 24, 2021 via email

@henryiii
Copy link
Contributor Author

Can we promise 1.x works with Travis macOS when we can't test it anymore? What happens when Travis updates their runners, etc?

@joerick
Copy link
Contributor

joerick commented May 24, 2021

I guess, no, we can't, but we're not formally maintaining 1.x anyway, it's more of an if-and-when thing. I just wasn't intending to drop support for anything in the 1.x branch, that was kinda the point of 2.0.

@henryiii
Copy link
Contributor Author

I think there will be things we have to drop support for because it's died (think Windows 2.7, for example). I would have bundled Travis in here too - if we can't support travis, we shouldn't list it. I didn't want to remove it from the examples, though, so I'm fine with it as is. I might FP to drop the commit instead of reverting it, though. :)

@henryiii
Copy link
Contributor Author

Oh, never mind, it's only reverting part of the commit. I think it's fine as is.

@henryiii henryiii merged commit e4a917f into pypa:1.x May 24, 2021
@henryiii henryiii deleted the henryiii/1.x/pypa branch May 24, 2021 21:24
@joerick
Copy link
Contributor

joerick commented May 25, 2021

Do you think 1.x is ready for a release now? I think it is?

@henryiii
Copy link
Contributor Author

I think so - looking at v1.11.0...1.x , it looks like the only real change is the move to the pypa name, along with the CI changes to make that happen (we can re-enable Circle CI macOS if you want). Guessing this would be 1.11.1?

@joerick
Copy link
Contributor

joerick commented May 26, 2021

Yeah, agreed. I'll backport the CircleCI changes and release that soon.

@joerick
Copy link
Contributor

joerick commented May 28, 2021

v1.11.1 released! And then I realised I had forgotten the edit-in-github fix, so theres a v1.11.1.post1 too 😅

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.

4 participants