From e411b906f1adfca24e09b5e1ac7fcdcf428f1553 Mon Sep 17 00:00:00 2001 From: Morten Ledum Date: Wed, 22 Dec 2021 05:52:11 +0100 Subject: [PATCH] Switch to the real PyPI index --- .docker/hpf/Dockerfile | 42 ----------------------------------- .github/workflows/release.yml | 8 +++---- hymd/version.py | 2 +- 3 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 .docker/hpf/Dockerfile diff --git a/.docker/hpf/Dockerfile b/.docker/hpf/Dockerfile deleted file mode 100644 index 4120dbf6..00000000 --- a/.docker/hpf/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -FROM ubuntu:20.04 - -# Fix for tzdata installation from -# https://rtfm.co.ua/en/docker-configure-tzdata-and-timezone-during-build/ -ENV TZ=Europe/Oslo -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - -RUN apt-get update && apt-get install -y \ - libopenmpi-dev=4.0.3-0ubuntu1 \ - libhdf5-openmpi-dev=1.10.4+repack-11ubuntu1 \ - pkg-config=0.29.1-0ubuntu4 \ - curl=7.68.0-1ubuntu2.2 \ - python3.8 \ - python3-pip - -RUN pip3 install --upgrade pip && \ - pip3 install --no-cache-dir cython==0.29.21 && \ - pip3 install --no-cache-dir numpy==1.19.1 && \ - pip3 install --no-cache-dir mpi4py==3.0.3 && \ - pip3 install --no-cache-dir cython==0.29.21 && \ - pip3 install --no-cache-dir networkx==2.5 && \ - pip3 install --no-cache-dir sympy==1.6.2 && \ - pip3 install --no-cache-dir pytest==6.0.1 && \ - pip3 install --no-cache-dir pytest-mpi==0.4 && \ - pip3 install --no-cache-dir mpsort==0.1.17 && \ - pip3 install --no-cache-dir pfft-python==0.1.21 && \ - pip3 install --no-cache-dir pmesh==0.1.56 && \ - pip3 install --no-cache-dir numba==0.51.2 - -COPY . /app -WORKDIR /app - -# Compile h5py with MPI support from source. The h5py install script does not -# like to be told where MPI includes are, so first we just put them where -# configure.py expects them to be. -RUN ln -s /usr/lib/x86_64-linux-gnu/openmpi/include/ /usr/include/openmpi - -RUN curl -L -o h5py.tar.gz \ - https://github.com/h5py/h5py/archive/6f4c578f78321b857da31eee0ce8d9b1ba291888.tar.gz -RUN tar -xzf h5py.tar.gz && rm h5py.tar.gz && \ - mv h5py-6f4c578f78321b857da31eee0ce8d9b1ba291888 h5py -RUN cd h5py && HDF5_MPI="ON" pip3 install -v . && cd .. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b3aa35da..31df52e4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,8 +3,8 @@ name: Upload Python Package on: - push: - branches: [ main ] + release: + types: [ created ] jobs: deploy: @@ -24,8 +24,8 @@ jobs: - name: Build and publish env: TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_TEST_PASSWORD }} + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | pip3 list python3 setup.py sdist - python3 -m twine upload --repository testpypi dist/* + python3 -m twine upload dist/* diff --git a/hymd/version.py b/hymd/version.py index 7863915f..5becc17c 100644 --- a/hymd/version.py +++ b/hymd/version.py @@ -1 +1 @@ -__version__ = "1.0.2" +__version__ = "1.0.0"