Merge branch 'master' into master

twisted · May 21, 2018 · 823be97 · 823be97
2 parents 9e89030 + 685e2cc
commit 823be97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -49,13 +49,12 @@ install:
         # Build and install a wheel of Nevow.
         pip install wheel
 
-        # Explicitly select the py27 tag because it makes the filename more predictable.
-        python setup.py bdist_wheel --python-tag py27
+        python setup.py bdist_wheel
 
         # Install whatever was just built.  The filename is tricky to figure
         # out because wheels mangle the version in certain ways.  Replicate
         # some of that mangling here.
-        pip install dist/Nevow-"$(python setup.py --version | tr - _)"-py27-none-any.whl
+        pip install dist/Nevow-"$(python setup.py --version | tr - _)"-py2-none-any.whl
 
         # Also install the extra documentation requirements.  Unfortunately, it
         # seems pip doesn't automatically handle that case when installing from

diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,3 @@
-[aliases]
-dev = egg_info --tag-svn-revision
-
-
 # See the docstring in versioneer.py for instructions. Note that you must
 # re-run 'versioneer.py setup' after changing this section, and commit the
 # resulting files.