Merge pull request #721 from dbmi-bgm/kmp_remove_library

Remove unused library (C4-1036)
dbmi-bgm · Jun 13, 2023 · e3cfc18 · e3cfc18
2 parents 5a7dfc6 + 3f98c36
commit e3cfc18
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 25 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,9 +6,16 @@ cgap-portal
 Change Log
 ----------
 
+
+13.3.2
+======
+
+* Remove inclusion of unused loremipsum library from pyproject.toml (C4-1036)
+
+
 13.3.1
 ======
-`No PR: Staff-change Insert Updates`_
+*No PR: Staff-change Insert Updates*
 
 * Remove Victoria's user insert from master-inserts
 * Add Cesar's user insert to master-inserts

diff --git a/Dockerfile b/Dockerfile
@@ -43,7 +43,7 @@ RUN apt-get update && apt-get upgrade -y && \
     apt-get install -y --no-install-recommends vim emacs net-tools ca-certificates build-essential \
     gcc zlib1g-dev postgresql-client libpq-dev git make curl libmagic-dev && \
     pip install --upgrade pip && \
-    pip install poetry==1.3.2 && \
+    pip install poetry==1.4.2 && \
     curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh | bash && \
     . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION} && \
     nvm use v${NODE_VERSION} && \

diff --git a/Makefile b/Makefile
@@ -47,13 +47,9 @@ macpoetry-install:  # Same as 'poetry install' except that on OSX Catalina, an e
 	bin/macpoetry-install
 
 configure:  # does any pre-requisite installs
-	@#pip install --upgrade pip==21.0.1
 	pip install --upgrade pip
-	@#pip install poetry==1.1.9  # this version is known to work. -kmp 11-Mar-2021
-	@# Pin to version 1.1.15 for now to avoid this error:
-	@#   Because encoded depends on wheel (>=0.29.0) which doesn't match any versions, version solving failed.
-	pip install poetry==1.3.2
-	pip install setuptools  # ==57.5.0 # this version allows 2to3, any later will break -wrr 20-Sept-2021
+	pip install poetry==1.4.2
+	pip install setuptools
 	pip install wheel
 ifeq ($(shell uname -s), Darwin)
 ifeq ($(shell uname -m), arm64)

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 # Note: Various modules refer to this system as "encoded", not "cgap-portal".
 name = "encoded"
-version = "13.3.1"
+version = "13.3.2"
 description = "Computational Genome Analysis Platform"
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"
@@ -65,7 +65,6 @@ isodate = ">=0.6.1,<1"
 jmespath = ">=0.10.0,<1"
 jsonschema_serialize_fork = "^2.1.1"
 # keepalive = ">=0.5,<1"
-loremipsum = "1.0.5"
 netaddr = ">=0.8.0,<1"
 negspy = "0.2.24"
 numpy = "^1.24.2"  # negspy needs it