Merge pull request #14 from scipion-em/devel

release devel

.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

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.
+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.

MANIFEST.in

@@ -2,4 +2,3 @@ include *.txt
 include *.rst
 include LICENSE
 include modelangelo/protocols.conf
-include modelangelo/logo.jpeg

modelangelo/__init__.py

@@ -32,7 +32,7 @@
 
 from .constants import *
 
-__version__ = "3.1"
+__version__ = "3.1.1"
 _logo = "logo.jpeg"
 _references = ['jamali2023']
 
@@ -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):
@@ -91,8 +91,8 @@ 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 += 'cd model-angelo && pip install -r requirements.txt && '
+            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'