Skip to content

Commit

Permalink
Merge branch 'cookiecutter-template' into update-from-cookiecutter-20…
Browse files Browse the repository at this point in the history
…22-07-07-0935
  • Loading branch information
apiology committed Jul 7, 2022
2 parents 3d1e36b + 2db81f5 commit 0115031
Show file tree
Hide file tree
Showing 10 changed files with 152 additions and 39 deletions.
3 changes: 3 additions & 0 deletions .markdownlint_style.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# frozen_string_literal: true

rule 'MD029', style: 'ordered'
1 change: 1 addition & 0 deletions .mdlrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
style ".markdownlint_style.rb"
75 changes: 75 additions & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
============
Contributing
============

Contributions are welcome, and they are greatly appreciated! Every little bit
helps, and credit will always be given.

You can contribute in many ways:

Types of Contributions
----------------------

Report Bugs
~~~~~~~~~~~

Report bugs at https://github.com/apiology/bigfiles/issues

If you are reporting a bug, please include:

* Your operating system name and version.
* Any details about your local setup that might be helpful in troubleshooting.
* Detailed steps to reproduce the bug.

Fix Bugs
~~~~~~~~

Look through the GitHub issues for bugs. Anything tagged with "bug"
and "help wanted" is open to whoever wants to implement a fix for it.

Implement Features
~~~~~~~~~~~~~~~~~~

Look through the GitHub issues for features. Anything tagged with "enhancement"
and "help wanted" is open to whoever wants to implement it.

If you have a new feature in mind, please start it by filing an issue
so we can discuss the need and approach before you invest time into
coding it.

Write Documentation
~~~~~~~~~~~~~~~~~~~

BigFiles could always use more documentation, whether as part of
the official BigFiles docs, in docstrings, or even on the web in blog posts, articles,
and such.

Submit Feedback
~~~~~~~~~~~~~~~

The best way to send feedback is to file an issue at
https://github.com/apiology/bigfiles/issues.

If you are proposing a new feature:

* Explain in detail how it would work.
* Keep the scope as narrow as possible, to make it easier to implement.
* Remember that this is a volunteer-driven project, and that contributions
are welcome :)

Get Started!
------------

Ready to contribute? See DEVELOPMENT.md in this directory for details
on how to set yourself up for local development.

Pull Request Guidelines
-----------------------

Before you submit a pull request, check that it meets these guidelines:

1. The pull request should include tests.

