Skip to content

Rebase unix server sockets#2727

Closed
CoolCat467 wants to merge 2385 commits intopython-trio:unix-listenersfrom
CoolCat467:rebase-unix-server-sockets
Closed

Rebase unix server sockets#2727
CoolCat467 wants to merge 2385 commits intopython-trio:unix-listenersfrom
CoolCat467:rebase-unix-server-sockets

Conversation

@CoolCat467
Copy link
Member

This PR rebases #1433 so it could be merged

A5rocks and others added 30 commits February 11, 2023 08:47
Bumps [sphinx-rtd-theme](https://github.com/readthedocs/sphinx_rtd_theme) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/readthedocs/sphinx_rtd_theme/releases)
- [Changelog](https://github.com/readthedocs/sphinx_rtd_theme/blob/master/docs/changelog.rst)
- [Commits](readthedocs/sphinx_rtd_theme@1.1.1...1.2.0)

---
updated-dependencies:
- dependency-name: sphinx-rtd-theme
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…phinx-rtd-theme-1.2.0

Bump sphinx-rtd-theme from 1.1.1 to 1.2.0
Bumps [black](https://github.com/psf/black) from 22.12.0 to 23.1.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](psf/black@22.12.0...23.1.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…lack-23.1.0

Bump black from 22.12.0 to 23.1.0
Bumps [pathspec](https://github.com/cpburnz/python-pathspec) from 0.10.3 to 0.11.0.
- [Release notes](https://github.com/cpburnz/python-pathspec/releases)
- [Changelog](https://github.com/cpburnz/python-pathspec/blob/master/CHANGES.rst)
- [Commits](cpburnz/python-pathspec@v0.10.3...v0.11.0)

---
updated-dependencies:
- dependency-name: pathspec
  dependency-type: indirect
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…athspec-0.11.0

Bump pathspec from 0.10.3 to 0.11.0
Bumps [traitlets](https://github.com/ipython/traitlets) from 5.8.1 to 5.9.0.
- [Release notes](https://github.com/ipython/traitlets/releases)
- [Changelog](https://github.com/ipython/traitlets/blob/main/CHANGELOG.md)
- [Commits](ipython/traitlets@v5.8.1...v5.9.0)

---
updated-dependencies:
- dependency-name: traitlets
  dependency-type: indirect
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…raitlets-5.9.0

Bump traitlets from 5.8.1 to 5.9.0
Bumps [astroid](https://github.com/PyCQA/astroid) from 2.14.1 to 2.14.2.
- [Release notes](https://github.com/PyCQA/astroid/releases)
- [Changelog](https://github.com/PyCQA/astroid/blob/main/ChangeLog)
- [Commits](pylint-dev/astroid@v2.14.1...v2.14.2)

---
updated-dependencies:
- dependency-name: astroid
  dependency-type: indirect
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…stroid-2.14.2

Bump astroid from 2.14.1 to 2.14.2
Bumps [pylint](https://github.com/PyCQA/pylint) from 2.16.1 to 2.16.2.
- [Release notes](https://github.com/PyCQA/pylint/releases)
- [Commits](pylint-dev/pylint@v2.16.1...v2.16.2)

---
updated-dependencies:
- dependency-name: pylint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [types-pyopenssl](https://github.com/python/typeshed) from 23.0.0.2 to 23.0.0.3.
- [Release notes](https://github.com/python/typeshed/releases)
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-pyopenssl
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.3.1 to 6.1.3.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES)
- [Commits](sphinx-doc/sphinx@v3.3.1...v6.1.3)

---
updated-dependencies:
- dependency-name: sphinx
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [typing-extensions](https://github.com/python/typing_extensions) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/python/typing_extensions/releases)
- [Changelog](https://github.com/python/typing_extensions/blob/main/CHANGELOG.md)
- [Commits](python/typing_extensions@4.4.0...4.5.0)

---
updated-dependencies:
- dependency-name: typing-extensions
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…ypes-pyopenssl-23.0.0.3

Bump types-pyopenssl from 23.0.0.2 to 23.0.0.3
kulothunganug and others added 21 commits July 19, 2023 21:14
Normally I wouldn't make such a trivial PR, but this is such an excellent quote that I think it deserves to be fixed.
* Improve documentation to make sure to make GitHub releases
…ne-nos

Docs: Fix line numbers on tutorial.rst
Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.5.7 to 2023.7.22.
- [Commits](certifi/python-certifi@2023.05.07...2023.07.22)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…io#2716)

* Partially revert "Bump certifi from 2023.5.7 to 2023.7.22", restoring several lines that were removed from docs-requirements.txt
* Add types to directly defined objects in _file_io

* Implement methods on AsyncIOWrapper using a pile of self-type-properties.

* Add types for open_file()

* Suppress the duplicate type hints for trio.open_file()

* Add types to Path wrapper class

* Overloads are never executed, so they should be ignored by coverage

* Type trio._util.async_wraps

* Add mostly-any types for internal _path functions

These are way too dynamic to properly type.

* Disallow untyped definitions in _path and _file_io


---------

Co-authored-by: EXPLOSION <git@helvetica.moe>
* add type hints to _socket and _core.local

---------

Co-authored-by: Spencer Brown <spencerb21@live.com>
Co-authored-by: EXPLOSION <git@helvetica.moe>
@jakkdl
Copy link
Member

jakkdl commented Jul 30, 2023

hm, something has clearly gone wrong with your rebasing since this is shown as modifying a ton of files.

@A5rocks
Copy link
Contributor

A5rocks commented Jul 30, 2023

It's cause the PR is trying to merge into the unix sockets branch!

@CoolCat467
Copy link
Member Author

hm, something has clearly gone wrong with your rebasing since this is shown as modifying a ton of files.

This is because we are updating the branch it was originally created in, which diverged in 2020.

@CoolCat467
Copy link
Member Author

Basically, merging this will resolve the conflicts in #1433, so that it can be reviewed and merged properly. This is a pull request on a pull request.

@jakkdl
Copy link
Member

jakkdl commented Jul 31, 2023

Oh, that's fancy! Feels like it might just be simpler to create a new PR including the changes to #1433 meant for merging straight into master though - reviewing this one is close to impossible. Or directly working on #1433

@CoolCat467
Copy link
Member Author

Closing as I can now update the unix-listeners branch directly

@CoolCat467 CoolCat467 closed this Aug 2, 2023
@CoolCat467 CoolCat467 deleted the rebase-unix-server-sockets branch August 24, 2023 01:56
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.