From e8800c2bc7cad27f0ca96206a78f6fd3aaea43b7 Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 10 Jun 2019 10:00:45 -0500 Subject: [PATCH 1/2] add news for the conda fix PR --- news/conda_fix.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 news/conda_fix.rst diff --git a/news/conda_fix.rst b/news/conda_fix.rst new file mode 100644 index 0000000000..6dd0288fad --- /dev/null +++ b/news/conda_fix.rst @@ -0,0 +1,19 @@ +**Added:** None + +**Changed:** None +- `cycpp.py` now takes advantage of the `$CPP` environment variable if defined, + falls back on `cpp` if not defined +- `cyclus_deps` docker container built now on debian9, removed gcc from apt-get + package, build the full list of conda package (don't rely on cyclus-deps conda + package as it is temporary broken), define CXX CC and CPP environment variable +- `cython` compatibility limited to >=0.25 and <0.27 + +**Deprecated:** None + +**Removed:** None + +**Fixed:** None +- `boost/uuid/sha1.hpp` include now varies according to the Boost version + installed du to its deprecation in boost > 1.67 + +**Security:** None From cf6a06549bd329058bb635ceb2ab4c38889e54db Mon Sep 17 00:00:00 2001 From: Baptiste Mouginot Date: Mon, 10 Jun 2019 10:02:21 -0500 Subject: [PATCH 2/2] typo --- news/conda_fix.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/conda_fix.rst b/news/conda_fix.rst index 6dd0288fad..e2e1a07d98 100644 --- a/news/conda_fix.rst +++ b/news/conda_fix.rst @@ -14,6 +14,6 @@ **Fixed:** None - `boost/uuid/sha1.hpp` include now varies according to the Boost version - installed du to its deprecation in boost > 1.67 + installed due to its deprecation in boost > 1.67 **Security:** None