Update requirements.txt and diracos.json for release v1r15

config/diracos.json

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

config/requirements.txt

@@ -1,57 +1,113 @@
-# 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.4.0       # via pytest
+attrs==20.2.0             # via hypothesis, pytest
+autopep8==1.3.3           # via -r /tmp/fixed_requirements.txt
+awkward==0.13.0           # via uproot, uproot-methods
+backports-abc==0.5        # via tornado
+backports.functools-lru-cache==1.6.1  # via astroid, isort, matplotlib, pylint, wcwidth
+backports.lzma==0.0.14    # via -r /tmp/fixed_requirements.txt
+backports.shutil-get-terminal-size==1.0.0  # via ipython
+boto3==1.16.5             # via -r /tmp/fixed_requirements.txt
+botocore==1.19.5          # via boto3, s3transfer
+cachetools==3.1.1         # via uproot
+certifi==2020.6.20        # via -r /tmp/fixed_requirements.txt, requests
+chardet==3.0.4            # via requests
+cmreshandler==1.0.0       # via -r /tmp/fixed_requirements.txt
+codecov==2.1.10           # via -r /tmp/fixed_requirements.txt
+configparser==4.0.2       # via importlib-metadata, pylint
+contextlib2==0.6.0.post1  # via importlib-metadata, zipp
+coverage==5.3             # via codecov, pytest-cov
+cycler==0.10.0            # via matplotlib
+decorator==4.4.2          # via ipython, traitlets
+diraccfg==0.2.0           # via -r /tmp/fixed_requirements.txt
+docopt==0.6.2             # via stomp.py
+docutils==0.16            # via -r /tmp/fixed_requirements.txt
+elasticsearch-dsl==6.4.0  # via -r /tmp/fixed_requirements.txt
+elasticsearch==6.8.1      # via cmreshandler, elasticsearch-dsl
+enum34==1.1.10            # via astroid, hypothesis, traitlets
+enum==0.4.7               # via cmreshandler
+flaky==3.7.0              # via -r /tmp/fixed_requirements.txt
+fts3-rest==3.9.4          # via -r /tmp/fixed_requirements.txt
+funcsigs==1.0.2           # via -r /tmp/fixed_requirements.txt, mock, pytest
+future==0.18.2            # via -r /tmp/fixed_requirements.txt, lz4
+futures==3.3.0            # via -r /tmp/fixed_requirements.txt, isort, s3transfer, tornado
+gitdb2==2.0.6             # via gitpython
+gitpython==2.1.15         # via -r /tmp/fixed_requirements.txt
+hypothesis==4.57.1        # via -r /tmp/fixed_requirements.txt
+idna==2.10                # via requests
+importlib-metadata==2.0.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
+isort==4.3.21             # via pylint
+jinja2==2.11.2            # via -r /tmp/fixed_requirements.txt
+jmespath==0.10.0          # via boto3, botocore
+kiwisolver==1.1.0         # via matplotlib
+lazy-object-proxy==1.5.1  # via astroid
+lz4==2.2.1                # via -r /tmp/fixed_requirements.txt
+m2crypto==0.36.0          # via -r /tmp/fixed_requirements.txt, fts3-rest
+markupsafe==1.1.1         # via jinja2
+matplotlib==2.2.5         # via -r /tmp/fixed_requirements.txt
+mccabe==0.6.1             # via pylint
+mock==3.0.5               # via -r /tmp/fixed_requirements.txt, pytest-mock
+more-itertools==5.0.0     # via pytest
+mysql-python==1.2.5       # via -r /tmp/fixed_requirements.txt
+numpy==1.16.6             # via -r /tmp/fixed_requirements.txt, awkward, matplotlib, uproot, uproot-methods
+packaging==20.4           # via pytest
+pathlib2==2.3.5           # via importlib-metadata, ipython, pickleshare, pytest
+pexpect==4.8.0            # via -r /tmp/fixed_requirements.txt, ipython
+pickleshare==0.7.5        # via ipython
+pillow==6.2.2             # via -r /tmp/fixed_requirements.txt
+pluggy==0.13.1            # via pytest
+prompt-toolkit==1.0.18    # via ipython
+psutil==5.7.3             # via -r /tmp/fixed_requirements.txt
+ptyprocess==0.6.0         # via pexpect
+py==1.9.0                 # via pytest
+pyasn1-modules==0.2.8     # via -r /tmp/fixed_requirements.txt
+pyasn1==0.4.8             # via -r /tmp/fixed_requirements.txt, pyasn1-modules
+pycodestyle==2.6.0        # via autopep8
+pycurl==7.19.0            # via fts3-rest
+pygments==2.5.2           # via -r /tmp/fixed_requirements.txt, ipython
+pylint==1.9.5             # via -r /tmp/fixed_requirements.txt
+pyparsing==2.4.7          # via -r /tmp/fixed_requirements.txt, matplotlib, packaging
+pytest-cov==2.10.1        # via -r /tmp/fixed_requirements.txt
+pytest-mock==2.0.0        # via -r /tmp/fixed_requirements.txt
+pytest==4.6.11            # via -r /tmp/fixed_requirements.txt, pytest-cov, pytest-mock
+python-dateutil==2.8.1    # via botocore, elasticsearch-dsl, matplotlib
+python-json-logger==0.1.11  # via -r /tmp/fixed_requirements.txt
+pytz==2020.1              # via -r /tmp/fixed_requirements.txt, matplotlib
+readline==6.2.4.1         # via -r /tmp/fixed_requirements.txt
+requests==2.24.0          # via -r /tmp/fixed_requirements.txt, cmreshandler, codecov, fts3-rest
+s3transfer==0.3.3         # via boto3
+scandir==1.10.0           # via pathlib2
+simplegeneric==0.8.1      # via ipython
+simplejson==3.17.2        # via -r /tmp/fixed_requirements.txt
+singledispatch==3.4.0.3   # via astroid, pylint, tornado
+six==1.15.0               # via -r /tmp/fixed_requirements.txt, astroid, cycler, elasticsearch-dsl, matplotlib, mock, more-itertools, packaging, pathlib2, prompt-toolkit, pylint, pytest, python-dateutil, singledispatch, traitlets
+smmap2==3.0.1             # via gitdb2
+smmap==3.0.4              # via smmap2
+sortedcontainers==2.2.2   # via hypothesis
+sqlalchemy==1.3.20        # via -r /tmp/fixed_requirements.txt
+stomp.py==4.1.22          # via -r /tmp/fixed_requirements.txt
+subprocess32==3.5.4       # via -r /tmp/fixed_requirements.txt, matplotlib
+suds-jurko==0.6           # via -r /tmp/fixed_requirements.txt
+tornado==5.1.1            # via -r /tmp/fixed_requirements.txt
+traitlets==4.3.3          # via ipython
+typing==3.6.6             # via -r /tmp/fixed_requirements.txt, m2crypto
+uproot-methods==0.7.4     # via uproot
+uproot==3.12.0            # via -r /tmp/fixed_requirements.txt
+urllib3==1.25.11          # via botocore, elasticsearch, requests
+wcwidth==0.2.5            # via prompt-toolkit, pytest
+wrapt==1.12.1             # via astroid
+xxhash==2.0.0             # via -r /tmp/fixed_requirements.txt
+zipp==1.2.0               # via importlib-metadata
 
-# From pypi
-autopep8==1.3.3
-boto3
-certifi
-CMRESHandler>=1.0.0b4
-codecov
-diraccfg
-docutils
-elasticsearch-dsl>=6.0.0,<7.0.0
-flaky
-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
-pillow
-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
-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