Default value for scmInfo #117

nscarcella · 2016-12-16T15:09:16Z

Uses Git to automatically initialize scmInfo field with a default value so no special configuration is needed to deploy to Sonatype. #113

jonas · 2016-12-22T14:23:08Z

src/main/scala/com/typesafe/sbt/SbtGit.scala

+    gitUncommittedChanges in ThisBuild := gitReader.value.withGit(_.hasUncommittedChanges),
+    scmInfo := {
+      val remote = """origin[ \t]+git@([^:]*):(.*)\.git[ \t]+\(fetch\)""".r
+      Process("git remote -v").lines_!.collect {


If you just want the URL for origin git remote get-url origin will get you the first fetch URL.

Indeed, but it does not work for older versions of Git. I, for example, have 1.9.1 and the get-url subcommand is not available.

jonas · 2016-12-22T14:30:45Z

src/main/scala/com/typesafe/sbt/SbtGit.scala

-    gitUncommittedChanges in ThisBuild := gitReader.value.withGit(_.hasUncommittedChanges)
+    gitUncommittedChanges in ThisBuild := gitReader.value.withGit(_.hasUncommittedChanges),
+    scmInfo := {
+      val remote = """origin[ \t]+git@([^:]*):(.*)\.git[ \t]+\(fetch\)""".r


Would it make sense to also support at least http[s]:// and git:// remotes? SSH remotes can also start with ssh:// but I don't know if that is common.

nscarcella · 2016-12-23T15:17:06Z

@jonas I modified the regex to support http and https formats. This should cover all the cases offered by Github.

I don't exactly know what the git:// and shh:// formats look like (which makes me think they are not that common), but if you show me some examples I can add them too.

jonas · 2016-12-23T17:52:02Z

The Git URL syntax is documented here: https://git-scm.com/docs/git-push#_git_urls_a_id_urls_a

jonas · 2016-12-23T18:24:42Z

src/main/scala/com/typesafe/sbt/SbtGit.scala

+    scmInfo := {
+      val remote = """origin[ \t]+(?:git@|https?\:\/\/)([^:\/]+)[:\/](.*)\.git[ \t]+\(fetch\)""".r
+
+      Process("git remote -v").lines_!.collect {


OK, then how about using git ls-remote --get-url origin added in git/git@45781ad and released in v1.7.5, which will also honor url.<base>.insteadOf.

Fair enough. I made a commit to change this and also refactored the code a bit, because the regex started to look quite ugly.

jonas · 2016-12-23T18:53:03Z

src/main/scala/com/typesafe/sbt/SbtGit.scala

+        case remote(domain, repo) =>
+          ScmInfo(
+            url(s"https://$domain/$repo"),
+            s"scm:git:https://$domain/$repo.git",


Is the scm:git: prefix really needed? I thought it was only the Maven release plugin which used that convention.

I would also suggest to leave out the devConnection field and just use the URL returned either by git ls-remote --get-url origin or git remote -v as the connection URL. For GitHub (and I guess most other hosting services) SSH and HTTPS can both be used for read/write.

Finally, avoiding to hard-code the supported URLs would be nice, but I don't know what the goal of the plugin is in terms of what Git workflows should be supported.

Sadly it seems like this needs to be specified in this way to generate the pom properly. I couldn't make my Sonatype work otherwise.

Regarding the supported URLs, I do agree, though this change is only meant to offer a sane default. Any special cases can still be set manually.

dwijnand

Thanks!

olafurpg · 2017-08-13T19:00:28Z

Just to note it down somewhere, this breaks publish in projects that already provide scm information in pomExtra. Sonatype reports "Duplicated tag: 'scm'" when trying to close a staging repository.

sbt-git got pulled in transitively via sbt-ghpages.

The workaround is to remove the scm section in pomExtra.

Cool feature btw, I'm glad I don't not have to write this info in my builds anymore 😄

Fixes "Duplicate scm" errors from sonatype encountered while publishing, explained here lihaoyi#60 (comment). sbt-git is pulled in transitively via sbt-ghpages, a recent release of sbt-git added a feature where scmInfo is automatically populated, see sbt/sbt-git#117 (comment)

- Make build `+test` friendly. sbt 1.0 `+` uses the sbt-doge `very` semantics. - Remove scm info and add explicit depedency on sbt-git. Fixes "Duplicate scm" errors from sonatype encountered while publishing, explained here lihaoyi#60 (comment). sbt-git is pulled in transitively via sbt-ghpages, a recent release of sbt-git added a feature where scmInfo is automatically populated, see sbt/sbt-git#117 (comment) Blocked by 0.3.10 release because of a `java.io.IOException: destination file exists and overwrite == false` error. I don't know where the destination file is, I've removed ~/.ivy2/local cache, target, ~/.m2 and the error still appears.

- Make build `+test` friendly. sbt 1.0 `+` uses the sbt-doge `very` semantics. - Remove scm info and add explicit depedency on sbt-git. Fixes "Duplicate scm" errors from sonatype encountered while publishing, explained here lihaoyi#60 (comment). sbt-git is pulled in transitively via sbt-ghpages, a recent release of sbt-git added a feature where scmInfo is automatically populated, see sbt/sbt-git#117 (comment) - I skipped 0.3.10 because of a `java.io.IOException: destination file exists and overwrite == false` error. I don't know where the destination file is, I've removed ~/.ivy2/local cache, target, ~/.m2 and the error still appears.

…ed in from microsites plugin automatically adds it. Leaving it in breaks deploy. See sbt/sbt-git#117 for details.

* initial commit with some ideas on how to do multilabel. * Additional hacking on multilabel model. * Added multilabel type aliases. Updated MultilabelModel but it's broken. * Added additional commentst. * Made SparseLabelDepFeatures type alias a little nicer but abused notation a little. * New plan. No label-dependent features for now. * moved MultilabelModel to multilabel package. * updated comments * Removed the requirements that SparseMultiLabelPredictor is Closeable. * Added comment to predictor. * Updated skeleton of MultilabelModel and small change to RegressionFeatures. * Added B <: U in helper methods. * Added a few comments to model and added test skeleton. * removed parameters to Auditor. Just use defaults because the values don't matter because there are no sub models or super models. * Added import to companion object Label type and Auditor. * Added additional test. * SparseMultiLabelPredictor was made package private for testing. * updated privacy of type aliases in multilabel package object * Serialization test * First test passing * Hopefully code complete for the case class. * Added comment. * lessened privileges. * Adding more multi-label tests * Success report test case * Addressing JMorra's PR comments. * More tests * java Serializable needs to be here * Adding MultilabelModel parsing stuff, plugins, VW version, etc. * Empty label problems test * More explicit val name * MultilabelModel parsing is compiling. * Added changed from Iterable[(String, Double)] to Sparse. * new line at EOF. * VW compiling but still a few holes to fill in. Added Namespaces trait. * VW compiling. Added test shell. Fill in shell. * Number of new changes * Test passing. It appears we don't need the dummy classes in test mode. * Updated VwSparseMultilabelPredictor. It now seems to be fully working as show in the test VwMultilabelModelTest. * Added some test comments. * Added comments to VwSparseMultilabelPredictor. * One more passing test, moving to performance testing now * updated split * Merging updates * Figured out the gist of a few more tests, terrible code though * First pass over all tests * Simplified some of the tests * Refactoring * Refactoring common patterns into the companion object * committing VwMultilabelRowCreator and updating other stuff to use it. * All tests pass, code structured a bit better * Wasn't compiling after merge * labels not in training set should be reported * Renamed missingLabels->labelsNotInTrainingSet to conform to new signature * Added some unit tests. Still plenty more to do. * Adding PR template * Addressing comments * Getting everything to compile. Still some work to be done., * VW multi-label model parsing working correctly. Tests prove it! * exposed VW parameters to VwSparseMultilabelPredictor * removed TODO. * updated tests to add coverage. * Added additional tests. * End to end testing working. Need to clean it up. * a little cleanup. * Removed implicit fn com.eharmony.aloha.factory.ScalaJsonFormats.lift(JsonReader). It was turning JsonFormats to JsonReaders and back to JsonFormats without writing capabilities. * simplifying tests. * Updated Travis and made docs:tut succeed. * Bumped stack to 3M for tut until 0.5.5+ can be used. * Bumped stack to 4M for tut until 0.5.5+ can be used. * partial EitherAuditor implementation * Added documentation in project/plugins.sbt about stack overflows. * working * some comments * Lots of tests, documentation, etc. Ready for PR. * updated scaladoc * whitespace * Added -Xss4m to tut scalac options, updated docs deps to: ioProto % "compile->test;compile->compile" * add sbt -v to docs:tut in .travis.yml * vw param function skeleton. * Trying -Xss8m * trying sbt-microsites 0.7.3 with no -Xss params. * Changed comments in project/plugins.sbt. Attempting Ubuntu Trusty on Travis. * updated the VW SHA-256 hash because were using trusty and VW wasn't being cached. * non working VwMultilabelModel.updatedVwParams. Skeleton laid out. * quadratics and cubics seem to be working. * removed println * made ignore_linear more concise * lots of stuff working. More tests to write for VwMultilabelParamAugmentation. * tested higher order interactions. * removed extra whitespace in string output. * working but will change regex padding to use zero-width positive lookahead. * added different padding. * Updated documentation and tests. Looks good. * Updated VW label NS algo. Added test for when a NS can't be found. * hacky solution to flags with options referencing files. Use tmp files :-( * Looks good. * Precompute positive and negative dummy class strings. * Adding numUniqueLabels parameter to updatedVwParams to add VW's --ring_size parameter * stateful row creator and reservoir sampling. * provided concrete implementations of iterator and vector apply method. * more purity in test. * separated pure and impure code. * no more. good enough. * It's never good enough, even on a football Saturday. * Seq -> List * VwDownsampledMultilabelRowCreator and supporting infrastructure and tests. * Made Rand use Int indices, made k < 2^15 in neg label sampling. Updated StatefulRowCreator API. * Addressing PR comments. Removed VW params from VW multi-label model code. * Downsampling can now operate over 2^31 - 1 (2 billion) labels. * changed Iterator.isEmpty to hasNext. Updated docs. * forgot logical not in if statement. * removed toShort from Rand. * addressing PR comments. Changed name of multilabel model to 'SparseMultilabel'. Generalized StatefulRowCreator. * 5.0.1-SNAPSHOT -> 5.1.0-SNAPSHOT * removed SCM section from pom content because new sbt-git version pulled in from microsites plugin automatically adds it. Leaving it in breaks deploy. See sbt/sbt-git#117 for details.

sbt#133

dac37c0

jonas reviewed Dec 22, 2016

View reviewed changes

Adding http[s] format support

f8a2a6b

jonas reviewed Dec 23, 2016

View reviewed changes

Added support for more url formats

c5e88fc

dwijnand approved these changes Mar 28, 2017

View reviewed changes

dwijnand merged commit 4e05a74 into sbt:master Mar 28, 2017

jvican mentioned this pull request Jun 19, 2017

Extracting scmInfo directly from git #113

Closed

olafurpg mentioned this pull request Aug 13, 2017

Release 0.3.11. lihaoyi/Scalatex#61

Merged

deaktator mentioned this pull request Nov 15, 2017

Fix deployment eHarmony/aloha#197

Closed

deaktator pushed a commit to eHarmony/aloha that referenced this pull request Nov 17, 2017

removed SCM section from pom content because new sbt-git version pull…

ac51108

…ed in from microsites plugin automatically adds it. Leaving it in breaks deploy. See sbt/sbt-git#117 for details.

deaktator mentioned this pull request Nov 17, 2017

Closes #197 eHarmony/aloha#198

Closed

deaktator pushed a commit to eHarmony/aloha that referenced this pull request Nov 17, 2017

removed SCM section from pom content because new sbt-git version pull…

f8588f3

…ed in from microsites plugin automatically adds it. Leaving it in breaks deploy. See sbt/sbt-git#117 for details.

deaktator mentioned this pull request Nov 17, 2017

Closes #197 eHarmony/aloha#199

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Default value for scmInfo #117

Default value for scmInfo #117

nscarcella commented Dec 16, 2016

jonas Dec 22, 2016

nscarcella Dec 23, 2016 •

edited

Loading

jonas Dec 22, 2016

nscarcella commented Dec 23, 2016

jonas commented Dec 23, 2016

jonas Dec 23, 2016

nscarcella Dec 23, 2016

jonas Dec 23, 2016

nscarcella Dec 23, 2016

dwijnand left a comment

olafurpg commented Aug 13, 2017

Default value for scmInfo #117

Default value for scmInfo #117

Conversation

nscarcella commented Dec 16, 2016

jonas Dec 22, 2016

Choose a reason for hiding this comment

nscarcella Dec 23, 2016 • edited Loading

Choose a reason for hiding this comment

jonas Dec 22, 2016

Choose a reason for hiding this comment

nscarcella commented Dec 23, 2016

jonas commented Dec 23, 2016

jonas Dec 23, 2016

Choose a reason for hiding this comment

nscarcella Dec 23, 2016

Choose a reason for hiding this comment

jonas Dec 23, 2016

Choose a reason for hiding this comment

nscarcella Dec 23, 2016

Choose a reason for hiding this comment

dwijnand left a comment

Choose a reason for hiding this comment

olafurpg commented Aug 13, 2017

nscarcella Dec 23, 2016 •

edited

Loading