Update PyGithub and other dependencies (#147)

danvk · web-flow · commit a52254cd5209 · 2022-09-06T11:21:40.000-04:00
* Various updates

* Switch from nose -&gt; pytest

* update travis commands

* version bump

* Update setup.py
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+# Changelog
+
+- 0.16
+  - Update a few Python dependencies that had bitrotted (#147)
+
 - 0.15
   * Fix `setup.py` configuration error that prevented install on macOS Catalina (#131)
   * JavaScript modernization:
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/README.md b/README.md
@@ -47,28 +47,26 @@ This will download the files relevant to the Pull Request and run `webdiff`.
 If you run into GitHub API quota limits or you'd like to use webdiff with
 private repos, you can set your credentials in a `.githubrc` file:
 
-```
-user.login: yourusername
-user.token: your-personal-access-tokens
-```
+    user.login: yourusername
+    user.token: your-personal-access-tokens
 
 Make sure you chmod this file to only be readable by yourself. You can generate
 a personal access token for webdiff via github.com → profile → Settings →
 Personal access tokens. Make sure to grant all the "repo" privileges.
 
-
 ## Development
 
-(from an activated virtualenv)
-
+    python3 -m venv venv
+    source venv/bin/activate
     pip install -r requirements.txt
     cd ts
     yarn
-    webpack
+    # see https://github.com/webpack/webpack/issues/14532
+    NODE_OPTIONS=--openssl-legacy-provider webpack
 
 Then from the root directory:
 
-    ./webdiff/app.py testdata/dygraphsjs/{left,right}
+    PYTHONPATH=. ./webdiff/app.py testdata/dygraphsjs/{left,right}
 
 or to launch in debug mode:
 
@@ -78,7 +76,7 @@ or to launch in debug mode:
 
 To run the Python tests:
 
-    nosetests
+    pytest
 
 To run the JavaScript tests:
 
@@ -103,11 +101,11 @@ To iterate on the PyPI package, run:
 
     deactivate
     cd /tmp/webdiff-test
-    pip install webdiff-X.Y.Z.tar.gz
+    pip3 install webdiff-X.Y.Z.tar.gz
 
 To publish to pypitest:
 
-    pip install --upgraede wheel setuptools twine
+    pip install --upgrade wheel setuptools twine
     python setup.py sdist bdist_wheel
     twine upload -r testpypi dist/*
 
@@ -117,5 +115,4 @@ And to the real pypi:
 
 See [pypirc][] docs for details on setting up `~/.pypirc`.
 
-[oauth]: https://github.com/danvk/webdiff/issues/103
 [pypirc]: https://packaging.python.org/specifications/pypirc/
diff --git a/bower.json b/bower.json
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
-flask==0.10.1
-nose
-PyGithub==1.25.2
+flask==2.2.2
+pytest==7.1.3
+PyGithub==1.55
 pillow
 requests
 binaryornot
diff --git a/scripts/black.sh b/scripts/black.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-black --line-length 99 --skip-string-normalization webdiff
+black --line-length 99 --skip-string-normalization webdiff tests
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 
 setup(name='webdiff',
-      version='0.15.0',
+      version='0.16.0',
       description='Two-column web-based git difftool',
       long_description=long_description,
       long_description_content_type='text/markdown',
@@ -22,10 +22,10 @@
       packages=find_packages(exclude=['tests*']),
       install_requires=[
           'binaryornot',
-          'flask',
+          'flask==2.2.2',
           'pillow',
           'requests',
-          'PyGithub==1.25.2'
+          'PyGithub==1.55'
       ],
       include_package_data=True,
       package_data = {
diff --git a/test.sh b/test.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 export WEBDIFF_CONFIG=$(pwd)/testing.cfg
 export WEBDIFF_PORT=$(($RANDOM + 10000))
+export PYTHONPATH=.
 ./webdiff/app.py $*
diff --git a/tests/argparser_test.py b/tests/argparser_test.py
@@ -2,34 +2,40 @@
 
 import tempfile
 import os
-from nose.tools import *
+import pytest
 
 _, file1 = tempfile.mkstemp()
 _, file2 = tempfile.mkstemp()
 dir1 = tempfile.mkdtemp()
 dir2 = tempfile.mkdtemp()
 
+
 def test_file_dir_pairs():
-    eq_({'files': (file1, file2)}, argparser.parse([file1, file2]))
-    eq_({'dirs': (dir1, dir2)}, argparser.parse([dir1, dir2]))
+    assert {'files': (file1, file2)} == argparser.parse([file1, file2])
+    assert {'dirs': (dir1, dir2)} == argparser.parse([dir1, dir2])
 
-    with assert_raises(argparser.UsageError):
+    with pytest.raises(argparser.UsageError):
         argparser.parse([file1, dir1])
-    with assert_raises(argparser.UsageError):
+    with pytest.raises(argparser.UsageError):
         argparser.parse([dir2, file2])
 
 
 def test_port():
-    eq_({'files': (file1, file2), 'port': 12345},
-        argparser.parse(['--port', '12345', file1, file2]))
+    assert {'files': (file1, file2), 'port': 12345} == argparser.parse(
+        ['--port', '12345', file1, file2]
+    )
 
 
 def test_github_pull_request():
-    eq_({'github': {'owner': 'danvk', 'repo': 'dygraphs', 'num': 292}},
-        argparser.parse(['https://github.com/danvk/dygraphs/pull/292']))
-    eq_({'github': {'owner': 'danvk', 'repo': 'dygraphs', 'num': 292}},
-        argparser.parse(['https://github.com/danvk/dygraphs/pull/292/']))
-    eq_({'github': {'owner': 'danvk', 'repo': 'dygraphs', 'num': 292}},
-        argparser.parse(['https://github.com/danvk/dygraphs/pull/292/files']))
-    eq_({'github': {'owner': 'danvk', 'repo': 'dygraphs', 'num': 292}},
-        argparser.parse(['https://github.com/danvk/dygraphs/pull/292/commits']))
+    assert {'github': {'owner': 'danvk', 'repo': 'dygraphs', 'num': 292}} == argparser.parse(
+        ['https://github.com/danvk/dygraphs/pull/292']
+    )
+    assert {'github': {'owner': 'danvk', 'repo': 'dygraphs', 'num': 292}} == argparser.parse(
+        ['https://github.com/danvk/dygraphs/pull/292/']
+    )
+    assert {'github': {'owner': 'danvk', 'repo': 'dygraphs', 'num': 292}} == argparser.parse(
+        ['https://github.com/danvk/dygraphs/pull/292/files']
+    )
+    assert {'github': {'owner': 'danvk', 'repo': 'dygraphs', 'num': 292}} == argparser.parse(
+        ['https://github.com/danvk/dygraphs/pull/292/commits']
+    )
diff --git a/tests/pair_test.py b/tests/pair_test.py
@@ -1,18 +1,19 @@
 import unittest
 
-from nose.tools import *
 from webdiff import util
 from webdiff import diff
 from webdiff import dirdiff
 
+
 def test_pairing():
     a_files = [
         'app.py',
         'TODO',
         'static/js/file_diff.js',
         'static/jsdifflib/diffview.css',
         'static/jsdifflib/diffview.js',
-        'templates/heartbeat.html']
+        'templates/heartbeat.html',
+    ]
 
     b_files = [
         'app.py',
@@ -21,30 +22,33 @@ def test_pairing():
         'static/js/file_diff.js',
         'static/jsdifflib/diffview.css',
         'static/jsdifflib/diffview.js',
-        'templates/heartbeat.html']
+        'templates/heartbeat.html',
+    ]
 
     pairs = dirdiff.pair_files(a_files, b_files)
     pairs.sort()
 
-    eq_(
-        [('', 'testing.cfg'),
-         ('TODO', 'TODO'),
-         ('app.py', 'app.py'),
-         ('static/js/file_diff.js', 'static/js/file_diff.js'),
-         ('static/jsdifflib/diffview.css', 'static/jsdifflib/diffview.css'),
-         ('static/jsdifflib/diffview.js', 'static/jsdifflib/diffview.js'),
-         ('templates/heartbeat.html', 'templates/heartbeat.html'),
-         ], pairs)
+    assert [
+        ('', 'testing.cfg'),
+        ('TODO', 'TODO'),
+        ('app.py', 'app.py'),
+        ('static/js/file_diff.js', 'static/js/file_diff.js'),
+        ('static/jsdifflib/diffview.css', 'static/jsdifflib/diffview.css'),
+        ('static/jsdifflib/diffview.js', 'static/jsdifflib/diffview.js'),
+        ('templates/heartbeat.html', 'templates/heartbeat.html'),
+    ] == pairs
 
 
 def test_pairing_with_move():
     testdir = 'testdata/renamedfile'
     diffs = dirdiff.diff('%s/left/dir' % testdir, '%s/right/dir' % testdir)
-    eq_([{
-          'a': 'file.json',
-          'b': 'renamed.json',
-          'type': 'move',
-         }], [diff.get_thin_dict(d) for d in diffs])
+    assert [
+        {
+            'a': 'file.json',
+            'b': 'renamed.json',
+            'type': 'move',
+        }
+    ] == [diff.get_thin_dict(d) for d in diffs]
 
 
 class TinyDiff(object):
@@ -54,10 +58,10 @@ def __init__(self, a, b):
 
 
 def test_is_image_diff():
-    assert     diff.is_image_diff(TinyDiff('foo.png', 'bar.png'))
+    assert diff.is_image_diff(TinyDiff('foo.png', 'bar.png'))
     assert not diff.is_image_diff(TinyDiff('foo.png.gz', 'bar.png.gz'))
     assert not diff.is_image_diff(TinyDiff('foo.txt', 'bar.txt'))
-    assert     diff.is_image_diff(TinyDiff('foo.png', ''))
+    assert diff.is_image_diff(TinyDiff('foo.png', ''))
     assert not diff.is_image_diff(TinyDiff('foo.txt', ''))
-    assert     diff.is_image_diff(TinyDiff('', 'foo.png'))
+    assert diff.is_image_diff(TinyDiff('', 'foo.png'))
     assert not diff.is_image_diff(TinyDiff('', 'foo.txt'))
diff --git a/tests/travis-setup.sh b/tests/travis-setup.sh
@@ -3,5 +3,5 @@
 set -o errexit
 
 pip install -r requirements.txt
-npm install
-bower install
+cd ts
+yarn
diff --git a/tests/travis-test.sh b/tests/travis-test.sh
@@ -2,5 +2,7 @@
 # Run both the Python & JS tests.
 set -o errexit
 
-nosetests tests
-grunt test --verbose
+pytest
+
+cd ts
+yarn webpack
diff --git a/webdiff/app.py b/webdiff/app.py
@@ -31,7 +31,7 @@
 from webdiff import util
 from webdiff import argparser
 
-VERSION = '0.15.0'
+VERSION = '0.16.0'
 
 
 def determine_path():
@@ -211,15 +211,23 @@ def favicon():
     )
 
 
+# See https://stackoverflow.com/a/69812984/388951
+exiting = False
+
+
 @app.route('/seriouslykill', methods=['POST'])
 def seriouslykill():
-    func = request.environ.get('werkzeug.server.shutdown')
-    if func is None:
-        raise RuntimeError('Not running with the Werkzeug Server')
-    func()
+    global exiting
+    exiting = True
     return "Shutting down..."
 
 
+@app.teardown_request
+def teardown(exception):
+    if exiting:
+        os._exit(0)
+
+
 @app.route('/kill', methods=['POST'])
 def kill():
     global PORT
diff --git a/webdiff/diff.py b/webdiff/diff.py
@@ -1,7 +1,7 @@
 '''Utility code for working with Diff objects.
 
 Diff objects must have these properties:
-    - a      Name of the file on the left side of a diff      
+    - a      Name of the file on the left side of a diff
     - a_path Path to a copy of the left side file on local disk.
     - b      (like a)
     - b_path (like a_path)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`
`3`		`-black --line-length 99 --skip-string-normalization webdiff`
	`3`	`+black --line-length 99 --skip-string-normalization webdiff tests`