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

Fast-forward changes from upstream, enable testing #115

Merged
merged 33 commits into from
Jan 12, 2024
Merged

Conversation

Zeitsperre
Copy link
Collaborator

@Zeitsperre Zeitsperre commented Dec 20, 2023

Overview

Changes:

  • Merged with upstream master
  • Cleaned up Makefile for a cleaner and more ordered help menu
  • Adjusted tests to fit latest changes
  • Small adjustments to docs
  • Do not use test_requires for pytest-based projects
  • Updated ReadTheDocs configuration
  • Synchronized dependencies across top-level package and template
  • Removed all references to Travis CI

Related Issue / Discussion

Additional Information

jackton1 and others added 30 commits May 25, 2021 22:42
* Remove deprecated setup requires and pytest-runner

* Update test_bake_project.py

* Update setup.cfg

* Update requirements_dev.txt
* Step 5 and Step 8 links updated.

Step 5: Change link to travis.ci.com and remove travis.ci.org
Since June 15th, 2021, the building on travis-ci.org is ceased. Please use travis-ci.com from now on. 

Step 8
Release on PyPi checklist link was 404.  Updated the link to to point to the pypi_release_checklist in docs.

* Step 5 remove missing internal link

One of the travis links deleted in the last commit had not been completely removed.
Adding waynerv/cookiecutter-pypackage to list of similar templates. Main differences:

- Using Poetry to manage packaging and dependencies.
- Run test, staging and release workflows with GitHub Actions.
- Added Pre-commit hooks to automatically run format, lint and static type check before every git commit.
Git(hub) changed the default `master` branch name to `main`, so a newly created project should follow this current naming policy.
Replace collect_ignore with adopts as the former is not available anymore.
From https://blog.readthedocs.com/migrate-configuration-v2/

.readthedocs.yaml file will be required in September 2023
Use current git branch naming scheme in tutorial
…hedocs-yaml

Bring over sample .readthedocs.yaml
# Conflicts:
#	README.rst
#	cookiecutter.json
#	tests/test_bake_project.py
#	{{cookiecutter.project_slug}}/.gitignore
#	{{cookiecutter.project_slug}}/Makefile
#	{{cookiecutter.project_slug}}/requirements_dev.txt
#	{{cookiecutter.project_slug}}/setup.cfg
#	{{cookiecutter.project_slug}}/setup.py
…ts to fit latest changes, small adjustments to docs, do not use test_requires for pytest-based projects
@Zeitsperre Zeitsperre requested a review from cehbrecht December 21, 2023 18:47
@Zeitsperre Zeitsperre self-assigned this Dec 21, 2023
@Zeitsperre Zeitsperre marked this pull request as ready for review December 21, 2023 18:47
@Zeitsperre Zeitsperre added enhancement New feature or request tests labels Dec 21, 2023
@Zeitsperre Zeitsperre changed the title Fast-forward changes from upstream Fast-forward changes from upstream, enable testing Dec 21, 2023
@cehbrecht
Copy link
Member

@Zeitsperre we could remove travis-ci ... not used anymore ...

@Zeitsperre
Copy link
Collaborator Author

@cehbrecht

Will do! I wasn't sure if there were any projects in Bird-house that might still be using it.

@Zeitsperre Zeitsperre merged commit 3c9bbed into master Jan 12, 2024
5 checks passed
@Zeitsperre Zeitsperre deleted the upstream-changes branch May 10, 2024 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.