Skip to content

Commit

Permalink
Change deps
Browse files Browse the repository at this point in the history
  • Loading branch information
jonas-eschle committed Nov 19, 2018
1 parent 8aa4620 commit d5f89ae
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 128 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ install:
#- pip uninstall pandas -y || echo pandas not installed
#- pip install xgboost > tmp.txt && echo "alive"
#- pip install -U -r requirements.txt
#- pip install git+https://github.com/REPlegacy/rep -U
- pip install git+https://github.com/REPlegacy/rep -U
- pip install .[all]
script:

Expand Down
96 changes: 0 additions & 96 deletions README.md

This file was deleted.

44 changes: 15 additions & 29 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
|Code Health| |Build Status| |PyPI version| |Dependency Status|
|Code Health| |Build Status| |PyPI version|

raredecay
=========
Expand Down Expand Up @@ -34,10 +34,10 @@ Want to test whether your reweighting did overfit? Use train\_similar:

.. code:: python
import raredecay as rd
import raredecay as rd
mc_data = rd.data.HEPDataStorage(df, weights=*pd.Series weights*, target=0)
real_data = rd.data.HEPDataStorage(df, weights=*pd.Series weights*, target=1)
mc_data = rd.data.HEPDataStorage(df, weights=*pd.Series weights*, target=0)
real_data = rd.data.HEPDataStorage(df, weights=*pd.Series weights*, target=1)
score = rd.score.train_similar(mc_data, real_data, old_mc_weights=1 *or whatever weights the mc had before*)
Expand All @@ -59,36 +59,31 @@ The API as well as the documentation:
Setup and installation
----------------------

Anaconda
~~~~~~~~

Easiest way: use conda to install everything (except of the rep, which
has to be upgraded with pip for some functionalities)

::

conda install raredecay -c mayou36

PyPI
~~~~

The package with all extras requires root\_numpy as well as rootpy (and
therefore a ROOT installation with python-bindings) to be installed on
your system. If that is not the case, some functions won't work.

If you want to install all the extra, first install the very newest
version of REP (may also needed with conda install) (the -U can be
omitted, but is recommended to have the newest dependencies):
Recommended installation (requires ROOT):


::

pip install -U https://github.com/yandex/rep/archive/stratifiedkfold.zip
pip install raredecay[all] --process-dependency-links

Then, install the raredecay package (without ROOT-support) via
Anaconda
~~~~~~~~

Easiest way: use conda to install everything (except of the rep, which
has to be upgraded with pip for some functionalities)

::

pip install raredecay
conda install raredecay -c mayou36



To make sure you can convert ROOT-NTuples, use

Expand All @@ -99,15 +94,6 @@ To make sure you can convert ROOT-NTuples, use
or, instead of root/additionally (comma separated) ``reweight`` or
``reweight`` for the specific functionalities.

In order to have all functionalities, use

::

pip install raredecay[all]

As it is a young package still under developement, it may receive
regular updates and improvements and it is probably a good idea to
regularly download the newest package.

.. |Code Health| image:: https://landscape.io/github/mayou36/raredecay/master/landscape.svg?style=flat
:target: https://landscape.io/github/mayou36/raredecay/master
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ numpy
matplotlib
future
xgboost
rep>0.7.0
hep_ml>=0.5.0
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
here = os.path.abspath(os.path.dirname(__file__))

with io.open(os.path.join(here, 'requirements.txt')) as f:
requirements = f.read().split('\n')
requirements = f.read().splitlines()


def readme():
Expand Down Expand Up @@ -67,7 +67,7 @@ def readme():
author='Jonas Eschle',
author_email='[email protected]',
license='Apache-2.0 License',
dependency_links=['https://github.com/REPlegacy/rep/tarball/master#egg=rep'],
dependency_links=['https://github.com/REPlegacy/rep/tarball/master#egg=rep-0.7.1'],
install_requires=requirements,
extras_require=extras_require,
packages=['raredecay',
Expand Down

0 comments on commit d5f89ae

Please sign in to comment.