final maintenance before starting ai_pip

matthewdeanmartin · Nov 4, 2023 · be94be0 · be94be0
1 parent 7c03f12
commit be94be0
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 31 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -43,7 +43,7 @@
 	// "forwardPorts": [],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "pipenv sync --dev",
+	"postCreateCommand": "poetry install --with dev",
 
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode",
@@ -56,7 +56,6 @@
 		"ghcr.io/devcontainers-contrib/features/black:2": {},
 		"ghcr.io/devcontainers-contrib/features/coverage-py:2": {},
 		"ghcr.io/devcontainers-contrib/features/isort:2": {},
-		"ghcr.io/devcontainers-contrib/features/pipenv:2": {},
 		"ghcr.io/devcontainers-contrib/features/pylint:2": {}
 	}
 }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,10 +11,10 @@ jobs:
             -   uses: actions/setup-python@v4
                 with:
                     python-version: '3.11'
-                    cache: 'pipenv' # caching pipenv dependencies
-            -   name: Install pipenv and pipx
+                    cache: 'pipenv' # TODO: how to cache poetry?
+            -   name: Install poetry
                 run: |
-                    pip install pipenv && pip install pipx
+                    pip install poetry && pip install pipx
 
             -   name: Install global dependencies
                 run: |

diff --git a/.so_pip.ini b/.so_pip.ini
@@ -57,4 +57,4 @@ POSSIBLE_LANGUAGES = ['python','javascript','go','lua']
 
 # cli client stuff
 [SHELL_CONFIG]
-SHELL = pipenv run
+SHELL = poetry run
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,9 +6,9 @@ I personally am registering multiple keys for the same product.
 To run a build
 ```
 git clone https://github.com/matthewdeanmartin/so_pip.git
-pipenv install --dev --skip-lock
+poetry install --with dev
 # todo list pipx installs, e.g. pylint, isort, etc.
-pipenv shell
+poetry shell
 # verify code
 python -m navio package
 # update version number...

diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ Requires Python 3.11+
 ```
 pip install so_pip
 # or
-pipenv install so_pip --pre --skip-lock
+poetry install so_pip
 
 so_pip vendorize my_name --question=31049648 --output=output
 ```

diff --git a/dead_code/Pipfile b/dead_code/Pipfile
@@ -71,6 +71,3 @@ slpp = "*"
 
 [requires]
 python_version = "3.11"
-
-[pipenv]
-allow_prereleases = true
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -11,7 +11,7 @@ RUN python -m pip install --user pipx && python -m pipx ensurepath
 RUN pipx install isort && \
     pipx install pylint
 RUN python -m pip install --no-cache-dir --upgrade pip --quiet \
-    && pip install pipenv  --no-cache-dir --quiet
+    && pip install poetry --no-cache-dir --quiet
 # Github action doesn't build a local package. But we have one on pypi!
 # inexplicable fail with pipenv.
 RUN pipx install "so-pip>=0.2.1"

diff --git a/docker/Dockerfile_local b/docker/Dockerfile_local
@@ -12,7 +12,7 @@ RUN python -m pip install --user pipx && python -m pipx ensurepath
 RUN pipx install isort && \
     pipx install pylint
 RUN python -m pip install --no-cache-dir --upgrade pip --quiet \
-    && pip install pipenv  --no-cache-dir --quiet
+    && pip install poetry  --no-cache-dir --quiet
 COPY dist/so_pip-*-py3-none-any.whl /app/
-RUN pipenv install so_pip-*.whl --skip-lock
-ENTRYPOINT ["pipenv", "run", "so_pip"]
+RUN pip install so_pip-*.whl
+ENTRYPOINT ["so_pip"]
diff --git a/examples/self_managed_packages/.so_pip.ini b/examples/self_managed_packages/.so_pip.ini
@@ -43,4 +43,4 @@ POSSIBLE_LANGUAGES = ["*"]
 
 # cli client stuff
 [SHELL_CONFIG]
-SHELL = pipenv run
+SHELL = poetry run
diff --git a/examples/vendorize_to_src/.so_pip.ini b/examples/vendorize_to_src/.so_pip.ini
@@ -43,4 +43,4 @@ POSSIBLE_LANGUAGES = ["*"]
 
 # cli client stuff
 [SHELL_CONFIG]
-SHELL = pipenv run
+SHELL = poetry run
diff --git a/pipx_installs.sh b/pipx_installs.sh
@@ -1,6 +1,5 @@
 # so these tools don't conflict with each other
 pipx install isort
-pipx install pygount
 pipx install mypy
 pipx install vulture
 
@@ -9,15 +8,4 @@ pipx install vulture
 #pipx install pyupgrade
 pipx install pylint
 pipx install radon
-pipx install flake8
-pipx inject flake8 dlint mccabe pyflakes pep8-naming flake8-bugbear
-pipx install pipenv-to-requirements
-pipx install yamllint
-pipx install apistar
-pipx install openapi-spec-validator
-pipx install jiggle_version
-pipx install pyroma
-pipx install twine
 pipx install bandit
-
-# pipx install "check-manifest==0.40"
diff --git a/scripts/.so_pip.ini b/scripts/.so_pip.ini
@@ -52,4 +52,4 @@ POSSIBLE_LANGUAGES = ['python','javascript','go','lua']
 
 # cli client stuff
 [SHELL_CONFIG]
-SHELL = pipenv run
+SHELL = poetry run