Merge branch 'master' into chore/relax_integrator

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build and release artifacts
+name: Build artifacts
 
 on:
   workflow_dispatch:
@@ -8,8 +8,9 @@ on:
   push:
     branches:
       - master
+  pull_request:
   release:
-    types: [released]
+    types: [published]  # releases and pre-releases (release candidates)
 
 defaults:
   run:
@@ -38,10 +39,11 @@ jobs:
 
       - name: Generate Binary
         run: >-
-          pip install --no-binary pycryptodome . &&
+          pip install --no-binary pycryptodome --no-binary cbor2 . &&
           pip install pyinstaller &&
           make freeze
 
+
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -98,6 +100,16 @@ jobs:
               -X POST \
               -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}"\
               -H "Content-Type: application/octet-stream" \
-              "https://uploads.github.com/repos/${{ github.repository }}/releases/${{ github.event.release.id }}/assets?name=${BIN_NAME}" \
+              "https://uploads.github.com/repos/${{ github.repository }}/releases/${{ github.event.release.id }}/assets?name=${BIN_NAME/+/%2B}" \
               --data-binary "@${BIN_NAME}"
           done
+
+  # check build success for pull requests
+  build-success:
+    if: always()
+    runs-on: ubuntu-latest
+    needs: [windows-build, unix-build]
+    steps:
+      - name: check that all builds succeeded
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1

.github/workflows/publish.yml

@@ -5,7 +5,7 @@ name: Publish to PyPI
 
 on:
   release:
-    types: [released]
+    types: [published]  # releases and pre-releases (release candidates)
 
 jobs:
 

README.md

@@ -1,3 +1,4 @@
+**Vyper compiler security audit competition starts 14th September with $150k worth of bounties.** [See the competition on CodeHawks](https://www.codehawks.com/contests/cll5rujmw0001js08menkj7hc) and find [more details in this blog post](https://mirror.xyz/0xBA41A04A14aeaEec79e2D694B21ba5Ab610982f1/WTZ3l3MLhTz9P4avq6JqipN5d4HJNiUY-d8zT0pfmXg).
 
 <img src="https://raw.githubusercontent.com/vyperlang/vyper/master/logo/vyper-logo-transparent.svg?sanitize=true" alt="" width="110">
 

docs/structure-of-a-contract.rst

@@ -17,7 +17,7 @@ Vyper supports several source code directives to control compiler modes and help
 Version Pragma
 --------------
 
-The version pragma ensures that a contract is only compiled by the intended compiler version, or range of versions. Version strings use `NPM <https://docs.npmjs.com/about-semantic-versioning>`_ style syntax.
+The version pragma ensures that a contract is only compiled by the intended compiler version, or range of versions. Version strings use `NPM <https://docs.npmjs.com/about-semantic-versioning>`_ style syntax. Starting from v0.4.0 and up, version strings will use `PEP440 version specifiers <https://peps.python.org/pep-0440/#version-specifiers>_`.
 
 As of 0.3.10, the recommended way to specify the version pragma is as follows:
 

setup.py

@@ -95,7 +95,7 @@ def _global_version(version):
         "cbor2>=5.4.6,<6",
         "asttokens>=2.0.5,<3",
         "pycryptodome>=3.5.1,<4",
-        "semantic-version>=2.10,<3",
+        "packaging>=23.1,<24",
         "importlib-metadata",
         "wheel",
     ],

tests/ast/test_pre_parser.py

@@ -21,16 +21,9 @@ def set_version(version):
     "0.1.1",
     ">0.0.1",
     "^0.1.0",
-    "<=1.0.0 >=0.1.0",
-    "0.1.0 - 1.0.0",
-    "~0.1.0",
-    "0.1",
-    "0",
-    "*",
-    "x",
-    "0.x",
-    "0.1.x",
-    "0.2.0 || 0.1.1",
+    "<=1.0.0,>=0.1.0",
+    # "0.1.0 - 1.0.0",
+    "~=0.1.0",
 ]
 invalid_versions = [
     "0.1.0",
@@ -44,7 +37,6 @@ def set_version(version):
     "1.x",
     "0.2.x",
     "0.2.0 || 0.1.3",
-    "==0.1.1",
     "abc",
 ]
 
@@ -70,29 +62,19 @@ def test_invalid_version_pragma(file_version, mock_version):
     "<0.1.1-rc.1",
     ">0.1.1a1",
     ">0.1.1-alpha.1",
-    "0.1.1a9 - 0.1.1-rc.10",
+    ">=0.1.1a9,<=0.1.1-rc.10",
     "<0.1.1b8",
     "<0.1.1rc1",
+    "<0.2.0",
 ]
 prerelease_invalid_versions = [
     ">0.1.1-beta.9",
     ">0.1.1b9",
     "0.1.1b8",
     "0.1.1rc2",
     "0.1.1-rc.9 - 0.1.1-rc.10",
-    "<0.2.0",
-    pytest.param(
-        "<0.1.1b1",
-        marks=pytest.mark.xfail(
-            reason="https://github.com/rbarrois/python-semanticversion/issues/100"
-        ),
-    ),
-    pytest.param(
-        "<0.1.1a9",
-        marks=pytest.mark.xfail(
-            reason="https://github.com/rbarrois/python-semanticversion/issues/100"
-        ),
-    ),
+    "<0.1.1b1",
+    "<0.1.1a9",
 ]
 
 

tests/parser/exceptions/test_structure_exception.py

@@ -56,9 +56,26 @@ def double_nonreentrant():
     """,
     """
 @external
-@nonreentrant("B")
-@nonreentrant("C")
-def double_nonreentrant():
+@nonreentrant(" ")
+def invalid_nonreentrant_key():
+    pass
+    """,
+    """
+@external
+@nonreentrant("")
+def invalid_nonreentrant_key():
+    pass
+    """,
+    """
+@external
+@nonreentrant("123")
+def invalid_nonreentrant_key():
+    pass
+    """,
+    """
+@external
+@nonreentrant("!123abcd")
+def invalid_nonreentrant_key():
     pass
     """,
     """

tests/parser/features/decorators/test_nonreentrant.py

@@ -142,7 +142,7 @@ def set_callback(c: address):
 
 @external
 @payable
-@nonreentrant('default')
+@nonreentrant("lock")
 def protected_function(val: String[100], do_callback: bool) -> uint256:
     self.special_value = val
     _amount: uint256 = msg.value
@@ -166,7 +166,7 @@ def unprotected_function(val: String[100], do_callback: bool):
 
 @external
 @payable
-@nonreentrant('default')
+@nonreentrant("lock")
 def __default__():
     pass
     """

tests/parser/test_call_graph_stability.py

@@ -6,8 +6,8 @@
 from hypothesis import given, settings
 
 import vyper.ast as vy_ast
+from vyper.ast.identifiers import RESERVED_KEYWORDS
 from vyper.compiler.phases import CompilerData
-from vyper.semantics.namespace import RESERVED_KEYWORDS
 
 
 def _valid_identifier(attr):