Merge branch 'master' into update_dl3

cta-observatory · Oct 29, 2021 · bde676a · bde676a
2 parents 99289b6 + e758585
commit bde676a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/environment.yml b/environment.yml
@@ -17,6 +17,7 @@ dependencies:
   - toml
   - protozfits=2.0
   - pyparsing~=2.4
+  - traitlets=5.0
   - pip:
       - pytest_runner
       - pytest-ordering

diff --git a/setup.py b/setup.py
@@ -59,7 +59,7 @@ def find_scripts(script_dir, prefix):
         'scikit-learn',
         'tables',
         'toml',
-        'traitlets',
+        'traitlets~=5.0.5',
         'iminuit~=1.5',
         'pymongo',
         'pyparsing~=2.4'