Merge remote-tracking branch 'origin/master' into 3709-even-more-integration-tests-python-3

.github/workflows/ci.yml

@@ -33,20 +33,6 @@ jobs:
             python-version: 2.7
 
     steps:
-      - name: Install Tor [Ubuntu]
-        if: matrix.os == 'ubuntu-latest'
-        run: sudo apt install tor
-
-      - name: Install Tor [macOS]
-        if: matrix.os == 'macos-latest'
-        run: brew install tor
-
-      - name: Install Tor [Windows]
-        if: matrix.os == 'windows-latest'
-        uses: crazy-max/ghaction-chocolatey@v1
-        with:
-          args: install tor
-
       # See https://github.com/actions/checkout. A fetch-depth of 0
       # fetches all tags and branches.
       - name: Check out Tahoe-LAFS sources
@@ -185,6 +171,90 @@ jobs:
           # Some magic value required for some magic reason.
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
+  integration:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-latest
+          - windows-latest
+        python-version:
+          - 2.7
+        include:
+          - os: ubuntu-latest
+            python-version: 3.6
+
+    steps:
+
+      - name: Install Tor [Ubuntu]
+        if: matrix.os == 'ubuntu-latest'
+        run: sudo apt install tor
+
+      - name: Install Tor [macOS]
+        if: matrix.os == 'macos-latest'
+        run: brew install tor
+
+      - name: Install Tor [Windows]
+        if: matrix.os == 'windows-latest'
+        uses: crazy-max/ghaction-chocolatey@v1
+        with:
+          args: install tor
+
+      - name: Check out Tahoe-LAFS sources
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python ${{ matrix.python-version }}
+        if: ${{ matrix.os != 'windows-latest' }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      # See this step under coverage job.
+      - name: Set up Python ${{ matrix.python-version }} [Windows x86]
+        if: ${{ matrix.os == 'windows-latest' }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: 'x86'
+
+      - name: Get pip cache directory
+        id: pip-cache
+        run: |
+          echo "::set-output name=dir::$(pip cache dir)"
+
+      - name: Use pip cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - 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 "Python 2 integration tests"
+        if: ${{ matrix.python-version == '2.7' }}
+        run: tox -e integration
+
+      - name: Run "Python 3 integration tests"
+        if: ${{ matrix.python-version != '2.7' }}
+        run: tox -e integration3
+
+      - name: Upload eliot.log in case of failure
+        uses: actions/upload-artifact@v1
+        if: failure()
+        with:
+          name: integration.eliot.json
+          path: integration.eliot.json
 
   packaging:
     runs-on: ${{ matrix.os }}

CREDITS

@@ -204,6 +204,34 @@ E: meejah@meejah.ca
 P: 0xC2602803128069A7, 9D5A 2BD5 688E CB88 9DEB  CD3F C260 2803 1280 69A7
 D: various bug-fixes and features
 
+N: Chad Whitacre
+E: chad@zetaweb.com
+D: Python3 porting
+
+N: Itamar Turner-Trauring
+E: itamar@pythonspeed.com
+D: Python3 porting
+
+N: Jason R. Coombs
+E: jaraco@jaraco.com
+D: Python3 porting
+
+N: Maciej Fijalkowski
+E: fijall@gmail.com
+D: Python3 porting
+
+N: Ross Patterson
+E: me@rpatterson.net
+D: Python3 porting
+
+N: Sajith Sasidharan
+E: sajith@hcoop.net
+D: Python3 porting
+
+N: Pete Fein
+E: pete@snake.dev
+D: Python3 porting
+
 N: Viktoriia Savchuk
 W: https://twitter.com/viktoriiasvchk
 D: Developer community focused improvements on the README file.

README.rst

@@ -6,7 +6,7 @@ Free and Open decentralized data store
 
 `Tahoe-LAFS <https://www.tahoe-lafs.org>`__ (Tahoe Least-Authority File Store) is the first free software / open-source storage technology that distributes your data across multiple servers. Even if some servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security.
 
-|Contributor Covenant|  |readthedocs|  |travis|  |circleci|  |coveralls|
+|Contributor Covenant|  |readthedocs|  |circleci|  |githubactions|  |coveralls|
 
 
 Table of contents
@@ -118,13 +118,12 @@ See `TGPPL.PDF <https://tahoe-lafs.org/~zooko/tgppl.pdf>`__ for why the TGPPL ex
     :alt: documentation status
     :target: http://tahoe-lafs.readthedocs.io/en/latest/?badge=latest
 
-.. |travis| image:: https://travis-ci.org/tahoe-lafs/tahoe-lafs.png?branch=master
-    :alt: build status
-    :target: https://travis-ci.org/tahoe-lafs/tahoe-lafs
-
 .. |circleci| image:: https://circleci.com/gh/tahoe-lafs/tahoe-lafs.svg?style=svg
     :target: https://circleci.com/gh/tahoe-lafs/tahoe-lafs
 
+.. |githubactions| image:: https://github.com/tahoe-lafs/tahoe-lafs/actions/workflows/ci.yml/badge.svg
+    :target: https://github.com/tahoe-lafs/tahoe-lafs/actions
+
 .. |coveralls| image:: https://coveralls.io/repos/github/tahoe-lafs/tahoe-lafs/badge.svg
     :alt: code coverage
     :target: https://coveralls.io/github/tahoe-lafs/tahoe-lafs

docs/INSTALL.rst

@@ -165,7 +165,7 @@ from PyPI with ``venv/bin/pip install tahoe-lafs``. After installation, run
  Successfully installed ...
 
  % venv/bin/tahoe --version
- tahoe-lafs: 1.14.0
+ tahoe-lafs: 1.15.1
  foolscap: ...
 
  %
@@ -180,15 +180,15 @@ following instructions with the local filename.
  % virtualenv venv
  New python executable in ~/venv/bin/python2.7
  Installing setuptools, pip, wheel...done.
-
- % venv/bin/pip install https://tahoe-lafs.org/downloads/tahoe-lafs-1.14.0.tar.bz2
- Collecting https://tahoe-lafs.org/downloads/tahoe-lafs-1.14.0.tar.bz2
+ 
+ % venv/bin/pip install https://tahoe-lafs.org/downloads/tahoe-lafs-1.15.1.tar.bz2
+ Collecting https://tahoe-lafs.org/downloads/tahoe-lafs-1.15.1.tar.bz2
  ...
  Installing collected packages: ...
  Successfully installed ...
 
  % venv/bin/tahoe --version
- tahoe-lafs: 1.14.0
+ tahoe-lafs: 1.15.1
  ...
 
 .. _verifying_signatures:
@@ -256,7 +256,7 @@ the additional libraries needed to run the unit tests::
  Successfully installed ...
 
  % venv/bin/tahoe --version
- tahoe-lafs: 1.14.0.post34.dev0
+ tahoe-lafs: 1.15.1
  ...
 
 This way, you won't have to re-run the ``pip install`` step each time you
@@ -305,7 +305,7 @@ result in a "all tests passed" mesage::
  % tox
  GLOB sdist-make: ~/tahoe-lafs/setup.py
  py27 recreate: ~/tahoe-lafs/.tox/py27
- py27 inst: ~/tahoe-lafs/.tox/dist/tahoe-lafs-1.14.0.post8.dev0.zip
+ py27 inst: ~/tahoe-lafs/.tox/dist/tahoe-lafs-1.15.1.zip
  py27 runtests: commands[0] | tahoe --version
  py27 runtests: commands[1] | trial --rterrors allmydata
  allmydata.test.test_auth

docs/release-checklist.rst

@@ -59,6 +59,10 @@ Create Branch and Apply Updates
   - summarize major changes
   - commit it
 
+- update "nix/tahoe-lafs.nix"
+
+  - change the value given for `version` from `OLD.post1` to `NEW.post1`
+
 - update "CREDITS"
 
   - are there any new contributors in this release?
@@ -189,11 +193,16 @@ is appropriate.
 Once a release-candidate has marinated for some time then it can be
 made into a the actual release.
 
-XXX Write this section when doing 1.15.0 actual release
-
-(In general, this means dropping the "rcX" part of the release and the
-tag, uploading those artifacts, uploading to PyPI, ... )
+The actual release follows the same steps as above, with some differences:
 
+- there is no "-rcX" on the end of release names
+- the release is uploaded to PyPI (using Twine)
+- the version is tagged in Git (ideally using "the tahoe release key"
+  but can be done with any of the authorized core developers' personal
+  key)
+- the release-candidate branches must be merged back to master after
+  the release is official (e.g. causing newsfragments to be deleted on
+  master, etc)
 
 
 Announcing the Release

newsfragments/1792.feature

@@ -1 +0,0 @@
-PyPy is now a supported platform.

newsfragments/2755.other

@@ -1 +0,0 @@
-The Tahoe-LAFS project has adopted a formal code of conduct.

newsfragments/3284.removed

@@ -1 +0,0 @@
-The Magic Folder frontend has been split out into a stand-alone project.  The functionality is no longer part of Tahoe-LAFS itself.  Learn more at <https://github.com/LeastAuthority/magic-folder>.

newsfragments/3296.installation

@@ -1 +0,0 @@
-Tahoe-LAFS now supports CentOS 8 and no longer supports CentOS 7.

newsfragments/3312.bugfix

@@ -1 +0,0 @@
-Make directory page links work.

newsfragments/3313.minor

@@ -1 +0,0 @@
-Replace nevow with twisted.web in web.operations.OphandleTable

newsfragments/3315.minor

@@ -1 +0,0 @@
-Replace nevow with twisted.web in web.operations.ReloadMixin

newsfragments/3316.minor

@@ -1 +0,0 @@
-Port checker result pages' rendering from nevow to twisted web templates.

newsfragments/3317.feature

@@ -1 +0,0 @@
-allmydata.testing.web, a new module, now offers a supported Python API for testing Tahoe-LAFS web API clients.

newsfragments/3323.removed

@@ -1 +0,0 @@
-Slackware 14.2 is no longer a Tahoe-LAFS supported platform.

newsfragments/3328.installation

@@ -1 +0,0 @@
-Tahoe-LAFS now supports Ubuntu 20.04.

newsfragments/3348.bugfix

@@ -1 +0,0 @@
-Use last known revision of Chutney that is known to work with Python 2 for Tor integration tests.

newsfragments/3349.bugfix

@@ -1 +0,0 @@
-Mutable files now use RSA exponent 65537

newsfragments/3354.minor

@@ -1 +0,0 @@
-

newsfragments/3355.other

@@ -1 +0,0 @@
-The "coverage" tox environment has been replaced by the "py27-coverage" and "py36-coverage" environments.

newsfragments/3357.minor

@@ -1 +0,0 @@
-

newsfragments/3372.minor

@@ -1 +0,0 @@
-

newsfragments/3398.minor

@@ -1 +0,0 @@
-Added pre-commit config to run flake8 checks on commit/push.