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 #120

Open
wants to merge 65 commits into
base: master
Choose a base branch
from
Open

Upstream changes #120

wants to merge 65 commits into from

Conversation

Zeitsperre
Copy link
Collaborator

@Zeitsperre Zeitsperre commented Sep 16, 2024

Overview

Changes:

  • Merged upstream master branch
  • Includes the "modernization" changes

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
pydanny and others added 16 commits April 6, 2024 15:27
…te-CI-to-GithubActions

Migrate ci to GitHub actions audreyfeldroy#707
…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:
#	Makefile
#	cookiecutter.json
#	docs/source/conf.py
#	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}}/.gitignore
#	{{cookiecutter.project_slug}}/CONTRIBUTING.rst
#	{{cookiecutter.project_slug}}/Makefile
#	{{cookiecutter.project_slug}}/requirements_dev.txt
#	{{cookiecutter.project_slug}}/setup.cfg
#	{{cookiecutter.project_slug}}/setup.py
#	{{cookiecutter.project_slug}}/src/{{cookiecutter.project_slug}}/__version__.py
#	{{cookiecutter.project_slug}}/src/{{cookiecutter.project_slug}}/default.cfg
#	{{cookiecutter.project_slug}}/src/{{cookiecutter.project_slug}}/processes/__init__.py
#	{{cookiecutter.project_slug}}/src/{{cookiecutter.project_slug}}/processes/wps_say_hello.py
#	{{cookiecutter.project_slug}}/src/{{cookiecutter.project_slug}}/templates/pywps.cfg
#	{{cookiecutter.project_slug}}/src/{{cookiecutter.project_slug}}/wsgi.py
#	{{cookiecutter.project_slug}}/src/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}.py
#	{{cookiecutter.project_slug}}/tests/test_{{cookiecutter.project_slug}}.py
#	{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/cli.py
@Zeitsperre Zeitsperre self-assigned this Sep 16, 2024
# Conflicts:
#	.github/workflows/main.yml
#	setup.cfg
#	setup.py
#	tox.ini
#	{{cookiecutter.project_slug}}/setup.py
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.