From 5862e1bea3342067e5d59ce18b8124f91fca809f Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Mon, 17 Feb 2020 15:35:56 -0500 Subject: [PATCH 01/27] Use GitHub Actions for CI. Fixes: ticket:3277 --- .github/workflows/ci.yml | 82 ++++++++++++++++++++++++++++++++++++++++ newsfragments/3277.minor | 0 2 files changed, 82 insertions(+) create mode 100644 .github/workflows/ci.yml create mode 100644 newsfragments/3277.minor diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..1dcfc892e --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,82 @@ +name: CI + +on: + push: + pull_request: + release: + types: [published] + schedule: + # Daily at 3:21 + - cron: '21 3 * * *' + +jobs: + test: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - macos-latest + - windows-latest + - ubuntu-latest + python-version: + - 2.7 + + steps: + + # Get vcpython27 on Windows + Python 2.7, to build zfec + # extension. See https://chocolatey.org/packages/vcpython27 and + # https://github.com/crazy-max/ghaction-chocolatey + - name: Install MSVC 9.0 for Python 2.7 on Windows + if: matrix.os == 'windows-latest' && matrix.python-version == '2.7' + uses: crazy-max/ghaction-chocolatey@v1 + with: + args: install vcpython27 + + - name: Check out Tahoe-LAFS sources + uses: actions/checkout@v2 + + - name: Fetch all history for all tags and branches + run: git fetch --prune --unshallow + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + + - name: Install Python packages + run: | + pip install --upgrade codecov tox setuptools + pip list + + - name: Display tool versions + run: python misc/build_helpers/show-tool-versions.py + + # # codechecks throws type error; disable for now. + # - name: Run "tox -e codechecks" + # run: tox -e codechecks + + - name: Run "tox -e py27" + if: matrix.python-version == '2.7' + run: tox -e py27 + + - name: Run "tox -e coverage" + run: tox -e coverage + + - name: Run "tox -e pyinstaller" + run: tox -e pyinstaller + + - name: Upload eliot.log in case of failure + uses: actions/upload-artifact@v1 + if: failure() + with: + name: eliot.log + path: eliot.log + + # Set Codecov token inside Project Settings > Secrets as + # CODECOV_TOKEN. + - name: Upload coverage report + uses: codecov/codecov-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: coverage.xml diff --git a/newsfragments/3277.minor b/newsfragments/3277.minor new file mode 100644 index 000000000..e69de29bb From afdfb48ee1775da8e6beb2d6b7bfe59766ef7493 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Tue, 25 Feb 2020 22:59:04 -0500 Subject: [PATCH 02/27] Run codechecks, but continue on error. --- .github/workflows/ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1dcfc892e..ea311c553 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,9 +52,14 @@ jobs: - name: Display tool versions run: python misc/build_helpers/show-tool-versions.py - # # codechecks throws type error; disable for now. - # - name: Run "tox -e codechecks" - # run: tox -e codechecks + # Codechecks errors out when running Towncrier within GitHub + # Actions. See this issue: + # https://github.com/hawkowl/towncrier/issues/175. + # + # Run codechecks anyway, and continue on error, for now. + - name: Run "tox -e codechecks" + run: tox -e codechecks + continue-on-error: true - name: Run "tox -e py27" if: matrix.python-version == '2.7' From 77c6b39a700c7f76ce7e54cda5d62d3d6874dccd Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Tue, 25 Feb 2020 23:01:29 -0500 Subject: [PATCH 03/27] Update a name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea311c553..e1ca4a679 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: # Get vcpython27 on Windows + Python 2.7, to build zfec # extension. See https://chocolatey.org/packages/vcpython27 and # https://github.com/crazy-max/ghaction-chocolatey - - name: Install MSVC 9.0 for Python 2.7 on Windows + - name: [Windows] Install MSVC 9.0 for Python 2.7 if: matrix.os == 'windows-latest' && matrix.python-version == '2.7' uses: crazy-max/ghaction-chocolatey@v1 with: From c535b83f0662a25360aa979de050ce600befb7dc Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Tue, 25 Feb 2020 23:02:02 -0500 Subject: [PATCH 04/27] Rename "test" to "coverage" --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1ca4a679..54f962cb9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,8 @@ on: - cron: '21 3 * * *' jobs: - test: + + coverage: runs-on: ${{ matrix.os }} strategy: fail-fast: false From 1a4ae0fc81f7e413bb79277b1fe7bff87bc534a4 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Tue, 25 Feb 2020 23:02:35 -0500 Subject: [PATCH 05/27] Remove "tox -e py27" Running "tox -e coverage" is sufficient. --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54f962cb9..ebdb5d223 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,10 +62,6 @@ jobs: run: tox -e codechecks continue-on-error: true - - name: Run "tox -e py27" - if: matrix.python-version == '2.7' - run: tox -e py27 - - name: Run "tox -e coverage" run: tox -e coverage From 383b102b78827ac89e9638750d9112137b50cef1 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Tue, 25 Feb 2020 23:05:03 -0500 Subject: [PATCH 06/27] Run integration tests Run integration tests only on macOS for now, because on Windows and Ubuntu integration tests get stuck and time out after six hours. --- .github/workflows/ci.yml | 62 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebdb5d223..9f255b9d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,3 +82,65 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} file: coverage.xml + + integration: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - macos-latest + python-version: + - 2.7 + + steps: + + - name: [Ubuntu] Install Tor + if: matrix.os == 'ubuntu-latest' + run: sudo apt install tor + + - name: [macOS] Install Tor + if: matrix.os == 'macos-latest' + run: brew install tor + + - name: [Windows] Install Tor + if: matrix.os == 'windows-latest' + uses: crazy-max/ghaction-chocolatey@v1 + with: + args: install tor + + - name: Install MSVC 9.0 for Python 2.7 [Windows] + if: matrix.os == 'windows-latest' && matrix.python-version == '2.7' + uses: crazy-max/ghaction-chocolatey@v1 + with: + args: install vcpython27 + + - name: Check out Tahoe-LAFS sources + uses: actions/checkout@v2 + + - name: Fetch all history for all tags and branches + run: git fetch --prune --unshallow + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + + - name: Install Python packages + run: | + pip install --upgrade tox + pip list + + - name: Display tool versions + run: python misc/build_helpers/show-tool-versions.py + + - name: Run "tox -e integration" + run: tox -e integration + + - name: Upload eliot.log in case of failure + uses: actions/upload-artifact@v1 + if: failure() + with: + name: eliot.log + path: eliot.log + From 4924cd9c0478c0406911d7f4d302487f4bcdfb2f Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Tue, 25 Feb 2020 23:10:26 -0500 Subject: [PATCH 07/27] Run "tox -e pyinstaller" in a separate step --- .github/workflows/ci.yml | 47 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f255b9d6..67e9bdfb7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,9 +65,6 @@ jobs: - name: Run "tox -e coverage" run: tox -e coverage - - name: Run "tox -e pyinstaller" - run: tox -e pyinstaller - - name: Upload eliot.log in case of failure uses: actions/upload-artifact@v1 if: failure() @@ -144,3 +141,47 @@ jobs: name: eliot.log path: eliot.log + packaging: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - macos-latest + - windows-latest + - ubuntu-latest + python-version: + - 2.7 + + steps: + + # Get vcpython27 on Windows + Python 2.7, to build zfec + # extension. See https://chocolatey.org/packages/vcpython27 and + # https://github.com/crazy-max/ghaction-chocolatey + - name: [Windows] Install MSVC 9.0 for Python 2.7 + if: matrix.os == 'windows-latest' && matrix.python-version == '2.7' + uses: crazy-max/ghaction-chocolatey@v1 + with: + args: install vcpython27 + + - name: Check out Tahoe-LAFS sources + uses: actions/checkout@v2 + + - name: Fetch all history for all tags and branches + run: git fetch --prune --unshallow + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + + - name: Install Python packages + run: | + pip install --upgrade codecov tox setuptools + pip list + + - name: Display tool versions + run: python misc/build_helpers/show-tool-versions.py + + - name: Run "tox -e pyinstaller" + run: tox -e pyinstaller From d996cc8d1129809a9409d2544f462b3620ff5ea2 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Tue, 25 Feb 2020 23:17:45 -0500 Subject: [PATCH 08/27] Fix a syntax error Per GitHub, this is not fine: - name: [Windows] Do stuff run: ... This is fine: - name: Do stuff [Windows] run: ... --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67e9bdfb7..95b24bb62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: # Get vcpython27 on Windows + Python 2.7, to build zfec # extension. See https://chocolatey.org/packages/vcpython27 and # https://github.com/crazy-max/ghaction-chocolatey - - name: [Windows] Install MSVC 9.0 for Python 2.7 + - name: Install MSVC 9.0 for Python 2.7 [Windows] if: matrix.os == 'windows-latest' && matrix.python-version == '2.7' uses: crazy-max/ghaction-chocolatey@v1 with: @@ -92,15 +92,15 @@ jobs: steps: - - name: [Ubuntu] Install Tor + - name: Install Tor [Ubuntu] if: matrix.os == 'ubuntu-latest' run: sudo apt install tor - - name: [macOS] Install Tor + - name: Install Tor [macOS] if: matrix.os == 'macos-latest' run: brew install tor - - name: [Windows] Install Tor + - name: Install Tor [Windows] if: matrix.os == 'windows-latest' uses: crazy-max/ghaction-chocolatey@v1 with: @@ -158,7 +158,7 @@ jobs: # Get vcpython27 on Windows + Python 2.7, to build zfec # extension. See https://chocolatey.org/packages/vcpython27 and # https://github.com/crazy-max/ghaction-chocolatey - - name: [Windows] Install MSVC 9.0 for Python 2.7 + - name: Install MSVC 9.0 for Python 2.7 [Windows] if: matrix.os == 'windows-latest' && matrix.python-version == '2.7' uses: crazy-max/ghaction-chocolatey@v1 with: From 5ba0ba787f67f25455cae95431eabdb19e7f24e6 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Wed, 26 Feb 2020 09:09:54 -0500 Subject: [PATCH 09/27] Omit codechecks --- .github/workflows/ci.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95b24bb62..6c6fe829f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,15 +53,6 @@ jobs: - name: Display tool versions run: python misc/build_helpers/show-tool-versions.py - # Codechecks errors out when running Towncrier within GitHub - # Actions. See this issue: - # https://github.com/hawkowl/towncrier/issues/175. - # - # Run codechecks anyway, and continue on error, for now. - - name: Run "tox -e codechecks" - run: tox -e codechecks - continue-on-error: true - - name: Run "tox -e coverage" run: tox -e coverage From 2d0cf3d3c3aeb8690abfdcec59555f513cdb3767 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Wed, 26 Feb 2020 09:11:23 -0500 Subject: [PATCH 10/27] Upload integration.eliot.json if integration tests fail --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c6fe829f..7aa8edba1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,8 +129,8 @@ jobs: uses: actions/upload-artifact@v1 if: failure() with: - name: eliot.log - path: eliot.log + name: integration.eliot.json + path: integration.eliot.json packaging: runs-on: ${{ matrix.os }} From 9752d6a2ff1f1dc6a78f90d65ddbe7a9e8987f38 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Wed, 26 Feb 2020 09:15:02 -0500 Subject: [PATCH 11/27] Don't run tests periodically While working on the PR, I never saw this actually working. --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7aa8edba1..838ccd30d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,9 +5,6 @@ on: pull_request: release: types: [published] - schedule: - # Daily at 3:21 - - cron: '21 3 * * *' jobs: From 29947aad86fb6608c5702aa94801a19e4ad19d2f Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Wed, 26 Feb 2020 09:19:37 -0500 Subject: [PATCH 12/27] Don't run coverage tests on Ubuntu --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 838ccd30d..5a865a956 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,6 @@ jobs: os: - macos-latest - windows-latest - - ubuntu-latest python-version: - 2.7 From c4061fffa0651004a305887dfa670593acf6c979 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Thu, 27 Feb 2020 23:15:51 -0500 Subject: [PATCH 13/27] Fearlessly use codecov.io token --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a865a956..c9e8e5e3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,12 +59,10 @@ jobs: name: eliot.log path: eliot.log - # Set Codecov token inside Project Settings > Secrets as - # CODECOV_TOKEN. - name: Upload coverage report uses: codecov/codecov-action@v1 with: - token: ${{ secrets.CODECOV_TOKEN }} + token: abf679b6-e2e6-4b33-b7b5-6cfbd41ee691 file: coverage.xml integration: From a38029f9db20346ddaa7a52fe38555be64bbd2de Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Fri, 6 Mar 2020 14:09:52 -0500 Subject: [PATCH 14/27] Remove `on.release` from workflow triggers Per GitHub's documentation for on.release events, `on.release` event will run our workflow any time the `release` event occurs, but it is unclear if Tahoe will need this yet. Removing for now. --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9e8e5e3a..a59581180 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,8 +3,6 @@ name: CI on: push: pull_request: - release: - types: [published] jobs: From bcfd3a5eb88f0990a7ce17fc6c6267a9fce879c3 Mon Sep 17 00:00:00 2001 From: Sajith Sasidharan Date: Fri, 6 Mar 2020 15:32:27 -0500 Subject: [PATCH 15/27] Pass posargs to py.test when running integration tests Running "tox -e integration" takes a while. It would be helpful to run tests from just one file. With this change, we can do that, like so: $ tox -e integration -- integration/test_web.py Or even just one test, like so: $ tox -e integration -- integration/test_web.py::test_index With this investigating failing integration tests will be a little easier, hopefully. Fixes: ticket:3285 --- newsfragments/3285.minor | 0 tox.ini | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 newsfragments/3285.minor diff --git a/newsfragments/3285.minor b/newsfragments/3285.minor new file mode 100644 index 000000000..e69de29bb diff --git a/tox.ini b/tox.ini index 7d869b6bd..44016c891 100644 --- a/tox.ini +++ b/tox.ini @@ -53,7 +53,7 @@ setenv = COVERAGE_PROCESS_START=.coveragerc commands = # NOTE: 'run with "py.test --keep-tempdir -s -v integration/" to debug failures' - py.test --coverage -v integration/ + py.test --coverage -v {posargs:integration} coverage combine coverage report From 3dd480fd82c29f5b98c6a66d21d676b8dfdfc285 Mon Sep 17 00:00:00 2001 From: meejah Date: Fri, 17 Jan 2020 01:55:21 -0700 Subject: [PATCH 16/27] tweak release HOWTO --- docs/how_to_make_a_tahoe-lafs_release.org | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/how_to_make_a_tahoe-lafs_release.org b/docs/how_to_make_a_tahoe-lafs_release.org index 79438c85d..44b9e3dd1 100644 --- a/docs/how_to_make_a_tahoe-lafs_release.org +++ b/docs/how_to_make_a_tahoe-lafs_release.org @@ -17,13 +17,14 @@ people are Release Maintainers: - [ ] all appveyor checks pass - [ ] all buildbot workers pass their checks -* freeze master branch [0/] +* freeze master branch [0/1] - [ ] announced the freeze of the master branch on IRC (i.e. non-release PRs won't be merged until after release) * sync documentation [0/7] - - [ ] NEWS.rst: summarize user-visible changes, aim for one page of text + + - [ ] NEWS.rst: (run "tox -e news") - [ ] added final release name and date to top-most item in NEWS.rst - - [ ] updated relnotes.txt + - [ ] updated relnotes.txt (change next, last versions; summarize NEWS) - [ ] updated CREDITS - [ ] updated docs/known_issues.rst - [ ] docs/INSTALL.rst only points to current tahoe-lafs-X.Y.Z.tar.gz source code file From 602c6d1811c74edc970ee30cdb1d6f73b2d060c9 Mon Sep 17 00:00:00 2001 From: meejah Date: Fri, 17 Jan 2020 01:56:02 -0700 Subject: [PATCH 17/27] news --- newsfragments/3275.minor | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/3275.minor diff --git a/newsfragments/3275.minor b/newsfragments/3275.minor new file mode 100644 index 000000000..dc25bc1a9 --- /dev/null +++ b/newsfragments/3275.minor @@ -0,0 +1 @@ +Updates to release process/docs \ No newline at end of file From 241b5a3d364e13d9c9c03f1571bc5d889c786ffc Mon Sep 17 00:00:00 2001 From: meejah Date: Wed, 11 Mar 2020 10:52:26 -0600 Subject: [PATCH 18/27] use Tox to build NEWS --- tox.ini | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tox.ini b/tox.ini index 44016c891..7948e897a 100644 --- a/tox.ini +++ b/tox.ini @@ -115,6 +115,37 @@ commands = # put it back mv pyproject.toml towncrier.pyproject.toml +[testenv:news] +passenv = TAHOE_LAFS_* PIP_* SUBUNITREPORTER_* USERPROFILE HOMEDRIVE HOMEPATH +# see comment in [testenv] about "certifi" +whitelist_externals = mv +deps = + certifi + towncrier >= 19.2 +commands = + # With pip >= 10 the existence of pyproject.toml (which we are + # required to have to configure towncrier) triggers a "build + # isolation" mode which prevents anything from working. Avoid + # triggering that pip behavior by keeping the towncrier configuration + # somewhere else and only bringing it in when it's actually needed + # (after pip is done). + # + # Some discussion is available at + # https://github.com/pypa/pip/issues/5696 + # + # towncrier post 19.2 (unreleased as of this writing) adds a --config + # option that can be used instead of this file shuffling. + mv towncrier.pyproject.toml pyproject.toml + + # towncrier 19.2 + works with python2.7 + python -m towncrier --yes + + # put it back + mv pyproject.toml towncrier.pyproject.toml + + # commit the changes + git commit -m "update NEWS.txt for release" + [testenv:deprecations] setenv = PYTHONWARNINGS=default::DeprecationWarning From 37af15c24536ad0d290ceb641fbc4af6538cefd6 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:09:25 -0400 Subject: [PATCH 19/27] Bump CentOS from 7 to 8 on CI --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 45e42bca4..41e4ea7fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ workflows: requires: - "fedora-29" - - "centos-7" + - "centos-8" - "slackware-14.2" @@ -67,7 +67,7 @@ workflows: - "build-image-ubuntu-18.04" - "build-image-fedora-28" - "build-image-fedora-29" - - "build-image-centos-7" + - "build-image-centos-8" - "build-image-slackware-14.2" - "build-image-pypy-2.7-7.1.1-jessie" @@ -269,9 +269,9 @@ jobs: user: "nobody" - centos-7: &RHEL_DERIV + centos-8: &RHEL_DERIV docker: - - image: "tahoelafsci/centos:7" + - image: "tahoelafsci/centos:8" user: "nobody" environment: *UTF_8_ENVIRONMENT @@ -481,12 +481,12 @@ jobs: TAG: "18.04" - build-image-centos-7: + build-image-centos-8: <<: *BUILD_IMAGE environment: DISTRO: "centos" - TAG: "7" + TAG: "8" build-image-fedora-28: From 757dd61eb5c63e06f0add5ff560a9f141ebc1706 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:11:36 -0400 Subject: [PATCH 20/27] news fragment --- newsfragments/3296.installation | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/3296.installation diff --git a/newsfragments/3296.installation b/newsfragments/3296.installation new file mode 100644 index 000000000..78cf83f60 --- /dev/null +++ b/newsfragments/3296.installation @@ -0,0 +1 @@ +Tahoe-LAFS now supports CentOS 8 and no longer supports CentOS 7. \ No newline at end of file From 3c1bffdc9ed0ffc3812da86c94d8970493849f6d Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:36:54 -0400 Subject: [PATCH 21/27] Don't install Twisted trunk@HEAD since it doesn't support Python 2 --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index 7948e897a..3134a0d9f 100644 --- a/tox.ini +++ b/tox.ini @@ -158,7 +158,6 @@ setenv = deps = # Take the base deps as well! {[testenv]deps} - git+https://github.com/twisted/twisted git+https://github.com/warner/foolscap commands = flogtool --version From 03dfb10863fd6e1635f4e170e4781734bd2db977 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:37:24 -0400 Subject: [PATCH 22/27] news fragment --- newsfragments/3297.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3297.minor diff --git a/newsfragments/3297.minor b/newsfragments/3297.minor new file mode 100644 index 000000000..e69de29bb From 16d452b68271d4f5563756e0cf2be51b35e8c8e5 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 11:01:21 -0400 Subject: [PATCH 23/27] Skip another Eliot test --- nix/eliot.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nix/eliot.nix b/nix/eliot.nix index 04344ff79..df41b3a61 100644 --- a/nix/eliot.nix +++ b/nix/eliot.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { # Fails intermittently. substituteInPlace eliot/tests/test_validation.py \ - --replace "def test_omitLoggerFromActionType" "def xtest_omitLoggerFromActionType" + --replace "def test_omitLoggerFromActionType" "def xtest_omitLoggerFromActionType" \ + --replace "def test_logCallsDefaultLoggerWrite" "def xtest_logCallsDefaultLoggerWrite" ''; checkInputs = [ testtools pytest hypothesis ]; From 333ca2aa0af8a9f40ee970bb8aaec94cc3ed894e Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 11:01:33 -0400 Subject: [PATCH 24/27] news fragment --- newsfragments/3298.minor | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newsfragments/3298.minor diff --git a/newsfragments/3298.minor b/newsfragments/3298.minor new file mode 100644 index 000000000..e69de29bb From 02ca2ad219096814664eee769497f889db323e02 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:38:52 -0400 Subject: [PATCH 25/27] This package has been renamed --- .circleci/Dockerfile.centos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/Dockerfile.centos b/.circleci/Dockerfile.centos index aeb9eb914..9fb6b7c2b 100644 --- a/.circleci/Dockerfile.centos +++ b/.circleci/Dockerfile.centos @@ -12,7 +12,7 @@ RUN yum install --assumeyes \ sudo \ make automake gcc gcc-c++ \ python \ - python-devel \ + python2-devel \ libffi-devel \ openssl-devel \ libyaml-devel \ From 74f46b66868ad96af10dba4caf3cd2829a9b876f Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:57:28 -0400 Subject: [PATCH 26/27] this one renamed too --- .circleci/Dockerfile.centos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/Dockerfile.centos b/.circleci/Dockerfile.centos index 9fb6b7c2b..146414560 100644 --- a/.circleci/Dockerfile.centos +++ b/.circleci/Dockerfile.centos @@ -11,7 +11,7 @@ RUN yum install --assumeyes \ git \ sudo \ make automake gcc gcc-c++ \ - python \ + python2 \ python2-devel \ libffi-devel \ openssl-devel \ From 5ccc241990595186588526cde463e00f44acf8ab Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 13 Apr 2020 10:57:37 -0400 Subject: [PATCH 27/27] no more libyaml-devel, maybe it was merged into libyaml --- .circleci/Dockerfile.centos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/Dockerfile.centos b/.circleci/Dockerfile.centos index 146414560..febb61545 100644 --- a/.circleci/Dockerfile.centos +++ b/.circleci/Dockerfile.centos @@ -15,7 +15,7 @@ RUN yum install --assumeyes \ python2-devel \ libffi-devel \ openssl-devel \ - libyaml-devel \ + libyaml \ /usr/bin/virtualenv \ net-tools