Plugins for py3

.circleci/config.yml

@@ -0,0 +1,168 @@
+version: 2.1
+
+orbs:
+  # Get easier access to the Windows machine executor.
+  win: "circleci/windows@4.1.1"
+
+jobs:
+  build-wheel:
+    docker:
+      - image: "cimg/python:3.10"
+
+    steps:
+      - "checkout"
+      - run:
+          name: "Build Wheel"
+          command: |
+            python -m pip install build
+            python -m build
+      - store_artifacts:
+          path: "./dist/"
+      - persist_to_workspace:
+          root: "./dist/"
+          paths:
+            - "*"
+
+  pypi-upload:
+    parameters:
+      repository:
+        type: "string"
+
+    docker:
+      - image: "cimg/python:3.10"
+
+    environment:
+      TWINE_REPOSITORY: "<< parameters.repository >>"
+      TWINE_USERNAME: "__token__"
+
+    steps:
+      - attach_workspace:
+          at: "release-workspace"
+
+      - run:
+          name: "Upload Wheel"
+          command: |
+            set -eux -o pipefail
+
+            if [ "<< parameters.repository >>" = "testpypi" ]; then
+              export TWINE_PASSWORD="${TESTPYPI_API_TOKEN}"
+            elif [ "<< parameters.repository >>" = "pypi" ]; then
+              export TWINE_PASSWORD="${PYPI_API_TOKEN}"
+            else
+              echo "Unknown repository: << parameters.repository >>"
+              exit 1
+            fi
+
+            python -m pip install twine
+            python -m twine upload --non-interactive release-workspace/*
+
+  tests:
+    parameters:
+      image-base:
+        type: "string"
+      python-version:
+        type: "string"
+      twisted-version:
+        type: "string"
+
+    docker:
+      - image: "<< parameters.image-base >>:<< parameters.python-version >>"
+
+    steps:
+      - "checkout"
+      - run:
+          name: "Setup Test Environment"
+          command: |
+            python -m pip install coverage coveralls .[test]
+
+            case << parameters.twisted-version >> in
+              current) TW="Twisted" ;;
+              trunk)   TW="git+https://github.com/twisted/twisted.git" ;;
+              *)       TW="Twisted==<< parameters.twisted-version >>" ;;
+            esac
+            python -m pip install --upgrade "$TW"
+
+      - run:
+          name: "Run Tests"
+          command: |
+
+            python -m coverage run --source=txi2p --omit=*/_version.py,*test* -m twisted.trial txi2p
+            python run_coveralls.py
+
+
+workflows:
+  version: 2
+
+  release:
+    jobs:
+      - "build-wheel":
+          filters:
+            tags:
+              only: "/^\\d+\\.\\d+\\.\\d+$/"
+            branches:
+              ignore: "/.*/"
+      - "pypi-upload":
+          filters:
+            tags:
+              only: "/^\\d+\\.\\d+\\.\\d+$/"
+            branches:
+              ignore: "/.*/"
+          repository: "pypi"
+          requires:
+            - "build-wheel"
+
+  tests:
+    jobs:
+      - "build-wheel"
+      - "pypi-upload":
+          repository: "testpypi"
+          requires:
+            - "build-wheel"
+
+      - "tests":
+          matrix:
+            parameters:
+              image-base:
+                - "cimg/python"
+
+              python-version:
+                - "3.7"
+                - "3.8"
+                - "3.9"
+                - "3.10"
+
+              twisted-version:
+                - "trunk"
+                - "current"
+                - "22.2.0"
+                - "19.2.1"
+
+      - "tests":
+          matrix:
+            parameters:
+              image-base:
+                - "pypy"
+
+              python-version:
+                - "3.7"
+                - "3.8"
+                - "3.9"
+
+              twisted-version:
+                - "trunk"
+                - "current"
+                - "22.2.0"
+                - "19.2.1"
+
+      - "tests":
+          matrix:
+            parameters:
+              image-base:
+                - "pypy"
+                - "cimg/python"
+
+              python-version:
+                - "2.7"
+
+              twisted-version:
+                - "20.3.0"

.gitignore

@@ -5,7 +5,6 @@
 
 .coverage
 .eggs/
-.tox/
 coverage/
 dropin.cache
 env/
@@ -15,6 +14,4 @@ build/
 dist/
 docs/_build
 txi2p.egg-info/
-vcversioner-*.egg/
 _version.py
-version.txt

README.rst

@@ -1,6 +1,12 @@
-=====
-txi2p
-=====
+===========
+txi2p-tahoe
+===========
+
+This is a hopefully temporary fork of txi2p_, to help Tahoe-LAFS_
+project to get unstuck in Python 3 porting efforts.
+
+.. _txi2p: https://pypi.org/project/txi2p/
+.. _Tahoe-LAFS: https://pypi.org/project/tahoe-lafs/
 
 .. image:: https://api.travis-ci.org/str4d/txi2p.svg?branch=master
     :target: https://www.travis-ci.org/str4d/txi2p
@@ -22,11 +28,11 @@ Installation
 
 You can install |txi2p| from PyPI::
 
-    $ pip2 install txi2p
+    $ pip install txi2p-tahoe
 
 or by downloading the source and running::
 
-    $ pip2 install .
+    $ pip install .
 
 inside the source directory.
 

pyproject.toml

@@ -1,2 +1,6 @@
 [build-system]
-requires = ["setuptools", "vcversioner>=1"]
+requires = ["setuptools", "setuptools_scm[toml]"]
+
+[tool.setuptools_scm]
+write_to = "txi2p/_version.py"
+local_scheme = "no-local-version"

setup.py

@@ -27,7 +27,7 @@ def readme():
     install_requires.append('Twisted>=15.4')
 
 setup(
-    name='txi2p',
+    name='txi2p-tahoe',
     description='I2P bindings for Twisted',
     long_description=readme(),
     author='str4d',
@@ -46,15 +46,6 @@ def readme():
         'Topic :: Internet',
     ],
     license='ISC',
-
-    # This is left to support installation with pip < 10 or with another tool.
-    # However, it is expected that modern installations will be performed with
-    # pip >= 10 and will look at pyproject.toml first, mooting this
-    # declaration.
-    setup_requires=['vcversioner>=1'],
-    vcversioner={
-        'version_module_paths': ['txi2p/_version.py'],
-    },
     install_requires=install_requires,
     packages=[
         'txi2p',
@@ -65,6 +56,11 @@ def readme():
         'txi2p.sam.test',
         'twisted.plugins',
     ],
+    extras_require={
+        "test": [
+            "mock; python_version < '3.0'",
+        ],
+    },
 )
 
 # Make Twisted regenerate the dropin.cache, if possible.  This is necessary