From 4a816e8455331d4464e7b4ceabd4597536120178 Mon Sep 17 00:00:00 2001 From: Oier Lauzirika Zarrabeitia Date: Mon, 25 Mar 2024 15:21:57 +0100 Subject: [PATCH 1/5] Fixing installation with updated modelangelo --- modelangelo/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modelangelo/__init__.py b/modelangelo/__init__.py index 875dbfa..7ec0f14 100644 --- a/modelangelo/__init__.py +++ b/modelangelo/__init__.py @@ -92,7 +92,7 @@ def getCondaInstallation(version): installationCmd += 'conda create -y -n modelangelo-' + version + ' python=3.10 && ' installationCmd += cls.getActivationCmd(version) + ' && ' installationCmd += 'conda install -y pytorch torchvision torchaudio pytorch-cuda=11.7 -c pytorch -c nvidia && ' - installationCmd += 'cd model-angelo && pip install -r requirements.txt && ' + installationCmd += 'cd model-angelo && ' installationCmd += 'pip install -e . && ' installationCmd += 'touch ../env-created.txt' From 1be648cdcf84cc36ee3ba5cb7103837f48367e6a Mon Sep 17 00:00:00 2001 From: Oier Lauzirika Zarrabeitia Date: Wed, 3 Apr 2024 16:26:32 +0200 Subject: [PATCH 2/5] Update CHANGES.txt --- CHANGES.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 2842b1c..eb9dcc7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,4 +2,5 @@ - update installation - create constants - add MODEL_ANGELO_CUDA_LIB -3.0.1: Installation does not fail but is never complete. So installb modelangelo will git pull all the time. \ No newline at end of file +3.0.1: Installation does not fail but is never complete. So installb modelangelo will git pull all the time. +3.1.1: Fixed installation to be on pair with the changes introduced by the program developers. From 5c1f638dc5c81ca08173671d36e929f0a1dca8c8 Mon Sep 17 00:00:00 2001 From: Oier Lauzirika Zarrabeitia Date: Wed, 3 Apr 2024 16:52:10 +0200 Subject: [PATCH 3/5] Update version on __init__.py --- modelangelo/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modelangelo/__init__.py b/modelangelo/__init__.py index 7ec0f14..4c03eb5 100644 --- a/modelangelo/__init__.py +++ b/modelangelo/__init__.py @@ -32,7 +32,7 @@ from .constants import * -__version__ = "3.1" +__version__ = "3.1.1" _logo = "logo.jpeg" _references = ['jamali2023'] From bafb01f9c6241b908a28b13a774ee6aa0578f79a Mon Sep 17 00:00:00 2001 From: Grigory Sharov Date: Thu, 4 Apr 2024 12:23:16 +0100 Subject: [PATCH 4/5] update cuda to match the official instructions --- modelangelo/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modelangelo/__init__.py b/modelangelo/__init__.py index 4c03eb5..c66693f 100644 --- a/modelangelo/__init__.py +++ b/modelangelo/__init__.py @@ -91,7 +91,7 @@ def getCondaInstallation(version): installationCmd = cls.getCondaActivationCmd() installationCmd += 'conda create -y -n modelangelo-' + version + ' python=3.10 && ' installationCmd += cls.getActivationCmd(version) + ' && ' - installationCmd += 'conda install -y pytorch torchvision torchaudio pytorch-cuda=11.7 -c pytorch -c nvidia && ' + installationCmd += 'conda install -y pytorch torchvision torchaudio pytorch-cuda=11.8 -c pytorch -c nvidia && ' installationCmd += 'cd model-angelo && ' installationCmd += 'pip install -e . && ' installationCmd += 'touch ../env-created.txt' From 752d8f944cc082c1bfd55819ef420890e58ff198 Mon Sep 17 00:00:00 2001 From: Grigory Sharov Date: Thu, 4 Apr 2024 12:29:38 +0100 Subject: [PATCH 5/5] update GH workflow --- .github/workflows/publish_and_tag.yml | 47 ++++----------------------- MANIFEST.in | 1 - modelangelo/__init__.py | 2 +- 3 files changed, 8 insertions(+), 42 deletions(-) diff --git a/.github/workflows/publish_and_tag.yml b/.github/workflows/publish_and_tag.yml index ffb9f7e..5e21b7d 100644 --- a/.github/workflows/publish_and_tag.yml +++ b/.github/workflows/publish_and_tag.yml @@ -1,47 +1,14 @@ -# Workflow to send master to pypi and tag the branch: -# You need to edit FOLDER_WITH_VERSION with the folder that has the __version__ value. - +# Workflow to send master to pypi and tag the branch name: master to pypi with comments and tag - -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the master branch +# Triggers the workflow on push to the master branch on: push: branches: [ master ] -env: - FOLDER_WITH_VERSION: modelangelo -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - deploy: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up MPI - uses: mpi4py/setup-mpi@v1 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.8' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install setuptools wheel twine - pip install scipion-pyworkflow - pip install scipion-em - pip install scipion-app - - name: Build and publish - env: - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: | - python setup.py sdist bdist_wheel - twine upload dist/* -c "${{ secrets.PYPI_COMMENT }}" - - name: Get version and tag - run: | - export PACKAGE_VERSION=$(python -c "import $FOLDER_WITH_VERSION; print('VERSION', 'v'+$FOLDER_WITH_VERSION.__version__)" | grep VERSION | sed "s/VERSION //g") - git tag $PACKAGE_VERSION - git push origin $PACKAGE_VERSION + call-publish-workflow: + uses: scipion-em/.github/.github/workflows/publish_and_tag.yml@master + with: + folder: modelangelo + secrets: inherit diff --git a/MANIFEST.in b/MANIFEST.in index d4b7d19..5de7bc2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,4 +2,3 @@ include *.txt include *.rst include LICENSE include modelangelo/protocols.conf -include modelangelo/logo.jpeg \ No newline at end of file diff --git a/modelangelo/__init__.py b/modelangelo/__init__.py index c66693f..362b616 100644 --- a/modelangelo/__init__.py +++ b/modelangelo/__init__.py @@ -68,7 +68,7 @@ def getEnviron(cls): @classmethod def getActivationCmd(cls, version): - return'conda activate modelangelo-' + version + return 'conda activate modelangelo-' + version @classmethod def defineBinaries(cls, env):