diff --git a/.github/workflows/publish_and_release.yml b/.github/workflows/publish_and_release.yml index e4c3f03b..db591cca 100644 --- a/.github/workflows/publish_and_release.yml +++ b/.github/workflows/publish_and_release.yml @@ -197,7 +197,30 @@ jobs: uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.PYPI_API_TOKEN }} - + Test_PyPi_Release: + name: Test_PyPi_version_on_${{ matrix.os }} + runs-on: ${{ matrix.os }} + needs: Create_PyPi_Release + strategy: + matrix: + os: [ubuntu-latest, macOS-latest, windows-latest] + steps: + - uses: actions/checkout@v2 + - uses: conda-incubator/setup-miniconda@v2 + with: + auto-update-conda: true + python-version: ${{ matrix.python-version }} + - name: Conda info + shell: bash -l {0} + run: conda info + - name: Test pip installation from PyPi + shell: bash -l {0} + run: | + conda create -n alphatims_pip_test python=3.8 -y + conda activate alphatims_pip_test + pip install "alphatims[stable,plotting-stable,legacy-stable]" + alphatims + conda deactivate Create_Docker_Release: # Adapted from wfondrie/mokapot's docker actions runs-on: ubuntu-latest @@ -213,7 +236,9 @@ jobs: - name: Build Wheel run: | + python -m pip install wheel twine python setup.py bdist_wheel + twine check dist/* - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -239,28 +264,3 @@ jobs: platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - Test_PyPi_Release: - name: Test_PyPi_version_on_${{ matrix.os }} - runs-on: ${{ matrix.os }} - needs: Create_PyPi_Release - strategy: - matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] - steps: - - uses: actions/checkout@v2 - - uses: conda-incubator/setup-miniconda@v2 - with: - auto-update-conda: true - python-version: ${{ matrix.python-version }} - - name: Conda info - shell: bash -l {0} - run: conda info - - name: Test pip installation from PyPi - shell: bash -l {0} - run: | - conda create -n alphatims_pip_test python=3.8 -y - conda activate alphatims_pip_test - pip install "alphatims[stable,plotting-stable,legacy-stable]" - alphatims - conda deactivate diff --git a/misc/pyinstaller/alphatims.spec b/misc/pyinstaller/alphatims.spec index 8ecd4585..6044c68c 100644 --- a/misc/pyinstaller/alphatims.spec +++ b/misc/pyinstaller/alphatims.spec @@ -75,18 +75,18 @@ else: hidden_imports = [h for h in hidden_imports if "__pycache__" not in h] datas = [d for d in datas if ("__pycache__" not in d[0]) and (d[1] not in [".", "Resources", "scripts"])] -if sys.platform[:5] == "win32": - base_path = os.path.dirname(sys.executable) - library_path = os.path.join(base_path, "Library", "bin") - dll_path = os.path.join(base_path, "DLLs") - libcrypto_dll_path = os.path.join(dll_path, "libcrypto-1_1-x64.dll") - libssl_dll_path = os.path.join(dll_path, "libssl-1_1-x64.dll") - libcrypto_lib_path = os.path.join(library_path, "libcrypto-1_1-x64.dll") - libssl_lib_path = os.path.join(library_path, "libssl-1_1-x64.dll") - if not os.path.exists(libcrypto_dll_path): - datas.append((libcrypto_lib_path, ".")) - if not os.path.exists(libssl_dll_path): - datas.append((libssl_lib_path, ".")) +# if sys.platform[:5] == "win32": +# base_path = os.path.dirname(sys.executable) +# library_path = os.path.join(base_path, "Library", "bin") +# dll_path = os.path.join(base_path, "DLLs") +# libcrypto_dll_path = os.path.join(dll_path, "libcrypto-1_1-x64.dll") +# libssl_dll_path = os.path.join(dll_path, "libssl-1_1-x64.dll") +# libcrypto_lib_path = os.path.join(library_path, "libcrypto-1_1-x64.dll") +# libssl_lib_path = os.path.join(library_path, "libssl-1_1-x64.dll") +# if not os.path.exists(libcrypto_dll_path): +# datas.append((libcrypto_lib_path, ".")) +# if not os.path.exists(libssl_dll_path): +# datas.append((libssl_lib_path, ".")) a = Analysis( [script_name],