public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/portage:repoman commit in: repoman/bin/, repoman/pym/repoman/modules/vcs/git/, ...
@ 2016-05-14 18:33 Brian Dolbec
  2016-05-15 23:51 ` [gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/vcs/, repoman/pym/repoman/modules/scan/depend/, man/, Brian Dolbec
  0 siblings, 1 reply; 2+ messages in thread
From: Brian Dolbec @ 2016-05-14 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     3c3c4cf1fd7e99995ccdfd43320cce1a97432b99
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 08:49:48 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat May 14 18:29:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3c3c4cf1

Bulk move of repoman to it's own namespace for better packaging

Edit repoman calls from portage setup.py, MANIFEST.in.
Copy setup.py to the new repoman pkg, begin edit for repoman.
Copy TEST-NOTES to repoman

 MANIFEST.in                                        |  1 -
 repoman/MANIFEST.in                                |  3 ++
 repoman/README                                     | 49 +++++++++++++++++
 repoman/TEST-NOTES                                 | 45 ++++++++++++++++
 {bin => repoman/bin}/repoman                       |  0
 {cnf => repoman/cnf}/metadata.xsd                  |  0
 {man => repoman/man}/repoman.1                     |  0
 {pym => repoman/pym}/repoman/__init__.py           |  0
 {pym => repoman/pym}/repoman/_portage.py           |  0
 {pym => repoman/pym}/repoman/_subprocess.py        |  0
 {pym => repoman/pym}/repoman/actions.py            |  0
 {pym => repoman/pym}/repoman/argparser.py          |  0
 {pym => repoman/pym}/repoman/check_missingslot.py  |  0
 {pym => repoman/pym}/repoman/checks/__init__.py    |  0
 .../pym}/repoman/checks/herds/__init__.py          |  0
 .../pym}/repoman/checks/herds/herdbase.py          |  0
 .../pym}/repoman/checks/herds/metadata.py          |  0
 {pym => repoman/pym}/repoman/copyrights.py         |  0
 {pym => repoman/pym}/repoman/errors.py             |  0
 {pym => repoman/pym}/repoman/gpg.py                |  0
 {pym => repoman/pym}/repoman/main.py               |  0
 {pym => repoman/pym}/repoman/metadata.py           |  0
 {pym => repoman/pym}/repoman/modules/__init__.py   |  0
 .../pym}/repoman/modules/commit/__init__.py        |  0
 .../pym}/repoman/modules/commit/repochecks.py      |  0
 .../pym}/repoman/modules/scan/__init__.py          |  0
 .../pym}/repoman/modules/scan/depend/__init__.py   |  0
 .../repoman/modules/scan/depend/_depend_checks.py  |  0
 .../repoman/modules/scan/depend/_gen_arches.py     |  0
 .../pym}/repoman/modules/scan/depend/profile.py    |  0
 .../repoman/modules/scan/directories/__init__.py   |  0
 .../pym}/repoman/modules/scan/directories/files.py |  0
 .../pym}/repoman/modules/scan/directories/mtime.py |  0
 .../pym}/repoman/modules/scan/eapi/__init__.py     |  0
 .../pym}/repoman/modules/scan/eapi/eapi.py         |  0
 .../pym}/repoman/modules/scan/ebuild/__init__.py   |  0
 .../pym}/repoman/modules/scan/ebuild/checks.py     |  0
 .../pym}/repoman/modules/scan/ebuild/ebuild.py     |  0
 .../pym}/repoman/modules/scan/ebuild/errors.py     |  0
 .../pym}/repoman/modules/scan/ebuild/multicheck.py |  0
 .../pym}/repoman/modules/scan/eclasses/__init__.py |  0
 .../pym}/repoman/modules/scan/eclasses/live.py     |  0
 .../pym}/repoman/modules/scan/eclasses/ruby.py     |  0
 .../pym}/repoman/modules/scan/fetch/__init__.py    |  0
 .../pym}/repoman/modules/scan/fetch/fetches.py     |  0
 .../pym}/repoman/modules/scan/keywords/__init__.py |  0
 .../pym}/repoman/modules/scan/keywords/keywords.py |  0
 .../pym}/repoman/modules/scan/manifest/__init__.py |  0
 .../repoman/modules/scan/manifest/manifests.py     |  0
 .../pym}/repoman/modules/scan/metadata/__init__.py |  0
 .../repoman/modules/scan/metadata/description.py   |  0
 .../modules/scan/metadata/ebuild_metadata.py       |  0
 .../repoman/modules/scan/metadata/pkgmetadata.py   |  0
 .../pym}/repoman/modules/scan/metadata/restrict.py |  0
 .../repoman/modules/scan/metadata/use_flags.py     |  0
 .../pym}/repoman/modules/scan/options/__init__.py  |  0
 .../pym}/repoman/modules/scan/options/options.py   |  0
 {pym => repoman/pym}/repoman/modules/scan/scan.py  |  0
 .../pym}/repoman/modules/scan/scanbase.py          |  0
 .../pym}/repoman/modules/vcs/None/__init__.py      |  0
 .../pym}/repoman/modules/vcs/None/changes.py       |  0
 .../pym}/repoman/modules/vcs/None/status.py        |  0
 .../pym}/repoman/modules/vcs/__init__.py           |  0
 .../pym}/repoman/modules/vcs/bzr/__init__.py       |  0
 .../pym}/repoman/modules/vcs/bzr/changes.py        |  0
 .../pym}/repoman/modules/vcs/bzr/status.py         |  0
 .../pym}/repoman/modules/vcs/changes.py            |  0
 .../pym}/repoman/modules/vcs/cvs/__init__.py       |  0
 .../pym}/repoman/modules/vcs/cvs/changes.py        |  0
 .../pym}/repoman/modules/vcs/cvs/status.py         |  0
 .../pym}/repoman/modules/vcs/git/__init__.py       |  0
 .../pym}/repoman/modules/vcs/git/changes.py        |  0
 .../pym}/repoman/modules/vcs/git/status.py         |  0
 .../pym}/repoman/modules/vcs/hg/__init__.py        |  0
 .../pym}/repoman/modules/vcs/hg/changes.py         |  0
 .../pym}/repoman/modules/vcs/hg/status.py          |  0
 .../pym}/repoman/modules/vcs/settings.py           |  0
 .../pym}/repoman/modules/vcs/svn/__init__.py       |  0
 .../pym}/repoman/modules/vcs/svn/changes.py        |  0
 .../pym}/repoman/modules/vcs/svn/status.py         |  0
 {pym => repoman/pym}/repoman/modules/vcs/vcs.py    |  0
 {pym => repoman/pym}/repoman/profile.py            |  0
 {pym => repoman/pym}/repoman/qa_data.py            |  0
 {pym => repoman/pym}/repoman/qa_tracker.py         |  0
 {pym => repoman/pym}/repoman/repos.py              |  0
 {pym => repoman/pym}/repoman/scanner.py            |  0
 .../pym/repoman/tests}/__init__.py                 |  0
 .../pym/repoman/tests}/__test__.py                 |  0
 .../pym/repoman/tests/changelog}/__init__.py       |  0
 .../repoman/tests/changelog}/test_echangelog.py    |  0
 repoman/pym/repoman/tests/runTests.py              | 61 ++++++++++++++++++++++
 .../pym/repoman/tests/simple}/__init__.py          |  0
 .../pym/repoman/tests/simple}/test_simple.py       |  0
 {pym => repoman/pym}/repoman/utilities.py          |  0
 setup.py => repoman/setup.py                       | 18 ++-----
 setup.py                                           |  4 +-
 96 files changed, 164 insertions(+), 17 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 2178460..4f6cac1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -12,7 +12,6 @@ include cnf/make.conf.example.*
 
 # extra files for tests
 include .portage_not_installed
-include cnf/metadata.xsd
 
 # extra scripts
 include misc/*

diff --git a/repoman/MANIFEST.in b/repoman/MANIFEST.in
new file mode 100644
index 0000000..ed81a97
--- /dev/null
+++ b/repoman/MANIFEST.in
@@ -0,0 +1,3 @@
+
+# for the tests
+include cnf/metadata.xsd

diff --git a/repoman/README b/repoman/README
new file mode 100644
index 0000000..5e78842
--- /dev/null
+++ b/repoman/README
@@ -0,0 +1,49 @@
+About Portage
+=============
+
+Portage is a package management system based on ports collections. The
+Package Manager Specification Project (PMS) standardises and documents
+the behaviour of Portage so that the Portage tree can be used by other
+package managers.
+
+
+Dependencies
+============
+
+Python and Bash should be the only hard dependencies. Python 2.7 is the
+minimum supported version.
+
+
+Licensing and Legalese
+=======================
+
+Portage is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+version 2 as published by the Free Software Foundation.
+
+Portage is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Portage; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.
+
+
+More information
+================
+
+-DEVELOPING contains some code guidelines.
+-LICENSE contains the GNU General Public License version 2.
+-NEWS contains new features/major bug fixes for each version.
+-RELEASE NOTES contains mainly upgrade information for each version.
+-TEST-NOTES contains Portage unit test information.
+
+
+Links
+=====
+Gentoo project page: <https://wiki.gentoo.org/wiki/Project:Portage>
+PMS: <https://dev.gentoo.org/~ulm/pms/head/pms.html>
+PMS git repo: <https://gitweb.gentoo.org/proj/pms.git/>

diff --git a/repoman/TEST-NOTES b/repoman/TEST-NOTES
new file mode 100644
index 0000000..f9c6ab0
--- /dev/null
+++ b/repoman/TEST-NOTES
@@ -0,0 +1,45 @@
+UnitTests
+---------
+
+Portage has some tests that use the unittest framework that ships with python (2.3-2.4ish)
+Tests have a specific naming convention.
+
+in pym/portage/tests/ there is a runTest script that invokes pym/portage/tests/__init__.py
+
+This init looks at a hardcoded list of test dirs to search for tests.
+If you add a new dir and don't see your new tests, make sure that the dir is in this list.
+
+On the subject of adding more directories; the layout is basically 1 directory per portage
+file at this point (we have few files, and even fewer large files).  Inside of the dir
+you should have files of the form test_${function}.py.
+
+So if I was to write a vercmp test, and vercmp is in portage_versions.
+
+pym/portage/tests/portage_versions/test_vercmp.py
+
+would be the filename.
+
+The __init__.py file now does recursive tests, but you need to tell it so.  For example, if
+you had cache tests the dir format would be something like...
+
+pym/portage/tests/cache/flat_hash/test_foo.py
+
+and you would put "cache/flat_hash" into the testDirs variable in __init__.py.
+
+
+Skipping
+--------
+
+Please use the portage.tests.* classes as they support throwing a SkipException for
+tests that are known to fail.  Normally one uses testing to do Test Driven Development
+(TDD); however we do not do that here.  Therefore there are times when legitimate tests
+exist but fail due to code in trunk.  We would still like the suite to pass in some instances
+because the suite is built around two things, testing functionality in the current code as
+well as poking holes in the current code (isvalidatom is an example).  So sometimes we desire
+a test to point out that "this needs fixing" but it doesn't affect portage's overall
+functionality.  You should raise portage.tests.SkipException in that case.
+
+emerge
+------
+
+The emerge namespace currently has 0 tests (and no runner)

diff --git a/bin/repoman b/repoman/bin/repoman
similarity index 100%
rename from bin/repoman
rename to repoman/bin/repoman

diff --git a/cnf/metadata.xsd b/repoman/cnf/metadata.xsd
similarity index 100%
rename from cnf/metadata.xsd
rename to repoman/cnf/metadata.xsd

diff --git a/man/repoman.1 b/repoman/man/repoman.1
similarity index 100%
rename from man/repoman.1
rename to repoman/man/repoman.1

diff --git a/pym/repoman/__init__.py b/repoman/pym/repoman/__init__.py
similarity index 100%
rename from pym/repoman/__init__.py
rename to repoman/pym/repoman/__init__.py

diff --git a/pym/repoman/_portage.py b/repoman/pym/repoman/_portage.py
similarity index 100%
rename from pym/repoman/_portage.py
rename to repoman/pym/repoman/_portage.py

diff --git a/pym/repoman/_subprocess.py b/repoman/pym/repoman/_subprocess.py
similarity index 100%
rename from pym/repoman/_subprocess.py
rename to repoman/pym/repoman/_subprocess.py

diff --git a/pym/repoman/actions.py b/repoman/pym/repoman/actions.py
similarity index 100%
rename from pym/repoman/actions.py
rename to repoman/pym/repoman/actions.py

diff --git a/pym/repoman/argparser.py b/repoman/pym/repoman/argparser.py
similarity index 100%
rename from pym/repoman/argparser.py
rename to repoman/pym/repoman/argparser.py

diff --git a/pym/repoman/check_missingslot.py b/repoman/pym/repoman/check_missingslot.py
similarity index 100%
rename from pym/repoman/check_missingslot.py
rename to repoman/pym/repoman/check_missingslot.py

diff --git a/pym/repoman/checks/__init__.py b/repoman/pym/repoman/checks/__init__.py
similarity index 100%
rename from pym/repoman/checks/__init__.py
rename to repoman/pym/repoman/checks/__init__.py

diff --git a/pym/repoman/checks/herds/__init__.py b/repoman/pym/repoman/checks/herds/__init__.py
similarity index 100%
rename from pym/repoman/checks/herds/__init__.py
rename to repoman/pym/repoman/checks/herds/__init__.py

diff --git a/pym/repoman/checks/herds/herdbase.py b/repoman/pym/repoman/checks/herds/herdbase.py
similarity index 100%
rename from pym/repoman/checks/herds/herdbase.py
rename to repoman/pym/repoman/checks/herds/herdbase.py

diff --git a/pym/repoman/checks/herds/metadata.py b/repoman/pym/repoman/checks/herds/metadata.py
similarity index 100%
rename from pym/repoman/checks/herds/metadata.py
rename to repoman/pym/repoman/checks/herds/metadata.py

diff --git a/pym/repoman/copyrights.py b/repoman/pym/repoman/copyrights.py
similarity index 100%
rename from pym/repoman/copyrights.py
rename to repoman/pym/repoman/copyrights.py

diff --git a/pym/repoman/errors.py b/repoman/pym/repoman/errors.py
similarity index 100%
rename from pym/repoman/errors.py
rename to repoman/pym/repoman/errors.py

diff --git a/pym/repoman/gpg.py b/repoman/pym/repoman/gpg.py
similarity index 100%
rename from pym/repoman/gpg.py
rename to repoman/pym/repoman/gpg.py

diff --git a/pym/repoman/main.py b/repoman/pym/repoman/main.py
similarity index 100%
rename from pym/repoman/main.py
rename to repoman/pym/repoman/main.py

diff --git a/pym/repoman/metadata.py b/repoman/pym/repoman/metadata.py
similarity index 100%
rename from pym/repoman/metadata.py
rename to repoman/pym/repoman/metadata.py

diff --git a/pym/repoman/modules/__init__.py b/repoman/pym/repoman/modules/__init__.py
similarity index 100%
rename from pym/repoman/modules/__init__.py
rename to repoman/pym/repoman/modules/__init__.py

diff --git a/pym/repoman/modules/commit/__init__.py b/repoman/pym/repoman/modules/commit/__init__.py
similarity index 100%
rename from pym/repoman/modules/commit/__init__.py
rename to repoman/pym/repoman/modules/commit/__init__.py

diff --git a/pym/repoman/modules/commit/repochecks.py b/repoman/pym/repoman/modules/commit/repochecks.py
similarity index 100%
rename from pym/repoman/modules/commit/repochecks.py
rename to repoman/pym/repoman/modules/commit/repochecks.py

diff --git a/pym/repoman/modules/scan/__init__.py b/repoman/pym/repoman/modules/scan/__init__.py
similarity index 100%
rename from pym/repoman/modules/scan/__init__.py
rename to repoman/pym/repoman/modules/scan/__init__.py

diff --git a/pym/repoman/modules/scan/depend/__init__.py b/repoman/pym/repoman/modules/scan/depend/__init__.py
similarity index 100%
rename from pym/repoman/modules/scan/depend/__init__.py
rename to repoman/pym/repoman/modules/scan/depend/__init__.py

diff --git a/pym/repoman/modules/scan/depend/_depend_checks.py b/repoman/pym/repoman/modules/scan/depend/_depend_checks.py
similarity index 100%
rename from pym/repoman/modules/scan/depend/_depend_checks.py
rename to repoman/pym/repoman/modules/scan/depend/_depend_checks.py

diff --git a/pym/repoman/modules/scan/depend/_gen_arches.py b/repoman/pym/repoman/modules/scan/depend/_gen_arches.py
similarity index 100%
rename from pym/repoman/modules/scan/depend/_gen_arches.py
rename to repoman/pym/repoman/modules/scan/depend/_gen_arches.py

diff --git a/pym/repoman/modules/scan/depend/profile.py b/repoman/pym/repoman/modules/scan/depend/profile.py
similarity index 100%
rename from pym/repoman/modules/scan/depend/profile.py
rename to repoman/pym/repoman/modules/scan/depend/profile.py

diff --git a/pym/repoman/modules/scan/directories/__init__.py b/repoman/pym/repoman/modules/scan/directories/__init__.py
similarity index 100%
rename from pym/repoman/modules/scan/directories/__init__.py
rename to repoman/pym/repoman/modules/scan/directories/__init__.py

diff --git a/pym/repoman/modules/scan/directories/files.py b/repoman/pym/repoman/modules/scan/directories/files.py
similarity index 100%
rename from pym/repoman/modules/scan/directories/files.py
rename to repoman/pym/repoman/modules/scan/directories/files.py

diff --git a/pym/repoman/modules/scan/directories/mtime.py b/repoman/pym/repoman/modules/scan/directories/mtime.py
similarity index 100%
rename from pym/repoman/modules/scan/directories/mtime.py
rename to repoman/pym/repoman/modules/scan/directories/mtime.py

diff --git a/pym/repoman/modules/scan/eapi/__init__.py b/repoman/pym/repoman/modules/scan/eapi/__init__.py
similarity index 100%
rename from pym/repoman/modules/scan/eapi/__init__.py
rename to repoman/pym/repoman/modules/scan/eapi/__init__.py

diff --git a/pym/repoman/modules/scan/eapi/eapi.py b/repoman/pym/repoman/modules/scan/eapi/eapi.py
similarity index 100%
rename from pym/repoman/modules/scan/eapi/eapi.py
rename to repoman/pym/repoman/modules/scan/eapi/eapi.py

diff --git a/pym/repoman/modules/scan/ebuild/__init__.py b/repoman/pym/repoman/modules/scan/ebuild/__init__.py
similarity index 100%
rename from pym/repoman/modules/scan/ebuild/__init__.py
rename to repoman/pym/repoman/modules/scan/ebuild/__init__.py

diff --git a/pym/repoman/modules/scan/ebuild/checks.py b/repoman/pym/repoman/modules/scan/ebuild/checks.py
similarity index 100%
rename from pym/repoman/modules/scan/ebuild/checks.py
rename to repoman/pym/repoman/modules/scan/ebuild/checks.py

diff --git a/pym/repoman/modules/scan/ebuild/ebuild.py b/repoman/pym/repoman/modules/scan/ebuild/ebuild.py
similarity index 100%
rename from pym/repoman/modules/scan/ebuild/ebuild.py
rename to repoman/pym/repoman/modules/scan/ebuild/ebuild.py

diff --git a/pym/repoman/modules/scan/ebuild/errors.py b/repoman/pym/repoman/modules/scan/ebuild/errors.py
similarity index 100%
rename from pym/repoman/modules/scan/ebuild/errors.py
rename to repoman/pym/repoman/modules/scan/ebuild/errors.py

diff --git a/pym/repoman/modules/scan/ebuild/multicheck.py b/repoman/pym/repoman/modules/scan/ebuild/multicheck.py
similarity index 100%
rename from pym/repoman/modules/scan/ebuild/multicheck.py
rename to repoman/pym/repoman/modules/scan/ebuild/multicheck.py

diff --git a/pym/repoman/modules/scan/eclasses/__init__.py b/repoman/pym/repoman/modules/scan/eclasses/__init__.py
similarity index 100%
rename from pym/repoman/modules/scan/eclasses/__init__.py
rename to repoman/pym/repoman/modules/scan/eclasses/__init__.py

diff --git a/pym/repoman/modules/scan/eclasses/live.py b/repoman/pym/repoman/modules/scan/eclasses/live.py
similarity index 100%
rename from pym/repoman/modules/scan/eclasses/live.py
rename to repoman/pym/repoman/modules/scan/eclasses/live.py

diff --git a/pym/repoman/modules/scan/eclasses/ruby.py b/repoman/pym/repoman/modules/scan/eclasses/ruby.py
similarity index 100%
rename from pym/repoman/modules/scan/eclasses/ruby.py
rename to repoman/pym/repoman/modules/scan/eclasses/ruby.py

diff --git a/pym/repoman/modules/scan/fetch/__init__.py b/repoman/pym/repoman/modules/scan/fetch/__init__.py
similarity index 100%
rename from pym/repoman/modules/scan/fetch/__init__.py
rename to repoman/pym/repoman/modules/scan/fetch/__init__.py

diff --git a/pym/repoman/modules/scan/fetch/fetches.py b/repoman/pym/repoman/modules/scan/fetch/fetches.py
similarity index 100%
rename from pym/repoman/modules/scan/fetch/fetches.py
rename to repoman/pym/repoman/modules/scan/fetch/fetches.py

diff --git a/pym/repoman/modules/scan/keywords/__init__.py b/repoman/pym/repoman/modules/scan/keywords/__init__.py
similarity index 100%
rename from pym/repoman/modules/scan/keywords/__init__.py
rename to repoman/pym/repoman/modules/scan/keywords/__init__.py

diff --git a/pym/repoman/modules/scan/keywords/keywords.py b/repoman/pym/repoman/modules/scan/keywords/keywords.py
similarity index 100%
rename from pym/repoman/modules/scan/keywords/keywords.py
rename to repoman/pym/repoman/modules/scan/keywords/keywords.py

diff --git a/pym/repoman/modules/scan/manifest/__init__.py b/repoman/pym/repoman/modules/scan/manifest/__init__.py
similarity index 100%
rename from pym/repoman/modules/scan/manifest/__init__.py
rename to repoman/pym/repoman/modules/scan/manifest/__init__.py

diff --git a/pym/repoman/modules/scan/manifest/manifests.py b/repoman/pym/repoman/modules/scan/manifest/manifests.py
similarity index 100%
rename from pym/repoman/modules/scan/manifest/manifests.py
rename to repoman/pym/repoman/modules/scan/manifest/manifests.py

diff --git a/pym/repoman/modules/scan/metadata/__init__.py b/repoman/pym/repoman/modules/scan/metadata/__init__.py
similarity index 100%
rename from pym/repoman/modules/scan/metadata/__init__.py
rename to repoman/pym/repoman/modules/scan/metadata/__init__.py

diff --git a/pym/repoman/modules/scan/metadata/description.py b/repoman/pym/repoman/modules/scan/metadata/description.py
similarity index 100%
rename from pym/repoman/modules/scan/metadata/description.py
rename to repoman/pym/repoman/modules/scan/metadata/description.py

diff --git a/pym/repoman/modules/scan/metadata/ebuild_metadata.py b/repoman/pym/repoman/modules/scan/metadata/ebuild_metadata.py
similarity index 100%
rename from pym/repoman/modules/scan/metadata/ebuild_metadata.py
rename to repoman/pym/repoman/modules/scan/metadata/ebuild_metadata.py

diff --git a/pym/repoman/modules/scan/metadata/pkgmetadata.py b/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
similarity index 100%
rename from pym/repoman/modules/scan/metadata/pkgmetadata.py
rename to repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py

diff --git a/pym/repoman/modules/scan/metadata/restrict.py b/repoman/pym/repoman/modules/scan/metadata/restrict.py
similarity index 100%
rename from pym/repoman/modules/scan/metadata/restrict.py
rename to repoman/pym/repoman/modules/scan/metadata/restrict.py

diff --git a/pym/repoman/modules/scan/metadata/use_flags.py b/repoman/pym/repoman/modules/scan/metadata/use_flags.py
similarity index 100%
rename from pym/repoman/modules/scan/metadata/use_flags.py
rename to repoman/pym/repoman/modules/scan/metadata/use_flags.py

diff --git a/pym/repoman/modules/scan/options/__init__.py b/repoman/pym/repoman/modules/scan/options/__init__.py
similarity index 100%
rename from pym/repoman/modules/scan/options/__init__.py
rename to repoman/pym/repoman/modules/scan/options/__init__.py

diff --git a/pym/repoman/modules/scan/options/options.py b/repoman/pym/repoman/modules/scan/options/options.py
similarity index 100%
rename from pym/repoman/modules/scan/options/options.py
rename to repoman/pym/repoman/modules/scan/options/options.py

diff --git a/pym/repoman/modules/scan/scan.py b/repoman/pym/repoman/modules/scan/scan.py
similarity index 100%
rename from pym/repoman/modules/scan/scan.py
rename to repoman/pym/repoman/modules/scan/scan.py

diff --git a/pym/repoman/modules/scan/scanbase.py b/repoman/pym/repoman/modules/scan/scanbase.py
similarity index 100%
rename from pym/repoman/modules/scan/scanbase.py
rename to repoman/pym/repoman/modules/scan/scanbase.py

diff --git a/pym/repoman/modules/vcs/None/__init__.py b/repoman/pym/repoman/modules/vcs/None/__init__.py
similarity index 100%
rename from pym/repoman/modules/vcs/None/__init__.py
rename to repoman/pym/repoman/modules/vcs/None/__init__.py

diff --git a/pym/repoman/modules/vcs/None/changes.py b/repoman/pym/repoman/modules/vcs/None/changes.py
similarity index 100%
rename from pym/repoman/modules/vcs/None/changes.py
rename to repoman/pym/repoman/modules/vcs/None/changes.py

diff --git a/pym/repoman/modules/vcs/None/status.py b/repoman/pym/repoman/modules/vcs/None/status.py
similarity index 100%
rename from pym/repoman/modules/vcs/None/status.py
rename to repoman/pym/repoman/modules/vcs/None/status.py

diff --git a/pym/repoman/modules/vcs/__init__.py b/repoman/pym/repoman/modules/vcs/__init__.py
similarity index 100%
rename from pym/repoman/modules/vcs/__init__.py
rename to repoman/pym/repoman/modules/vcs/__init__.py

diff --git a/pym/repoman/modules/vcs/bzr/__init__.py b/repoman/pym/repoman/modules/vcs/bzr/__init__.py
similarity index 100%
rename from pym/repoman/modules/vcs/bzr/__init__.py
rename to repoman/pym/repoman/modules/vcs/bzr/__init__.py

diff --git a/pym/repoman/modules/vcs/bzr/changes.py b/repoman/pym/repoman/modules/vcs/bzr/changes.py
similarity index 100%
rename from pym/repoman/modules/vcs/bzr/changes.py
rename to repoman/pym/repoman/modules/vcs/bzr/changes.py

diff --git a/pym/repoman/modules/vcs/bzr/status.py b/repoman/pym/repoman/modules/vcs/bzr/status.py
similarity index 100%
rename from pym/repoman/modules/vcs/bzr/status.py
rename to repoman/pym/repoman/modules/vcs/bzr/status.py

diff --git a/pym/repoman/modules/vcs/changes.py b/repoman/pym/repoman/modules/vcs/changes.py
similarity index 100%
rename from pym/repoman/modules/vcs/changes.py
rename to repoman/pym/repoman/modules/vcs/changes.py

diff --git a/pym/repoman/modules/vcs/cvs/__init__.py b/repoman/pym/repoman/modules/vcs/cvs/__init__.py
similarity index 100%
rename from pym/repoman/modules/vcs/cvs/__init__.py
rename to repoman/pym/repoman/modules/vcs/cvs/__init__.py

diff --git a/pym/repoman/modules/vcs/cvs/changes.py b/repoman/pym/repoman/modules/vcs/cvs/changes.py
similarity index 100%
rename from pym/repoman/modules/vcs/cvs/changes.py
rename to repoman/pym/repoman/modules/vcs/cvs/changes.py

diff --git a/pym/repoman/modules/vcs/cvs/status.py b/repoman/pym/repoman/modules/vcs/cvs/status.py
similarity index 100%
rename from pym/repoman/modules/vcs/cvs/status.py
rename to repoman/pym/repoman/modules/vcs/cvs/status.py

diff --git a/pym/repoman/modules/vcs/git/__init__.py b/repoman/pym/repoman/modules/vcs/git/__init__.py
similarity index 100%
rename from pym/repoman/modules/vcs/git/__init__.py
rename to repoman/pym/repoman/modules/vcs/git/__init__.py

diff --git a/pym/repoman/modules/vcs/git/changes.py b/repoman/pym/repoman/modules/vcs/git/changes.py
similarity index 100%
rename from pym/repoman/modules/vcs/git/changes.py
rename to repoman/pym/repoman/modules/vcs/git/changes.py

diff --git a/pym/repoman/modules/vcs/git/status.py b/repoman/pym/repoman/modules/vcs/git/status.py
similarity index 100%
rename from pym/repoman/modules/vcs/git/status.py
rename to repoman/pym/repoman/modules/vcs/git/status.py

diff --git a/pym/repoman/modules/vcs/hg/__init__.py b/repoman/pym/repoman/modules/vcs/hg/__init__.py
similarity index 100%
rename from pym/repoman/modules/vcs/hg/__init__.py
rename to repoman/pym/repoman/modules/vcs/hg/__init__.py

diff --git a/pym/repoman/modules/vcs/hg/changes.py b/repoman/pym/repoman/modules/vcs/hg/changes.py
similarity index 100%
rename from pym/repoman/modules/vcs/hg/changes.py
rename to repoman/pym/repoman/modules/vcs/hg/changes.py

diff --git a/pym/repoman/modules/vcs/hg/status.py b/repoman/pym/repoman/modules/vcs/hg/status.py
similarity index 100%
rename from pym/repoman/modules/vcs/hg/status.py
rename to repoman/pym/repoman/modules/vcs/hg/status.py

diff --git a/pym/repoman/modules/vcs/settings.py b/repoman/pym/repoman/modules/vcs/settings.py
similarity index 100%
rename from pym/repoman/modules/vcs/settings.py
rename to repoman/pym/repoman/modules/vcs/settings.py

diff --git a/pym/repoman/modules/vcs/svn/__init__.py b/repoman/pym/repoman/modules/vcs/svn/__init__.py
similarity index 100%
rename from pym/repoman/modules/vcs/svn/__init__.py
rename to repoman/pym/repoman/modules/vcs/svn/__init__.py

diff --git a/pym/repoman/modules/vcs/svn/changes.py b/repoman/pym/repoman/modules/vcs/svn/changes.py
similarity index 100%
rename from pym/repoman/modules/vcs/svn/changes.py
rename to repoman/pym/repoman/modules/vcs/svn/changes.py

diff --git a/pym/repoman/modules/vcs/svn/status.py b/repoman/pym/repoman/modules/vcs/svn/status.py
similarity index 100%
rename from pym/repoman/modules/vcs/svn/status.py
rename to repoman/pym/repoman/modules/vcs/svn/status.py

diff --git a/pym/repoman/modules/vcs/vcs.py b/repoman/pym/repoman/modules/vcs/vcs.py
similarity index 100%
rename from pym/repoman/modules/vcs/vcs.py
rename to repoman/pym/repoman/modules/vcs/vcs.py

diff --git a/pym/repoman/profile.py b/repoman/pym/repoman/profile.py
similarity index 100%
rename from pym/repoman/profile.py
rename to repoman/pym/repoman/profile.py

diff --git a/pym/repoman/qa_data.py b/repoman/pym/repoman/qa_data.py
similarity index 100%
rename from pym/repoman/qa_data.py
rename to repoman/pym/repoman/qa_data.py

diff --git a/pym/repoman/qa_tracker.py b/repoman/pym/repoman/qa_tracker.py
similarity index 100%
rename from pym/repoman/qa_tracker.py
rename to repoman/pym/repoman/qa_tracker.py

diff --git a/pym/repoman/repos.py b/repoman/pym/repoman/repos.py
similarity index 100%
rename from pym/repoman/repos.py
rename to repoman/pym/repoman/repos.py

diff --git a/pym/repoman/scanner.py b/repoman/pym/repoman/scanner.py
similarity index 100%
rename from pym/repoman/scanner.py
rename to repoman/pym/repoman/scanner.py

diff --git a/pym/portage/tests/repoman/__init__.py b/repoman/pym/repoman/tests/__init__.py
similarity index 100%
copy from pym/portage/tests/repoman/__init__.py
copy to repoman/pym/repoman/tests/__init__.py

diff --git a/pym/portage/tests/repoman/__test__.py b/repoman/pym/repoman/tests/__test__.py
similarity index 100%
rename from pym/portage/tests/repoman/__test__.py
rename to repoman/pym/repoman/tests/__test__.py

diff --git a/pym/portage/tests/repoman/__init__.py b/repoman/pym/repoman/tests/changelog/__init__.py
similarity index 100%
copy from pym/portage/tests/repoman/__init__.py
copy to repoman/pym/repoman/tests/changelog/__init__.py

diff --git a/pym/portage/tests/repoman/test_echangelog.py b/repoman/pym/repoman/tests/changelog/test_echangelog.py
similarity index 100%
rename from pym/portage/tests/repoman/test_echangelog.py
rename to repoman/pym/repoman/tests/changelog/test_echangelog.py

diff --git a/repoman/pym/repoman/tests/runTests.py b/repoman/pym/repoman/tests/runTests.py
new file mode 100644
index 0000000..9c45276
--- /dev/null
+++ b/repoman/pym/repoman/tests/runTests.py
@@ -0,0 +1,61 @@
+#!/usr/bin/python -bWd
+# runTests.py -- Portage Unit Test Functionality
+# Copyright 2006-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+import os, sys
+import os.path as osp
+import grp
+import platform
+import pwd
+import signal
+
+def debug_signal(signum, frame):
+	import pdb
+	pdb.set_trace()
+
+if platform.python_implementation() == 'Jython':
+	debug_signum = signal.SIGUSR2 # bug #424259
+else:
+	debug_signum = signal.SIGUSR1
+
+signal.signal(debug_signum, debug_signal)
+
+# Pretend that the current user's uid/gid are the 'portage' uid/gid,
+# so things go smoothly regardless of the current user and global
+# user/group configuration.
+os.environ["PORTAGE_USERNAME"] = pwd.getpwuid(os.getuid()).pw_name
+os.environ["PORTAGE_GRPNAME"] = grp.getgrgid(os.getgid()).gr_name
+
+# Insert our parent dir so we can do shiny import "tests"
+# This line courtesy of Marienz and Pkgcore ;)
+sys.path.insert(0, osp.dirname(osp.dirname(osp.dirname(osp.realpath(__file__)))))
+
+import portage
+portage._internal_caller = True
+
+# Ensure that we don't instantiate portage.settings, so that tests should
+# work the same regardless of global configuration file state/existence.
+portage._disable_legacy_globals()
+
+if os.environ.get('NOCOLOR') in ('yes', 'true'):
+	portage.output.nocolor()
+
+import portage.tests as tests
+from portage.const import PORTAGE_BIN_PATH
+path = os.environ.get("PATH", "").split(":")
+path = [x for x in path if x]
+
+insert_bin_path = True
+try:
+	insert_bin_path = not path or \
+		not os.path.samefile(path[0], PORTAGE_BIN_PATH)
+except OSError:
+	pass
+
+if insert_bin_path:
+	path.insert(0, PORTAGE_BIN_PATH)
+	os.environ["PATH"] = ":".join(path)
+
+if __name__ == "__main__":
+	sys.exit(tests.main())

diff --git a/pym/portage/tests/repoman/__init__.py b/repoman/pym/repoman/tests/simple/__init__.py
similarity index 100%
rename from pym/portage/tests/repoman/__init__.py
rename to repoman/pym/repoman/tests/simple/__init__.py

diff --git a/pym/portage/tests/repoman/test_simple.py b/repoman/pym/repoman/tests/simple/test_simple.py
similarity index 100%
rename from pym/portage/tests/repoman/test_simple.py
rename to repoman/pym/repoman/tests/simple/test_simple.py

diff --git a/pym/repoman/utilities.py b/repoman/pym/repoman/utilities.py
similarity index 100%
rename from pym/repoman/utilities.py
rename to repoman/pym/repoman/utilities.py

diff --git a/setup.py b/repoman/setup.py
similarity index 95%
copy from setup.py
copy to repoman/setup.py
index b066fae..b7b8ee2 100755
--- a/setup.py
+++ b/repoman/setup.py
@@ -32,12 +32,9 @@ import sys
 
 x_scripts = {
 	'bin': [
-		'bin/ebuild', 'bin/egencache', 'bin/emerge', 'bin/emerge-webrsync',
-		'bin/emirrordist', 'bin/portageq', 'bin/quickpkg', 'bin/repoman'
+		'bin/repoman',
 	],
 	'sbin': [
-		'bin/archive-conf', 'bin/dispatch-conf', 'bin/emaint', 'bin/env-update',
-		'bin/etc-update', 'bin/fixpackages', 'bin/regenworld'
 	],
 }
 
@@ -144,7 +141,7 @@ class epydoc(Command):
 			'--url', self.distribution.get_url(),
 			'-qq', '--no-frames', '--show-imports',
 			'--exclude', 'portage.tests',
-			'_emerge', 'portage', 'repoman'],
+			'_emerge', 'portage'],
 			env = process_env)
 		os.remove('epydoc/api-objects.txt')
 
@@ -614,8 +611,8 @@ def get_manpages():
 
 
 setup(
-	name = 'portage',
-	version = '2.2.28',
+	name = 'repoman',
+	version = '2.3.0',
 	url = 'https://wiki.gentoo.org/wiki/Project:Portage',
 	author = 'Gentoo Portage Development Team',
 	author_email = 'dev-portage@gentoo.org',
@@ -626,14 +623,7 @@ setup(
 	scripts = list(find_scripts()),
 
 	data_files = list(get_manpages()) + [
-		['$sysconfdir', ['cnf/etc-update.conf', 'cnf/dispatch-conf.conf']],
-		['$logrotatedir', ['cnf/logrotate.d/elog-save-summary']],
-		['$portage_confdir', [
-			'cnf/make.conf.example', 'cnf/make.globals', 'cnf/repos.conf']],
-		['$portage_setsdir', ['cnf/sets/portage.conf']],
 		['$docdir', ['NEWS', 'RELEASE-NOTES']],
-		['$portage_base/bin', ['bin/deprecated-path']],
-		['$sysconfdir/portage/repo.postsync.d', ['cnf/repo.postsync.d/example']],
 	],
 
 	cmdclass = {

diff --git a/setup.py b/setup.py
index b066fae..c487ddf 100755
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ import sys
 x_scripts = {
 	'bin': [
 		'bin/ebuild', 'bin/egencache', 'bin/emerge', 'bin/emerge-webrsync',
-		'bin/emirrordist', 'bin/portageq', 'bin/quickpkg', 'bin/repoman'
+		'bin/emirrordist', 'bin/portageq', 'bin/quickpkg',
 	],
 	'sbin': [
 		'bin/archive-conf', 'bin/dispatch-conf', 'bin/emaint', 'bin/env-update',
@@ -144,7 +144,7 @@ class epydoc(Command):
 			'--url', self.distribution.get_url(),
 			'-qq', '--no-frames', '--show-imports',
 			'--exclude', 'portage.tests',
-			'_emerge', 'portage', 'repoman'],
+			'_emerge', 'portage'],
 			env = process_env)
 		os.remove('epydoc/api-objects.txt')
 


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-15 23:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-14 18:33 [gentoo-commits] proj/portage:repoman commit in: repoman/bin/, repoman/pym/repoman/modules/vcs/git/, Brian Dolbec
2016-05-15 23:51 ` [gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/modules/vcs/, repoman/pym/repoman/modules/scan/depend/, man/, Brian Dolbec

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox