diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f54d3131a..2954ab59c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -19,6 +19,7 @@ Change Log - Had to update dcicutils (from 8.11.0) to 8.13.0 (for pyramid update for imp import not found). - Had to update future (from >=0.15.2,<1) to 1.0.0 (otherwise in fourfront for from past.builtins import basestring we get ModuleNotFoundError: No module named 'imp'). + IN PROGRESS - NOW fourfront not building ... back to future 0.18.3 ... * Minor change to dev_servers.py to facilitate running a local ElasticSearch proxy to observe traffic (resquests/responses) between the portal and ElasticSearch with a tool like mitmproxy or mitmweb; see comments in dev_server.py. diff --git a/poetry.lock b/poetry.lock index b60d75eed..31ea7e652 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1140,13 +1140,12 @@ files = [ [[package]] name = "future" -version = "1.0.0" +version = "0.18.3" description = "Clean single-source support for Python 3 and 2" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" files = [ - {file = "future-1.0.0-py3-none-any.whl", hash = "sha256:929292d34f5872e70396626ef385ec22355a1fae8ad29e1a734c3e43f9fbc216"}, - {file = "future-1.0.0.tar.gz", hash = "sha256:bd2968309307861edae1458a4f8a4f3598c03be43b97521076aebf5d94c07b05"}, + {file = "future-0.18.3.tar.gz", hash = "sha256:34a17436ed1e96697a86f9de3d15a3b0be01d8bc8de9c1dffd59fb8234ed5307"}, ] [[package]] @@ -3763,4 +3762,4 @@ test = ["zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.13" -content-hash = "eb2ebeb0b794686fcc38d91d2c254ce3bc80aa311ff610a5d0db5d1ad11f05e0" +content-hash = "ae006d222ff7e26b8b7fe5c77dcde68436b166fdc5869285dfa74e4f4b97b045" diff --git a/pyproject.toml b/pyproject.toml index 50514f2ab..5b0ea4107 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "11.17.0.1b4" # TODO: To become 11.18.0 +version = "11.17.0.1b5" # TODO: To become 11.18.0 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" @@ -49,7 +49,8 @@ elasticsearch_dsl = "^7.4.0" #dcicutils = "^8.11.0" dcicutils = "8.12.0.1b8" # future = ">=0.15.2,<1" -future = "^1.0.0" +# future = "^1.0.0" +future = "^0.18.3" html5lib = ">=1.1" # experimental, should be OK now that we're not using moto server humanfriendly = "^1.44.9" netaddr = ">=0.8.0,<1"