Merge pull request #47 from genouest/sort

Sort downloads in proper alphabetical order

.github/workflows/ci.yml

@@ -0,0 +1,56 @@
+name: Lint, test and publish
+
+on: ["push"]
+
+jobs:
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+    - name: Install Flake8
+      run: |
+        pip install flake8
+    - name: Flake8
+      run: flake8 --ignore=E501,W504 biomaj_download/*.py biomaj_download/download
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+    - name: Install requirements
+      run: |
+        sudo apt update
+        sudo apt install libcurl4-openssl-dev libssl-dev
+        pip install pytest
+        python setup.py install
+    - name: Run tests
+      run: |
+        LOCAL_IRODS=0 NETWORK=0 pytest -v tests/biomaj_tests.py
+
+  pypi:
+    runs-on: ubuntu-latest
+    needs: [lint, test]
+    name: Deploy release to Pypi
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+    - name: Python install
+      run: pip install -U pip setuptools build
+    - name: Build a binary wheel and a source tarball
+      run: python -m build --sdist --wheel --outdir dist/ .
+    - name: Publish distribution 📦 to PyPI
+      if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        password: ${{ secrets.pypi_password }}

CHANGES.txt

@@ -1,3 +1,6 @@
+3.2.12:
+  Sort downloads in proper alphabetical order
+
 3.2.11:
   fix direct handler in case of plugin usage
 

biomaj_download/downloadclient.py

@@ -209,7 +209,7 @@ def wait_for_download(self):
                         for i in range(max_submit):
                             if self.download_pool:
                                 logging.debug('Workflow:wf_download:RemoteDownload:RequestNewFile')
-                                operation = self.download_pool.pop()
+                                operation = self.download_pool.pop(0)
                                 self.ask_download(operation)
                                 nb_submitted += 1
 

requirements.txt

@@ -1,4 +1,3 @@
-pytest
 pycurl
 py-bcrypt
 pika==0.13.0
@@ -11,7 +10,6 @@ prometheus_client>=0.0.18
 requests
 biomaj_core>=3.0.19
 biomaj_zipkin
-flake8
 humanfriendly
 python-irodsclient
 simpleeval

setup.cfg

@@ -1,2 +1,8 @@
 [bdist_wheel]
 universal=1
+
+[metadata]
+description-file = README.md
+
+[flake8]
+ignore = E501,W504

setup.py

@@ -22,11 +22,11 @@
     'description': 'BioMAJ download service',
     'long_description': README + '\n\n' + CHANGES,
     'long_description_content_type': 'text/markdown',
-    'author': 'Olivier Sallou',
-    'url': 'http://biomaj.genouest.org',
-    'download_url': 'http://biomaj.genouest.org',
-    'author_email': '[email protected]',
-    'version': '3.2.11',
+    'author': 'GenOuest platform',
+    'url': 'https://biomaj.genouest.org',
+    'download_url': 'https://biomaj.genouest.org',
+    'author_email': '[email protected]',
+    'version': '3.2.12',
     'classifiers': [
         # How mature is this project? Common values are
         #   3 - Alpha