close
The Wayback Machine - https://web.archive.org/web/20211123215743/https://github.com/aws/serverless-application-model/pull/394
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update packaging configuration in setup.py and MANIFEST.in #394

Merged
merged 5 commits into from Apr 25, 2018

Conversation

@digioak-zz
Copy link

@digioak-zz digioak-zz commented Apr 18, 2018

Description of changes:

Refactoring packaging configuration, removing package_data in setup.py and adding JSON files to MANIFEST.in

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@sanathkr
Copy link
Contributor

@sanathkr sanathkr commented Apr 18, 2018

Can you update the PR with a better title and description of your problem? I can't evaluate the change without knowing why it is required

Loading

@digioak-zz digioak-zz changed the title Minor fix the setup.py Fix package_data in setup.py Apr 19, 2018
Copy link
Contributor

@brettstack brettstack left a comment

Do we still need the json entries in MANIFEST now?

Loading

@digioak-zz
Copy link
Author

@digioak-zz digioak-zz commented Apr 19, 2018

@brettstack Not according to https://docs.python.org/2/distutils/sourcedist.html. Files declared in package_data is pulled in by default.

Loading

Copy link
Contributor

@sanathkr sanathkr left a comment

LGTM

Loading

@brettstack
Copy link
Contributor

@brettstack brettstack commented Apr 20, 2018

Can you remove the lines in MANIFEST if they're redundant.

Loading

@heitorlessa
Copy link
Contributor

@heitorlessa heitorlessa commented Apr 20, 2018

my 2c: For simplicity I would prefer not to have package_data and only rely on MANIFEST file.

Loading

@digioak-zz digioak-zz changed the title Fix package_data in setup.py Update packaging configuration in setup.py and MANIFEST.in Apr 20, 2018
@digioak-zz
Copy link
Author

@digioak-zz digioak-zz commented Apr 20, 2018

Loading

jfuss
jfuss approved these changes Apr 25, 2018
@jfuss jfuss merged commit 3ffdc80 into aws:develop Apr 25, 2018
1 check passed
Loading
sanathkr added a commit that referenced this issue Apr 25, 2018
* Add new AWSSecretsManagerRotationPolicy PolicyTemplate with docs update (#361)

* Update links to Policy Templates for documentation (#355)

These links were broken in the documentation at https://awslabs.github.io/serverless-application-model/policy_templates.html

That's because they were relative links that didn't exist within the documentation website.
* OLD (Doesn't exist): https://awslabs.github.io/serverless-application-model/policy_templates_data/policy_templates.json
* NEW: https://github.com/awslabs/serverless-application-model/blob/develop/docs/policy_templates_data/policy_templates.json

There might be a more generic way to do this across all the documentation, but I don't know enough about Sphinx to do it generically.

* Modernize Python 2 code to get ready for Python 3 (#365)

Using six.string_types instead of basestring

* docs: update SimpleTable example to include Properties (#374)

* docs: add validation on make setup target (#375)

* Added validation to the setup target and raise a clear error when pyenv is not found on your system

* Remove the install target and improved the configuration validation

* Updated the developer guide with a note on the pyenv requirement.

* Fix the hyperlink used a markdown syntax instead of restructuredtext

* Fix the note block used a markdown syntax instead of restructuredtext

* Restored removed line

* Correct the text a bit so that it looks ok on GitHub

* Keep the pyenv word linked to the github repo

* Added a way to run a single class to test

* Update the branch to develop

* Removed some Mac OS X code what was needed due to incorrectly installation of python

* Improved the Makefile by adding a help function and added info context (mostly copied from https://github.com/aws-samples/cookiecutter-aws-sam-python)

* Removed the clean target as requested in the PR

* release: update setup.py (#381)

* release: 1.5.1 (#391)

* docs: fix "asynchronously" typo in safe_lambda_deployments.rst (#385)

* docs: add Travis and PyPi badges to README (#392)

* docs: update requirements paths in development guide (#396)

* Update packaging configuration in setup.py and MANIFEST.in (#394)

* fix: remove redundant macro resolver logic in parser to prevent plugins from running twice (#398)
keetonian pushed a commit to keetonian/serverless-application-model that referenced this issue Nov 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants