Skip to content

Conversation

achow101
Copy link
Member

@achow101 achow101 commented Sep 5, 2019

Updates all of the dependencies to their latest versions.

pywin32-ctypes is moved to be a windows only developer dependency as it should have been. pefile and macholib have been added as platform specific developer dependencies. These are needed because Pyinstaller 3.5 made these platform specific installs and poetry does not automatically detect them as being dependencies, so they must be added manually. Since these dependencies are also now platform specified, there is no need for the windist extra so that has been removed.

The issues that we had with poetry 0.12.13 were resolved and it has since been updated multiple times. So the restriction to poetry 0.12.12 has been removed.

Assuming that new versions aren't published, commits that have the scripted-diff format will have the commands that were run to achieve their diffs and should be reproducible.

Also updated setup.py to match the new dependencies.

---BEGIN-SCRIPTED-DIFF---
poetry remove pywin32-ctypes
poetry add --platform=win32 --dev pywin32-ctypes
---END-SCRIPTED-DIFF---
---BEGIN-SCRIPTED-DIFF---
poetry add --platform=windows --dev pefile
---END-SCRIPTED-DIFF---
---BEGIN-SCRIPTED-DIFF---
poetry add --platform=darwin --dev macholib
---END-SCRIPTED-DIFF---
---BEGIN-SCRIPTED-DIFF---
poetry update
---END-SCRIPTED-DIFF---
Recent versions of poetry have fixed the bug that was preventing us
from using newer versions so we can remove this specific version lock.
Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 899e5cf

Checked out these changes and tested the Docker based release-process, local macOS build instructions and ran the tests.

Also rebooted the With process_commands interface test, as it seemed to have stalled during it's run, but looks like it's stalled again.

achow101 added a commit that referenced this pull request Sep 6, 2019
899e5cf Update setup.py (Andrew Chow)
abe2deb Remove windist extra (Andrew Chow)
9123946 Remove poetry version lock to 0.12.12 (Andrew Chow)
c26386f Update poetry.lock (Andrew Chow)
6edb990 Add macholib as a macOS specific dev dependency (Andrew Chow)
e8c8b90 Add pefile as a windows specific dev dependency (Andrew Chow)
ab5a49e Move pywin32-ctypes to windows specific dev dependency (Andrew Chow)

Pull request description:

  Updates all of the dependencies to their latest versions.

  pywin32-ctypes is moved to be a windows only developer dependency as it should have been. pefile and macholib have been added as platform specific developer dependencies. These are needed because Pyinstaller 3.5 made these platform specific installs and poetry does not automatically detect them as being dependencies, so they must be added manually. Since these dependencies are also now platform specified, there is no need for the windist extra so that has been removed.

  The issues that we had with poetry 0.12.13 were resolved and it has since been updated multiple times. So the restriction to poetry 0.12.12 has been removed.

  Assuming that new versions aren't published, commits that have the scripted-diff format will have the commands that were run to achieve their diffs and should be reproducible.

  Also updated setup.py to match the new dependencies.

ACKs for top commit:
  fanquake:
    ACK 899e5cf

Tree-SHA512: aba5b0a5f2074a5a4aa0025acb4b37e4b6f85558caacd33bf190e39a0a70ccc166bb862b3830913368da0b0ac5981b43758787408de545855e5a15d35396078f
@achow101 achow101 merged commit 899e5cf into bitcoin-core:master Sep 6, 2019
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