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

Remove outdated Django version warning #1345

Merged
merged 1 commit into from
Aug 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Unreleased

- Remove outdated Django version warning ([#1345](https://github.com/heroku/heroku-buildpack-python/pull/1345)).

## v214 (2022-08-02)

Expand Down
8 changes: 0 additions & 8 deletions bin/steps/pip-install
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
mcount "failure.none-version"
fi

# TODO: Either remove this or fix since it's pretty broken at the moment - for example it
# doesn't match against a requirements specifier of 'Django >=1.11,<2' amongst others.
if grep -qi '^django==1.*' requirements.txt; then
puts-warn "Your Django version is nearing the end of its community support."
puts-warn "Upgrade to continue to receive security updates and for the best experience with Django."
puts-warn "For more information, check out https://www.djangoproject.com/download/#supported-versions"
fi

if [ ! -f "$BUILD_DIR/.heroku/python/bin/pip" ]; then
exit 1
fi
Expand Down
1 change: 0 additions & 1 deletion spec/fixtures/requirements_django_1.11/requirements.txt

This file was deleted.

2 changes: 0 additions & 2 deletions spec/fixtures/requirements_django_2.1/requirements.txt

This file was deleted.

27 changes: 0 additions & 27 deletions spec/hatchet/django_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,6 @@
require_relative '../spec_helper'

RSpec.describe 'Django support' do
describe 'Unsupported version warnings' do
context 'when requirements.txt contains Django==1.11' do
let(:app) { Hatchet::Runner.new('spec/fixtures/requirements_django_1.11') }

it 'warns about Django end of support' do
app.deploy do |app|
expect(clean_output(app.output)).to include(<<~OUTPUT)
remote: -----> Installing requirements with pip
remote: ! Your Django version is nearing the end of its community support.
remote: ! Upgrade to continue to receive security updates and for the best experience with Django.
remote: ! For more information, check out https://www.djangoproject.com/download/#supported-versions
OUTPUT
end
end
end

context 'when requirements.txt contains Django==2.1' do
let(:app) { Hatchet::Runner.new('spec/fixtures/requirements_django_2.1') }

it 'does not warn about Django end of support' do
app.deploy do |app|
expect(app.output).not_to include('https://www.djangoproject.com/download/#supported-versions')
end
end
end
end

describe 'collectstatic' do
context 'when building a Django project' do
let(:app) { Hatchet::Runner.new('python-getting-started') }
Expand Down