Skip to content
This repository has been archived by the owner on Feb 9, 2024. It is now read-only.

Commit

Permalink
Security Updates (#20)
Browse files Browse the repository at this point in the history
  • Loading branch information
dllopis-sfdc authored Jul 11, 2019
1 parent 63e13ad commit 8a2fee2
Show file tree
Hide file tree
Showing 7 changed files with 331 additions and 36 deletions.
38 changes: 38 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
## What does this PR do?

_(required) Describe the effects of your pull request in detail. If multiple
changes are involved, a bulleted list is often useful._

## Why is this change being made?

_(required) Describe the reasoning and background context for your
change. Include a link to relevant ticket(s)._

## How does this PR do it?

_(encourged) Describe how your pull request does what it does so that your
reviewer can better understand the changes being made. If multiple
changes are involved, a bulleted list is often useful.

## How was this tested? How can the reviewer verify your testing?

_(required) Describe the steps you used to test your change. Provide evidence of
testing or explicit, repeatable instructions the reviewer can follow
to verify your testing._

## What gif best describes this PR or how it makes you feel?

_(encouraged) Insert an appropriate gif/meme to brighten up your reviewer's day._

## Completion checklist

- [ ] The pull request has been appropriately labeled according to
our [conventions](https://kruxdigital.jira.com/wiki/display/EN/Changes+and+Peer+Review).
- [ ] The version of the package has been updated according to [Semantic Versioning](http://semver.org/).
- [ ] The change has unit & integration tests as appropriate.
- [ ] Documentation is up to date and correct.
- [ ] Dependencies are correctly listed under `requirements.pip` and
are up to date without going over a major version.
- [ ] Stakeholders have been notified. Workflow-impacting changes have
been appropriately socialized to avoid surprises.
- [ ] The change is either small or have been canaried in the appropriate environment(s).
21 changes: 21 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[[source]]
url = "${KRUX_PIP_PROP_URL}"
verify_ssl = true
name = "kruxprop"

[[source]]
url = "${KRUX_PIP_FOSS_URL}"
verify_ssl = true
name = "kruxfoss"

[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
krux-stdlib = "==3.1.0"
marathon = "==0.11.0"

[requires]
python_version = "2.7"
268 changes: 268 additions & 0 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ It comes with a sample json config file for specifying state of an app.

The Application defaults to localhost and port 8080 use the host and port flags to change the location.

```marathon-api --host marathon_server.com --port 8081 --list_apps```
```marathon-api --host marathon_server.com --port 8081 --list-apps```

## Create / Update Marathon Application
Requires a valid json file (see sample).
Expand All @@ -24,7 +24,7 @@ You can delete an app using the json file or just using the app name
## List all Applications
List all applications on your Marathon Server.

```marathon-api --list_apps```
```marathon-api --list-apps```

### List all available commands
Running ```marathon-api -h ``` will show you a list of possible commands.
Expand Down
2 changes: 1 addition & 1 deletion krux_marathon_api/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = '0.0.16'
VERSION = '0.1.0'
33 changes: 0 additions & 33 deletions requirements.txt

This file was deleted.

1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@
],
},
zip_safe=False, # Don't install a single .egg file, it's harder to debug
python_requires='~=2.7, ~=3.6',
)

0 comments on commit 8a2fee2

Please sign in to comment.