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

Upstream changes, use src layout #40

Merged
merged 67 commits into from
May 8, 2024
Merged

Upstream changes, use src layout #40

merged 67 commits into from
May 8, 2024

Conversation

Zeitsperre
Copy link

@Zeitsperre Zeitsperre commented May 6, 2024

What kind of change does this PR introduce?

  • Updates the main branch with the latest changes from upstream
  • Applies the flat layout

Does this PR introduce a breaking change?

Yes. The new src layout will have repercussions on all downstream projects.

Other information:

Closes #39

FYI @bzah

David Mougeolle and others added 30 commits September 16, 2019 09:23
The folder "dask-worker-space/" is a cache folder (like "__pycache__/") for IPython/Jupyter or other projects that implement Dask (https://dask.org). If a data science project package uses Jupyter notebooks, there is a chance that they might use Dask. This addition keeps that cache out of commits.
Built off initial work by @goyalyashpal.

Co-Authored-By: goyalyashpal <19423063+goyalyashpal@users.noreply.github.com>
…ject.toml

Initial working pyproject.toml addition
…les-instead-of-the-plain-commands

Document the make rules instead of the plain commands
fix audreyfeldroy#715: Get tests running + remove obsolete Argparse tests
- adapted to src structure... moved to pathlib
ArjunDandagi and others added 9 commits April 7, 2024 10:49
…wine-1.14.0-to-5.0.0

Update twine to 5.0.0
…phinx-1.8.5-to-7.2.6

Update sphinx to 7.2.6
…references-in-makefile

remove-black-references-in-makefile
# Conflicts:
#	cookiecutter.json
#	hooks/post_gen_project.py
#	hooks/pre_gen_project.py
#	requirements_dev.txt
#	setup.py
#	tests/test_bake_project.py
#	tox.ini
#	{{cookiecutter.project_slug}}/CONTRIBUTING.rst
#	{{cookiecutter.project_slug}}/Makefile
#	{{cookiecutter.project_slug}}/pyproject.toml
#	{{cookiecutter.project_slug}}/requirements_dev.txt
#	{{cookiecutter.project_slug}}/tests/test_{{cookiecutter.project_slug}}.py
#	{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/cli.py
@Zeitsperre Zeitsperre added the enhancement New feature or request label May 6, 2024
@Zeitsperre Zeitsperre self-assigned this May 6, 2024
@Zeitsperre Zeitsperre changed the title Upstream changes, use flat src layout Upstream changes, use src layout May 7, 2024
@Zeitsperre Zeitsperre marked this pull request as ready for review May 7, 2024 00:33
@Zeitsperre Zeitsperre requested a review from bzah May 7, 2024 00:33
Copy link

@bzah bzah left a comment

Choose a reason for hiding this comment

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

Looks good to me, some changes will clash with #38 but nothing too serious.

docs/conf.py Show resolved Hide resolved
@Zeitsperre
Copy link
Author

@bzah I'll merge my changes in here now and see if I can sort out the differences.

@Zeitsperre Zeitsperre merged commit 6b81aca into main May 8, 2024
6 checks passed
@Zeitsperre Zeitsperre deleted the upstream branch May 8, 2024 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Discuss the benefits of the src layout vs the flat layout