2. If the pull request adds functionality, the docs should be updated. Put your
new functionality into a function with a docstring, and add the feature to
the list in README.md.
1 change: 1 addition & 0 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ git log "v$(bump current)..."
bump --tag --tag-prefix=v ${type_of_bump:?}
rake release
git push
git push --tags
```
81 changes: 52 additions & 29 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,42 @@ GEM
specs:
ast (2.4.2)
bump (0.10.0)
chef-utils (17.10.0)
concurrent-ruby
childprocess (4.1.0)
coderay (1.1.3)
diff-lcs (1.4.4)
concurrent-ruby (1.1.10)
diff-lcs (1.5.0)
docile (1.4.0)
ffi (1.15.4-java)
high_water_mark (0.1.0)
imagen (0.1.8)
parser (>= 2.5, != 2.5.1.1)
iniparse (1.5.0)
json (2.6.2)
json (2.6.2-java)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
mdl (0.11.0)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.1)
mixlib-cli (~> 2.1, >= 2.1.1)
mixlib-config (>= 2.2.1, < 4)
mixlib-shellout
method_source (1.0.0)
overcommit (0.58.0)
mixlib-cli (2.1.8)
mixlib-config (3.0.27)
tomlrb
mixlib-shellout (3.2.7)
chef-utils
overcommit (0.59.1)
childprocess (>= 0.6.3, < 5)
iniparse (~> 1.4)
rexml (~> 3.2)
parallel (1.21.0)
parser (3.0.2.0)
parallel (1.22.1)
parser (3.1.2.0)
ast (~> 2.4.1)
pry (0.14.1)
coderay (~> 1.1)
Expand All @@ -34,40 +54,41 @@ GEM
coderay (~> 1.1)
method_source (~> 1.0)
spoon (~> 0.0)
rainbow (3.0.0)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.1.1)
regexp_parser (2.5.0)
rexml (3.2.5)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
rspec (3.11.0)
rspec-core (~> 3.11.0)
rspec-expectations (~> 3.11.0)
rspec-mocks (~> 3.11.0)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
rspec-expectations (3.11.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-mocks (3.10.2)
rspec-support (~> 3.11.0)
rspec-mocks (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.3)
rubocop (1.23.0)
rspec-support (~> 3.11.0)
rspec-support (3.11.0)
rubocop (1.31.2)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.0.0.0)
parser (>= 3.1.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.12.0, < 2.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.18.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.13.0)
parser (>= 3.0.1.1)
rubocop-ast (1.18.0)
parser (>= 3.1.1.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (2.6.0)
rubocop (~> 1.19)
rubocop-rspec (2.12.1)
rubocop (~> 1.31)
ruby-progressbar (1.11.0)
rugged (1.1.1)
rugged (1.2.0)
simplecov (0.21.2)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand All @@ -78,11 +99,12 @@ GEM
source_finder (3.2.1)
spoon (0.0.6)
ffi
undercover (0.4.3)
tomlrb (2.0.3)
undercover (0.4.4)
imagen (>= 0.1.8)
rainbow (>= 2.1, < 4.0)
rugged (>= 0.27, < 1.2)
unicode-display_width (2.1.0)
rugged (>= 0.27, < 1.3)
unicode-display_width (2.2.0)

PLATFORMS
java
Expand All @@ -95,6 +117,7 @@ DEPENDENCIES
bigfiles!
bump
bundler
mdl
overcommit (>= 0.58.0)
pry
rake (~> 13.0)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2013-2021, Vince Broz
Copyright (c) 2013-2022, Vince Broz

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ clean: clear_metrics ## remove all built artifacts

test: spec ## run tests quickly

typecheck: ## validate types in code and configuration

overcommit: ## run precommit quality checks
bundle exec overcommit --run

Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,15 @@ The gem is available as open source under the terms of the
Everyone interacting in the Pronto::Punchlist project’s codebases,
issue trackers, chat rooms and mailing lists is expected to follow the
[code of conduct](https://github.com/apiology/bigfiles/blob/main/CODE_OF_CONDUCT.md).

## Contributions

This project, as with all others, rests on the shoulders of a broad
ecosystem supported by many volunteers doing thankless work, along
with specific contributors.

In particular I'd like to call out:

* [Audrey Roy Greenfeld](https://github.com/audreyfeldroy) for the
cookiecutter tool and associated examples, which keep my many
projects building with shared boilerplate with a minimum of fuss.
1 change: 1 addition & 0 deletions bigfiles.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Gem::Specification.new do |spec|

spec.add_development_dependency 'bump'
spec.add_development_dependency 'bundler'
spec.add_development_dependency 'mdl'
# 0.58.0 and 0.57.0 don't seem super compatible with signatures, and
# magit doesn't seem to want to use the bundled version at the moment,
# so let's favor the more recent version...
Expand Down
13 changes: 4 additions & 9 deletions fix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -284,12 +284,7 @@ ensure_python_versions() {
}

major_minor="$(cut -d. -f1-2 <<<"${ver}")"
if [ "${major_minor}" == 3.6 ]
then
pyenv_install --patch "${ver}" < <(curl -sSL https://github.com/python/cpython/commit/8ea6353.patch\?full_index=1)
else
pyenv_install "${ver}"
fi
pyenv_install "${ver}"
else
pyenv install -s "${ver}"
fi
Expand All @@ -307,12 +302,12 @@ ensure_pyenv_virtualenvs() {
}

ensure_pip_and_wheel() {
# Make sure we have a pip with the 20.3 resolver, and after the
# initial bugfix release
# pip 22 seems to be better at finding pandas pre-compiled wheels
# for macOS, so let's make sure we're using at least that version
major_pip_version=$(pip --version | cut -d' ' -f2 | cut -d '.' -f 1)
if [[ major_pip_version -lt 21 ]]
then
pip install 'pip>=20.3.1'
pip install 'pip>=22'
fi
# wheel is helpful for being able to cache long package builds
pip show wheel >/dev/null 2>&1 || pip install wheel
Expand Down

0 comments on commit 0115031

Please sign in to comment.