diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100644 index 36fe006678..0000000000 --- a/dev-requirements.txt +++ /dev/null @@ -1,10 +0,0 @@ -# -# Use this file to list development versions of OpenStack libraries -# which have not yet been released to PyPI. -# -# By the time OpenStack projects are released, they should switch to -# versions of these libraries which have been released to PyPI. -# -# See also: -# https://wiki.openstack.org/wiki/Oslo#FAQs -# diff --git a/tests/files/dev-req.txt b/tests/files/dev-req.txt deleted file mode 100644 index c07520f652..0000000000 --- a/tests/files/dev-req.txt +++ /dev/null @@ -1,12 +0,0 @@ -# -# Use this file to list development versions of OpenStack libraries -# which have not yet been released to PyPI. -# -# By the time OpenStack projects are released, they should switch to -# versions of these libraries which have been released to PyPI. -# -# See also: -# https://wiki.openstack.org/wiki/Oslo#FAQs -# --f http://tarballs.openstack.org/oslo.config/oslo.config-1.2.0a3.tar.gz#egg=oslo.config-1.2.0a3 -oslo.config>=1.2.0a3 diff --git a/tests/test_update.py b/tests/test_update.py index 2d8c7aeab5..3a14d1dece 100644 --- a/tests/test_update.py +++ b/tests/test_update.py @@ -39,7 +39,6 @@ class UpdateTest(testtools.TestCase): self.oslo_dir = os.path.join(self.dir, "project_with_oslo") self.req_file = os.path.join(self.dir, "global-requirements.txt") - self.dev_req_file = os.path.join(self.dir, "dev-requirements.txt") self.proj_file = os.path.join(self.project_dir, "requirements.txt") self.oslo_file = os.path.join(self.oslo_dir, "requirements.txt") self.bad_proj_file = os.path.join(self.bad_project_dir, @@ -58,7 +57,6 @@ class UpdateTest(testtools.TestCase): os.mkdir(self.bad_project_dir) shutil.copy("tests/files/gr-base.txt", self.req_file) - shutil.copy("tests/files/dev-req.txt", self.dev_req_file) shutil.copy("tests/files/project-with-oslo-tar.txt", self.oslo_file) shutil.copy("tests/files/project.txt", self.proj_file) shutil.copy("tests/files/project-with-bad-requirement.txt", @@ -118,8 +116,6 @@ class UpdateTest(testtools.TestCase): oslo_tar = ("-f http://tarballs.openstack.org/oslo.config/" "oslo.config-1.2.0a3.tar.gz#egg=oslo.config-1.2.0a3") self.assertIn(oslo_tar, reqs) - self.assertIn("oslo.config>=1.2.0a3", reqs) - self.assertNotIn("oslo.config>=1.1.0", reqs) def test_test_project(self): self._run_update() diff --git a/tests/test_update_pbr.py b/tests/test_update_pbr.py index 8ed3c03eaf..3aa2416830 100644 --- a/tests/test_update_pbr.py +++ b/tests/test_update_pbr.py @@ -42,7 +42,6 @@ class UpdateTestPbr(testtools.TestCase): self.project_dir = os.path.join(self.dir, "project_pbr") self.req_file = os.path.join(self.dir, "global-requirements.txt") - self.dev_req_file = os.path.join(self.dir, "dev-requirements.txt") self.proj_file = os.path.join(self.project_dir, "requirements.txt") self.proj_test_file = os.path.join(self.project_dir, "test-requirements.txt") @@ -51,7 +50,6 @@ class UpdateTestPbr(testtools.TestCase): os.mkdir(self.project_dir) shutil.copy("tests/files/gr-base.txt", self.req_file) - shutil.copy("tests/files/dev-req.txt", self.dev_req_file) shutil.copy("tests/files/project.txt", self.proj_file) shutil.copy("tests/files/test-project.txt", self.proj_test_file) shutil.copy("tests/files/setup.py", self.setup_file) diff --git a/tests/test_update_suffix.py b/tests/test_update_suffix.py index 0abfea9d17..f13106838e 100644 --- a/tests/test_update_suffix.py +++ b/tests/test_update_suffix.py @@ -40,7 +40,6 @@ class UpdateTestWithSuffix(testtools.TestCase): self.oslo_dir = os.path.join(self.dir, "project_with_oslo") self.req_file = os.path.join(self.dir, "global-requirements.txt") - self.dev_req_file = os.path.join(self.dir, "dev-requirements.txt") self.proj_file = os.path.join(self.project_dir, "requirements.txt") self.oslo_file = os.path.join(self.oslo_dir, "requirements.txt") self.proj_test_file = os.path.join(self.project_dir, @@ -53,7 +52,6 @@ class UpdateTestWithSuffix(testtools.TestCase): os.mkdir(self.oslo_dir) shutil.copy("tests/files/gr-base.txt", self.req_file) - shutil.copy("tests/files/dev-req.txt", self.dev_req_file) shutil.copy("tests/files/project-with-oslo-tar.txt", self.oslo_file) shutil.copy("tests/files/project.txt", self.proj_file) shutil.copy("tests/files/test-project.txt", self.proj_test_file) @@ -88,8 +86,6 @@ class UpdateTestWithSuffix(testtools.TestCase): oslo_tar = ("-f http://tarballs.openstack.org/oslo.config/" "oslo.config-1.2.0a3.tar.gz#egg=oslo.config-1.2.0a3") self.assertIn(oslo_tar, reqs) - self.assertIn("oslo.config>=1.2.0a3", reqs) - self.assertNotIn("oslo.config>=1.1.0", reqs) def test_test_project(self): reqs = _file_to_list("%s.%s" % (self.proj_test_file, 'global')) diff --git a/update.py b/update.py index 1a9c927910..e5c6247a3b 100644 --- a/update.py +++ b/update.py @@ -137,8 +137,8 @@ def _parse_reqs(filename): return reqs -def _sync_requirements_file(source_reqs, dev_reqs, dest_path, - suffix, softupdate, hacking): +def _sync_requirements_file( + source_reqs, dest_path, suffix, softupdate, hacking): dest_reqs = _readlines(dest_path) changes = [] # this is specifically for global-requirements gate jobs so we don't @@ -170,11 +170,7 @@ def _sync_requirements_file(source_reqs, dev_reqs, dest_path, continue if old_pip in source_reqs: - # allow it to be in dev-requirements - if ((old_pip in dev_reqs) and ( - old_require == dev_reqs[old_pip])): - new_reqs.write("%s\n" % dev_reqs[old_pip]) - elif _functionally_equal(old_require, source_reqs[old_pip]): + if _functionally_equal(old_require, source_reqs[old_pip]): new_reqs.write(old_line) else: changes.append( @@ -213,7 +209,6 @@ def _copy_requires(suffix, softupdate, hacking, dest_dir): """Copy requirements files.""" source_reqs = _parse_reqs('global-requirements.txt') - dev_reqs = _parse_reqs('dev-requirements.txt') target_files = [ 'requirements.txt', 'tools/pip-requires', @@ -226,8 +221,8 @@ def _copy_requires(suffix, softupdate, hacking, dest_dir): for dest in target_files: dest_path = os.path.join(dest_dir, dest) if os.path.exists(dest_path): - _sync_requirements_file(source_reqs, dev_reqs, dest_path, - suffix, softupdate, hacking) + _sync_requirements_file( + source_reqs, dest_path, suffix, softupdate, hacking) def _write_setup_py(dest_path):