Merge branch 'master' of https://github.com/carlislewishard/swiftest

environment.yml

@@ -5,18 +5,19 @@ channels:
   - defaults
 
 dependencies:
-  - numpy
-  - scipy
-  - matplotlib
-  - pandas
-  - xarray
-  - h5netcdf
-  - netcdf4
-  - dask
-  - bottleneck
-  - astropy
-  - astroquery
-  - tqdm
-  - x264
-  - ffmpeg
+  - python>=3.8
+  - numpy>=1.24.3
+  - pandas>=1.5.3
+  - scipy>=1.10.1
+  - xarray>=2022.11.0
+  - dask>=2022.1
+  - bottleneck>=1.3.5
+  - h5netcdf>=1.0.2
+  - netcdf4>=1.6.2
+  - matplotlib>=3.7.1
+  - astropy>=5.1
+  - astroquery>=0.4.6
+  - tqdm>=4.65.0
+  - x264>=1!157.20191217
+  - ffmpeg>=4.3.2
   - conda-build

python/swiftest/requirements.txt

@@ -1,86 +1,16 @@
-argon2-cffi @ file:///tmp/build/80754af9/argon2-cffi_1613036642480/work
-astropy==4.2.1
-astroquery==0.4.2
-async-generator==1.10
-attrs @ file:///tmp/build/80754af9/attrs_1620827162558/work
-backcall @ file:///home/ktietz/src/ci/backcall_1611930011877/work
-beautifulsoup4==4.9.3
-bleach @ file:///tmp/build/80754af9/bleach_1612211392645/work
-certifi==2021.5.30
-cffi @ file:///tmp/build/80754af9/cffi_1613246939562/work
-chardet==4.0.0
-cryptography==3.4.7
-cycler==0.10.0
-decorator @ file:///tmp/build/80754af9/decorator_1621259047763/work
-defusedxml @ file:///tmp/build/80754af9/defusedxml_1615228127516/work
-entrypoints==0.3
-html5lib==1.1
-idna==2.10
-importlib-metadata==4.5.0
-ipykernel==5.5.5
-ipython @ file:///tmp/build/80754af9/ipython_1617118429768/work
-ipython-genutils @ file:///tmp/build/80754af9/ipython_genutils_1606773439826/work
-ipywidgets @ file:///tmp/build/80754af9/ipywidgets_1610481889018/work
-jedi==0.17.0
-jeepney==0.6.0
-Jinja2 @ file:///tmp/build/80754af9/jinja2_1621238361758/work
-jsonschema @ file:///tmp/build/80754af9/jsonschema_1602607155483/work
-jupyter==1.0.0
-jupyter-client @ file:///tmp/build/80754af9/jupyter_client_1616770841739/work
-jupyter-console @ file:///tmp/build/80754af9/jupyter_console_1616615302928/work
-jupyter-core @ file:///tmp/build/80754af9/jupyter_core_1612213308260/work
-jupyterlab-pygments @ file:///tmp/build/80754af9/jupyterlab_pygments_1601490720602/work
-jupyterlab-widgets @ file:///tmp/build/80754af9/jupyterlab_widgets_1609884341231/work
-keyring==23.0.1
-kiwisolver @ file:///tmp/build/80754af9/kiwisolver_1612282414123/work
-MarkupSafe @ file:///tmp/build/80754af9/markupsafe_1621528142364/work
-matplotlib==3.4.2
-mistune @ file:///tmp/build/80754af9/mistune_1594373098390/work
-mkl-random @ file:///tmp/build/80754af9/mkl_random_1618853974840/work
-mkl-service==2.3.0
-nbclient @ file:///tmp/build/80754af9/nbclient_1614364831625/work
-nbconvert @ file:///tmp/build/80754af9/nbconvert_1601914821128/work
-nbformat @ file:///tmp/build/80754af9/nbformat_1617383369282/work
-nest-asyncio @ file:///tmp/build/80754af9/nest-asyncio_1613680548246/work
-notebook @ file:///tmp/build/80754af9/notebook_1621523661196/work
-numpy==1.20.3
-olefile==0.46
-packaging @ file:///tmp/build/80754af9/packaging_1611952188834/work
-pandas==1.2.4
-pandocfilters @ file:///tmp/build/80754af9/pandocfilters_1605120451932/work
-parso @ file:///tmp/build/80754af9/parso_1617223946239/work
-pexpect @ file:///tmp/build/80754af9/pexpect_1605563209008/work
-pickleshare @ file:///tmp/build/80754af9/pickleshare_1606932040724/work
-Pillow @ file:///tmp/build/80754af9/pillow_1617386154241/work
-prometheus-client @ file:///tmp/build/80754af9/prometheus_client_1623189609245/work
-prompt-toolkit @ file:///tmp/build/80754af9/prompt-toolkit_1616415428029/work
-ptyprocess @ file:///tmp/build/80754af9/ptyprocess_1609355006118/work/dist/ptyprocess-0.7.0-py2.py3-none-any.whl
-pycparser @ file:///tmp/build/80754af9/pycparser_1594388511720/work
-pyerfa==2.0.0
-Pygments @ file:///tmp/build/80754af9/pygments_1621606182707/work
-pyparsing @ file:///home/linux1/recipes/ci/pyparsing_1610983426697/work
-pyrsistent @ file:///tmp/build/80754af9/pyrsistent_1600141707582/work
-pySLALIB==1.0.4
-python-dateutil @ file:///home/ktietz/src/ci/python-dateutil_1611928101742/work
-pytz @ file:///tmp/build/80754af9/pytz_1612215392582/work
-pyvo==1.1
-pyzmq==20.0.0
-qtconsole @ file:///tmp/build/80754af9/qtconsole_1623278325812/work
-QtPy==1.9.0
-requests==2.25.1
-scipy==1.6.3
-Send2Trash @ file:///tmp/build/80754af9/send2trash_1607525499227/work
-six @ file:///tmp/build/80754af9/six_1623709665295/work
-soupsieve==2.2.1
--e git+https://github.itap.purdue.edu/MintonGroup/swiftest.git@19f9e7d0b735f38b5b2e0f5d21fe9b4fb2b79838#egg=swiftest&subdirectory=python/swiftest
-terminado==0.9.4
-testpath @ file:///home/ktietz/src/ci/testpath_1611930608132/work
-tornado @ file:///tmp/build/80754af9/tornado_1606942283357/work
-traitlets @ file:///home/ktietz/src/ci/traitlets_1611929699868/work
-typing-extensions==3.10.0.0
-urllib3==1.26.5
-wcwidth @ file:///tmp/build/80754af9/wcwidth_1593447189090/work
-webencodings==0.5.1
-widgetsnbextension==3.5.1
-xarray==0.18.2
-zipp @ file:///tmp/build/80754af9/zipp_1615904174917/work
+  python>=3.8
+  numpy>=1.24.3
+  pandas>=1.5.3
+  scipy>=1.10.1
+  xarray>=2022.11.0
+  dask>=2022.1
+  bottleneck>=1.3.5
+  h5netcdf>=1.0.2
+  netcdf4>=1.6.2
+  matplotlib>=3.7.1
+  astropy>=5.1
+  astroquery>=0.4.6
+  tqdm>=4.65.0
+  x264>=1!157.20191217
+  ffmpeg>=4.3.2
+  conda-build