diff --git a/.github/workflows/publish-python.yml b/.github/workflows/publish-python.yml index 5c440bf..33d6c61 100644 --- a/.github/workflows/publish-python.yml +++ b/.github/workflows/publish-python.yml @@ -53,7 +53,7 @@ jobs: fi target: aarch64 manylinux: manylinux_2_28 # auto doesn't work see https://github.com/briansmith/ring/issues/1728#issuecomment-1758180655 - args: --release --out dist + args: --release --out dist --manifest-path pyultima/Cargo.toml - name: Upload wheels uses: actions/upload-artifact@v3 @@ -69,9 +69,11 @@ jobs: target: [x86_64, x86, armv7, i686, ppc64le] steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: ${{ env.PYTHON_VERSION }} + + # TODO Remove if not needed + # - uses: actions/setup-python@v4 + # with: + # python-version: ${{ env.PYTHON_VERSION }} - name: Install Node run: npm install @@ -80,11 +82,6 @@ jobs: - name: Build Node run: npm run build working-directory: frontend - - # - uses: awalsh128/cache-apt-pkgs-action@v1 - # with: - # packages: musl-tools # provides musl-gcc - # version: 1.0 - name: Build wheels uses: PyO3/maturin-action@v1 @@ -224,171 +221,3 @@ jobs: with: command: upload args: --non-interactive --skip-existing * - -# name: Create Python release - -# #on: -# # release: -# # types: [published] - -# on: -# push: -# tags: ['py*.*.*'] - -# env: -# RUST_TOOLCHAIN: stable -# PYTHON_VERSION: '3.9' -# MATURIN_VERSION: '1.2.1' - -# defaults: -# run: -# shell: bash - -# jobs: -# manylinux-x64_64: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# - uses: actions/setup-python@v4 -# with: -# python-version: ${{ env.PYTHON_VERSION }} - -# - name: Install tools -# run: | -# sudo apt update -# sudo apt install -y pkg-config libssl-dev - -# - name: Setup node -# uses: actions/setup-node@v1 -# with: -# node-version: "16.x" - -# - name: Install Node -# run: npm install -# working-directory: frontend - -# - name: Build Node -# run: npm run build -# working-directory: frontend - -# - name: Publish wheel -# uses: PyO3/maturin-action@v1 -# env: -# MATURIN_PASSWORD: ${{ secrets.PYPI_PASS }} -# RUSTFLAGS: -C target-feature=+fxsr,+sse,+sse2,+sse3,+ssse3,+sse4.1,+sse4.2,+popcnt,+avx,+fma -# with: -# rust-toolchain: ${{ env.RUST_TOOLCHAIN }} -# maturin-version: ${{ env.MATURIN_VERSION }} -# command: publish -# args: -m pyultima/Cargo.toml --all-features --skip-existing -o wheels -u anatoly.bugakov - -# # Needed for Docker on Apple M1 -# manylinux-aarch64: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# - uses: actions/setup-python@v4 -# with: -# python-version: ${{ env.PYTHON_VERSION }} - -# - name: Install tools -# run: | -# sudo apt-get update -# sudo apt-get install -y pkg-config libssl-dev - -# - name: Setup node -# uses: actions/setup-node@v1 -# with: -# node-version: "16.x" - -# - name: Install Node -# run: npm install -# working-directory: frontend - -# - name: Build Node -# run: npm run build -# working-directory: frontend - -# - name: Publish wheel -# uses: PyO3/maturin-action@v1 -# env: -# MATURIN_PASSWORD: ${{ secrets.PYPI_PASS }} -# JEMALLOC_SYS_WITH_LG_PAGE: 16 -# with: -# rust-toolchain: ${{ env.RUST_TOOLCHAIN }} -# target: aarch64-unknown-linux-gnu -# maturin-version: ${{ env.MATURIN_VERSION }} -# command: publish -# args: -m pyultima/Cargo.toml --all-features --skip-existing --no-sdist -o wheels -i python -u anatoly.bugakov - -# win-macos: -# runs-on: ${{ matrix.os }} -# strategy: -# fail-fast: false -# matrix: -# os: [macos-latest, windows-latest] -# env: -# OPENSSL_NO_VENDOR: 1 - -# steps: -# - uses: actions/checkout@v3 -# - uses: actions/setup-python@v4 -# with: -# python-version: ${{ env.PYTHON_VERSION }} - -# - name: Install OpenSSL (Windows) -# if: runner.os == 'Windows' -# shell: powershell -# run: | -# echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append -# vcpkg install openssl:x64-windows-static-md - -# - name: Setup node -# uses: actions/setup-node@v1 -# with: -# node-version: "16.x" - -# - name: Install Node -# run: npm install -# working-directory: frontend - -# - name: Build Node -# run: npm run build -# working-directory: frontend - -# - name: Publish wheel -# uses: PyO3/maturin-action@v1 -# env: -# MATURIN_PASSWORD: ${{ secrets.PYPI_PASS }} -# RUSTFLAGS: -C target-feature=+fxsr,+sse,+sse2,+sse3,+sse4.1,+sse4.2 -# with: -# rust-toolchain: ${{ env.RUST_TOOLCHAIN }} -# maturin-version: ${{ env.MATURIN_VERSION }} -# command: publish -# args: -m pyultima/Cargo.toml --all-features --no-sdist --skip-existing -o wheels -i python -u anatoly.bugakov - -# This job fails - understand/check why -# macos-aarch64: -# runs-on: macos-latest -# steps: -# - uses: actions/checkout@v3 -# - uses: actions/setup-python@v4 -# with: -# python-version: ${{ env.PYTHON_VERSION }} -# -# - name: Set up Rust -# uses: dtolnay/rust-toolchain@master -# with: -# toolchain: nightly-2022-12-20 -# -# - name: Set up Rust targets -# run: rustup target add aarch64-apple-darwin -# -# - name: Publish wheel -# uses: messense/maturin-action@v1 -# env: -# MATURIN_PASSWORD: ${{ secrets.PYPI_PASS }} -# with: -# maturin-version: ${{ env.MATURIN_VERSION }} -# command: publish -# args: -m pyultima/Cargo.toml --all-features --target aarch64-apple-darwin --no-sdist -o wheels -i python -u anatoly.bugakov diff --git a/template_drivers/Cargo.toml b/template_drivers/Cargo.toml index 102230a..86147d0 100644 --- a/template_drivers/Cargo.toml +++ b/template_drivers/Cargo.toml @@ -24,9 +24,7 @@ log = "0.4" pretty_env_logger = "0.4" tokio = { version = "1.21.0", features = ["full"] } actix-web = "4" -actix-files = "0.6.2" tracing = { version = "0.1", features = ["log"] } -uuid = { version = "1.1.2", features = ["v4"] } # Errors thiserror = "1" anyhow = "1" @@ -35,7 +33,6 @@ toml = { workspace = true } mimalloc = { version = "0.1.29", default-features = false } dotenv = "0.15" clap = { version = "4", features = ["derive"] } -actix-web-httpauth = "0.8.0" actix-web-static-files = "4.0" static-files = "0.2.1" diff --git a/ultibi/ultibi_core/Cargo.toml b/ultibi/ultibi_core/Cargo.toml index ce2612c..cecc18a 100644 --- a/ultibi/ultibi_core/Cargo.toml +++ b/ultibi/ultibi_core/Cargo.toml @@ -37,7 +37,7 @@ futures = { version = "0.3", optional = true } #Cache dashmap = { workspace = true } # Open API Swagger -quote = "1.0.26" # Needs to be specified for utoipa to build +# TODO remove if compiles without quote = "1.0.26" # Needs to be specified for utoipa to build utoipa = { version="4.1.0", optional = true} # TODO change to version # DB connectorx = {git="https://github.com/AnatolyBuga/connector-x", branch = "arrow49", features=["dst_arrow", "src_mysql"], optional = true} diff --git a/ultibi/ultibi_core/src/prelude.rs b/ultibi/ultibi_core/src/prelude.rs index 2d427c6..bd50209 100644 --- a/ultibi/ultibi_core/src/prelude.rs +++ b/ultibi/ultibi_core/src/prelude.rs @@ -1,4 +1,4 @@ -//pub use super::*; +#![allow(unused_imports)] pub use super::datarequest::*; pub use super::dataset::*; pub use super::execution::*;