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

[FEATURE] Use more granular requirements-dev-xxx.txt files #4327

Merged
merged 16 commits into from
Mar 15, 2022

Conversation

kenwade4
Copy link
Contributor

@kenwade4 kenwade4 commented Mar 3, 2022

Changes proposed in this pull request:

  • Use more granular requirements-dev-xxx.txt files

Definition of Done

Please delete options that are not relevant.

@netlify
Copy link

netlify bot commented Mar 3, 2022

✔️ Deploy Preview for niobium-lead-7998 ready!

🔨 Explore the source changes: 3b141eb

🔍 Inspect the deploy log: https://app.netlify.com/sites/niobium-lead-7998/deploys/62310c1cada47c0008419e4f

😎 Browse the preview: https://deploy-preview-4327--niobium-lead-7998.netlify.app

setup.py Outdated
Comment on lines 9 to 22
with open("requirements-dev-lite.txt") as f:
dev_lite = f.read().splitlines()

req_boto = [req for req in dev_lite if req.startswith("boto")]
req_sqlalchemy = [req for req in dev_lite if req.startswith("sqlalchemy")]

with open("requirements-dev-airflow.txt") as f:
req_airflow = f.read().splitlines()

with open("requirements-dev-arrow.txt") as f:
req_arrow = f.read().splitlines()

with open("requirements-dev-athena.txt") as f:
req_athena = f.read().splitlines()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this logic be encapsulated in a for-loop or function of sorts?

Comment on lines 19 to 27
with open(file_relative_path(__file__, "../requirements-dev-lite.txt")) as req:
requirements_dev_lite = {
f'{line.name}{"".join(line.specs[0])}' for line in rp.parse(req)
}

with open(file_relative_path(__file__, "../requirements-dev-contrib.txt")) as req:
requirements_dev_contrib = {
f'{line.name}{"".join(line.specs[0])}' for line in rp.parse(req)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same note here - the granularity we're adding adds a lot of verbosity and I'd love to simply things into a loop/function/dict if possible.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not changing this file

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason why? I'm okay leaving it be but this seems like a good candidate for a refactor.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ended up refactoring it...

requirements.txt Outdated
pandas>=0.23.0
pyparsing>=2.4,<3
python-dateutil>=2.8.1
pytz>=2015.6 # <---- should we update to something in the recent few years?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we resolve this before merging?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment was added so it could be discussed in PR

Comment on lines 1 to 2
boto3>=1.9 # <------ should this be 1.14 (see extras_require["s3"] in setup.py)
# <------ should this be 1.17.106 (see constraints-dev.txt)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please resolve these comments before merging.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment was added so it could be discussed in PR

Copy link
Member

@cdkini cdkini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requesting a few changes but nothing too significant.

@@ -0,0 +1 @@
apache-airflow[s3]>=1.9.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should get rid of the airflow file... I only added it because there was an extras_require entry in setup.py, but it's not documented and nobody would miss it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me but maybe reach out to @talagluck first just to confirm!

setup.py Outdated
lite = results.pop("lite")
results["boto"] = [req for req in lite if req.startswith("boto")]
results["sqlalchemy"] = [req for req in lite if req.startswith("sqlalchemy")]
results["airflow"] += results["boto"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line would be deleted too

@kenwade4 kenwade4 merged commit 1acb90c into develop Mar 15, 2022
@kenwade4 kenwade4 deleted the feature/split-requirements-dev-files branch March 15, 2022 22:09
Shinnnyshinshin pushed a commit that referenced this pull request Mar 15, 2022
…hub.com/great-expectations/great_expectations into feature/GREAT-500/add-notebooks-for-rbp

* 'feature/GREAT-500/add-notebooks-for-rbp' of https://github.com/great-expectations/great_expectations:
  [FEATURE] Use more granular requirements-dev-xxx.txt files (#4327)
  standardise on include and exclude columns list for profiler (#4424)
  [MAINTENANCE] Continue chipping away at warnings (#4422)
  [MAINTENANCE] Add docstrings and type hints to `Anonymizer` (#4419)
  Replace "sampling_method" with "estimator", since the latter is a more fitting name for the parameter. (#4420)
  [BUGFIX] Adding `--spark` flag back to `azure-pipelines.yml` compatibility_matrix stage.  (#4418)
  [MAINTENANCE] Refactor out unnecessary Anonymizer child classes (#4408)
  [BUGFIX] Pin `pytest-azurepipelines` due to breaking changes made in latest release
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants