Skip to content

Commit

Permalink
Remove pipenv dependency
Browse files Browse the repository at this point in the history
pipenv is really slow and sometimes it hangs for a really long time.
Perhaps because I'm using a private PyPi instance that makes it worse,
but that works fine with plain pip.

This seems to be a common problem - see and the several other linked
issues there:

pypa/pipenv#3827

So far, this is just the result of grep/search/replace. Haven't
tested this at all and there's more work to do. Just want to start by getting
some feedback if this is going to be something that everyone is OK with.

Closes hashicorp#324
  • Loading branch information
cmclaughlin committed Aug 19, 2020
1 parent 06cf128 commit 747603f
Show file tree
Hide file tree
Showing 29 changed files with 37 additions and 369 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM jsii/superchain

RUN yum install -y unzip && curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
RUN yum install -y unzip

ENV DEFAULT_TERRAFORM_VERSION=0.13.0

Expand Down
1 change: 0 additions & 1 deletion docs/getting-started/python.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
- [Terraform](https://www.terraform.io/downloads.html) >= v0.12
- [Node.js](https://nodejs.org) >= v12.16
- [Python](https://www.python.org/downloads/) >= v3.7
- [Pipenv](https://pipenv.pypa.io/en/latest/install/#installing-pipenv/)

### Install CDK for Terraform CLI

Expand Down
10 changes: 0 additions & 10 deletions examples/python/aws/Pipfile

This file was deleted.

90 changes: 0 additions & 90 deletions examples/python/aws/Pipfile.lock

This file was deleted.

9 changes: 1 addition & 8 deletions examples/python/aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,10 @@ A CDK for Terraform application in Python.

## Usage

Install Pipenv using Homebrew by running:

```bash
$ brew install pipenv
```
You can install Pipenv by visiting the [website](https://pipenv.pypa.io/en/latest/).

Install project dependencies

```shell
pipenv install
pip3 install -r requirements.txt
```

Generate CDK for Terraform constructs for Terraform provides and modules used in the project.
Expand Down
4 changes: 2 additions & 2 deletions examples/python/aws/cdktf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"language": "python",
"app": "pipenv run ./main.py",
"app": "python3 main.py",
"terraformProviders": ["aws@~> 2.0"],
"terraformModules": ["terraform-aws-modules/vpc/aws"],
"codeMakerOutput": "imports"
}
}
1 change: 1 addition & 0 deletions examples/python/aws/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./../../../dist/python/cdktf-0.0.0-py3-none-any.whl
10 changes: 0 additions & 10 deletions examples/python/docker/Pipfile

This file was deleted.

90 changes: 0 additions & 90 deletions examples/python/docker/Pipfile.lock

This file was deleted.

9 changes: 1 addition & 8 deletions examples/python/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,10 @@

## Usage

Install Pipenv using Homebrew by running:

```bash
$ brew install pipenv
```
You can install Pipenv by visiting the [website](https://pipenv.pypa.io/en/latest/).

Install project dependencies

```shell
pipenv install
pip3 install -r requirements.txt
```

Generate CDK for Terraform constructs for Terraform provides and modules used in the project.
Expand Down
4 changes: 2 additions & 2 deletions examples/python/docker/cdktf.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"language": "python",
"app": "pipenv run ./main.py",
"app": "python3 main.py",
"terraformProviders": [
"terraform-providers/docker@~> 2.0"
],
"codeMakerOutput": "imports"
}
}
4 changes: 2 additions & 2 deletions examples/python/docker/help
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
cat help Prints this message

Compile:
pipenv run ./main.py Compile and run the python code.
python main.py Compile and run the python code.

Synthesize:
cdktf synth Synthesize Terraform resources to cdktf.out/

Diff:
cdktf diff Perform a diff (terraform plan) for the given stack

Expand Down
1 change: 1 addition & 0 deletions examples/python/docker/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./../../../dist/python/cdktf-0.0.0-py3-none-any.whl
10 changes: 0 additions & 10 deletions examples/python/kubernetes/Pipfile

This file was deleted.

Loading

0 comments on commit 747603f

Please sign in to comment.