From bb2647ba70bc0465ed9ccecb798ee3ab27bcde80 Mon Sep 17 00:00:00 2001
From: liamhuber <liamhuber@greyhavensolutions.com>
Date: Wed, 14 Feb 2024 13:05:11 -0800
Subject: [PATCH] Move contrib and h5io_browser to the main dependencies

---
 .ci_support/environment-tinybase.yml | 6 ------
 .ci_support/environment.yml          | 2 ++
 setup.py                             | 7 ++-----
 3 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 .ci_support/environment-tinybase.yml

diff --git a/.ci_support/environment-tinybase.yml b/.ci_support/environment-tinybase.yml
deleted file mode 100644
index a766e7ca..00000000
--- a/.ci_support/environment-tinybase.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-channels:
-- conda-forge
-dependencies:
-- boto3
-- h5io_browser =0.0.6
-- pyiron_contrib =0.1.14
\ No newline at end of file
diff --git a/.ci_support/environment.yml b/.ci_support/environment.yml
index 978884a7..acbc180e 100644
--- a/.ci_support/environment.yml
+++ b/.ci_support/environment.yml
@@ -7,7 +7,9 @@ dependencies:
 - cloudpickle =3.0.0
 - graphviz =8.1.0
 - h5io =0.2.2
+- h5io_browser =0.0.6
 - matplotlib =3.8.2
+- pyiron_contrib =0.1.14
 - pympipool =0.7.13
 - python-graphviz =0.20.1
 - toposort =1.10
diff --git a/setup.py b/setup.py
index e8d02b61..835f8959 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,9 @@
         'cloudpickle==3.0.0',
         'graphviz==0.20.1',
         'h5io==0.2.2',
+        'h5io_browser==0.0.6',
         'matplotlib==3.8.2',
+        'pyiron_contrib==0.1.14',
         'pympipool==0.7.13',
         'toposort==1.10',
         'typeguard==4.1.5',
@@ -45,11 +47,6 @@
             'phonopy==2.21.0',
             'pyiron_atomistics==0.4.14',
         ],
-        "tinybase": [
-            'boto3',  # Just because pyiron_contrib is not making sure it's there
-            'h5io_browser==0.0.6',
-            'pyiron_contrib==0.1.14',
-        ]
     },
     cmdclass=versioneer.get_cmdclass(),