This commit is contained in:
Brian Quistorff 2020-12-14 20:37:36 -05:00
Родитель 176d87d1e0
Коммит 3c8840785a
4 изменённых файлов: 0 добавлений и 131 удалений

Просмотреть файл

@ -63,12 +63,10 @@ examples:
python example-code.py python example-code.py
python examples/fit_poc.py python examples/fit_poc.py
#Python 2.7 can do 'test.test_fit' but not 'test/test_fit.py'
tests: tests:
python -m unittest test.test_fit.TestFitForErrors test.test_fit.TestFitFastForErrors test.test_normal.TestNormalForErrors test.test_estimation.TestEstimationForErrors python -m unittest test.test_fit.TestFitForErrors test.test_fit.TestFitFastForErrors test.test_normal.TestNormalForErrors test.test_estimation.TestEstimationForErrors
#tests_both: #tests_both:
# activate SparseSC_27 && python -m unittest test.test_fit
# activate SparseSC_35 && python -m unittest test.test_fit # activate SparseSC_35 && python -m unittest test.test_fit
#add examples here when working #add examples here when working
@ -93,9 +91,6 @@ gen_ipynb_output:
#Have to cd into subfulder otherwise will pick up potential SparseSC pkg in build/ #Have to cd into subfulder otherwise will pick up potential SparseSC pkg in build/
#TODO: Make the prefix filter automatic #TODO: Make the prefix filter automatic
#TODO: check if this way of doing phony targets for nmake works with make #TODO: check if this way of doing phony targets for nmake works with make
test/SparseSC_27.yml: .phony
activate SparseSC_27 && cd test && conda env export > SparseSC_27.yml
echo Make sure to remove the last prefix line and the pip sparsesc line, as user does pip install -e for that
test/SparseSC_35.yml: .phony test/SparseSC_35.yml: .phony
activate SparseSC_35 && cd test && conda env export > SparseSC_35.yml activate SparseSC_35 && cd test && conda env export > SparseSC_35.yml
echo Make sure to remove the last prefix line and the pip sparsesc line, as user does pip install -e for that echo Make sure to remove the last prefix line and the pip sparsesc line, as user does pip install -e for that
@ -111,13 +106,11 @@ test/SparseSC_36.yml: .phony
#doc/rtd-requirements.txt: #doc/rtd-requirements.txt:
conda_env_upate: conda_env_upate:
deactivate && conda env update -f test/SparseSC_27.yml
deactivate && conda env update -f test/SparseSC_35.yml deactivate && conda env update -f test/SparseSC_35.yml
deactivate && conda env update -f test/SparseSC_36.yml deactivate && conda env update -f test/SparseSC_36.yml
#Just needs to be done once #Just needs to be done once
conda_env_create: conda_env_create:
conda env create -f test/SparseSC_27.yml
conda env create -f test/SparseSC_35.yml conda env create -f test/SparseSC_35.yml
conda env create -f test/SparseSC_36.yml conda env create -f test/SparseSC_36.yml

Просмотреть файл

