Move code from lib3 to lib

yaml · Sep 22, 2021 · f20947a · f20947a
1 parent dc0c4c1
commit f20947a
Show file tree

Hide file tree

Showing 42 changed files with 2 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,6 @@
 /dist/*
 /build/*
 /lib/PyYAML.egg-info/*
-/lib3/PyYAML.egg-info/*
 /wheelhouse/*
 /yaml/_yaml.c
 MANIFEST

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,10 +1,7 @@
 include CHANGES README LICENSE Makefile pyproject.toml setup.py
 recursive-include lib/yaml *.py
 recursive-include lib/_yaml *.py
-recursive-include lib3/yaml *.py
-recursive-include lib3/_yaml *.py
 recursive-include examples *.py *.cfg *.yaml
 recursive-include tests/data *
 recursive-include tests/lib *.py
-recursive-include tests/lib3 *.py
 recursive-include yaml *
diff --git a/lib3/_yaml/__init__.py → lib/_yaml/__init__.py b/lib3/_yaml/__init__.py → lib/_yaml/__init__.py
diff --git a/lib3/yaml/__init__.py → lib/yaml/__init__.py b/lib3/yaml/__init__.py → lib/yaml/__init__.py
diff --git a/lib3/yaml/composer.py → lib/yaml/composer.py b/lib3/yaml/composer.py → lib/yaml/composer.py
diff --git a/lib3/yaml/constructor.py → lib/yaml/constructor.py b/lib3/yaml/constructor.py → lib/yaml/constructor.py
diff --git a/lib3/yaml/cyaml.py → lib/yaml/cyaml.py b/lib3/yaml/cyaml.py → lib/yaml/cyaml.py
diff --git a/lib3/yaml/dumper.py → lib/yaml/dumper.py b/lib3/yaml/dumper.py → lib/yaml/dumper.py
diff --git a/lib3/yaml/emitter.py → lib/yaml/emitter.py b/lib3/yaml/emitter.py → lib/yaml/emitter.py
diff --git a/lib3/yaml/error.py → lib/yaml/error.py b/lib3/yaml/error.py → lib/yaml/error.py
diff --git a/lib3/yaml/events.py → lib/yaml/events.py b/lib3/yaml/events.py → lib/yaml/events.py
diff --git a/lib3/yaml/loader.py → lib/yaml/loader.py b/lib3/yaml/loader.py → lib/yaml/loader.py
diff --git a/lib3/yaml/nodes.py → lib/yaml/nodes.py b/lib3/yaml/nodes.py → lib/yaml/nodes.py
diff --git a/lib3/yaml/parser.py → lib/yaml/parser.py b/lib3/yaml/parser.py → lib/yaml/parser.py
diff --git a/lib3/yaml/reader.py → lib/yaml/reader.py b/lib3/yaml/reader.py → lib/yaml/reader.py
diff --git a/lib3/yaml/representer.py → lib/yaml/representer.py b/lib3/yaml/representer.py → lib/yaml/representer.py
diff --git a/lib3/yaml/resolver.py → lib/yaml/resolver.py b/lib3/yaml/resolver.py → lib/yaml/resolver.py
diff --git a/lib3/yaml/scanner.py → lib/yaml/scanner.py b/lib3/yaml/scanner.py → lib/yaml/scanner.py
diff --git a/lib3/yaml/serializer.py → lib/yaml/serializer.py b/lib3/yaml/serializer.py → lib/yaml/serializer.py
diff --git a/lib3/yaml/tokens.py → lib/yaml/tokens.py b/lib3/yaml/tokens.py → lib/yaml/tokens.py
diff --git a/setup.py b/setup.py
@@ -247,7 +247,7 @@ def run(self):
         build_cmd = self.get_finalized_command('build')
         build_cmd.run()
         sys.path.insert(0, build_cmd.build_lib)
-        sys.path.insert(0, 'tests/lib3')
+        sys.path.insert(0, 'tests/lib')
         import test_all
         if not test_all.main([]):
             raise DistutilsError("Tests failed")
@@ -277,7 +277,7 @@ def run(self):
         classifiers=CLASSIFIERS,
         project_urls=PROJECT_URLS,
 
-        package_dir={'': 'lib3'},
+        package_dir={'': 'lib'},
         packages=['yaml', '_yaml'],
         ext_modules=[
             Extension('yaml._yaml', ['yaml/_yaml.pyx'],

diff --git a/tests/lib3/canonical.py → tests/lib/canonical.py b/tests/lib3/canonical.py → tests/lib/canonical.py
diff --git a/tests/lib3/test_all.py → tests/lib/test_all.py b/tests/lib3/test_all.py → tests/lib/test_all.py
diff --git a/tests/lib3/test_appliance.py → tests/lib/test_appliance.py b/tests/lib3/test_appliance.py → tests/lib/test_appliance.py
diff --git a/tests/lib3/test_build.py → tests/lib/test_build.py b/tests/lib3/test_build.py → tests/lib/test_build.py
diff --git a/tests/lib3/test_build_ext.py → tests/lib/test_build_ext.py b/tests/lib3/test_build_ext.py → tests/lib/test_build_ext.py
diff --git a/tests/lib3/test_canonical.py → tests/lib/test_canonical.py b/tests/lib3/test_canonical.py → tests/lib/test_canonical.py
diff --git a/tests/lib3/test_constructor.py → tests/lib/test_constructor.py b/tests/lib3/test_constructor.py → tests/lib/test_constructor.py
diff --git a/tests/lib3/test_emitter.py → tests/lib/test_emitter.py b/tests/lib3/test_emitter.py → tests/lib/test_emitter.py
diff --git a/tests/lib3/test_errors.py → tests/lib/test_errors.py b/tests/lib3/test_errors.py → tests/lib/test_errors.py
diff --git a/tests/lib3/test_input_output.py → tests/lib/test_input_output.py b/tests/lib3/test_input_output.py → tests/lib/test_input_output.py
diff --git a/tests/lib3/test_mark.py → tests/lib/test_mark.py b/tests/lib3/test_mark.py → tests/lib/test_mark.py
diff --git a/tests/lib3/test_multi_constructor.py → tests/lib/test_multi_constructor.py b/tests/lib3/test_multi_constructor.py → tests/lib/test_multi_constructor.py
diff --git a/tests/lib3/test_reader.py → tests/lib/test_reader.py b/tests/lib3/test_reader.py → tests/lib/test_reader.py
diff --git a/tests/lib3/test_recursive.py → tests/lib/test_recursive.py b/tests/lib3/test_recursive.py → tests/lib/test_recursive.py
diff --git a/tests/lib3/test_representer.py → tests/lib/test_representer.py b/tests/lib3/test_representer.py → tests/lib/test_representer.py
diff --git a/tests/lib3/test_resolver.py → tests/lib/test_resolver.py b/tests/lib3/test_resolver.py → tests/lib/test_resolver.py
diff --git a/tests/lib3/test_sort_keys.py → tests/lib/test_sort_keys.py b/tests/lib3/test_sort_keys.py → tests/lib/test_sort_keys.py
diff --git a/tests/lib3/test_structure.py → tests/lib/test_structure.py b/tests/lib3/test_structure.py → tests/lib/test_structure.py
diff --git a/tests/lib3/test_tokens.py → tests/lib/test_tokens.py b/tests/lib3/test_tokens.py → tests/lib/test_tokens.py
diff --git a/tests/lib3/test_yaml.py → tests/lib/test_yaml.py b/tests/lib3/test_yaml.py → tests/lib/test_yaml.py
diff --git a/tests/lib3/test_yaml_ext.py → tests/lib/test_yaml_ext.py b/tests/lib3/test_yaml_ext.py → tests/lib/test_yaml_ext.py