Skip to content

Commit

Permalink
Merge pull request #292 from cadCAD-org/staging
Browse files Browse the repository at this point in the history
ver. 0.4.27
  • Loading branch information
JEJodesty authored Aug 26, 2021
2 parents d7b7806 + c0da68a commit a5dc002
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 71 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog:

### July 7, 2021
### August 25, 2021
#### New Features:
* **ver. ≥ `0.4.27`:**
* ##### [Experiments](documentation#experiments)
Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
45 changes: 0 additions & 45 deletions default.nix

This file was deleted.

Binary file modified dist/cadCAD-0.4.27-py3-none-any.whl
Binary file not shown.
Binary file modified dist/cadCAD-0.4.27.tar.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion documentation/cadCAD-v0.4.27-Model-Upgrade-Guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<th>
ver. 0.4.27
</th>
<th>
<th>
ver. 0.4.23
</th>
</tr>
Expand Down
17 changes: 8 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
-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
seaborn==0.11.0
tabulate==0.8.7
xarray==0.16.0
wheel==0.36.2
pytz==2019.3
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
10 changes: 7 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,13 @@
packages=find_packages(),
install_requires=[
"pandas",
"pathos",
"fn",
"funcy"
"funcy",
"dill",
"pathos",
"numpy",
"pytz",
"six"
],
python_requires='>=3.6.13'
)
)
4 changes: 0 additions & 4 deletions shell.nix

This file was deleted.

0 comments on commit a5dc002

Please sign in to comment.