diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml index e39519c7..e834104b 100644 --- a/.github/workflows/commit.yaml +++ b/.github/workflows/commit.yaml @@ -9,7 +9,7 @@ jobs: max-parallel: 1 matrix: os: [ubuntu-latest] - version: ["3.11"] + version: ["3.12"] steps: - uses: actions/checkout@v4 - name: set up python ${{ matrix.version }} @@ -30,7 +30,7 @@ jobs: max-parallel: 1 matrix: os: [ubuntu-latest] - version: ["3.11"] + version: ["3.12"] steps: - uses: actions/checkout@v4 - name: set up python ${{ matrix.version }} @@ -67,11 +67,6 @@ jobs: # version we are targeting with nox, while still having versions like 3.9.0a4 run: | echo "FRIENDLY_PYTHON_VERSION=$(python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")" >> $GITHUB_ENV - - name: ensure openssl installed for macos - # openssl missing/being linked incorrectly causes ssh2-python install failures - if: matrix.os == 'macos-latest' - run: | - brew install openssl libssh2 - name: setup test env run: | python -m pip install --upgrade pip @@ -80,8 +75,7 @@ jobs: - name: run nox # TERM is needed needed to make the terminal a tty (i think? without this system ssh is super broken) # libssh2/ssh2-python were getting libssh2 linked incorrectly/weirdly and libraries were trying to be loaded - # from the temp dir that pip used for installs. setting the DYLD_LIBRARY_PATH envvar seems to solve this even - # if it feels horribly hacky. afaik, this is ignored on linux, so it will only matter on the macos builds - # https://stackoverflow.com/questions/71356491/python3-on-mac-having-trouble-loading-libssh2 - run: TERM=xterm DYLD_LIBRARY_PATH=/usr/local/lib python -m nox -p $FRIENDLY_PYTHON_VERSION -k "not darglint" + # from the temp dir that pip used for installs. setting the DYLD_LIBRARY_PATH envvar seems to solve this -- note + # that if brew macos packages get updated on runners this may break again :) + run: TERM=xterm DYLD_LIBRARY_PATH=/opt/homebrew/Cellar/libssh2/1.11.0_1/lib python -m nox -p $FRIENDLY_PYTHON_VERSION -k "not darglint" diff --git a/.github/workflows/pre_release.yaml b/.github/workflows/pre_release.yaml index a77a5f11..9cb576f7 100644 --- a/.github/workflows/pre_release.yaml +++ b/.github/workflows/pre_release.yaml @@ -14,7 +14,7 @@ jobs: max-parallel: 2 matrix: os: [ubuntu-latest, macos-latest] - version: ["3.12-dev"] + version: ["3.13-dev"] steps: - uses: actions/checkout@v4 - name: set up python ${{ matrix.version }} @@ -26,11 +26,6 @@ jobs: # version we are targeting with nox, while still having versions like 3.9.0a4 run: | echo "FRIENDLY_PYTHON_VERSION=$(python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")" >> $GITHUB_ENV - - name: ensure openssl installed for macos - # openssl missing/being linked incorrectly causes ssh2-python install failures - if: matrix.os == 'macos-latest' - run: | - brew install openssl libssh2 - name: setup test env run: | python -m pip install --upgrade pip @@ -39,7 +34,6 @@ jobs: - name: run nox # TERM is needed needed to make the terminal a tty (i think? without this system ssh is super broken) # libssh2/ssh2-python were getting libssh2 linked incorrectly/weirdly and libraries were trying to be loaded - # from the temp dir that pip used for installs. setting the DYLD_LIBRARY_PATH envvar seems to solve this even - # if it feels horribly hacky. afaik, this is ignored on linux, so it will only matter on the macos builds - # https://stackoverflow.com/questions/71356491/python3-on-mac-having-trouble-loading-libssh2 - run: TERM=xterm DYLD_LIBRARY_PATH=/usr/local/lib python -m nox -p $FRIENDLY_PYTHON_VERSION -k "not darglint" \ No newline at end of file + # from the temp dir that pip used for installs. setting the DYLD_LIBRARY_PATH envvar seems to solve this -- note + # that if brew macos packages get updated on runners this may break again :) + run: TERM=xterm DYLD_LIBRARY_PATH=/opt/homebrew/Cellar/libssh2/1.11.0_1/lib python -m nox -p $FRIENDLY_PYTHON_VERSION -k "not darglint" \ No newline at end of file diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml index c937fe14..e899b2a3 100644 --- a/.github/workflows/weekly.yaml +++ b/.github/workflows/weekly.yaml @@ -13,7 +13,7 @@ jobs: max-parallel: 1 matrix: os: [ubuntu-latest] - version: ["3.11"] + version: ["3.12"] steps: - uses: actions/checkout@v4 with: @@ -48,11 +48,6 @@ jobs: # version we are targeting with nox, while still having versions like 3.9.0a4 run: | echo "FRIENDLY_PYTHON_VERSION=$(python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")" >> $GITHUB_ENV - - name: ensure openssl installed for macos - # openssl missing/being linked incorrectly causes ssh2-python install failures - if: matrix.os == 'macos-latest' - run: | - brew install openssl libssh2 - name: setup test env run: | python -m pip install --upgrade pip @@ -61,7 +56,6 @@ jobs: - name: run nox # TERM is needed needed to make the terminal a tty (i think? without this system ssh is super broken) # libssh2/ssh2-python were getting libssh2 linked incorrectly/weirdly and libraries were trying to be loaded - # from the temp dir that pip used for installs. setting the DYLD_LIBRARY_PATH envvar seems to solve this even - # if it feels horribly hacky. afaik, this is ignored on linux, so it will only matter on the macos builds - # https://stackoverflow.com/questions/71356491/python3-on-mac-having-trouble-loading-libssh2 - run: TERM=xterm DYLD_LIBRARY_PATH=/usr/local/lib python -m nox -p $FRIENDLY_PYTHON_VERSION -k "not darglint" \ No newline at end of file + # from the temp dir that pip used for installs. setting the DYLD_LIBRARY_PATH envvar seems to solve this -- note + # that if brew macos packages get updated on runners this may break again :) + run: TERM=xterm DYLD_LIBRARY_PATH=/opt/homebrew/Cellar/libssh2/1.11.0_1/lib python -m nox -p $FRIENDLY_PYTHON_VERSION -k "not darglint" \ No newline at end of file diff --git a/requirements-dev.txt b/requirements-dev.txt index 457c259f..62779357 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,7 +2,7 @@ black>=23.3.0,<25.0.0 darglint>=1.8.1,<2.0.0 isort>=5.10.1,<6.0.0 mypy>=1.4.1,<2.0.0 -nox==2024.3.2 +nox==2024.4.15 pycodestyle>=2.8.0,<3.0.0 pydocstyle>=6.1.1,<7.0.0 pyfakefs>=5.4.1,<6.0.0