Merge pull request #223 from nautechsystems/develop

Develop

Author: cjdsellers

.github/workflows/test-tag-publish.yml

@@ -68,6 +68,8 @@ jobs:
         python-version: [ 3.9 ]
     name: test-tag-publish - Python ${{ matrix.python-version }} (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
+    outputs:
+      upload_url: ${{ steps.create-release.outputs.upload_url }}
 
     steps:
       - uses: actions/checkout@v2
@@ -109,22 +111,22 @@ jobs:
           version-command: poetry version --short
 
       # Set release output variables
-      - name: Set Output
+      - name: Set output
         id: vars
         run: |
-          echo ::set-output name=tag_name::${GITHUB_REF#refs/*/}
-          echo ::set-output name=release_name::NautilusTrader ${GITHUB_REF#refs/*/} Beta
+          echo "::set-output name=tag_name::v$(poetry version --short)"
+          echo "::set-output name=release_name::NautilusTrader $(poetry version --short) Beta"
 
       # Create GitHub release
-      - name: Create Release
+      - name: Create release
         id: create-release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG_NAME: ${{ steps.vars.outputs.tag_name }}
           RELEASE_NAME: ${{ steps.vars.outputs.release_name }}
         with:
-          tag_name: v${{ env.TAG_NAME }}
+          tag_name: ${{ env.TAG_NAME }}
           release_name: ${{ env.RELEASE_NAME }}
           draft: false
           prerelease: false
@@ -174,31 +176,33 @@ jobs:
           poetry build --format sdist
 
       # Set release output variables
-      - name: Set Output
+      - name: Set output
         id: vars
         run: |
-          echo ::set-output name=release_url::https://github.com/nautechsystems/nautilus_trader/releases/tag/${GITHUB_REF#refs/*/}
+          echo "::set-output name=asset_path::$(find ./dist -mindepth 1 -print -quit)"
+          cd dist
+          echo "::set-output name=asset_name::$(printf '%s\0' * | awk 'BEGIN{RS="\0"} {print;  exit}')"
 
-      # Upload Release Asset
-      - name: Upload Release Asset
+      # Upload release asset
+      - name: Upload release asset
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE_URL: ${{ steps.vars.outputs.release_url }}
+          ASSET_PATH: ${{ steps.vars.outputs.asset_path }}
+          ASSET_NAME: ${{ steps.vars.outputs.asset_name }}
         with:
-          upload_url: ${{ env.RELEASE_URL }}
-          asset_path: find ./dist -mindepth 1 -print -quit
-          asset_name: (cd dist/; printf '%s\0' * | awk 'BEGIN{RS="\0"} {print;  exit}')
+          upload_url: ${{ needs.tag_release.outputs.upload_url }}
+          asset_path: ${{ env.ASSET_PATH }}
+          asset_name: ${{ env.ASSET_NAME }}
           asset_content_type: application/zip
 
-# TODO: Temporarily out of space on PyPI
-#      # Publish
-#      - name: Publish to production PyPI
-#        env:
-#          POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
-#          POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-#        run: poetry publish
+      # Publish
+      - name: Publish to production PyPI
+        env:
+          POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: poetry publish
 
 
   publish_wheels:
@@ -245,28 +249,30 @@ jobs:
           poetry build --format wheel
 
       # Set release output variables
-      - name: Set Output
+      - name: Set output
         id: vars
         run: |
-          echo ::set-output name=release_url::https://github.com/nautechsystems/nautilus_trader/releases/tag/${GITHUB_REF#refs/*/}
+          echo "::set-output name=asset_path::$(find ./dist -mindepth 1 -print -quit)"
+          cd dist
+          echo "::set-output name=asset_name::$(printf '%s\0' * | awk 'BEGIN{RS="\0"} {print;  exit}')"
 
-      # Upload Release Asset
-      - name: Upload Release Asset
+      # Upload release asset
+      - name: Upload release asset
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RELEASE_URL: ${{ steps.vars.outputs.release_url }}
+          ASSET_PATH: ${{ steps.vars.outputs.asset_path }}
+          ASSET_NAME: ${{ steps.vars.outputs.asset_name }}
         with:
-          upload_url: ${{ env.RELEASE_URL }}
-          asset_path: find ./dist -mindepth 1 -print -quit
-          asset_name: (cd dist/; printf '%s\0' * | awk 'BEGIN{RS="\0"} {print;  exit}')
+          upload_url: ${{ needs.tag_release.outputs.upload_url }}
+          asset_path: ${{ env.ASSET_PATH }}
+          asset_name: ${{ env.ASSET_NAME }}
           asset_content_type: application/wheel
 
-# TODO: Temporarily out of space on PyPI
-#      # Publish
-#      - name: Publish to production PyPI
-#        env:
-#          POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
-#          POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_TOKEN }}
-#        run: poetry publish
+      # Publish
+      - name: Publish to production PyPI
+        env:
+          POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: poetry publish

README.md

@@ -92,6 +92,16 @@ To install the latest binary wheel (or sdist package) from PyPI, run:
 
     pip install -U nautilus_trader
 
+#### From GitHub Release
+
+To install a binary wheel from GitHub, first navigate to the latest release.
+
+> https://github.com/nautechsystems/nautilus_trader/releases/latest/
+
+Download the appropriate `.whl` for your operating system and Python version, then run:
+
+    pip install <file-name>.whl
+
 #### From Source
 
 Installation from source requires `rustc` and `cargo` to compile the Rust libraries,

build.py

@@ -58,8 +58,8 @@
 ##########################
 
 RUST_LIBRARIES = {
-    "nautilus-core": "lib/nautilus-core/target/release/libnautilus_core.a",
-    "nautilus-model": "lib/nautilus-model/target/release/libnautilus_model.a",
+    "nautilus-core": "lib/nautilus/target/release/libnautilus_core.a",
+    "nautilus-model": "lib/nautilus/target/release/libnautilus_model.a",
 }
 
 STATIC_LINK_MAP = {
@@ -73,10 +73,9 @@ def _build_rust_libs() -> None:
     # Build the Rust libraries using Cargo
     print("Building rust libs...")
 
-    for lib in RUST_LIBRARIES:
-        cmd = f"(cd lib/{lib}; cargo build --release)"
-        print(cmd)
-        os.system(cmd)
+    cmd = f"(cd lib/nautilus; cargo build --release)"
+    print(cmd)
+    os.system(cmd)
 
 
 def _build_extensions() -> List[Extension]:

lib/nautilus-core/README.md

@@ -0,0 +1,12 @@
+[workspace]
+members = [
+    "core",
+    "model",
+]
+
+# Debug symbols end up chewing up several GB of disk space, so better to just
+# disable them.
+[profile.dev]
+debug = false
+[profile.test]
+debug = false

lib/nautilus-model/LICENSE

@@ -1,5 +1,5 @@
 [package]
-name = "nautilus_model"
+name = "nautilus-model"
 version = "0.1.1"
 authors = ["Nautech Systems <[email protected]>"]
 edition = "2018"
@@ -10,6 +10,7 @@ crate-type = ["rlib", "staticlib"]
 
 [dependencies]
 cbindgen = "0.17.0"
+nautilus-core = { path = "../core" }
 
 [build-dependencies]
 cbindgen = "0.17.0"