Merge cd0d1cd into 33b7e81

INSTALL

@@ -24,13 +24,11 @@ If you want to take slightly more time, but only install temporarily,
 use virtualenv:
 
    apt-get install python-setuptools python-pip
-   python setup.py build
    mkdir tmp
-   virtualenv --never-download --extra-search-dir=/usr/lib/python2.7/dist-packages/ tmp/txtorcon_env
+   virtualenv tmp/txtorcon_env
    cd tmp/txtorcon_env
    source bin/activate
-   pip install Twisted ipaddress pygeoip     # this will download from internets:
-   export PYTHONPATH=../../build/lib.linux-x86_64-2.7/
+   pip install --editable .  # this will download from internets:
 
 (Or you can type "make virtualenv" which creates tmp/txtorcon_env, up
 to the "activate" step above)

Makefile

@@ -1,6 +1,6 @@
 .PHONY: test html counts coverage sdist clean install doc integration diagrams
 default: test
-VERSION = 22.0.0
+VERSION = 23.0.0
 
 test:
 	PYTHONPATH=. trial --reporter=text test
@@ -99,37 +99,35 @@ counts:
 test-release: dist
 	./scripts/test-release.sh $(shell pwd) ${VERSION}
 
-dist: dist/txtorcon-${VERSION}-py2.py3-none-any.whl dist/txtorcon-${VERSION}.tar.gz
+dist: dist/txtorcon-${VERSION}-py3-none-any.whl dist/txtorcon-${VERSION}.tar.gz
 
-dist-sigs: dist/txtorcon-${VERSION}-py2.py3-none-any.whl.asc dist/txtorcon-${VERSION}.tar.gz.asc
+dist-sigs: dist/txtorcon-${VERSION}-py3-none-any.whl.asc dist/txtorcon-${VERSION}.tar.gz.asc
 
 sdist: setup.py
 	python setup.py check
 	python setup.py sdist
 
-dist/txtorcon-${VERSION}-py2.py3-none-any.whl:
+dist/txtorcon-${VERSION}-py3-none-any.whl:
 	python setup.py check
-	python setup.py bdist_wheel --universal
+	python setup.py bdist_wheel
 
-dist/txtorcon-${VERSION}-py2.py3-none-any.whl.asc: dist/txtorcon-${VERSION}-py2.py3-none-any.whl
-	gpg --verify dist/txtorcon-${VERSION}-py2.py3-none-any.whl.asc || gpg --pinentry loopback --no-version --detach-sign --armor --local-user meejah@meejah.ca dist/txtorcon-${VERSION}-py2.py3-none-any.whl
+dist/txtorcon-${VERSION}-py3-none-any.whl.asc: dist/txtorcon-${VERSION}-py3-none-any.whl
+	gpg --verify dist/txtorcon-${VERSION}-py3-none-any.whl.asc || gpg --pinentry loopback --no-version --detach-sign --armor --local-user meejah@meejah.ca dist/txtorcon-${VERSION}-py3-none-any.whl
 
 dist/txtorcon-${VERSION}.tar.gz: sdist
 dist/txtorcon-${VERSION}.tar.gz.asc: dist/txtorcon-${VERSION}.tar.gz
 	gpg --verify dist/txtorcon-${VERSION}.tar.gz.asc || gpg --pinentry loopback --no-version --detach-sign --armor --local-user meejah@meejah.ca dist/txtorcon-${VERSION}.tar.gz
 
 release:
 	twine upload -r pypi -c "txtorcon v${VERSION} tarball" dist/txtorcon-${VERSION}.tar.gz dist/txtorcon-${VERSION}.tar.gz.asc
-	twine upload -r pypi -c "txtorcon v${VERSION} wheel" dist/txtorcon-${VERSION}-py2.py3-none-any.whl dist/txtorcon-${VERSION}-py2.py3-none-any.whl.asc
+	twine upload -r pypi -c "txtorcon v${VERSION} wheel" dist/txtorcon-${VERSION}-py3-none-any.whl dist/txtorcon-${VERSION}-py3-none-any.whl.asc
 
 
 venv:
-	virtualenv --never-download --extra-search-dir=/usr/lib/python2.7/dist-packages/ venv
+	virtualenv venv
+	./venv/bin/pip install -r requirements.txt
+	./venv/bin/pip install -r dev-requirements.txt
 	@echo "created venv"
-	@echo "see INSTALL for more information; to use:"
-	@echo ". ./venv/bin/activate"
-	@echo "pip install -r requirements.txt"
-	@echo "pip install -r dev-requirements.txt"
 	@echo "python examples/monitor.py"
 
 html: docs/*.rst

README.rst

@@ -39,11 +39,10 @@ txtorcon
 - **code**: https://github.com/meejah/txtorcon
 - ``torsocks git clone git://fjblvrw2jrxnhtg67qpbzi45r7ofojaoo3orzykesly2j3c2m3htapid.onion/txtorcon.git``
 - MIT-licensed;
-- Python 2.7, PyPy 5.0.0+, Python 3.5+;
+- Python 3.5+, PyPy 5.0.0+;
 - depends on
   `Twisted`_,
-  `Automat <https://github.com/glyph/automat>`_,
-  (and the `ipaddress <https://pypi.python.org/pypi/ipaddress>`_ backport for non Python 3)
+  `Automat <https://github.com/glyph/automat>`_
 
 
 Ten Thousand Feet
@@ -67,7 +66,6 @@ Some Possibly Motivational Example Code
 ---------------------------------------
 
 `download <examples/readme.py>`_
-(also `python2 style <examples/readme2.py>`_)
 
 .. code:: python
 

setup.py

@@ -58,9 +58,6 @@
         'Operating System :: POSIX :: Linux',
         'Operating System :: Unix',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Internet :: Proxy Servers',

tox.ini

@@ -11,10 +11,10 @@
 # stretch: 16.3.0-1
 
 [tox]
-envlist = clean,flake8,stats,readme_render,{py27,py36,py37,py38,py39,pypy}-{tx18,tx19,tx20},{py36,py37,py38,py39}-tx21
+envlist = clean,flake8,stats,readme_render,{py36,py37,py38,py39,pypy}-{tx18,tx19,tx20},{py36,py37,py38,py39}-tx21
 # if you're not using detox, you can use this list to get
 # "all environments" coverage stats:
-# tox -e 'clean,flake8,py27-tx18,pypy-tx18,py35-tx18,stats'
+# tox -e 'clean,flake8,py39-tx20,pypy-tx20,py35-tx20,stats'
 
 # defaults
 [testenv]

txtorcon/_metadata.py

@@ -1,6 +1,6 @@
-__version__ = '22.0.0'
+__version__ = '23.0.0'
 __author__ = 'meejah'
 __contact__ = 'meejah@meejah.ca'
 __url__ = 'https://github.com/meejah/txtorcon'
 __license__ = 'MIT'
-__copyright__ = 'Copyright 2012-2022'
+__copyright__ = 'Copyright 2012-2023'