diff --git a/CHANGELOG.md b/CHANGELOG.md index 7857edce..5500ea72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog: -### July 7, 2021 +### August 25, 2021 #### New Features: * **ver. ≥ `0.4.27`:** * ##### [Experiments](documentation#experiments) @@ -17,7 +17,8 @@ * Users can no longer use the `config_list` method of `cadCAD.configuration.Experiment` * **Backwards Compatibility:** The `append_model` method of `cadCAD.configuration.Experiment` can also be used as the `append_configs` method. - * ##### [Upgrade Guide:](documentation#cadCAD-v0.4.27-Model-Upgrade-Guide.md) specific to feature changes / additions + * Removed [Nix](https://nixos.org/) + * ##### [Upgrade Guide:](https://github.com/cadCAD-org/cadCAD/blob/master/documentation/cadCAD-v0.4.27-Model-Upgrade-Guide.md) specific to feature changes / additions * **Fixes:** * [#248](https://github.com/cadCAD-org/cadCAD/issues/248) * The previous release was returning partial results. An A/B test for this has been included and will be for diff --git a/README.md b/README.md index 98309717..bb77351c 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ through simulation, with support for Monte Carlo methods, A/B testing and parame [Previous Stable Release (No Longer Supported)](https://github.com/cadCAD-org/cadCAD/tree/b9cc6b2e4af15d6361d60d6ec059246ab8fbf6da) ## 0. Pre-installation Virtual Environments with [`venv`](https://docs.python.org/3/library/venv.html) (Optional): -If you wish to create an easy to use virtual environment to install cadCAD inside of, please use the built in `venv` package. +If you wish to create an easy to use virtual environment to install cadCAD within, please use python's the built in `venv` package. ***Create** a virtual environment:* ```bash @@ -45,18 +45,18 @@ $ ``` ## 1. Installation: -Requires [>= Python 3.6](https://www.python.org/downloads/) +Requires [>= Python 3.6.13](https://www.python.org/downloads/) -**Option A: Install Using **[pip](https://test.pypi.org/project/cadCAD/0.4.27/)** +**Option A: Install Using **[pip](https://pypi.org/project/cadCAD/0.4.27/)** ```bash -$ pip3 install -i https://test.pypi.org/simple/ cadCAD==0.4.27 +pip3 install cadCAD ``` **Option B:** Build From Source ``` -$ pip3 install -r requirements.txt -$ python3 setup.py sdist bdist_wheel -$ pip3 install dist/*.whl +pip3 install -r requirements.txt +python3 setup.py sdist bdist_wheel +pip3 install dist/*.whl ``` ## 2. Documentation: diff --git a/default.nix b/default.nix deleted file mode 100644 index 55d9fc0f..00000000 --- a/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ pkgs ? import { }, stdenv ? pkgs.stdenv, fetchPypi ? pkgs.fetchPypi -, pythonPkgs ? pkgs.python36Packages -, buildPythonPackage ? pythonPkgs.buildPythonPackage }: - -buildPythonPackage rec { - pname = "cadCAD"; - version = "0.4.15"; - - # Nix allows fetching the project source from different locations - #src = fetchPypi { - # inherit pname version; - # sha256 = "4f2a4d39e4ea601b9ab42b2db08b5918a9538c168cff1c6895ae26646f3d73b1"; - #}; - # src = builtins.fetchGit { - # url = "git@github.com:BlockScience/cadCAD.git"; - # ref = "master"; - # }; - src = ./.; - - # In future, when tests are introduced, this can be updated to 'true' - doCheck = false; - - buildInputs = with pythonPkgs; [ - wheel - pytest - parameterized - ]; - checkInputs = [ ]; - propagatedBuildInputs = with pythonPkgs; [ - pandas - pathos - fn - funcy - tabulate - ]; - - meta = with stdenv.lib; { - description = - "Design, test and validate complex systems through simulation in Python"; - homepage = "https://github.com/BlockScience/cadCAD"; - license = licenses.mit; - # maintainers = with maintainers; [ benschza ]; - platforms = platforms.unix; - }; -} diff --git a/dist/cadCAD-0.4.27-py3-none-any.whl b/dist/cadCAD-0.4.27-py3-none-any.whl index 47ca39cd..5fd34b59 100644 Binary files a/dist/cadCAD-0.4.27-py3-none-any.whl and b/dist/cadCAD-0.4.27-py3-none-any.whl differ diff --git a/dist/cadCAD-0.4.27.tar.gz b/dist/cadCAD-0.4.27.tar.gz index ffd370a7..e8d329fc 100644 Binary files a/dist/cadCAD-0.4.27.tar.gz and b/dist/cadCAD-0.4.27.tar.gz differ diff --git a/documentation/cadCAD-v0.4.27-Model-Upgrade-Guide.md b/documentation/cadCAD-v0.4.27-Model-Upgrade-Guide.md index 57969b10..c5e91384 100644 --- a/documentation/cadCAD-v0.4.27-Model-Upgrade-Guide.md +++ b/documentation/cadCAD-v0.4.27-Model-Upgrade-Guide.md @@ -6,7 +6,7 @@ ver. 0.4.27 - + ver. 0.4.23 diff --git a/requirements.txt b/requirements.txt index 0ec6dacc..3e36a1ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,9 @@ -i https://pypi.org/simple -wheel>=0.35 -fn==0.4.3 -funcy==1.14 matplotlib==3.3.2 networkx==2.5 -numba==0.51.2 -numpy==1.19.2 -pandas==1.1.2 parameterized==0.7.4 -pathos==0.2.6 plotly==4.10.0 -pyarrow>=1.0.1 pytest==6.0.2 scikit-learn==0.23.2 scipy>=1.5.2 @@ -19,4 +11,11 @@ seaborn==0.11.0 tabulate==0.8.7 xarray==0.16.0 wheel==0.36.2 -pytz==2019.3 \ No newline at end of file +pandas==1.1.5 +fn==0.4.3 +funcy==1.16 +dill==0.3.4 +pathos==0.2.8 +numpy==1.19.5 +pytz==2021.1 +six>=1.11.0 \ No newline at end of file diff --git a/setup.py b/setup.py index 566f4c93..81a7c5c5 100644 --- a/setup.py +++ b/setup.py @@ -34,9 +34,13 @@ packages=find_packages(), install_requires=[ "pandas", - "pathos", "fn", - "funcy" + "funcy", + "dill", + "pathos", + "numpy", + "pytz", + "six" ], python_requires='>=3.6.13' -) +) \ No newline at end of file diff --git a/shell.nix b/shell.nix deleted file mode 100644 index e0599a09..00000000 --- a/shell.nix +++ /dev/null @@ -1,4 +0,0 @@ -with import { }; - -(let cadCAD = pkgs.callPackage ./default.nix { inherit (pkgs) ; }; -in pkgs.python36.withPackages (ps: [ cadCAD ps.pandas ])).env