From 08a9ea8af12f9b66e1b00e7d937506a10cc1db5f Mon Sep 17 00:00:00 2001 From: Parashar Date: Fri, 26 Jul 2024 16:53:08 +0200 Subject: [PATCH] fixes for deployment --- .github/workflows/pytest.yml | 4 ++-- Dockerfile | 31 +------------------------------ MANIFEST.in | 2 +- VERSION | 2 +- 4 files changed, 5 insertions(+), 34 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 5e02cdc..24744f6 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -18,9 +18,9 @@ jobs: os: [ubuntu-22.04, windows-2019] python-version: [3.11.9] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/Dockerfile b/Dockerfile index f0ce278..cae4f98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 RUN apt update -y && apt autoremove -y && apt clean -y && apt autoclean -y && apt upgrade -y RUN apt install -y wget build-essential git nano @@ -24,34 +24,5 @@ ENV PATH=$PATH:/root/miniconda3/bin:/workspace/bin # Installing numpy and pybind11 beforehand because sometimes they don't install so well from requirements.txt RUN pip install --upgrade pip RUN pip install --no-cache-dir -U numpy pybind11 -RUN pip install --no-cache-dir -U dask<=2021.03.1 - -# Needed for dask -RUN conda install -c conda-forge 'fsspec>=0.3.3' - -# This for interactive programming purposes -RUN pip install jupyterlab ipython-autotime -#RUN conda install nodejs - -# For compiling docs -RUN pip install Sphinx sphinx-autodoc-typehints nbsphinx sphinx_rtd_theme - -# For building vignettes -RUN conda install -y nodejs -RUN conda install -y -c conda-forge pandoc -RUN pip install jupytext -RUN jupyter lab build -y RUN pip install scarf - -# Building from Github repo -#RUN mkdir -p /tmp/scarf -#COPY . /tmp/scarf/ -#RUN pip install -e /tmp/scarf/ - -RUN mkdir workspace && \ - echo "jupyter lab --port 9734 --ip=0.0.0.0 --allow-root --no-browser" > launch_jupyter.sh - -# If you want to launch jupyter manually then feel free to comment this out. -CMD cd workspace && \ - bash ../launch_jupyter.sh diff --git a/MANIFEST.in b/MANIFEST.in index d8d78b2..70740d6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,13 +5,13 @@ exclude .gitignore exclude .gitattribute exclude .readthedocs.yml exclude Dockerfile -exclude push_pypi.sh prune scarf_toolkit.egg-info prune docs prune scarf/tests prune .circleci prune .github include requirements.txt +include requirements_extra.txt include VERSION include pypi_README.rst graft bin diff --git a/VERSION b/VERSION index 25939d3..20f0687 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.29.1 +0.29.2