Merge pull request #36 from sergeyklay/deprecate-package

sergeyklay · web-flow · commit 2ff7574002b2 · 2021-09-05T03:23:37.000+03:00
Deprecate package
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,15 +20,6 @@ on:
     branches:
       - master
 
-  schedule:
-    - cron: '0 11 * * *'
-      #      | | | | |
-      #      | | | | |____ day of the week (0 - 6 or SUN-SAT)
-      #      | | | |____ month (1 - 12 or JAN-DEC)
-      #      | | |____ day of the month (1 - 31)
-      #      | |____ hour (0 - 23)
-      #      |____ minute (0 - 59)
-
 env:
   PYTHONUNBUFFERED: '1'
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,9 +5,16 @@ This file contains a brief summary of new features and dependency changes or
 releases, in reverse chronological order.
 
 
-2.2.1 (2021-XX-XX)
+2.3.0 (2021-XX-XX)
 ------------------
 
+Features
+^^^^^^^^
+
+* **Deprecate package in favour of django-environ.**
+* Add Elasticsearch7 to search scheme.
+
+
 Bug Fixes
 ^^^^^^^^^
 
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -10,7 +10,7 @@
 # or remove some set of files from the sdist.
 
 # Include all files matching any of the listed patterns.
-include AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst LICENSE README.rst SECURITY.rst *.yml
+include AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst LICENSE README.rst *.yml
 graft .github
 
 # The contents of the directory tree tests will first be added to the sdist.
diff --git a/README.rst b/README.rst
@@ -18,6 +18,12 @@
 
 .. teaser-begin
 
+**Disclaimer:** This package is no longer maintained.
+Please use https://github.com/joke2k/django-environ instead.
+
+----
+
+
 ``django-environ-2`` is the Python package that allows you to use
 `Twelve-factor methodology <http://www.12factor.net/>`_ to configure your
 Django application with environment variables.
diff --git a/SECURITY.rst b/SECURITY.rst
diff --git a/environ/__init__.py b/environ/__init__.py
@@ -45,7 +45,7 @@
 
 
 __copyright__ = 'Copyright (C) 2021 Serghei Iakovlev'
-__version__ = '2.2.1'
+__version__ = '2.3.0'
 __license__ = 'MIT'
 __author__ = 'Daniele Faraglia'
 __author_email__ = 'daniele.faraglia@gmail.com'
diff --git a/setup.py b/setup.py
@@ -56,8 +56,6 @@ def changes():
             '',
             f"`Full changelog <{find_meta('url')}/en/latest/changelog.html>`_.",  # noqa: E501
             '',
-            read_file(path.join(PKG_DIR, 'SECURITY.rst')),
-            '',
             read_file(path.join(PKG_DIR, 'AUTHORS.rst')),
         )
 
@@ -148,7 +146,7 @@ def get_version_string():
 ]
 
 # Dependencies that are downloaded by pip on installation and why.
-INSTALL_REQUIRES = []
+INSTALL_REQUIRES = ['django-environ']
 
 DEPENDENCY_LINKS = []
 

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,6 @@ def changes():`
`56`	`56`	`'',`
`57`	`57`	f"`Full changelog <{find_meta('url')}/en/latest/changelog.html>`_.", # noqa: E501
`58`	`58`	`'',`
`59`		`- read_file(path.join(PKG_DIR, 'SECURITY.rst')),`
`60`		`- '',`
`61`	`59`	`read_file(path.join(PKG_DIR, 'AUTHORS.rst')),`
`62`	`60`	`)`
`63`	`61`
`@@ -148,7 +146,7 @@ def get_version_string():`
`148`	`146`	`]`
`149`	`147`
`150`	`148`	`# Dependencies that are downloaded by pip on installation and why.`
`151`		`-INSTALL_REQUIRES = []`
	`149`	`+INSTALL_REQUIRES = ['django-environ']`
`152`	`150`
`153`	`151`	`DEPENDENCY_LINKS = []`
`154`	`152`