Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidation #1387

Merged
merged 30 commits into from
Oct 13, 2016
Merged

Consolidation #1387

merged 30 commits into from
Oct 13, 2016

Conversation

janette
Copy link
Member

@janette janette commented Oct 5, 2016

Issue:

  • merge in dkan_dataset
  • civic 3800: merge in dkan_migrate_base
  • civic 4204: merge in dkan_datastore
  • civic 3527: consolidate make files
  • civic 3526: clean up artifacts in repo folders

Description

one repo to rule them all

Additional work for alpha QA

phpunit tests
civic-4304
civic-4317

@ghost
Copy link

ghost commented Oct 6, 2016

@janette Follows a list of extra cleanup steps that need to be done here:

  • dkan_datastore: Remove LICENSE.txt
  • dkan_datastore: Remove CHANGELOG.txt and add all the information on the main CHANGELOG file on DKAN. Check first that the information is not there. Consolidate by versions. Make clear that the new changelog line is related with the datastore module using something like 'DKAN Datastore: Many warnings fixed with proper isset calls' instead of just 'Many warnings fixed with proper isset calls'.
  • dkan_datastore_api: Remove 'composer.json' and 'composer.lock'.
  • dkan_datastore_api: Make sure that everything that is on the 'test' folder was moved and delete the folder.
  • dkan_datastore_fast_import: Make sure that everything that is on the 'test' folder was moved and delete the folder.

@teosibileau
Copy link

@janette, take a look at the PR above

@janette
Copy link
Member Author

janette commented Oct 12, 2016

@MSolv @dafeder one failing test, looks like a timing problem, site is still on the resource page when it is looking for the 'import' button

test-failure-screenshot-2016-10-12-18-04-30_i-press--import-

Copy link
Member

@dafeder dafeder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add a rudimentary README to grunt_extend to avoid confusion

@@ -2,173 +2,387 @@ api: '2'
core: 7.x
includes:
- "https://raw.githubusercontent.com/NuCivic/dkan_dataset/7.x-1.x/dkan_dataset.make"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not be here anymore

- "modules/dkan/dkan_data_story/dkan_data_story.make"
- "modules/dkan/dkan_topics/dkan_topics.make"
- "modules/dkan/dkan_harvest/dkan_harvest.make"
- "https://raw.githubusercontent.com/NuCivic/leaflet_draw_widget/860437c9e6813cf829fee91b31b0968a2f4c5d7a/leaflet_widget.make"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Point this to master for the 7.x-1.x branch, not a specific commit

@dafeder dafeder merged commit e54ed54 into 7.x-1.x Oct 13, 2016
@dafeder dafeder deleted the consolidation branch October 13, 2016 16:24
dafeder pushed a commit that referenced this pull request Apr 24, 2020
dkan_dataset, dkan_datastore, dkan_migrate_base, dkan_workflow all moved into core

* Move dkan_datastore into dkan core

* Apply dkan_datastore pr #76

* Move unit tests to core

* Move dkan_migrate_base repo into dkan core

* Delete unnecessary files, clean up others

* Remove probo, circle, dkan.make, init.sh, and duplicate test files

* civic-2537 consolidate make files

* Clean up dkan_datastore files, update changelog to incluce dkan_datastore info

* Merge dkan_dataset into dkan core

* Clean up changelog, disable fast_import tests

* Updates to latest dkan_migrate_base

* + Updates composer.lock so it installs phpunit
+ Sets proper docroot path for boot.php
+ Sets circle to run phpunit tests

* Update drupal-org.make file

* Update merge of dkan_dataset and integrate dkan_harvest make file

* Revert changes to composer.lock file

* Update leaflet_draw_widget to revision 860437c9e6813cf829fee91b31b0968a2f4c5d7a, see dkan_dataset PR 141 & 148

* Disable phpunit testing for now

* Add wait steps so resource.editor tests pass

* Update README.md

* Create README.md for dkan_migrate_base grunt extender

* Remove dkan_dataset make file and set leaflet_draw_widget to use master branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants