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

Merged
merged 68 commits into from
Oct 3, 2024
Merged

Upstream changes #120

merged 68 commits into from
Oct 3, 2024

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
ArjunDandagi and others added 4 commits April 7, 2024 11:13
…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
@cehbrecht
Copy link
Member

@Zeitsperre thanks :) Looks good to me.

we will probably move to pygeoapi (ogcapi-processes) and skip pywps in the future. Probably we want to keep a cookiecutter for setting up new projects (birds). It is then also a chance to build an improved version ... for example using markdown for documentation?

@Zeitsperre
Copy link
Collaborator Author

@cehbrecht

I think Markdown makes sense for some of the documentation, mostly the top-level files (README, CHANGELOG, SECURITY, etc.), but given that we use numpy docstrings everywhere, ReStructuredText makes for consistent docs when rendered.

Would you want to make a separate cookiecutter for the PyGeoAPI-based projects? Start completely from scratch (or port from here/upstream?). There are a lot of patterns I held back on here to not cause headaches in existing projects, but I imagine a new template could benefit from them.

In any case, thanks for the review. Will update a few existing projects with this.

@Zeitsperre
Copy link
Collaborator Author

@cehbrecht

There are so many changes since 2020 that I'm setting this package as v1.0.0 of the package. We could technically place this on PyPI, but there would be no point, IMO. Perhaps a better idea would be to publish this on Zenodo for future reference.

I'll merge this now, but let me know in the day if that's of interest to you.

@cehbrecht
Copy link
Member

@cehbrecht

I think Markdown makes sense for some of the documentation, mostly the top-level files (README, CHANGELOG, SECURITY, etc.), but given that we use numpy docstrings everywhere, ReStructuredText makes for consistent docs when rendered.

Would you want to make a separate cookiecutter for the PyGeoAPI-based projects? Start completely from scratch (or port from here/upstream?). There are a lot of patterns I held back on here to not cause headaches in existing projects, but I imagine a new template could benefit from them.

In any case, thanks for the review. Will update a few existing projects with this.

I would prefer to start with new projects (and a new cookiecutter) for pygeoapi. To avoid some headaches :)

@cehbrecht
Copy link
Member

@cehbrecht

There are so many changes since 2020 that I'm setting this package as v1.0.0 of the package. We could technically place this on PyPI, but there would be no point, IMO. Perhaps a better idea would be to publish this on Zenodo for future reference.

I'll merge this now, but let me know in the day if that's of interest to you.

I'm fine with version v1.0.0 ... finally :) Personally I don't need a Zenodo reference.

@Zeitsperre Zeitsperre merged commit a062df0 into master Oct 3, 2024
7 checks passed
@Zeitsperre Zeitsperre deleted the upstream-changes branch October 3, 2024 16:02
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.