Update requirements.txt and diracos.json for release v1r9

config/diracos.json

@@ -1,5 +1,5 @@
 {
-   "version": "master",
+   "version": "v1r9",
    "comment": "This is the latest version",
    "rpmBuild": {
       "mockConfig": "../mockConfigs/mock-build-diracos.cfg",

config/requirements.txt

@@ -1,53 +1,111 @@
-# From repo
-git+https://github.com/DIRACGrid/pyGSI.git#egg=GSI
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile /tmp/fixed_requirements.txt
+#
+astroid==1.6.6            # via pylint
+atomicwrites==1.3.0       # via pytest
+attrs==19.3.0             # via hypothesis, pytest
+autopep8==1.3.3           # via -r /tmp/fixed_requirements.txt (line 4)
+awkward==0.12.20          # via uproot, uproot-methods
+backports-abc==0.5        # via tornado
+backports.functools-lru-cache==1.6.1  # via astroid, isort, matplotlib, pylint
+backports.lzma==0.0.14    # via -r /tmp/fixed_requirements.txt (line 50)
+backports.shutil-get-terminal-size==1.0.0  # via ipython
+cachetools==3.1.1         # via uproot
+certifi==2019.11.28       # via -r /tmp/fixed_requirements.txt (line 5), requests
+chardet==3.0.4            # via requests
+cmreshandler==1.0.0       # via -r /tmp/fixed_requirements.txt (line 6)
+codecov==2.0.16           # via -r /tmp/fixed_requirements.txt (line 7)
+configparser==4.0.2       # via importlib-metadata, pylint
+contextlib2==0.6.0.post1  # via importlib-metadata, zipp
+coverage==5.0.3           # via codecov, pytest-cov
+cycler==0.10.0            # via matplotlib
+decorator==4.4.1          # via ipython, traitlets
+docopt==0.6.2             # via stomp.py
+docutils==0.16            # via rst2pdf
+elasticsearch-dsl==6.4.0  # via -r /tmp/fixed_requirements.txt (line 8)
+elasticsearch==6.4.0      # via cmreshandler, elasticsearch-dsl
+enum34==1.1.9             # via astroid, hypothesis, traitlets
+enum==0.4.7               # via cmreshandler
+fts3-rest==3.8.4          # via -r /tmp/fixed_requirements.txt (line 9)
+funcsigs==1.0.2           # via -r /tmp/fixed_requirements.txt (line 10), mock, pytest
+future==0.18.2            # via -r /tmp/fixed_requirements.txt (line 11), lz4
+futures==3.3.0            # via -r /tmp/fixed_requirements.txt (line 12), isort, tornado
+gitdb2==2.0.6             # via gitpython
+gitpython==2.1.15         # via -r /tmp/fixed_requirements.txt (line 13)
+hypothesis==4.57.1        # via -r /tmp/fixed_requirements.txt (line 45)
+idna==2.9                 # via requests
+importlib-metadata==1.5.0  # via pluggy, pytest
+ipaddress==1.0.23         # via elasticsearch-dsl
+ipython-genutils==0.2.0   # via traitlets
+ipython==5.3.0            # via -r /tmp/fixed_requirements.txt (line 20)
+isort==4.3.21             # via pylint
+jinja2==2.11.1            # via -r /tmp/fixed_requirements.txt (line 19), rst2pdf
+kiwisolver==1.1.0         # via matplotlib
+lazy-object-proxy==1.4.3  # via astroid
+lz4==2.2.1                # via -r /tmp/fixed_requirements.txt (line 51)
+m2crypto==0.35.2          # via -r /tmp/fixed_requirements.txt (line 17), fts3-rest
+markupsafe==1.1.1         # via jinja2
+matplotlib==2.2.5         # via -r /tmp/fixed_requirements.txt (line 15)
+mccabe==0.6.1             # via pylint
+mock==3.0.5               # via -r /tmp/fixed_requirements.txt (line 16), pytest-mock
+more-itertools==5.0.0     # via pytest
+mysql-python==1.2.5       # via -r /tmp/fixed_requirements.txt (line 18)
+numpy==1.16.6             # via -r /tmp/fixed_requirements.txt (line 21), awkward, matplotlib, uproot, uproot-methods
+packaging==20.1           # via pytest
+pathlib2==2.3.5           # via importlib-metadata, ipython, pickleshare, pytest
+pdfrw==0.4                # via rst2pdf
+pexpect==4.8.0            # via -r /tmp/fixed_requirements.txt (line 22), ipython
+pickleshare==0.7.5        # via ipython
+pillow==6.2.2             # via reportlab
+pluggy==0.13.1            # via pytest
+prompt-toolkit==1.0.18    # via ipython
+psutil==5.7.0             # via -r /tmp/fixed_requirements.txt (line 23)
+ptyprocess==0.6.0         # via pexpect
+py==1.8.1                 # via pytest
+pyasn1-modules==0.2.8     # via -r /tmp/fixed_requirements.txt (line 25)
+pyasn1==0.4.8             # via -r /tmp/fixed_requirements.txt (line 24), pyasn1-modules
+pycodestyle==2.5.0        # via autopep8
+pycurl==7.19.0            # via fts3-rest
+pygments==2.5.2           # via -r /tmp/fixed_requirements.txt (line 26), ipython, rst2pdf
+pylint==1.9.5             # via -r /tmp/fixed_requirements.txt (line 27)
+pyparsing==2.4.6          # via -r /tmp/fixed_requirements.txt (line 28), matplotlib, packaging
+pytest-cov==2.8.1         # via -r /tmp/fixed_requirements.txt (line 30)
+pytest-mock==2.0.0        # via -r /tmp/fixed_requirements.txt (line 31)
+pytest==4.6.9             # via -r /tmp/fixed_requirements.txt (line 29), pytest-cov, pytest-mock
+python-dateutil==2.8.1    # via elasticsearch-dsl, matplotlib
+python-json-logger==0.1.11  # via -r /tmp/fixed_requirements.txt (line 46)
+pytz==2019.3              # via -r /tmp/fixed_requirements.txt (line 32), matplotlib
+readline==6.2.4.1         # via -r /tmp/fixed_requirements.txt (line 33)
+reportlab==3.5.34         # via rst2pdf
+requests==2.23.0          # via -r /tmp/fixed_requirements.txt (line 34), cmreshandler, codecov, fts3-rest
+rst2pdf==0.96             # via -r /tmp/fixed_requirements.txt (line 35)
+scandir==1.10.0           # via pathlib2
+simplegeneric==0.8.1      # via ipython
+simplejson==3.17.0        # via -r /tmp/fixed_requirements.txt (line 36)
+singledispatch==3.4.0.3   # via astroid, pylint, tornado
+six==1.14.0               # via -r /tmp/fixed_requirements.txt (line 37), astroid, cycler, elasticsearch-dsl, matplotlib, mock, more-itertools, packaging, pathlib2, prompt-toolkit, pylint, pytest, python-dateutil, rst2pdf, singledispatch, traitlets
+smartypants==2.0.1        # via rst2pdf
+smmap2==3.0.1             # via gitdb2
+smmap==3.0.1              # via smmap2
+sortedcontainers==2.1.0   # via hypothesis
+sqlalchemy==1.3.13        # via -r /tmp/fixed_requirements.txt (line 38)
+stomp.py==4.1.22          # via -r /tmp/fixed_requirements.txt (line 40)
+subprocess32==3.5.4       # via -r /tmp/fixed_requirements.txt (line 41), matplotlib
+suds-jurko==0.6           # via -r /tmp/fixed_requirements.txt (line 42)
+tornado==5.1.1            # via -r /tmp/fixed_requirements.txt (line 47)
+traitlets==4.3.3          # via ipython
+typing==3.6.6             # via -r /tmp/fixed_requirements.txt (line 44), m2crypto
+uproot-methods==0.7.3     # via uproot
+uproot==3.11.3            # via -r /tmp/fixed_requirements.txt (line 49)
+urllib3==1.25.8           # via elasticsearch, requests
+wcwidth==0.1.8            # via prompt-toolkit, pytest
+wrapt==1.12.0             # via astroid
+xxhash==1.4.3             # via -r /tmp/fixed_requirements.txt (line 52)
+zipp==1.2.0               # via importlib-metadata
 
-# From pypi
-autopep8==1.3.3
-certifi
-CMRESHandler>=1.0.0b4
-codecov
-elasticsearch-dsl>=6.0.0,<7.0.0
-fts3-rest
-funcsigs
-future
-futures
-GitPython>=2.1.0
-# newer versions of matplotlib require python 3
-matplotlib>=2.1.0,<3.0
-mock>=1.0.1
-M2Crypto
-MySQL-python>=1.2.5
-jinja2
-ipython==5.3.0
-numpy>=1.10.1
-pexpect>=4.0.1
-psutil>=4.2.0
-pyasn1>0.4.1
-pyasn1_modules
-Pygments>=1.5
-pylint>=1.6.5
-pyparsing>=2.0.6
-pytest>=3.6
-pytest-cov>=2.2.0
-pytest-mock
-pytz>=2015.7
-readline>=6.2.4
-requests>=2.9.1
-rst2pdf>=0.93
-simplejson>=3.8.1
-six>=1.10
-sqlalchemy>=1.0.9
-# More recent version of stomp are python 3 only
-stomp.py==4.1.22
-subprocess32
-suds-jurko>=0.6
-# typing comes in via m2crypto. newer versions of typing caused an error in hypothesis
-typing==3.6.6
-hypothesis
-python-json-logger>=0.1.8
-tornado>=5.0.0,<6.0.0
-# Add uproot and optional compression related libraries
-uproot
-backports.lzma
-lz4
-xxhash
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
+git+https://github.com/DIRACGrid/pyGSI.git#egg=GSI