Skip to content

Commit

Permalink
Rename package github.com/sylabs/singularity to github.com/hpcng/sing…
Browse files Browse the repository at this point in the history
…ularity
  • Loading branch information
cclerget committed May 10, 2021
1 parent 6f4e00c commit 3763a56
Show file tree
Hide file tree
Showing 408 changed files with 1,284 additions and 1,286 deletions.
8 changes: 4 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ fixing or enhancing.

#### Before submitting a PR, make sure you have done the following:

- Read the [Guidelines for Contributing](https://github.com/sylabs/singularity/blob/master/CONTRIBUTING.md), and this PR conforms to the stated requirements.
- Added changes to the [CHANGELOG](https://github.com/sylabs/singularity/blob/master/CHANGELOG.md) if necessary according to the [Contribution Guidelines](https://github.com/sylabs/singularity/blob/master/CONTRIBUTING.md)
- Read the [Guidelines for Contributing](https://github.com/hpcng/singularity/blob/master/CONTRIBUTING.md), and this PR conforms to the stated requirements.
- Added changes to the [CHANGELOG](https://github.com/hpcng/singularity/blob/master/CHANGELOG.md) if necessary according to the [Contribution Guidelines](https://github.com/hpcng/singularity/blob/master/CONTRIBUTING.md)
- Added tests to validate this PR, linted with `make check` and tested this PR locally with a `make test`, and `make testall` if possible (see CONTRIBUTING.md).
- Based this PR against the appropriate branch according to the [Contribution Guidelines](https://github.com/sylabs/singularity/blob/master/CONTRIBUTING.md)
- Added myself as a contributor to the [Contributors File](https://github.com/sylabs/singularity/blob/master/CONTRIBUTORS.md)
- Based this PR against the appropriate branch according to the [Contribution Guidelines](https://github.com/hpcng/singularity/blob/master/CONTRIBUTING.md)
- Added myself as a contributor to the [Contributors File](https://github.com/hpcng/singularity/blob/master/CONTRIBUTORS.md)
10 changes: 4 additions & 6 deletions .github/RELEASE_PROCEDURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,18 @@ _This file uses `v3.0.0` as an example release_

## Documentation
Ensure that our documentation is up to date:
- [User Docs](https://www.sylabs.io/guides/3.0/user-guide/) can be edited [here](https://github.com/sylabs/singularity-userdocs)
- [Admin Docs](https://www.sylabs.io/guides/3.0/admin-guide/) can be edited [here](https://github.com/sylabs/singularity-admindocs)
- [User Docs](https://www.sylabs.io/guides/3.0/user-guide/) can be edited [here](https://github.com/hpcng/singularity-userdocs)
- [Admin Docs](https://www.sylabs.io/guides/3.0/admin-guide/) can be edited [here](https://github.com/hpcng/singularity-admindocs)


## Announcements
Release announcements should be made on:
- GitHub [releases page](https://github.com/sylabs/singularity/releases)
- GitHub [releases page](https://github.com/hpcng/singularity/releases)
- Run `make -C builddir/ dist` and attach the generated tarball as an asset to the release
- **NOTE:** The GitHub release MUST contain a line about the proper installation procedure when installing from the GitHub generated tarballs. Namely, that you must build using `./mconfig [-V version]`
- Singularity mailing list
- Singularity [Slack channel](https://www.sylabs.io/join-the-community/)
- Blog post on [sylabs.io](https://www.sylabs.io/category/labnotes/)
- Singularity [Slack channel](https://hpcng.slack.com)
- Various twitter channels:
- [@SylabsIO](https://twitter.com/sylabsio)
- [@SingularityApp](https://twitter.com/singularityapp)
- etc...
- LinkedIn
Expand Down
12 changes: 6 additions & 6 deletions .github/SUPPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
Need help? We have several ways to reach us, depending on your preferences and needs.

## Documentation
If you haven't already, read our [documentation](https://www.sylabs.io/docs/). These docs have common use cases, and might be helpful to browse before submitting an issue. You can contribute to our documentation by creating PRs against the [singularity-admindocs](https://github.com/sylabs/singularity-admindocs) and [singularity-userdocs](https://github.com/sylabs/singularity-userdocs) repositories.
If you haven't already, read our [documentation](https://www.sylabs.io/docs/). These docs have common use cases, and might be helpful to browse before submitting an issue. You can contribute to our documentation by creating PRs against the [singularity-admindocs](https://github.com/hpcng/singularity-admindocs) and [singularity-userdocs](https://github.com/hpcng/singularity-userdocs) repositories.

## Github
For issues with code (and especially if you need to share debug output) we recommend Github issues boards.

- [Singularity Issues](https://github.com/sylabs/singularity/issues): is recommended for most issues with the Singularity software.
- [Singularity Issues](https://github.com/hpcng/singularity/issues): is recommended for most issues with the Singularity software.
- [Singularity Hub Issues](https://github.com/singularityhub/singularityhub.github.io/issues): is the board for issues relevant to Singularity Hub.
- [Singularity Registry Issues](https://github.com/singularityhub/sregistry/issues): is the board for issues relevant to Singularity Registry
- [User Documentation](https://github.com/sylabs/singularity-userdocs/issues) questions, feedback, and suggestions should go here. Feel free to create an issue on a board and additionally request updated content here.
- [Admin Documentation](https://github.com/sylabs/singularity-admindocs/issues) questions, feedback, and suggestions should go here. Feel free to create an issue on a board and additionally request updated content here.
- [User Documentation](https://github.com/hpcng/singularity-userdocs/issues) questions, feedback, and suggestions should go here. Feel free to create an issue on a board and additionally request updated content here.
- [Admin Documentation](https://github.com/hpcng/singularity-admindocs/issues) questions, feedback, and suggestions should go here. Feel free to create an issue on a board and additionally request updated content here.


### How do I ask for help?
Expand Down Expand Up @@ -40,6 +40,6 @@ Issues can go stale for a number of reasons. In the bullets below, we will revie
You can reach the community quickly by way of joining our [Google Group](https://groups.google.com/a/lbl.gov/forum/#!forum/singularity).

## Slack
For real time support from the community, you can join our community on slack at [https://singularity-container.slack.com/](https://singularity-container.slack.com/). Ping the Google Group or one of the admins here to request to be added.
For real time support from the community, you can join our community on slack at [https://hpcng.slack.com/](https://hpcng.slack.com/). Ping the Google Group or one of the admins here to request to be added.

Is there something missing here you'd like to see? Please [let us know](https://github.com/sylabs/singularity/issues).
Is there something missing here you'd like to see? Please [let us know](https://github.com/hpcng/singularity/issues).
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ This point release addresses the following issues:
modifying permissions.
- `--fix-perms` option added to preserve old behaviour when
building sandboxes.
- Discussion issue for this change at: https://github.com/sylabs/singularity/issues/4671
- Discussion issue for this change at: https://github.com/hpcng/singularity/issues/4671
- `Singularity>` prompt is always set when entering shell in a container.
- The current `umask` will be honored when building a SIF file.
- `instance exec` processes acquire cgroups set on `instance start`
Expand Down
12 changes: 6 additions & 6 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ to build Singularity from source:
```
$ mkdir -p ${GOPATH}/src/github.com/sylabs && \
cd ${GOPATH}/src/github.com/sylabs && \
git clone https://github.com/sylabs/singularity.git && \
git clone https://github.com/hpcng/singularity.git && \
cd singularity
```

To build a stable version of Singularity, check out a [release tag](https://github.com/sylabs/singularity/tags) before compiling:
To build a stable version of Singularity, check out a [release tag](https://github.com/hpcng/singularity/tags) before compiling:

```
$ git checkout v3.7.1
Expand All @@ -98,7 +98,7 @@ $ git checkout v3.7.1
You can build Singularity using the following commands:

```
$ cd ${GOPATH}/src/github.com/sylabs/singularity && \
$ cd ${GOPATH}/src/github.com/hpcng/singularity && \
./mconfig && \
cd ./builddir && \
make && \
Expand Down Expand Up @@ -129,13 +129,13 @@ $ sudo yum -y update && sudo yum install -y rpm-build wget
Make sure you have also
[installed the system dependencies](#install-system-dependencies)
as shown above. Then download the latest
[release tarball](https://github.com/sylabs/singularity/releases)
[release tarball](https://github.com/hpcng/singularity/releases)
and use it to install the RPM like this:

```
$ export VERSION=3.7.3 # this is the singularity version, change as you need
$ wget https://github.com/sylabs/singularity/releases/download/v${VERSION}/singularity-${VERSION}.tar.gz && \
$ wget https://github.com/hpcng/singularity/releases/download/v${VERSION}/singularity-${VERSION}.tar.gz && \
rpmbuild -tb singularity-${VERSION}.tar.gz && \
sudo rpm -ivh ~/rpmbuild/RPMS/x86_64/singularity-${VERSION}-1.el7.x86_64.rpm && \
rm -rf ~/rpmbuild singularity-${VERSION}*.tar.gz
Expand All @@ -146,7 +146,7 @@ Alternatively, to build an RPM from the latest master you can
tarball and use it to install Singularity:

```
$ cd $GOPATH/src/github.com/sylabs/singularity && \
$ cd $GOPATH/src/github.com/hpcng/singularity && \
./mconfig && \
make -C builddir rpm && \
sudo rpm -ivh ~/rpmbuild/RPMS/x86_64/singularity-3.7.3*.x86_64.rpm # or whatever version you built
Expand Down
2 changes: 1 addition & 1 deletion cmd/bash_completion/bash_completion.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"
"os"

"github.com/sylabs/singularity/cmd/internal/cli"
"github.com/hpcng/singularity/cmd/internal/cli"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/docs/cmds/cmdtree.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"os"
"strings"

"github.com/hpcng/singularity/cmd/internal/cli"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/sylabs/singularity/cmd/internal/cli"
)

/*
Expand Down
4 changes: 2 additions & 2 deletions cmd/docs/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ package main
import (
"fmt"

"github.com/hpcng/singularity/cmd/internal/cli"
"github.com/hpcng/singularity/pkg/sylog"
"github.com/spf13/cobra"
"github.com/spf13/cobra/doc"
"github.com/sylabs/singularity/cmd/internal/cli"
"github.com/sylabs/singularity/pkg/sylog"
"golang.org/x/sys/unix"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/internal/cli/action_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package cli
import (
"os"

"github.com/sylabs/singularity/pkg/cmdline"
"github.com/hpcng/singularity/pkg/cmdline"
)

// actionflags.go contains flag variables for action-like commands to draw from
Expand Down
20 changes: 10 additions & 10 deletions cmd/internal/cli/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ import (
"runtime"
"strings"

"github.com/hpcng/singularity/docs"
"github.com/hpcng/singularity/internal/pkg/cache"
"github.com/hpcng/singularity/internal/pkg/client/library"
"github.com/hpcng/singularity/internal/pkg/client/net"
"github.com/hpcng/singularity/internal/pkg/client/oci"
"github.com/hpcng/singularity/internal/pkg/client/oras"
"github.com/hpcng/singularity/internal/pkg/client/shub"
"github.com/hpcng/singularity/internal/pkg/remote/endpoint"
"github.com/hpcng/singularity/internal/pkg/util/uri"
"github.com/hpcng/singularity/pkg/sylog"
"github.com/spf13/cobra"
"github.com/sylabs/singularity/docs"
"github.com/sylabs/singularity/internal/pkg/cache"
"github.com/sylabs/singularity/internal/pkg/client/library"
"github.com/sylabs/singularity/internal/pkg/client/net"
"github.com/sylabs/singularity/internal/pkg/client/oci"
"github.com/sylabs/singularity/internal/pkg/client/oras"
"github.com/sylabs/singularity/internal/pkg/client/shub"
"github.com/sylabs/singularity/internal/pkg/remote/endpoint"
"github.com/sylabs/singularity/internal/pkg/util/uri"
"github.com/sylabs/singularity/pkg/sylog"
)

const (
Expand Down
52 changes: 26 additions & 26 deletions cmd/internal/cli/actions_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,32 @@ import (
"syscall"
"time"

"github.com/hpcng/singularity/internal/pkg/buildcfg"
"github.com/hpcng/singularity/internal/pkg/instance"
"github.com/hpcng/singularity/internal/pkg/plugin"
"github.com/hpcng/singularity/internal/pkg/runtime/engine/config/oci"
"github.com/hpcng/singularity/internal/pkg/runtime/engine/config/oci/generate"
"github.com/hpcng/singularity/internal/pkg/security"
"github.com/hpcng/singularity/internal/pkg/util/env"
"github.com/hpcng/singularity/internal/pkg/util/fs"
"github.com/hpcng/singularity/internal/pkg/util/shell/interpreter"
"github.com/hpcng/singularity/internal/pkg/util/starter"
"github.com/hpcng/singularity/internal/pkg/util/user"
imgutil "github.com/hpcng/singularity/pkg/image"
"github.com/hpcng/singularity/pkg/image/unpacker"
clicallback "github.com/hpcng/singularity/pkg/plugin/callback/cli"
singularitycallback "github.com/hpcng/singularity/pkg/plugin/callback/runtime/engine/singularity"
"github.com/hpcng/singularity/pkg/runtime/engine/config"
singularityConfig "github.com/hpcng/singularity/pkg/runtime/engine/singularity/config"
"github.com/hpcng/singularity/pkg/sylog"
"github.com/hpcng/singularity/pkg/util/capabilities"
"github.com/hpcng/singularity/pkg/util/crypt"
"github.com/hpcng/singularity/pkg/util/fs/proc"
"github.com/hpcng/singularity/pkg/util/gpu"
"github.com/hpcng/singularity/pkg/util/namespaces"
"github.com/hpcng/singularity/pkg/util/rlimit"
"github.com/hpcng/singularity/pkg/util/singularityconf"
"github.com/spf13/cobra"
"github.com/sylabs/singularity/internal/pkg/buildcfg"
"github.com/sylabs/singularity/internal/pkg/instance"
"github.com/sylabs/singularity/internal/pkg/plugin"
"github.com/sylabs/singularity/internal/pkg/runtime/engine/config/oci"
"github.com/sylabs/singularity/internal/pkg/runtime/engine/config/oci/generate"
"github.com/sylabs/singularity/internal/pkg/security"
"github.com/sylabs/singularity/internal/pkg/util/env"
"github.com/sylabs/singularity/internal/pkg/util/fs"
"github.com/sylabs/singularity/internal/pkg/util/shell/interpreter"
"github.com/sylabs/singularity/internal/pkg/util/starter"
"github.com/sylabs/singularity/internal/pkg/util/user"
imgutil "github.com/sylabs/singularity/pkg/image"
"github.com/sylabs/singularity/pkg/image/unpacker"
clicallback "github.com/sylabs/singularity/pkg/plugin/callback/cli"
singularitycallback "github.com/sylabs/singularity/pkg/plugin/callback/runtime/engine/singularity"
"github.com/sylabs/singularity/pkg/runtime/engine/config"
singularityConfig "github.com/sylabs/singularity/pkg/runtime/engine/singularity/config"
"github.com/sylabs/singularity/pkg/sylog"
"github.com/sylabs/singularity/pkg/util/capabilities"
"github.com/sylabs/singularity/pkg/util/crypt"
"github.com/sylabs/singularity/pkg/util/fs/proc"
"github.com/sylabs/singularity/pkg/util/gpu"
"github.com/sylabs/singularity/pkg/util/namespaces"
"github.com/sylabs/singularity/pkg/util/rlimit"
"github.com/sylabs/singularity/pkg/util/singularityconf"
"golang.org/x/sys/unix"
)

Expand Down Expand Up @@ -472,7 +472,7 @@ func execStarter(cobraCmd *cobra.Command, image string, args []string, name stri
// This doesn't count as a SetCustomHome(true), as we are mounting from the real
// user's standard $HOME -> /root and we want to respect --contain not mounting
// the $HOME in this case.
// See https://github.com/sylabs/singularity/pull/5227
// See https://github.com/hpcng/singularity/pull/5227
if !homeFlag.Changed && IsFakeroot {
HomePath = fmt.Sprintf("%s:/root", HomePath)
}
Expand Down
18 changes: 9 additions & 9 deletions cmd/internal/cli/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ import (
"runtime"

ocitypes "github.com/containers/image/v5/types"
"github.com/hpcng/singularity/docs"
"github.com/hpcng/singularity/internal/pkg/remote/endpoint"
"github.com/hpcng/singularity/internal/pkg/util/fs"
"github.com/hpcng/singularity/internal/pkg/util/interactive"
"github.com/hpcng/singularity/pkg/build/types"
"github.com/hpcng/singularity/pkg/build/types/parser"
"github.com/hpcng/singularity/pkg/cmdline"
"github.com/hpcng/singularity/pkg/image"
"github.com/hpcng/singularity/pkg/sylog"
"github.com/spf13/cobra"
scsbuildclient "github.com/sylabs/scs-build-client/client"
scskeyclient "github.com/sylabs/scs-key-client/client"
scslibclient "github.com/sylabs/scs-library-client/client"
"github.com/sylabs/singularity/docs"
"github.com/sylabs/singularity/internal/pkg/remote/endpoint"
"github.com/sylabs/singularity/internal/pkg/util/fs"
"github.com/sylabs/singularity/internal/pkg/util/interactive"
"github.com/sylabs/singularity/pkg/build/types"
"github.com/sylabs/singularity/pkg/build/types/parser"
"github.com/sylabs/singularity/pkg/cmdline"
"github.com/sylabs/singularity/pkg/image"
"github.com/sylabs/singularity/pkg/sylog"
)

var buildArgs struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/internal/cli/build_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ package cli
import (
"context"

"github.com/hpcng/singularity/internal/pkg/build/remotebuilder"
"github.com/hpcng/singularity/pkg/sylog"
"github.com/spf13/cobra"
"github.com/sylabs/singularity/internal/pkg/build/remotebuilder"
"github.com/sylabs/singularity/pkg/sylog"
)

func fakerootExec(cmdArgs []string) {
Expand Down
30 changes: 15 additions & 15 deletions cmd/internal/cli/build_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ import (
"strings"
"syscall"

"github.com/hpcng/singularity/internal/pkg/build"
"github.com/hpcng/singularity/internal/pkg/build/remotebuilder"
"github.com/hpcng/singularity/internal/pkg/buildcfg"
"github.com/hpcng/singularity/internal/pkg/cache"
"github.com/hpcng/singularity/internal/pkg/remote/endpoint"
fakerootConfig "github.com/hpcng/singularity/internal/pkg/runtime/engine/fakeroot/config"
"github.com/hpcng/singularity/internal/pkg/util/fs"
"github.com/hpcng/singularity/internal/pkg/util/interactive"
"github.com/hpcng/singularity/internal/pkg/util/starter"
"github.com/hpcng/singularity/internal/pkg/util/user"
"github.com/hpcng/singularity/pkg/build/types"
"github.com/hpcng/singularity/pkg/image"
"github.com/hpcng/singularity/pkg/runtime/engine/config"
"github.com/hpcng/singularity/pkg/sylog"
"github.com/hpcng/singularity/pkg/util/crypt"
"github.com/spf13/cobra"
"github.com/sylabs/singularity/internal/pkg/build"
"github.com/sylabs/singularity/internal/pkg/build/remotebuilder"
"github.com/sylabs/singularity/internal/pkg/buildcfg"
"github.com/sylabs/singularity/internal/pkg/cache"
"github.com/sylabs/singularity/internal/pkg/remote/endpoint"
fakerootConfig "github.com/sylabs/singularity/internal/pkg/runtime/engine/fakeroot/config"
"github.com/sylabs/singularity/internal/pkg/util/fs"
"github.com/sylabs/singularity/internal/pkg/util/interactive"
"github.com/sylabs/singularity/internal/pkg/util/starter"
"github.com/sylabs/singularity/internal/pkg/util/user"
"github.com/sylabs/singularity/pkg/build/types"
"github.com/sylabs/singularity/pkg/image"
"github.com/sylabs/singularity/pkg/runtime/engine/config"
"github.com/sylabs/singularity/pkg/sylog"
"github.com/sylabs/singularity/pkg/util/crypt"
)

func fakerootExec(cmdArgs []string) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/internal/cli/buildconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ package cli
import (
"fmt"

"github.com/hpcng/singularity/internal/pkg/buildcfg"
"github.com/hpcng/singularity/pkg/cmdline"
"github.com/spf13/cobra"
"github.com/sylabs/singularity/internal/pkg/buildcfg"
"github.com/sylabs/singularity/pkg/cmdline"
)

func init() {
Expand Down
10 changes: 5 additions & 5 deletions cmd/internal/cli/cache_clean_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"os"
"strings"

"github.com/hpcng/singularity/docs"
"github.com/hpcng/singularity/internal/app/singularity"
"github.com/hpcng/singularity/internal/pkg/cache"
"github.com/hpcng/singularity/pkg/cmdline"
"github.com/hpcng/singularity/pkg/sylog"
"github.com/spf13/cobra"
"github.com/sylabs/singularity/docs"
"github.com/sylabs/singularity/internal/app/singularity"
"github.com/sylabs/singularity/internal/pkg/cache"
"github.com/sylabs/singularity/pkg/cmdline"
"github.com/sylabs/singularity/pkg/sylog"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/internal/cli/cache_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ package cli
import (
"errors"

"github.com/hpcng/singularity/docs"
"github.com/hpcng/singularity/pkg/cmdline"
"github.com/spf13/cobra"
"github.com/sylabs/singularity/docs"
"github.com/sylabs/singularity/pkg/cmdline"
)

func init() {
Expand Down
Loading

0 comments on commit 3763a56

Please sign in to comment.