@ -54,7 +54,6 @@ setup(
"Operating System :: POSIX", "Operating System :: POSIX",
"Operating System :: Microsoft :: Windows", "Operating System :: Microsoft :: Windows",
"Programming Language :: Python", "Programming Language :: Python",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.5",

Просмотреть файл

@ -1,122 +0,0 @@
name: SparseSC_27
channels:
- defaults
dependencies:
- alabaster=0.7.12=py27_0
- asn1crypto=0.24.0=py27_0
- astroid=1.6.5=py27_0
- babel=2.6.0=py27_0
- backports=1.0=py27_1
- backports.functools_lru_cache=1.5=py27_1
- backports.shutil_get_terminal_size=1.0.0=py27_2
- backports.shutil_which=3.5.2=py27_0
- backports_abc=0.5=py27h0ec6b72_0
- blas=1.0=mkl
- bleach=3.1.0=py27_0
- ca-certificates=2018.12.5=0
- certifi=2018.11.29=py27_0
- cffi=1.11.5=py27hc64555f_1
- chardet=3.0.4=py27_1
- colorama=0.4.1=py27_0
- configparser=3.5.0=py27h2fa79a8_0
- cryptography=2.4.2=py27hcfb25f9_0
- decorator=4.3.2=py27_0
- defusedxml=0.5.0=py27_1
- docutils=0.14=py27h8652d09_0
- entrypoints=0.3=py27_0
- enum34=1.1.6=py27_1
- functools32=3.2.3.2=py27_1
- futures=3.2.0=py27_0
- icc_rt=2019.0.0=h0cc432a_1
- idna=2.8=py27_0
- imagesize=1.1.0=py27_0
- intel-openmp=2019.1=144
- ipaddress=1.0.22=py27_0
- ipykernel=4.10.0=py27_0
- ipython=5.8.0=py27_0
- ipython_genutils=0.2.0=py27hbe997df_0
- ipywidgets=7.4.2=py27_0
- isort=4.3.4=py27_0
- jinja2=2.10=py27_0
- jsonschema=2.6.0=py27haaf3834_0
- jupyter=1.0.0=py27_7
- jupyter_client=5.2.4=py27_0
- jupyter_console=5.2.0=py27_1
- jupyter_core=4.4.0=py27_0
- lazy-object-proxy=1.3.1=py27h0c8e037_2
- libsodium=1.0.16=h8b3e59e_0
- m2w64-gcc-libgfortran=5.3.0=6
- m2w64-gcc-libs=5.3.0=7
- m2w64-gcc-libs-core=5.3.0=7
- m2w64-gmp=6.1.0=2
- m2w64-libwinpthread-git=5.0.0.4634.697f757=2
- markupsafe=1.1.0=py27h0c8e037_0
- mccabe=0.6.1=py27_1
- mistune=0.8.4=py27h0c8e037_0
- mkl=2018.0.3=1
- msys2-conda-epoch=20160418=1
- nbconvert=5.4.0=py27_1
- nbformat=4.4.0=py27hf49b375_0
- notebook=5.7.4=py27_0
- numpy=1.14.1=py27hda5cba4_2
- openssl=1.1.1a=h0c8e037_0
- pandas=0.20.3=py27he04484b_2
- pandoc=1.19.2.1=hb2460c7_1
- pandocfilters=1.4.2=py27_1
- pathlib2=2.3.3=py27_0
- patsy=0.5.1=py27_0
- pickleshare=0.7.5=py27_0
- pip=18.1=py27_0
- prometheus_client=0.5.0=py27_0
- prompt_toolkit=1.0.15=py27h3a8ec6a_0
- pycparser=2.19=py27_0
- pygments=2.3.1=py27_0
- pylint=1.9.2=py27_0
- pyopenssl=18.0.0=py27_0
- pyqt=4.10.4=py27_1
- pysocks=1.6.8=py27_0
- python=2.7.14=h4a10d90_31
- python-dateutil=2.7.5=py27_0
- pytz=2018.9=py27_0
- pywinpty=0.5.5=py27_1000
- pyzmq=17.1.2=py27hc56fc5f_2
- qtconsole=4.4.3=py27_0
- requests=2.21.0=py27_0
- scandir=1.9.0=py27h0c8e037_0
- scikit-learn=0.19.1=py27hbe35404_0
- scipy=1.0.1=py27hffc5294_0
- send2trash=1.5.0=py27_0
- setuptools=40.6.3=py27_0
- simplegeneric=0.8.1=py27_2
- singledispatch=3.4.0.3=py27h3f9d112_0
- six=1.12.0=py27_0
- snowballstemmer=1.2.1=py27h28d3bf7_0
- sphinx=1.6.3=py27h858dd0f_0
- sphinxcontrib=1.0=py27_1
- sphinxcontrib-websupport=1.1.0=py27_1
- sqlite=3.26.0=h0c8e037_0
- statsmodels=0.8.0=py27hc77c1fc_0
- terminado=0.8.1=py27_1
- testpath=0.4.2=py27_0
- tornado=5.1.1=py27h0c8e037_0
- traitlets=4.3.2=py27h1b1b3a5_0
- typing=3.6.6=py27_0
- urllib3=1.24.1=py27_0
- vc=9=h7299396_1
- vs2008_runtime=9.00.30729.1=hfaea7d5_1
- wcwidth=0.1.7=py27hb1a0d82_0
- webencodings=0.5.1=py27_1
- wheel=0.32.3=py27_0
- widgetsnbextension=3.4.2=py27_0
- win_inet_pton=1.0.1=py27_1
- win_unicode_console=0.5=py27hc037021_0
- wincertstore=0.2=py27hf04cefb_0
- winpty=0.4.3=4
- wrapt=1.11.0=py27h0c8e037_0
- zeromq=4.3.1=h2880e7c_3
- pip:
- commonmark==0.5.4
- markdown==2.6.11
- recommonmark==0.4.0
- sphinx-markdown-tables==0.0.9

Просмотреть файл

@ -35,7 +35,6 @@
<Compile Include="dgp\__init__.py" /> <Compile Include="dgp\__init__.py" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<InterpreterReference Include="CondaEnv|CondaEnv|SparseSC_27" />
<InterpreterReference Include="CondaEnv|CondaEnv|SparseSC_35" /> <InterpreterReference Include="CondaEnv|CondaEnv|SparseSC_35" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>