Merge pull request #266 from nicoddemus/gh-actions

.github/workflows/main.yml

@@ -14,17 +14,17 @@ jobs:
         os: [ubuntu-latest, windows-latest]
         include:
           - python: "2.7"
-            tox_env: "py27-pytest31"
+            tox_env: "py27-pytest30"
           - python: "3.5"
-            tox_env: "py35-pytest31"
+            tox_env: "py35-pytest30"
           - python: "3.6"
-            tox_env: "py36-pytest31"
+            tox_env: "py36-pytest30"
           - python: "3.7"
-            tox_env: "py37-pytest31"
+            tox_env: "py37-pytest30"
           - python: "3.8"
-            tox_env: "py38-pytest31"
+            tox_env: "py38-pytest30"
           - python: "pypy3"
-            tox_env: "pypy3-pytest31"
+            tox_env: "pypy3-pytest30"
 
     steps:
     - uses: actions/checkout@v1

README.rst

@@ -7,11 +7,8 @@
 .. image:: https://img.shields.io/pypi/pyversions/py.svg
   :target: https://pypi.org/project/py
 
-.. image:: https://img.shields.io/travis/pytest-dev/py.svg
-   :target: https://travis-ci.org/pytest-dev/py
-
-.. image:: https://ci.appveyor.com/api/projects/status/10keglan6uqwj5al/branch/master?svg=true
-   :target: https://ci.appveyor.com/project/pytestbot/py
+.. image:: https://github.com/pytest-dev/py/workflows/build/badge.svg
+  :target: https://github.com/pytest-dev/py/actions
 
 
 **NOTE**: this library is in **maintenance mode** and should not be used in new code.

testing/code/test_source.py

@@ -103,7 +103,7 @@ def test_source_strip_multiline():
 def test_syntaxerror_rerepresentation():
     ex = py.test.raises(SyntaxError, py.code.compile, 'xyz xyz')
     assert ex.value.lineno == 1
-    assert ex.value.offset in (4,7) # XXX pypy/jython versus cpython?
+    assert ex.value.offset in (5, 7)  # pypy/cpython difference
     assert ex.value.text.strip(), 'x x'
 
 def test_isparseable():
@@ -510,11 +510,17 @@ def test_comments():
 comment 4
 """
 '''
-    for line in range(2,6):
-        assert str(getstatement(line, source)) == '    x = 1'
-    for line in range(6,10):
-        assert str(getstatement(line, source)) == '    assert False'
-    assert str(getstatement(10, source)) == '"""'
+    for line in range(2, 6):
+        assert str(getstatement(line, source)) == "    x = 1"
+    if sys.version_info >= (3, 8) or hasattr(sys, "pypy_version_info"):
+        tqs_start = 8
+    else:
+        tqs_start = 10
+        assert str(getstatement(10, source)) == '"""'
+    for line in range(6, tqs_start):
+        assert str(getstatement(line, source)) == "    assert False"
+    for line in range(tqs_start, 10):
+        assert str(getstatement(line, source)) == '"""\ncomment 4\n"""'
 
 def test_comment_in_statement():
     source = '''test(foo=1,

testing/path/test_local.py

@@ -721,8 +721,9 @@ def test_samefile_symlink(tmpdir):
     p2 = tmpdir.join("linked.txt")
     try:
         os.symlink(str(p1), str(p2))
-    except OSError as e:
+    except (OSError, NotImplementedError) as e:
         # on Windows this might fail if the user doesn't have special symlink permissions
+        # pypy3 on Windows doesn't implement os.symlink and raises NotImplementedError
         pytest.skip(str(e.args[0]))
 
     assert p1.samefile(p2)