[ci skip] Merge PR 21839

Merge PR #21839, commits were: 
 * fix dep
 * Fix modlamp
 * Merge branch 'master' into bump/modlamp
 * Update modlamp to 4.2.1
 * Update modlamp to 4.2.0
 * Update modlamp to 4.1.4

recipes/modlamp/meta.yaml

@@ -1,13 +1,15 @@
 {% set name = "modlamp" %}
-{% set version = "4.1.2" %}
+{% set version = "4.2.1" %}
 
 package:
   name: "{{ name|lower }}"
   version: "{{ version }}"
 
 source:
   url: "https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz"
-  sha256: "01a2035f4325419f73eb9a80bdcf4e0cca37940572ca7376778501dd5e1b08fc"
+  sha256: "98a7fcd0779510f8c788f4e73ab7e6e5eabd428e465606bb2178a1281a857a54"
+  patches:
+    - patch
 
 build:
   noarch: python
@@ -16,28 +18,19 @@ build:
 
 requirements:
   host:
-    - lxml >=3.6.4
-    - matplotlib-base >=1.5.1
-    - nose >=1.3.7
-    - numpy >=1.10.4
-    - pandas >=0.18.1
     - pip
     - python
-    - requests >=2.11.1
-    - scikit-learn >=0.18.0
-    - scipy >=0.17.0
-    - setuptools >=20.2.2
   run:
     - lxml >=3.6.4
     - matplotlib-base >=1.5.1
-    - nose >=1.3.7
     - numpy >=1.10.4
     - pandas >=0.18.1
     - python
     - requests >=2.11.1
     - scikit-learn >=0.18.0
     - scipy >=0.17.0
-    - setuptools >=20.2.2
+    - joblib >=0.15.1
+    - mysql-connector-python >=2.2.9
 
 test:
   imports:

recipes/modlamp/patch

@@ -0,0 +1,21 @@
+--- setup.py	2020-06-12 14:08:56.000000000 +0200
++++ setup.bak	2020-06-14 15:28:40.063679415 +0200
+@@ -6,10 +6,6 @@
+ except ImportError:  # for pip <= 9.0.3
+     from pip.req import parse_requirements
+
+-# parse the requirements from the requirements file
+-install_reqs = parse_requirements('requirements.txt', session='hack')
+-reqs = [str(ir.req) for ir in install_reqs][:-1]
+-
+ with open('README.rst') as f:
+     readme = f.read()
+
+@@ -35,6 +31,5 @@
+           'Topic :: Scientific/Engineering :: Medical Science Apps.',
+           'License :: OSI Approved :: BSD License',
+           'Programming Language :: Python :: 3',
+-          'Programming Language :: Python :: 3.6'],
+-      install_requires=reqs
++          'Programming Language :: Python :: 3.6']
+       )